处理-网络相关问题

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -915,7 +915,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/UMSocialSDKPlugin",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
 				);
-				MARKETING_VERSION = 2.9.8;
+				MARKETING_VERSION = 2.9.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -999,7 +999,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/ThirdSDK/UMSocial/UMSocialSDKPlugin",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
 				);
-				MARKETING_VERSION = 2.9.8;
+				MARKETING_VERSION = 2.9.9;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,11 +26,75 @@
             filePath = "JianYuIOS/Classes（模块）/JYNewExpViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "725"
-            endingLineNumber = "725"
+            startingLineNumber = "726"
+            endingLineNumber = "726"
             landmarkName = "-jsLoginSuccess:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "08EDC44A-EFC0-4926-88FA-31774DFBB466"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSearchViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2001"
+            endingLineNumber = "2001"
+            landmarkName = "-popWebView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3EA8AEA0-BF37-4F1F-A8D7-93BCAB6CE52C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSubViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1504"
+            endingLineNumber = "1504"
+            landmarkName = "-popWebView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F9BC2C41-C736-4081-9BDD-61D58F17A57E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewExpViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1502"
+            endingLineNumber = "1502"
+            landmarkName = "-popWebView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D50D11AA-3A8C-411B-AB8F-0105F715E8F5"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewMineViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1531"
+            endingLineNumber = "1531"
+            landmarkName = "-popWebView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.m

@@ -466,9 +466,10 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 #pragma mark - WKNavigationDelegate
 /* 页面加载完成 */
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
-//    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
+    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
     [self judgeIsHiddenBottom];//是否隐藏
     [self removeNoNetViews];
+    [self removeFailNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
     [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
     [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
@@ -1376,13 +1377,6 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     kMainQueue(^{
         [self removeFailNetViews];
         self.failNetView = [NoNetView shareView];
-        if(self.tabBarController.selectedIndex == 0) {
-            if ([self.webView canGoBack]) {
-                self.failNetView.popBtn.hidden = NO;
-            }else{
-                self.failNetView.popBtn.hidden = YES;
-            }
-        }
         [self.view addSubview:self.failNetView];
     });
 }

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.m

@@ -457,6 +457,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     NSLog(@"我的初始化");
+    
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.webView];
     [self.view addSubview:self.progressView];
@@ -483,9 +484,10 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 #pragma mark - WKNavigationDelegate
 /* 页面加载完成 */
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
-//    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
+    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
     [self judgeIsHiddenBottom];
     [self removeNoNetViews];
+    [self removeFailNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
     [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
 //    [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
@@ -1385,6 +1387,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 -(void)addNoNetViews{
     kMainQueue(^{
         [self removeNoNetViews];
+        NSString *current_url = [self stringByEvaluatingJavaScriptFromString:@"document.location.href"];
+        NSLog(@"当前页面:%@",current_url);
         self.noNetView = [NoNetView shareView];
         [self.view addSubview:self.noNetView];
     });
@@ -1402,13 +1406,6 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     kMainQueue(^{
         [self removeFailNetViews];
         self.failNetView = [NoNetView shareView];
-        if(self.tabBarController.selectedIndex == 0) {
-            if ([self.webView canGoBack]) {
-                self.failNetView.popBtn.hidden = NO;
-            }else{
-                self.failNetView.popBtn.hidden = YES;
-            }
-        }
         [self.view addSubview:self.failNetView];
     });
 }

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.m

@@ -1856,22 +1856,17 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 -(void)addNoNetViews{
     kMainQueue(^{
+        self.recognizer.enabled = NO;
         [self removeNoNetViews];
+        //about:blank
         self.noNetView = [NoNetView shareView];
-        if(self.tabBarController.selectedIndex == 0) {
-            if ([self.webView canGoBack]) {
-                self.noNetView.popBtn.hidden = NO;
-            }else{
-                self.noNetView.popBtn.hidden = YES;
-            }
-        }
-    
         [self.view addSubview:self.noNetView];
     });
 }
 
 -(void)removeNoNetViews{
     if (self.noNetView ) {
+        self.recognizer.enabled = YES;
         [self.noNetView removeFromSuperview];
         self.noNetView  = nil;
     }
@@ -1880,21 +1875,16 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 -(void)addFailNetViews{
     kMainQueue(^{
+        self.recognizer.enabled = NO;
         [self removeFailNetViews];
         self.failNetView = [NoNetView shareView];
-        if(self.tabBarController.selectedIndex == 0) {
-            if ([self.webView canGoBack]) {
-                self.failNetView.popBtn.hidden = NO;
-            }else{
-                self.failNetView.popBtn.hidden = YES;
-            }
-        }
         [self.view addSubview:self.failNetView];
     });
 }
 
 -(void)removeFailNetViews{
     if (self.failNetView ) {
+        self.recognizer.enabled = YES;
         [self.failNetView removeFromSuperview];
         self.failNetView  = nil;
     }

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.m

@@ -472,10 +472,11 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 /* 页面加载完成 */
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
    
-//    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
+    NSLog(@"-----页面加载完成%@",webView.URL.absoluteString);
     //正常的网页加载
     [self judgeIsHiddenBottom];//是否隐藏
     [self removeNoNetViews];
+    [self removeFailNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
     [self.webView evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
     [self.webView evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';"completionHandler:nil];
@@ -1382,13 +1383,6 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     kMainQueue(^{
         [self removeFailNetViews];
         self.failNetView = [NoNetView shareView];
-        if(self.tabBarController.selectedIndex == 0) {
-            if ([self.webView canGoBack]) {
-                self.failNetView.popBtn.hidden = NO;
-            }else{
-                self.failNetView.popBtn.hidden = YES;
-            }
-        }
         [self.view addSubview:self.failNetView];
     });
 }

ios/JianYuIOS/JianYuIOS/CustomView/NoNetView.h

@@ -10,7 +10,7 @@
 
 @interface NoNetView : UIView
 
-@property (weak, nonatomic) IBOutlet UIButton *popBtn;
+//@property (weak, nonatomic) IBOutlet UIButton *popBtn;
 
 +(instancetype)shareView;
 

ios/JianYuIOS/JianYuIOS/CustomView/NoNetView.m

@@ -17,10 +17,11 @@
     view.frame = [UIScreen mainScreen].bounds;
     return view;
 }
-- (IBAction)popClick:(id)sender {
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:PopWebView object:nil];
-}
+
+//- (IBAction)popClick:(id)sender {
+//
+//    [[NSNotificationCenter defaultCenter] postNotificationName:PopWebView object:nil];
+//}
 - (IBAction)click1:(id)sender {
     [[NSNotificationCenter defaultCenter] postNotificationName:kReloadWebVIew object:nil];
 }

ios/JianYuIOS/JianYuIOS/CustomView/NoNetView.xib

@@ -64,41 +64,18 @@
                         <constraint firstItem="W56-Wm-H3y" firstAttribute="top" secondItem="bN2-JA-Ssh" secondAttribute="top" id="gLJ-7o-ysh"/>
                     </constraints>
                 </view>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bHO-yc-ATu">
-                    <rect key="frame" x="0.0" y="20" width="55" height="55"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="55" id="8jY-df-aiy"/>
-                        <constraint firstAttribute="width" constant="55" id="an4-eP-Iny"/>
-                    </constraints>
-                    <state key="normal" image="arrowLeft.png">
-                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    </state>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/>
-                        <userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="3"/>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <action selector="popClick:" destination="iN0-l3-epB" eventType="touchUpInside" id="uk8-AR-jEK"/>
-                    </connections>
-                </button>
             </subviews>
             <color key="backgroundColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.97647058819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="bHO-yc-ATu" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="1Ly-eJ-bmv"/>
                 <constraint firstItem="bN2-JA-Ssh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="7dB-g1-61f"/>
-                <constraint firstItem="bHO-yc-ATu" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="UYz-vJ-D3W"/>
                 <constraint firstItem="bN2-JA-Ssh" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="gae-IL-Cgb"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="popBtn" destination="bHO-yc-ATu" id="LvZ-F0-kT7"/>
-            </connections>
             <point key="canvasLocation" x="54.399999999999999" y="54.422788605697157"/>
         </view>
     </objects>
     <resources>
-        <image name="arrowLeft.png" width="10.5" height="19"/>
         <image name="noNet.png" width="147" height="147"/>
     </resources>
 </document>

ios/JianYuIOS/JianYuIOS/JYTabBarController.m

@@ -74,6 +74,10 @@
 //    if(tabBarController.tabBar.selectedItem.tag==0) {
 //        return NO;
 //    }
+    
+    if (![ZKMethod judegeNetworkIsAvailable]) {//无网络状态-不让点击
+        return NO;
+    }
     if (![LXUserDefaults isExistToken]) {
     
         if(tabBarController.tabBar.selectedItem.tag!=0) {