apple 4 年之前
父节点
当前提交
e8afd9f46c

+ 8 - 8
ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -922,8 +922,8 @@
 				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 64;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				CURRENT_PROJECT_VERSION = 65;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1004,8 +1004,8 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 64;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				CURRENT_PROJECT_VERSION = 65;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1083,7 +1083,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				INFOPLIST_FILE = JianYuIOSTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.topnet.jianyuiOS.JianYuIOSTests;
@@ -1098,7 +1098,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				INFOPLIST_FILE = JianYuIOSTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.topnet.jianyuiOS.JianYuIOSTests;
@@ -1112,7 +1112,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				INFOPLIST_FILE = JianYuIOSUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.topnet.jianyuiOS.JianYuIOSUITests;
@@ -1126,7 +1126,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4S438G3ZUL;
+				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				INFOPLIST_FILE = JianYuIOSUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.topnet.jianyuiOS.JianYuIOSUITests;

二进制
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 20 - 4
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -19,16 +19,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A620328F-20C4-4B68-9B7C-D5447A3003BC"
+            uuid = "9429D6C9-28CA-402C-AD9C-5DBBC89C006B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSubViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1095"
+            endingLineNumber = "1095"
+            landmarkName = "-jsCheckLocationPermission:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "708BFCA9-0E8E-4661-8161-744504F0525C"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewExpViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "658"
-            endingLineNumber = "658"
-            landmarkName = "-jsGetUserToken:"
+            startingLineNumber = "1096"
+            endingLineNumber = "1096"
+            landmarkName = "-jsReadRight:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 25 - 3
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -37,6 +37,8 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+    // 启动图片延时: 2秒
+//    [NSThread sleepForTimeInterval:2];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     JYTabBarController *tabBarVc = [[JYTabBarController alloc] init];
     self.window.rootViewController = tabBarVc;
@@ -185,8 +187,7 @@
     NSLog(@"测试:%@",[LXUserDefaults isInstallWeiXin]?@"1":@"0");
     NSLog(@"测试:%@",[LXUserDefaults isInstallAli]?@"1":@"0");
     
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:kUpdateNotifyState object:nil];
+
     
     //查看粘贴板数据
     NSString  *content = [UIPasteboard generalPasteboard].string;
@@ -202,7 +203,28 @@
 
 - (void)applicationWillTerminate:(UIApplication *)application {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-    
+}
+
+-(NSString*)getCurrentTimes{
+
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+
+    // ----------设置你想要的格式,hh与HH的区别:分别表示12小时制,24小时制
+
+    [formatter setDateFormat:@"YYYY-MM-dd HH:mm:ss"];
+
+    //现在时间,你可以输出来看下是什么格式
+
+    NSDate *datenow = [NSDate date];
+
+   
+
+    NSString *currentTimeString = [formatter stringFromDate:datenow];
+
+   
+
+    return currentTimeString;
+
 }
 
 

+ 9 - 33
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -83,8 +83,6 @@ _Pragma("clang diagnostic pop")\
 #import  <CommonCrypto/CommonCryptor.h>
 
 
-//监听网络变化
-#define kUpdateNotifyState @"kUpdateNotifyState"
 //刷新或页面
 #define NotNetReloadWebVIew @"notNetReloadWebVIew"
 //退出登录
@@ -182,19 +180,23 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"http://web-jydev-wh.jianyu360.cn/" //王hao
 
-//#define kHost @"http://web-jydev-yf.jianyu360.cn/" //杨峰
+//#define kHost @"https://web-yf.jydev.jianyu360.com/" //杨峰
 
+//#define kHost @"http://192.168.20.235:8081/dev/docs/"
 
 
 
 
-//#define kHost @"https://app207-jytest.jianyu360.cn/"   //测试http
+//#define kHost @"https://anti.jydev.jianyu360.com/"   //测试http
 
-//#define kHost @"https://app-jytest.jianyu360.cn/"  //测试1
+//#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
 
-#define kHost @"https://app2-jytest.jianyu360.cn/"  //测试2
+#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
+
+//#define kHost @"https://app-i2.jianyu360.com/"   //新正式
+
+//#define kHost @"https://app-i1.zhaobiao.info/"
 
-//#define kHost @"https://app-i5.jianyu360.com/"   //新正式
 
 //测试
 #define OCRAPPID @"TIDAXUV9"
@@ -211,32 +213,6 @@ _Pragma("clang diagnostic pop")\
  */
 
 
-#define POST_JS @"function my_post(path, params) {\
-var method = \"POST\";\
-var form = document.createElement(\"form\");\
-form.setAttribute(\"method\", method);\
-form.setAttribute(\"action\", path);\
-for(var key in params){\
-    if (params.hasOwnProperty(key)) {\
-        var hiddenFild = document.createElement(\"input\");\
-        hiddenFild.setAttribute(\"type\", \"hidden\");\
-        hiddenFild.setAttribute(\"name\", key);\
-        hiddenFild.setAttribute(\"value\", params[key]);\
-    }\
-    form.appendChild(hiddenFild);\
-}\
-document.body.appendChild(form);\
-form.submit();\
-}"
-
-
-
-
-
-
-
-
-
 
 #endif /* PrefixHeader_pch */
 

+ 4 - 25
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewExpViewController.m

@@ -20,7 +20,6 @@
 
 @property (nonatomic, strong) UIProgressView *progressView;
 @property (nonatomic, strong) WKWebView *webView;
-@property(nonatomic, assign)BOOL updateNotify;
 @property(nonatomic, strong)NoNetView *noNetView;
 @property(nonatomic, strong)NoNetView *failNetView;
 @property(nonatomic, strong)ZKClipboardView *clipboardView;
@@ -204,7 +203,7 @@ NSString *const new_AesKey_3 = @"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];
@@ -459,11 +458,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [_webView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
             if (error!=nil) {
-//                NSLog(@"result:%@,error:%@",result,error);
-//                [[GlobalData shareInstance] addOnePlistData:@{
-//                    @"detail":[[self stringByEvaluatingJavaScriptFromString:@"document.location.href"] stringByAppendingString:[NSString stringWithFormat:@"\nJS异常方法:%@\n%@",jsStr,[error description]]],
-//                    @"reqTime":[NSNumber numberWithInt:0],
-//                }];
+
             }
         }];
     });
@@ -667,7 +662,6 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 }
 // 跳转到系统设置
 -(void)jsOpenSystemNotification:(NSDictionary *)dict{
-    self.updateNotify = YES;
    [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
 }
 // 获取推送id
@@ -925,10 +919,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         NSLog(@"responseObject=%@",responseObject);
     } failure:^(NSError *error) {
         NSLog(@"error=%@",error);
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":[NSString stringWithFormat:@"message/receive接口:%@",[error description]],
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
 }
@@ -1328,10 +1319,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         
         NSLog(@"上传失败%@",error);
         [self uploadUrl:@""];
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":@"上传图片接口",
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
     
@@ -1500,15 +1488,6 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     
 }
 
-// 调用js方法 刷新推送权限状态
--(void)updateNotifyState:(NSNotification *)notification{
-    if (self.updateNotify) {
-        self.updateNotify = NO;
-        [self isExitCallToJS:[NSString stringWithFormat:@"updateNoticeSwitch()"] withMethodName:@"updateNoticeSwitch"];
-    }
-}
-
-
 // 再次加载页面
 -(void)notNetReloadWebVIew:(NSNotification *)notification{
     if(self.tabBarController.selectedIndex == 2) {

+ 10 - 19
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -30,7 +30,7 @@
 
 @property (nonatomic, strong) UIProgressView *progressView;
 @property (nonatomic, strong) WKWebView *webView;
-@property(nonatomic, assign)BOOL updateNotify;
+
 @property(nonatomic, strong)NoNetView *noNetView;
 @property(nonatomic, strong)NoNetView *failNetView;
 @property(nonatomic, strong)UIPanGestureRecognizer *recognizer;
@@ -217,7 +217,7 @@ NSString *const new_AesKey_4 = @"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];
@@ -669,7 +669,6 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 }
 // 跳转到系统设置
 -(void)jsOpenSystemNotification:(NSDictionary *)dict{
-    self.updateNotify = YES;
    [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
 }
 // 获取推送id
@@ -929,10 +928,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         NSLog(@"responseObject=%@",responseObject);
     } failure:^(NSError *error) {
         NSLog(@"error=%@",error);
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":[NSString stringWithFormat:@"message/receive接口:%@",[error description]],
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
 }
@@ -1111,11 +1107,17 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         //询问方式:
         if ([CLLocationManager authorizationStatus]!= kCLAuthorizationStatusDenied) {
             if ([CLLocationManager authorizationStatus]==kCLAuthorizationStatusNotDetermined) {
+                NSLog(@"询问");
+                //
                 return -1;
+                
             }
+            NSLog(@"开启");
             return 1;
+           
         }
     }
+    NSLog(@"未开启");
     return 0;
 }
 
@@ -1336,10 +1338,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         
         NSLog(@"上传失败%@",error);
         [self uploadUrl:@""];
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":@"上传图片接口",
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
     
@@ -1503,14 +1502,6 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     
 }
 
-// 调用js方法 刷新推送权限状态
--(void)updateNotifyState:(NSNotification *)notification{
-    if (self.updateNotify) {
-        self.updateNotify = NO;
-        [self isExitCallToJS:[NSString stringWithFormat:@"updateNoticeSwitch()"] withMethodName:@"updateNoticeSwitch"];
-    }
-}
-
 // 再次加载页面
 -(void)notNetReloadWebVIew:(NSNotification *)notification{
     if(self.tabBarController.selectedIndex == 3) {

+ 12 - 34
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -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{

+ 5 - 27
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSubViewController.m

@@ -20,7 +20,6 @@
 
 @property (nonatomic, strong) UIProgressView *progressView;
 @property (nonatomic, strong) WKWebView *webView;
-@property(nonatomic, assign)BOOL updateNotify;
 @property(nonatomic, strong)NoNetView *noNetView;
 @property(nonatomic, strong)NoNetView *failNetView;
 @property(nonatomic, strong)ZKClipboardView *clipboardView;
@@ -207,7 +206,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jyRefreshMenusView:) name:JYRefreshMenusView object:nil];
     //支付状态通知
     [[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];
@@ -455,11 +454,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [_webView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
             if (error!=nil) {
-//                NSLog(@"result:%@,error:%@",result,error);
-//                [[GlobalData shareInstance] addOnePlistData:@{
-//                    @"detail":[[self stringByEvaluatingJavaScriptFromString:@"document.location.href"] stringByAppendingString:[NSString stringWithFormat:@"\nJS异常方法:%@\n%@",jsStr,[error description]]],
-//                    @"reqTime":[NSNumber numberWithInt:0],
-//                }];
+                
             }
         }];
     });
@@ -469,10 +464,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     NSLog(@"订阅初始化");
-    [[GlobalData shareInstance] addOnePlistData:@{
-        @"detail":@"test",
-        @"reqTime":[NSNumber numberWithInt:0],
-    }];
+
     
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.webView];
@@ -667,7 +659,6 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 }
 // 跳转到系统设置
 -(void)jsOpenSystemNotification:(NSDictionary *)dict{
-    self.updateNotify = YES;
    kMainQueue(^{
        [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
    });
@@ -929,10 +920,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         NSLog(@"responseObject=%@",responseObject);
     } failure:^(NSError *error) {
         NSLog(@"error=%@",error);
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":[NSString stringWithFormat:@"message/receive接口:%@",[error description]],
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
 }
@@ -1329,10 +1317,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         
         NSLog(@"上传失败%@",error);
         [self uploadUrl:@""];
-        [[GlobalData shareInstance] addOnePlistData:@{
-            @"detail":@"上传图片接口",
-            @"reqTime":[NSNumber numberWithInt:0],
-        }];
+
     }];
     
     
@@ -1501,13 +1486,6 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     
 }
 
-// 调用js方法 刷新推送权限状态
--(void)updateNotifyState:(NSNotification *)notification{
-    if (self.updateNotify) {
-        self.updateNotify = NO;
-        [self isExitCallToJS:[NSString stringWithFormat:@"updateNoticeSwitch()"] withMethodName:@"updateNoticeSwitch"];
-    }
-}
 
 
 // 再次加载页面

+ 1 - 4
ios/JianYuIOS/JianYuIOS/JYWKNewWebController.m

@@ -164,10 +164,7 @@
 
 // 页面加载失败时调用
 - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(nonnull NSError *)error{
-    [[GlobalData shareInstance] addOnePlistData:@{
-        @"detail":[[self stringByEvaluatingJavaScriptFromString:@"document.location.href"] stringByAppendingString:[NSString stringWithFormat:@"\n%@",[error description]]],
-        @"reqTime":[NSNumber numberWithInt:0],
-    }];
+
 }