|
@@ -27,7 +27,6 @@
|
|
|
@property (nonatomic, strong) UIProgressView *progressView;
|
|
|
@property (nonatomic, strong) WKWebView *webView;
|
|
|
|
|
|
-@property(nonatomic, assign)BOOL updateNotify;
|
|
|
|
|
|
@property(nonatomic,strong)CLLocationManager *locaationManager;
|
|
|
@property(nonatomic,strong)NSString *placeAdr;
|
|
@@ -227,7 +226,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
//支付状态通知
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(alipayWXpayStatus:) name:AlipayWXpayStatus object:nil];
|
|
|
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateNotifyState:) name:kUpdateNotifyState object:nil];
|
|
|
+
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notNetReloadWebVIew:) name:NotNetReloadWebVIew object:nil];
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(popWebView:) name:PopWebView object:nil];
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginOut:) name:kLoginOut object:nil];
|
|
@@ -252,7 +251,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
NSLog(@"%@",current_url);
|
|
|
CGRect rect = self.view.bounds;
|
|
|
CGFloat width = CGRectGetWidth(rect);
|
|
|
- if (![self.webView canGoBack]||([current_url containsString:@"jyapp/free/login"])) {
|
|
|
+ if (![self.webView canGoBack] || ([current_url containsString:@"jyapp/free/login"])) {
|
|
|
NSLog(@"不可返回");
|
|
|
return;
|
|
|
}
|
|
@@ -555,7 +554,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
|
|
|
//定时器-检测错误数据是否超过10个 发送
|
|
|
- [NSTimer scheduledTimerWithTimeInterval:180 target:self selector:@selector(errorLogListening) userInfo:nil repeats:YES];
|
|
|
+// [NSTimer scheduledTimerWithTimeInterval:180 target:self selector:@selector(errorLogListening) userInfo:nil repeats:YES];
|
|
|
//监听底部栏
|
|
|
[NSTimer scheduledTimerWithTimeInterval:3 target:self selector:@selector(bottomOneListening) userInfo:nil repeats:YES];
|
|
|
|
|
@@ -667,10 +666,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
[[GlobalData shareInstance] clearPlistData];
|
|
|
} failure:^(NSError *error) {
|
|
|
NSLog(@"error=%@",error);
|
|
|
- [[GlobalData shareInstance] addOnePlistData:@{
|
|
|
- @"detail":[NSString stringWithFormat:@"上传日志接口:%@",[error description]],
|
|
|
- @"reqTime":[NSNumber numberWithInt:0],
|
|
|
- }];
|
|
|
+
|
|
|
}];
|
|
|
}
|
|
|
}else {
|
|
@@ -714,10 +710,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
} failure:^(NSError *error) {
|
|
|
NSLog(@"error=%@",error);
|
|
|
- [[GlobalData shareInstance] addOnePlistData:@{
|
|
|
- @"detail":[NSString stringWithFormat:@"获取小红点接口:%@",[error description]],
|
|
|
- @"reqTime":[NSNumber numberWithInt:0],
|
|
|
- }];
|
|
|
+
|
|
|
}];
|
|
|
}
|
|
|
}
|
|
@@ -905,7 +898,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
}
|
|
|
// 跳转到系统设置
|
|
|
-(void)jsOpenSystemNotification:(NSDictionary *)dict{
|
|
|
- self.updateNotify = YES;
|
|
|
[[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
|
|
|
}
|
|
|
// 获取推送id
|
|
@@ -1127,7 +1119,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
return device.platformString;
|
|
|
}
|
|
|
-(NSString *)jsGetLocation:(NSDictionary *)dict {
|
|
|
-// NSLog(@"------开始调用获取位置:%@",self.placeAdr);
|
|
|
+ NSLog(@"------开始调用获取位置:%@",self.placeAdr);
|
|
|
if (!self.isLocation) {
|
|
|
// 1.检查定位服务是否开启
|
|
|
if ([self checkLocationServiceIsEnabled]) {
|
|
@@ -1139,9 +1131,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
NSLog(@"定位不可用");
|
|
|
self.isLocation = NO;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-// NSLog(@"即将返回城市信息-%@",self.placeAdr);
|
|
|
+ //NSLog(@"即将返回城市信息-%@",self.placeAdr);
|
|
|
}
|
|
|
NSLog(@"即将返回城市信息-%@",self.placeAdr);
|
|
|
|
|
@@ -1206,10 +1196,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
NSLog(@"responseObject=%@",responseObject);
|
|
|
} failure:^(NSError *error) {
|
|
|
NSLog(@"error=%@",error);
|
|
|
- [[GlobalData shareInstance] addOnePlistData:@{
|
|
|
- @"detail":[NSString stringWithFormat:@"message/receive接口:%@",[error description]],
|
|
|
- @"reqTime":[NSNumber numberWithInt:0],
|
|
|
- }];
|
|
|
+
|
|
|
}];
|
|
|
|
|
|
}
|
|
@@ -1542,12 +1529,15 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
-(void)judgeIsHiddenBottom {
|
|
|
if(self.tabBarController.selectedIndex == 0) {
|
|
|
NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
|
|
|
+
|
|
|
NSArray *array = [current_url componentsSeparatedByString:@"?"];
|
|
|
current_url = [NSString stringWithFormat:@"%@",array.firstObject];
|
|
|
if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
|
|
|
+ NSLog(@"展示:%@",current_url);
|
|
|
[self showTabBar];
|
|
|
[self showMethodTabBar];
|
|
|
}else {
|
|
|
+ NSLog(@"隐藏:%@",current_url);
|
|
|
[self hideTabBar];
|
|
|
[self hiddenMethodTabBar];
|
|
|
}
|
|
@@ -1684,10 +1674,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
|
|
|
NSLog(@"上传失败%@",error);
|
|
|
[self uploadUrl:@""];
|
|
|
- [[GlobalData shareInstance] addOnePlistData:@{
|
|
|
- @"detail":@"上传图片接口",
|
|
|
- @"reqTime":[NSNumber numberWithInt:0],
|
|
|
- }];
|
|
|
+
|
|
|
}];
|
|
|
|
|
|
|
|
@@ -1931,15 +1918,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// 调用js方法 刷新推送权限状态
|
|
|
--(void)updateNotifyState:(NSNotification *)notification{
|
|
|
- if (self.updateNotify) {
|
|
|
- self.updateNotify = NO;
|
|
|
- [self isExitCallToJS:[NSString stringWithFormat:@"updateNoticeSwitch()"] withMethodName:@"updateNoticeSwitch"];
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
// 再次加载页面
|
|
|
-(void)notNetReloadWebVIew:(NSNotification *)notification{
|