|
@@ -18,7 +18,6 @@
|
|
|
NSInteger _time;
|
|
|
NSInteger pushIndex;//第几个模块过来的
|
|
|
BOOL notiFinish;
|
|
|
- BOOL refreshTabBool; //实验室-百宝箱 是否刷新
|
|
|
BOOL isLoadRedDot;
|
|
|
CGPoint startTouch;
|
|
|
BOOL _isMoving;
|
|
@@ -480,8 +479,18 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
|
|
|
//定时器-检测错误数据是否超过10个 发送
|
|
|
- [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(errorLogListening) userInfo:nil repeats:YES];
|
|
|
+ [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(errorLogListening) userInfo:nil repeats:YES];
|
|
|
+ //监听底部栏
|
|
|
+ [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(bottomOneListening) userInfo:nil repeats:YES];
|
|
|
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+-(void)bottomOneListening {
|
|
|
+ NSLog(@"监听tab-Sea");
|
|
|
+ if(self.tabBarController.selectedIndex == 0) {
|
|
|
+ [self judgeIsHiddenBottom];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- (BOOL)isTheCurrentPeriod{
|
|
@@ -614,30 +623,11 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
if(!notiFinish) {
|
|
|
notiFinish = YES;
|
|
|
}
|
|
|
- if(refreshTabBool){
|
|
|
- NSLog(@"刷新-刷新-刷新-刷新-")
|
|
|
- refreshTabBool = NO;
|
|
|
- }else {
|
|
|
- //正常的网页加载
|
|
|
- [self judgeIsHidden];//是否隐藏
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-// if ([GlobalData shareInstance].isSideslip) {
|
|
|
-// [GlobalData shareInstance].isSideslip = YES;
|
|
|
-// [self isExitCallToJS:@"afterClickBack()" withMethodName:@"afterClickBack"];
|
|
|
-// }
|
|
|
-
|
|
|
+ [self judgeIsHiddenBottom];//是否隐藏
|
|
|
[self removeNoNetViews];
|
|
|
[[LXViewControllerManager shareViewControllerManager] hideHud];
|
|
|
- //延迟测试
|
|
|
-// [self performSelector:@selector(afterPageClick) withObject:nil afterDelay:2];
|
|
|
-
|
|
|
}
|
|
|
|
|
|
-//-(void)afterPageClick {
|
|
|
-// [self isExitCallToJS:@"afterPageInit()" withMethodName:@"afterPageInit"];
|
|
|
-//}
|
|
|
// 页面开始加载时调用
|
|
|
- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
|
|
|
|
|
@@ -1022,37 +1012,20 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
return self.webView.canGoBack ? 1:0;
|
|
|
}
|
|
|
|
|
|
-//-(void)jsJudgeIsHidden:(NSDictionary *)dict {
|
|
|
-// if([dict objectForKey:@"referer"]) {
|
|
|
-// NSString *current_url = [NSString stringWithFormat:@"%@",dict[@"referer"]];
|
|
|
-// if (![current_url isEqualToString:@""]) {
|
|
|
-// NSLog(@"判断是否需要隐藏:%@",current_url);
|
|
|
-// if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
|
|
|
-// NSLog(@"需要展示");
|
|
|
-// [self showTabBar];
|
|
|
-// [self showMethodTabBar];
|
|
|
-// }else {
|
|
|
-// NSLog(@"需要隐藏");
|
|
|
-// [self hideTabBar];
|
|
|
-// [self hiddenMethodTabBar];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
-//}
|
|
|
-
|
|
|
-
|
|
|
#pragma mark *****其他方法
|
|
|
--(void)judgeIsHidden {
|
|
|
- NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
|
- NSLog(@"判断需要隐藏否:%@",current_url);
|
|
|
- if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
|
|
|
- NSLog(@"需要展示");
|
|
|
- [self showTabBar];
|
|
|
- [self showMethodTabBar];
|
|
|
- }else {
|
|
|
- NSLog(@"需要隐藏");
|
|
|
- [self hideTabBar];
|
|
|
- [self hiddenMethodTabBar];
|
|
|
+-(void)judgeIsHiddenBottom {
|
|
|
+ if(self.tabBarController.selectedIndex == 0) {
|
|
|
+ NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
|
+ NSLog(@"判断需要隐藏否:%@",current_url);
|
|
|
+ if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
|
|
|
+ NSLog(@"需要展示");
|
|
|
+ [self showTabBar];
|
|
|
+ [self showMethodTabBar];
|
|
|
+ }else {
|
|
|
+ NSLog(@"需要隐藏");
|
|
|
+ [self hideTabBar];
|
|
|
+ [self hiddenMethodTabBar];
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1584,7 +1557,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
//刷新页面相关
|
|
|
-(void)refreshNonCurVC:(NSNotification *)notificaition{
|
|
|
if(self.tabBarController.selectedIndex != 0) {
|
|
|
- refreshTabBool = YES;
|
|
|
[self webViewFirstRequest];
|
|
|
}
|
|
|
}
|