iOS 外部页面添加头部

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		C550BF362018591400F0BC2A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C550BF352018591400F0BC2A /* CoreGraphics.framework */; };
 		C55FF3BF20230E7E0088AECC /* NewWebController.m in Sources */ = {isa = PBXBuildFile; fileRef = C55FF3BD20230E7E0088AECC /* NewWebController.m */; };
 		C55FF3C020230E7E0088AECC /* NewWebController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C55FF3BE20230E7E0088AECC /* NewWebController.xib */; };
+		C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */; };
 		C5BE6E3F2011D99100F28B36 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BE6E3E2011D99100F28B36 /* ViewController.m */; };
 		C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5BE6E402011D99100F28B36 /* Main.storyboard */; };
 		C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C5BE6E432011D99100F28B36 /* Assets.xcassets */; };
@@ -76,6 +77,7 @@
 		C55FF3BC20230E7E0088AECC /* NewWebController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewWebController.h; sourceTree = "<group>"; };
 		C55FF3BD20230E7E0088AECC /* NewWebController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewWebController.m; sourceTree = "<group>"; };
 		C55FF3BE20230E7E0088AECC /* NewWebController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewWebController.xib; sourceTree = "<group>"; };
+		C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrowLeft@2x.png"; sourceTree = "<group>"; };
 		C5BE6E372011D99100F28B36 /* JianYuIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JianYuIOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5BE6E3D2011D99100F28B36 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		C5BE6E3E2011D99100F28B36 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
@@ -168,6 +170,7 @@
 			isa = PBXGroup;
 			children = (
 				C549310F201F11F30080CD63 /* logo.png */,
+				C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */,
 				C5392C56202AE96300A8E798 /* start12.jpg */,
 				C5D01D7D20282543007F207E /* back_normal@2x.png */,
 			);
@@ -359,6 +362,7 @@
 				C5392C57202AE96400A8E798 /* start12.jpg in Resources */,
 				C5493110201F11F40080CD63 /* logo.png in Resources */,
 				C550BEFB20180AF000F0BC2A /* Info.plist in Resources */,
+				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,
 				C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */,

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

@@ -84,7 +84,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "539686435.226676"
+            timestampString = "539754331.2548569"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "264"
@@ -93,38 +93,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/ViewController.m"
-            timestampString = "539748770.29119"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "118"
-            endingLineNumber = "118"
-            landmarkName = "-click:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/ViewController.m"
-            timestampString = "539748770.291267"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "334"
-            endingLineNumber = "334"
-            landmarkName = "-jsGetMessage:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -164,7 +132,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "539686435.227697"
+            timestampString = "539754331.2554359"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "214"
@@ -180,7 +148,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "539686435.227772"
+            timestampString = "539754331.255813"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "156"
@@ -196,7 +164,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "539686435.227826"
+            timestampString = "539754331.256079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "183"
@@ -205,21 +173,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/ViewController.m"
-            timestampString = "539748770.291436"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "228"
-            endingLineNumber = "228"
-            landmarkName = "-jsShare:title:content:link:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ios/JianYuIOS/JianYuIOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,8 +1,9 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "40@2x-1.png",
       "scale" : "2x"
     },
     {
@@ -48,8 +49,9 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "40@2x.png",
       "scale" : "2x"
     },
     {
@@ -58,8 +60,9 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "58@2x.png",
       "scale" : "2x"
     },
     {
@@ -68,8 +71,9 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "80@2x.png",
       "scale" : "2x"
     },
     {

ios/JianYuIOS/JianYuIOS/Base.lproj/LaunchScreen.storyboard

@@ -18,7 +18,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="start12.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="4UJ-k1-5uO">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="start12.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="4UJ-k1-5uO">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                             </imageView>
                         </subviews>

ios/JianYuIOS/JianYuIOS/BaseClass1/constant.h

@@ -25,6 +25,7 @@
 
 
 
+#define IphonexAboveScreen (kCurrentDeviceHeight>=812) // iphonex 及以上
 
 #endif /* constant_h */
 

ios/JianYuIOS/JianYuIOS/NewWebController.h

@@ -11,5 +11,6 @@
 @interface NewWebController : UIViewController
 
 @property(nonatomic, strong)NSString *url;
+@property(nonatomic, strong)NSString *titleShow;
 
 @end

ios/JianYuIOS/JianYuIOS/NewWebController.m

@@ -14,6 +14,11 @@
 @property (weak, nonatomic) IBOutlet UIButton *backBtn;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topC;
 @property(nonatomic, strong)LXProgressView *progressView;
+@property (weak, nonatomic) IBOutlet UIView *topView;
+@property (weak, nonatomic) IBOutlet UILabel *titleLbl;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *topViewH;
+
+
 
 
 @end
@@ -27,6 +32,19 @@
 //        self.topC.constant = -20;
 //        [self.webView updateConstraints];
 //    }
+    if (IphonexAboveScreen) {
+        self.topC.constant = 44;
+        [self.view updateConstraints];
+    }
+    
+    if (self.titleShow) {
+        self.backBtn.hidden = YES;
+        self.titleLbl.text = self.titleShow;
+    }else{
+        self.topViewH.constant = 0;
+        self.topView.hidden = YES;
+        [self.view updateConstraints];
+    }
     
     self.webView.scrollView.bounces = NO;
     self.webView.delegate = self;
@@ -60,21 +78,29 @@
 
 
 -(void)webViewDidStartLoad:(UIWebView *)webView{
-    [self addProgressView];
+    if (!self.titleShow) {
+        [self addProgressView];
+    }
 }
 
 -(void)addProgressView{
-    [self removeProgresView];
+    if (self.progressView) {
+        [self.progressView removeFromSuperview];
+        self.progressView = nil;
+    }
     self.progressView = [[LXProgressView alloc] init];
-    self.progressView.frame = CGRectMake(0, 0, kCurrentDeviceWidth, 2);
+    self.progressView.frame = CGRectMake(0, CGRectGetMinY(self.webView.frame), kCurrentDeviceWidth, 2);
     [self.view addSubview:self.progressView];
 }
 
 -(void)removeProgresView{
-    if (self.progressView) {
-        [self.progressView removeFromSuperview];
-        self.progressView = nil;
-    }
+    self.progressView.progress = .99;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (self.progressView) {
+            [self.progressView removeFromSuperview];
+            self.progressView = nil;
+        }
+    });
 }
 
 - (IBAction)backBtnAction:(id)sender {

ios/JianYuIOS/JianYuIOS/NewWebController.xib

@@ -13,7 +13,10 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NewWebController">
             <connections>
                 <outlet property="backBtn" destination="n0W-Rs-iUe" id="1Sv-zI-J73"/>
-                <outlet property="topC" destination="gS4-dx-nsb" id="YIT-vQ-MYP"/>
+                <outlet property="titleLbl" destination="06y-Wp-KW0" id="MiT-E3-Te4"/>
+                <outlet property="topC" destination="E3n-th-ijR" id="e15-2Z-on4"/>
+                <outlet property="topView" destination="9yt-yG-Kvh" id="IpQ-dh-IEH"/>
+                <outlet property="topViewH" destination="Lgr-zi-miA" id="plS-Gz-RUI"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="webView" destination="hKS-9A-lkH" id="K1j-ax-gsj"/>
             </connections>
@@ -24,12 +27,12 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hKS-9A-lkH">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                     <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </webView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n0W-Rs-iUe">
                     <rect key="frame" x="10" y="35" width="30" height="30"/>
-                    <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.69999999999999996" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="AJ4-xJ-RJh"/>
                         <constraint firstAttribute="width" constant="30" id="bxg-zZ-JSG"/>
@@ -43,20 +46,73 @@
                         <action selector="backBtnAction:" destination="-1" eventType="touchUpInside" id="aqS-7E-CZ0"/>
                     </connections>
                 </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9yt-yG-Kvh">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jaM-FE-122">
+                            <rect key="frame" x="5" y="28" width="50" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="Msz-3m-4I2"/>
+                                <constraint firstAttribute="width" constant="50" id="Vpk-My-rKC"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="1" maxX="27" maxY="0.0"/>
+                            <state key="normal" image="arrowLeft.png"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="15"/>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="backBtnAction:" destination="-1" eventType="touchUpInside" id="vLX-lg-5jb"/>
+                            </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="06y-Wp-KW0">
+                            <rect key="frame" x="153" y="26" width="69.5" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="Gfe-3C-N33"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wOH-mK-Uts">
+                            <rect key="frame" x="0.0" y="63.5" width="375" height="0.5"/>
+                            <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="aOS-Xz-aty"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="jaM-FE-122" secondAttribute="bottom" constant="6" id="1at-TP-5lA"/>
+                        <constraint firstAttribute="bottom" secondItem="06y-Wp-KW0" secondAttribute="bottom" constant="8" id="3hO-T4-5vD"/>
+                        <constraint firstItem="06y-Wp-KW0" firstAttribute="centerX" secondItem="9yt-yG-Kvh" secondAttribute="centerX" id="96I-yk-1cF"/>
+                        <constraint firstAttribute="bottom" secondItem="wOH-mK-Uts" secondAttribute="bottom" id="BHV-bI-Z0s"/>
+                        <constraint firstAttribute="height" constant="64" id="Lgr-zi-miA"/>
+                        <constraint firstAttribute="trailing" secondItem="wOH-mK-Uts" secondAttribute="trailing" id="cRa-Ny-bGV"/>
+                        <constraint firstItem="wOH-mK-Uts" firstAttribute="leading" secondItem="9yt-yG-Kvh" secondAttribute="leading" id="huX-fE-F19"/>
+                        <constraint firstItem="jaM-FE-122" firstAttribute="leading" secondItem="9yt-yG-Kvh" secondAttribute="leading" constant="5" id="keK-BA-Dlv"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="9yt-yG-Kvh" secondAttribute="trailing" id="1lW-Bt-Y4d"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="hKS-9A-lkH" secondAttribute="trailing" id="6nu-EY-FNH"/>
                 <constraint firstItem="n0W-Rs-iUe" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="10" id="D1g-jA-wTm"/>
+                <constraint firstItem="9yt-yG-Kvh" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="E3n-th-ijR"/>
                 <constraint firstItem="hKS-9A-lkH" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="HeZ-y1-nVG"/>
                 <constraint firstItem="n0W-Rs-iUe" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="15" id="VEu-09-LBg"/>
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="hKS-9A-lkH" secondAttribute="bottom" id="Ysb-dr-ykz"/>
-                <constraint firstItem="hKS-9A-lkH" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="gS4-dx-nsb"/>
+                <constraint firstItem="hKS-9A-lkH" firstAttribute="top" secondItem="9yt-yG-Kvh" secondAttribute="bottom" id="ZBl-A3-xFX"/>
+                <constraint firstItem="9yt-yG-Kvh" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="i13-TT-Cqr"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+            <point key="canvasLocation" x="33.5" y="53.5"/>
         </view>
     </objects>
     <resources>
+        <image name="arrowLeft.png" width="10" height="19"/>
         <image name="back_normal.png" width="14" height="22"/>
     </resources>
 </document>

ios/JianYuIOS/JianYuIOS/ViewController.m

@@ -12,6 +12,7 @@
 #import <UMSocialCore/UMSocialCore.h>
 #import "NewWebController.h"
 #import <UMSocialCore/UMSocialCore.h>
+#import <AFNetworking.h>
 //#import <WebKit/WebKit.h>
 
 
@@ -33,7 +34,8 @@ JSExportAs(getMessage, -(NSString *)jsGetMessage:(NSString *)lxID);// 取单条
 JSExportAs(getUnReadMessageCount, -(int)jsGetUnReadMessageCount:(NSString *)openid);// 获取未读消息总数
 JSExportAs(updateAllUnReadMessage, -(void)jsUpdateAllUnReadMessage:(NSString *)openid);// 全部置为已读
 JSExportAs(lightStatusBar, -(void)jsLightStatusBar:(NSString *)status);// 导航栏文字颜色
-JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url);// 打开新控制器 加载新web
+JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url title:(NSString *)title);// 打开新控制器 加载新web
+JSExportAs(getVersion, -(NSString *)jsGetVersion:(NSString *)str);// 获取当前版本号
 
 
 
@@ -44,7 +46,7 @@ JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url);// 打
 @interface ViewController ()<UIWebViewDelegate, ViewControllerJSExport>
 
 @property (weak, nonatomic) IBOutlet UIWebView *webView;
-//@property(nonatomic, assign)BOOL whiteBar;
+//@property(nonatomic, assign)BOOL ;
 @property(nonatomic, assign)BOOL updateNotify;
 @property(nonatomic, assign)BOOL afterOpenPushMessage;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topC;
@@ -78,13 +80,30 @@ JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url);// 打
 //    }
     
     self.webView.scrollView.bounces = NO;
-    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/me"]]]];
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login"];
+    NSString *token = [LXUserDefaults token];
+    if (token) {
+        url = [url stringByAppendingString:[NSString stringWithFormat:@"?sign=%@&url=/jyapp/jylab/mainSearch", token]];
+    }
+    url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
 //    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://192.168.100.145:8010/jyapp/me"]]];
     [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(requestWebView:) name:kRequestWebViewWithUrl object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateNotifyState) name:kUpdateNotifyState object:nil];
 
 //    [self addWKWebViews];
+    if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0 || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == -1){
+        [self noNetGetData];
+    }
+}
+
+-(void)noNetGetData{
+    if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN || [AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWiFi) {
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login"]]]];
+        return;
+    }
+    [self performSelector:@selector(noNetGetData) withObject:nil afterDelay:2];
 }
 
 
@@ -357,15 +376,25 @@ JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url);// 打
 
 }
 // 打开新页面 加载新web
--(void)jsOpenExternalLink:(NSString *)url{
+-(void)jsOpenExternalLink:(NSString *)url title:(NSString *)title{
     if (url) {
         NewWebController *ctr = [[NewWebController alloc] init];
         ctr.url = url;
+        if (!title || [title isEqualToString:@""] || [title isEqualToString:@"undefined"]) {
+            ctr.titleShow = nil;
+        }else{
+            ctr.titleShow = title;
+        }
         kMainQueue(^{
             [self presentViewController:ctr animated:NO completion:nil];
         });
     }
 }
 
+// 获取当前版本号
+-(NSString *)jsGetVersion:(NSString *)str{
+    return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
+}
+
 
 @end