网络加载H5失败显示

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "DEV"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSBaseWKWebViewController.m

@@ -1145,7 +1145,7 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
 }
 
 // 6 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation {
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
     NSLog(@"6-------页面加载失败时调用");
     [self showErrorView];
 }

KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSLocalWebViewController.m

@@ -195,7 +195,7 @@
 }
 
 // 6 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation {
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
     NSLog(@"6-------页面加载失败时调用");
 }
 

KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSWebLoadRefreshView.m

@@ -28,6 +28,12 @@
     self.refreshButton.layer.borderColor = CLIENT_THEMECOLOR.CGColor;
     self.refreshButton.backgroundColor = CLIENT_THEMECOLOR;
     [self.emptyImage setImage:[UIImage imageNamed:CLIENT_NONETWORKING_IMG]];
+    if ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0) {
+        [self.refreshButton setTitleColor:THEMECOLOR forState:UIControlStateNormal];
+    }
+    else {
+        [self.refreshButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    }
 }
 
 + (instancetype)shareInstance {

KulexiuForStudent/KulexiuForStudent/Common/Base/WebView/KSWebLoadRefreshView.xib

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,10 +15,10 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OSR-hZ-Liz">
-                    <rect key="frame" x="0.0" y="0.0" width="393" height="88"/>
+                    <rect key="frame" x="0.0" y="59" width="393" height="44"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BvM-d4-lej">
-                            <rect key="frame" x="0.0" y="44" width="393" height="44"/>
+                            <rect key="frame" x="0.0" y="0.0" width="393" height="44"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_black" translatesAutoresizingMaskIntoConstraints="NO" id="Vlj-I7-nf3">
                                     <rect key="frame" x="13" y="12" width="12" height="20"/>
@@ -57,14 +58,14 @@
                         <constraint firstAttribute="trailing" secondItem="BvM-d4-lej" secondAttribute="trailing" id="9D8-Q6-nCV"/>
                         <constraint firstItem="BvM-d4-lej" firstAttribute="leading" secondItem="OSR-hZ-Liz" secondAttribute="leading" id="Laz-Y9-rLX"/>
                         <constraint firstAttribute="bottom" secondItem="BvM-d4-lej" secondAttribute="bottom" id="lsM-TO-THM"/>
-                        <constraint firstAttribute="height" constant="88" id="maT-MN-XB2"/>
+                        <constraint firstItem="BvM-d4-lej" firstAttribute="top" secondItem="OSR-hZ-Liz" secondAttribute="top" id="t8Z-D5-jPu"/>
                     </constraints>
                 </view>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="no_networking" translatesAutoresizingMaskIntoConstraints="NO" id="MwE-bt-1NJ">
-                    <rect key="frame" x="66.666666666666686" y="110" width="260" height="230"/>
+                    <rect key="frame" x="66.666666666666686" y="125" width="260" height="230"/>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hbq-IV-sqV">
-                    <rect key="frame" x="146.66666666666666" y="405" width="100" height="36"/>
+                    <rect key="frame" x="146.66666666666666" y="420" width="100" height="36"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="36" id="Iwp-ts-m13"/>
@@ -91,7 +92,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="网络开小差，再刷新看看" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nlm-k3-ipo">
-                    <rect key="frame" x="106.66666666666669" y="361" width="180" height="22"/>
+                    <rect key="frame" x="106.66666666666669" y="376" width="180" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="4Ui-T9-ge2"/>
                     </constraints>
@@ -100,24 +101,24 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="IEa-D7-G8m"/>
             <color key="backgroundColor" red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="OSR-hZ-Liz" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="07x-EN-DkY"/>
                 <constraint firstItem="Nlm-k3-ipo" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="D66-0o-b6d"/>
-                <constraint firstAttribute="trailing" secondItem="OSR-hZ-Liz" secondAttribute="trailing" id="NFk-om-8aq"/>
+                <constraint firstItem="OSR-hZ-Liz" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="topMargin" id="USW-oN-vpp"/>
+                <constraint firstItem="OSR-hZ-Liz" firstAttribute="trailing" secondItem="IEa-D7-G8m" secondAttribute="trailing" id="WL0-X8-7Fa"/>
                 <constraint firstItem="hbq-IV-sqV" firstAttribute="top" secondItem="Nlm-k3-ipo" secondAttribute="bottom" constant="22" id="f79-6b-Lmd"/>
                 <constraint firstItem="MwE-bt-1NJ" firstAttribute="top" secondItem="OSR-hZ-Liz" secondAttribute="bottom" constant="22" id="gXT-i9-Jdn"/>
                 <constraint firstItem="MwE-bt-1NJ" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="hAC-pb-S9s"/>
+                <constraint firstItem="OSR-hZ-Liz" firstAttribute="leading" secondItem="IEa-D7-G8m" secondAttribute="leading" id="hOF-WN-HSo"/>
                 <constraint firstItem="Nlm-k3-ipo" firstAttribute="top" secondItem="MwE-bt-1NJ" secondAttribute="bottom" constant="21" id="r0L-CI-jCe"/>
                 <constraint firstItem="hbq-IV-sqV" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="w6P-Go-JVZ"/>
-                <constraint firstItem="OSR-hZ-Liz" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="y4K-tF-9kB"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="emptyImage" destination="MwE-bt-1NJ" id="Vpf-cF-edg"/>
-                <outlet property="headHeight" destination="maT-MN-XB2" id="Em4-5f-BCc"/>
                 <outlet property="headView" destination="OSR-hZ-Liz" id="tG6-Qc-ubI"/>
                 <outlet property="refreshButton" destination="hbq-IV-sqV" id="IKF-N8-joE"/>
             </connections>

KulexiuForStudent/KulexiuForStudent/Module/TXClassRoom/View/NewWhiteboard/KSNewWhiteBoard.m

@@ -208,7 +208,7 @@
 }
 
 // 6 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation {
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error {
     NSLog(@"6-------页面加载失败时调用");
     [LOADING_MANAGER MBShowAUTOHidingInWindow:@"网页加载失败！"];
 }