备份数据

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		182ECCFB22FD221100FFC79E /* qidongye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 182ECCFA22FD221000FFC79E /* qidongye@2x.png */; };
+		182ECCFD22FD223A00FFC79E /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 182ECCFC22FD223A00FFC79E /* logo.png */; };
 		1876C3FC219920DE00BC23DE /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1876C3FB219920DE00BC23DE /* ViewController.m */; };
 		187B4EE321EC356100A9368D /* UIView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 187B4EE221EC356100A9368D /* UIView+Extension.m */; };
 		187B4EE621EC635700A9368D /* GlobalData.m in Sources */ = {isa = PBXBuildFile; fileRef = 187B4EE521EC635700A9368D /* GlobalData.m */; };
@@ -37,7 +39,6 @@
 		C519972E2020238D007946E8 /* LXViewControllerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C51997282020238D007946E8 /* LXViewControllerManager.m */; };
 		C519972F2020238D007946E8 /* LXDataBaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C519972A2020238D007946E8 /* LXDataBaseManager.m */; };
 		C5321C76202BD89B0023CFEA /* LXProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5321C75202BD89B0023CFEA /* LXProgressView.m */; };
-		C5493110201F11F40080CD63 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = C549310F201F11F30080CD63 /* logo.png */; };
 		C550BEF920180AF000F0BC2A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C550BEF620180AF000F0BC2A /* AppDelegate.m */; };
 		C550BEFA20180AF000F0BC2A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C550BEF720180AF000F0BC2A /* main.m */; };
 		C550BEFB20180AF000F0BC2A /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C550BEF820180AF000F0BC2A /* Info.plist */; };
@@ -56,7 +57,6 @@
 		C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5D01D7D20282543007F207E /* back_normal@2x.png */; };
 		C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5FE4B5120468AED00CC8A2F /* noNet@2x.png */; };
 		C5FE4B5720468BC900CC8A2F /* NoNetView.m in Sources */ = {isa = PBXBuildFile; fileRef = C5FE4B5620468BC900CC8A2F /* NoNetView.m */; };
-		C5FE4B5B2046AC1E00CC8A2F /* start13@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5FE4B5A2046AC1E00CC8A2F /* start13@2x.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -79,6 +79,8 @@
 /* Begin PBXFileReference section */
 		0CA962A24EED00910F83394E /* libPods-JianYuIOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JianYuIOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		10D9BC27D00CB4DF3F791728 /* Pods-JianYuIOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JianYuIOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-JianYuIOS/Pods-JianYuIOS.release.xcconfig"; sourceTree = "<group>"; };
+		182ECCFA22FD221000FFC79E /* qidongye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qidongye@2x.png"; sourceTree = "<group>"; };
+		182ECCFC22FD223A00FFC79E /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		1876C3FB219920DE00BC23DE /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		187B4EE121EC356100A9368D /* UIView+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Extension.h"; sourceTree = "<group>"; };
 		187B4EE221EC356100A9368D /* UIView+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+Extension.m"; sourceTree = "<group>"; };
@@ -129,7 +131,6 @@
 		C519972B2020238D007946E8 /* LXUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXUserDefaults.h; sourceTree = "<group>"; };
 		C5321C74202BD89B0023CFEA /* LXProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LXProgressView.h; sourceTree = "<group>"; };
 		C5321C75202BD89B0023CFEA /* LXProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LXProgressView.m; sourceTree = "<group>"; };
-		C549310F201F11F30080CD63 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		C550BEF420180AB700F0BC2A /* JianYuIOS.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = JianYuIOS.entitlements; sourceTree = "<group>"; };
 		C550BEF520180AF000F0BC2A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		C550BEF620180AF000F0BC2A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -159,7 +160,6 @@
 		C5FE4B5120468AED00CC8A2F /* noNet@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "noNet@2x.png"; sourceTree = "<group>"; };
 		C5FE4B5520468BC900CC8A2F /* NoNetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NoNetView.h; sourceTree = "<group>"; };
 		C5FE4B5620468BC900CC8A2F /* NoNetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoNetView.m; sourceTree = "<group>"; };
-		C5FE4B5A2046AC1E00CC8A2F /* start13@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start13@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -285,8 +285,8 @@
 				C555EC272047DC5E0084642F /* LXNetworkManager.h */,
 				C555EC262047DC5E0084642F /* LXNetworkManager.m */,
 				C51997262020238D007946E8 /* constant.h */,
-				C51997252020238D007946E8 /* LXDataBaseManager.h */,
 				C519972A2020238D007946E8 /* LXDataBaseManager.m */,
+				C51997252020238D007946E8 /* LXDataBaseManager.h */,
 				C51997272020238D007946E8 /* LXMD5.h */,
 				C51997242020238D007946E8 /* LXMD5.m */,
 				C519972B2020238D007946E8 /* LXUserDefaults.h */,
@@ -315,9 +315,9 @@
 		C5493106201F04120080CD63 /* Image */ = {
 			isa = PBXGroup;
 			children = (
-				C5FE4B5A2046AC1E00CC8A2F /* start13@2x.png */,
+				182ECCFC22FD223A00FFC79E /* logo.png */,
+				182ECCFA22FD221000FFC79E /* qidongye@2x.png */,
 				C5FE4B5120468AED00CC8A2F /* noNet@2x.png */,
-				C549310F201F11F30080CD63 /* logo.png */,
 				C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */,
 				C5D01D7D20282543007F207E /* back_normal@2x.png */,
 			);
@@ -514,17 +514,17 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				182ECCFD22FD223A00FFC79E /* logo.png in Resources */,
 				C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */,
 				C55FF3C020230E7E0088AECC /* NewWebController.xib in Resources */,
-				C5493110201F11F40080CD63 /* logo.png in Resources */,
 				18E05CFB22F11CDE001E5B44 /* AlipaySDK.bundle in Resources */,
 				C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */,
 				C550BEFB20180AF000F0BC2A /* Info.plist in Resources */,
+				182ECCFB22FD221100FFC79E /* qidongye@2x.png in Resources */,
 				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,
 				C555EC2A2047E57C0084642F /* NoNetView.xib in Resources */,
-				C5FE4B5B2046AC1E00CC8A2F /* start13@2x.png in Resources */,
 				18E05CF922F11CDE001E5B44 /* README.txt in Resources */,
 				C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */,
 			);

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

@@ -13,5 +13,21 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/AppDelegate.m"
+            timestampString = "586855806.150555"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "392"
+            endingLineNumber = "392"
+            landmarkName = "-application:handleOpenURL:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -392,32 +392,24 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         if ([url.host isEqualToString:@"safepay"]) {
             //跳转支付宝钱包进行支付，处理支付结果
             [[AlipaySDK defaultService] processOrderWithPaymentResult:url standbyCallback:^(NSDictionary *resultDic) {
-                NSLog(@"reslut = %@",resultDic);
+                NSLog(@"app-reslut = %@",resultDic);
                 NSInteger orderState=[resultDic[@"resultStatus"] integerValue];
+                NSString *paystatus =@"";
                 if (orderState==9000) {
-                    //订单界面支付
-                    
-                } else {
-                    NSString *returnStr;
-                    switch (orderState) {
-                        case 8000:
-                            returnStr=@"订单正在处理中";
-                            break;
-                        case 4000:
-                            returnStr=@"订单支付失败";
-                            break;
-                        case 6001:
-                            returnStr=@"取消支付，订单支付失败";
-                            break;
-                        case 6002:
-                            returnStr=@"网络连接出错，订单支付失败";
-                            break;
-                        default:
-                            break;
-                    }
-                    //                    [SVProgressHUD showErrorWithStatus:returnStr];
-                    NSLog(@"%@",returnStr);
+                    //成功
+                    paystatus = @"1";
+                    NSLog(@"订单支付成功");
+                } else if(orderState==6001){
+                    //取消
+                    paystatus = @"0";
+                    NSLog(@"取消支付");
+                }else {
+                    //失败
+                    paystatus = @"-1";
+                    NSLog(@"订单支付失败");
                 }
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName:AlipayWXpayStatus object:paystatus userInfo:nil];
             }];
         }
     }
@@ -435,9 +427,40 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         }
         
         if ([url.host isEqualToString:@"safepay"]) {
+            
+            
+            /*
+             9000    订单支付成功
+             8000    正在处理中，支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+             4000    订单支付失败
+             5000    重复请求
+             6001    用户中途取消
+             6002    网络连接出错
+             6004    支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+             其它    其它支付错误
+             */
+            
             //跳转支付宝钱包进行支付，处理支付结果
             [[AlipaySDK defaultService] processOrderWithPaymentResult:url standbyCallback:^(NSDictionary *resultDic) {
-                NSLog(@"result = %@",resultDic);
+                NSLog(@"app-reslut = %@",resultDic);
+                NSInteger orderState=[resultDic[@"resultStatus"] integerValue];
+                NSString *paystatus =@"";
+                if (orderState==9000) {
+                    //成功
+                    paystatus = @"1";
+                    NSLog(@"订单支付成功");
+                } else if(orderState==6001){
+                    //取消
+                    paystatus = @"0";
+                    NSLog(@"取消支付");
+                }else {
+                    //失败
+                    paystatus = @"-1";
+                    NSLog(@"订单支付失败");
+                }
+                
+                [[NSNotificationCenter defaultCenter] postNotificationName:AlipayWXpayStatus object:paystatus userInfo:nil];
+
             }];
         }
     }
@@ -449,22 +472,26 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     
     if ([resp isKindOfClass:[PayResp class]]){
         PayResp*response=(PayResp*)resp;
+        NSString *paystatus =@"";
         switch(response.errCode){
             case WXSuccess:
-                
-                //                [[NSNotificationCenter defaultCenter] postNotificationName:LPWeiXinPayCallback object:nil userInfo:nil];
+                paystatus = @"1";
+                NSLog(@"微信支付成功");
                 break;
                 
             case WXErrCodeUserCancel:
-                //                [SVProgressHUD showErrorWithStatus:@"微信支付取消"];
+                paystatus = @"0";
                 NSLog(@"微信支付取消");
                 break;
                 
             default:
-                //                [SVProgressHUD showErrorWithStatus:@"微信支付失败"];
+                paystatus = @"-1";
                 NSLog(@"微信支付失败");
                 break;
         }
+        
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:AlipayWXpayStatus object:paystatus userInfo:nil];
     }
     
     NSLog(@"收到 微信 回执");

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

@@ -3,49 +3,49 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "40×40.png",
+      "filename" : "40X40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "60×60.png",
+      "filename" : "60X60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "58×58.png",
+      "filename" : "58X58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "87×87.png",
+      "filename" : "87X87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "80×80.png",
+      "filename" : "80X80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "120×120-1.png",
+      "filename" : "120X120.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "120×120.png",
+      "filename" : "120X120-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "180×180.png",
+      "filename" : "180X180.png",
       "scale" : "3x"
     },
     {
@@ -81,25 +81,25 @@
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "76×76.png",
+      "filename" : "76X76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "152×152.png",
+      "filename" : "152X152.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "167×167.png",
+      "filename" : "167X167.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "1024×1024.png",
+      "filename" : "1024X1024.png",
       "scale" : "1x"
     }
   ],

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="start13.png" translatesAutoresizingMaskIntoConstraints="NO" id="cnp-0C-3lp">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qidongye.png" translatesAutoresizingMaskIntoConstraints="NO" id="cnp-0C-3lp">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                             </imageView>
                         </subviews>
@@ -36,10 +36,10 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-29.000000000000004" y="338"/>
+            <point key="canvasLocation" x="-46.400000000000006" y="304.04797601199402"/>
         </scene>
     </scenes>
     <resources>
-        <image name="start13.png" width="375" height="667"/>
+        <image name="qidongye.png" width="375" height="667"/>
     </resources>
 </document>

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -95,6 +95,9 @@ _Pragma("clang diagnostic pop")\
 //点击订阅通知
 #define ClickSubNotiMethods @"ClickSubNotiMethods"
 
+//支付回调通知
+#define AlipayWXpayStatus @"AlipayWXpayStatus"
+
 //微信SDK头文件
 #import "WXApi.h"
 //支付宝支付头文件
@@ -105,13 +108,13 @@ _Pragma("clang diagnostic pop")\
 
 
 
-//#define kHost @"http://webws.qmx.top/" //王山
+//#define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
 
 //#define kHost @"https://web-jydev-wcj.jianyu360.cn/"//王传近
 
-//#define kHost @"https://app-jytest.jianyu360.cn/"//新测试
+#define kHost @"https://app-jytest.jianyu360.cn/"//新测试
 
-#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
+//#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
 
 
 //#define kHost @"https://app1.jianyu360.com/"//弃用

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

@@ -117,12 +117,12 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     [recognizer delaysTouchesBegan];
     [self.view addGestureRecognizer:recognizer];
     //手势
-
+    
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshAllVC:) name:@"refreshAllVC" object:nil];
     
     
-//    [self clearWeb];
+    //    [self clearWeb];
     
 }
 
@@ -248,7 +248,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-
+    
     NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
@@ -287,7 +287,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
         if(self.tabBarController.selectedIndex != 2) {
             return;
         }else {
-//            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshMine" object:nil];;
+            //            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshMine" object:nil];;
         }
         [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
         self.afterOpenPushMessage = YES;
@@ -304,18 +304,27 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     if (!infoDict) {
         return;
     }
+    NSLog(@"%@",infoDict);
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
     if (urlStr) {
+        NSLog(@"有info");
         if(self.tabBarController.selectedIndex == 2) {
             //底部栏置换到订阅
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshDY" object:nil userInfo:nil];
             AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
             JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
             tab.selectedIndex = 1;
+            
+            [self performSelector:@selector(pushDY:) withObject:infoDict afterDelay:1];
+            
         }
     }
 }
 
+-(void)pushDY:(NSDictionary *)infoDict
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshDY" object:nil userInfo:infoDict];
+}
+
 
 
 
@@ -331,43 +340,43 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     if([notification.userInfo[@"item_index"] integerValue]!=2) {
         return;
     }
-
-
+    
+    
     [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == YES) {
-        return;
-    }
-    UIView *contentView;
-    if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    else
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = YES;
+        if (self.tabBarController.tabBar.hidden == YES) {
+            return;
+        }
+        UIView *contentView;
+        if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
+        else
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = YES;
     });
 }
 - (void)showTabBar{
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == NO)
-    {
-        return;
-    }
-    UIView *contentView;
-    if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
-        
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    
-    else
+        if (self.tabBarController.tabBar.hidden == NO)
+        {
+            return;
+        }
+        UIView *contentView;
+        if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
         
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = NO;
+        else
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = NO;
         
-        });
+    });
 }
 
 
@@ -407,7 +416,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
         //正常的网页加载
         [self judgeIsHidden];//是否隐藏
     }
-
+    
     
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
@@ -443,7 +452,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-//    [self clearWeb];
+    //    [self clearWeb];
     // Dispose of any resources that can be recreated.
 }
 

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

@@ -100,7 +100,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-//    [self.webView reload];
+    //    [self.webView reload];
 }
 
 - (void)viewDidLoad {
@@ -124,7 +124,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loginOut:) name:kLoginOut object:nil];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshMine:) name:@"refreshMine" object:nil];
-   
+    
     
     
     
@@ -138,8 +138,8 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     //手势
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshAllVC:) name:@"refreshAllVC" object:nil];
-
-//    [self clearWeb]; 
+    
+    //    [self clearWeb];
     
 }
 
@@ -255,10 +255,10 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 // 首次加载web
 -(void)webViewFirstRequest{
     NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/me"];
-//    NSString *token = [LXUserDefaults token];
-//    if (token) {
-//        url = [url stringByAppendingString:[NSString stringWithFormat:@"?sign=%@&url=/jyapp/jylab/mainSearch&from=restart", token]];
-//    }
+    //    NSString *token = [LXUserDefaults token];
+    //    if (token) {
+    //        url = [url stringByAppendingString:[NSString stringWithFormat:@"?sign=%@&url=/jyapp/jylab/mainSearch&from=restart", token]];
+    //    }
     NSLog(@"444第一次加载%@",url);
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     
@@ -272,7 +272,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 //收到消息退出并重新加载web
 -(void)webViewRequestByMsg{
-
+    
     NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/login?back=index&isios=t&flag=kicked"];
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
@@ -320,7 +320,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
         if(self.tabBarController.selectedIndex != 3) {
             return;
         }else {
-//            [self webViewFirstRequest];
+            //            [self webViewFirstRequest];
         }
         
         [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
@@ -342,16 +342,24 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
     if (urlStr) {
+        NSLog(@"有info");
         if(self.tabBarController.selectedIndex == 3) {
             //底部栏置换到订阅
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshDY" object:nil userInfo:nil];
             AppDelegate *delegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
             JYTabBarController *tab = (JYTabBarController *)delegate.window.rootViewController;
             tab.selectedIndex = 1;
+            
+            [self performSelector:@selector(pushDY:) withObject:infoDict afterDelay:1];
+            
         }
     }
 }
 
+-(void)pushDY:(NSDictionary *)infoDict
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshDY" object:nil userInfo:infoDict];
+}
+
 
 
 
@@ -367,44 +375,44 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     if([notification.userInfo[@"item_index"] integerValue]!=3) {
         return;
     }
-
-
+    
+    
     [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
     
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == YES) {
-        return;
-    }
-    UIView *contentView;
-    if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    else
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = YES;
+        if (self.tabBarController.tabBar.hidden == YES) {
+            return;
+        }
+        UIView *contentView;
+        if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
+        else
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = YES;
     });
 }
 - (void)showTabBar{
     
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == NO)
-    {
-        return;
-    }
-    UIView *contentView;
-    if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
-        
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    
-    else
+        if (self.tabBarController.tabBar.hidden == NO)
+        {
+            return;
+        }
+        UIView *contentView;
+        if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
         
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = NO;
-        });
+        else
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = NO;
+    });
 }
 
 -(void)dealTabBar
@@ -433,14 +441,14 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 #pragma mark  webView代理方法
 - (void)webViewDidFinishLoad:(UIWebView *)webView{
-
+    
     if(searchRefreshBool) {
         searchRefreshBool = NO;
     }else {
         //正常的网页加载
         [self judgeIsHidden];//是否隐藏
     }
-
+    
     
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
@@ -466,13 +474,13 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 
 -(void)webViewDidStartLoad:(UIWebView *)webView{
-
+    
 }
 
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-//    [self clearWeb];
+    //    [self clearWeb];
     // Dispose of any resources that can be recreated.
 }
 
@@ -705,16 +713,16 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     NSLog(@"openid=%@",openid);
     //    NSLog(@"%d",[[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid]);
     
-//    if([[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid] ==0){
-//        //显示
-//        kMainQueue(^{
-//            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
-//        });
-//    }else {
-//        kMainQueue(^{
-//            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
-//        });
-//    }
+    //    if([[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid] ==0){
+    //        //显示
+    //        kMainQueue(^{
+    //            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
+    //        });
+    //    }else {
+    //        kMainQueue(^{
+    //            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
+    //        });
+    //    }
     
     return [[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid];
 }
@@ -877,9 +885,9 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
             
             [self dealTabBar];
         });
-     
+        
     }
- 
+    
     
 }
 
@@ -898,7 +906,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
             [[NSNotificationCenter defaultCenter] postNotificationName:@"changeItems" object:nil userInfo:@{@"item_index":@"5"}];
         });
     }else {
-    
+        
     }
 }
 
@@ -959,15 +967,15 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
      */
     
     //吊起微信
-//    PayReq *request = [[PayReq alloc] init] ;
-//    request.package = @"Sign=WXPay";
-//    request.nonceStr= data[@"nonceStr"];
-//    request.partnerId = data[@"partnerid"];
-//    request.sign= data[@"paySign"];
-//    request.timeStamp= [data[@"timeStamp"] intValue];
-//    request.openID = data[@"appId"];
-//    request.prepayId= data[@"prepay_id"];
-//    [WXApi sendReq:request];
+    //    PayReq *request = [[PayReq alloc] init] ;
+    //    request.package = @"Sign=WXPay";
+    //    request.nonceStr= data[@"nonceStr"];
+    //    request.partnerId = data[@"partnerid"];
+    //    request.sign= data[@"paySign"];
+    //    request.timeStamp= [data[@"timeStamp"] intValue];
+    //    request.openID = data[@"appId"];
+    //    request.prepayId= data[@"prepay_id"];
+    //    [WXApi sendReq:request];
 }
 
 

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

@@ -134,6 +134,9 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     [[AFNetworkReachabilityManager sharedManager] startMonitoring];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(netReachChanged:) name:AFNetworkingReachabilityDidChangeNotification object:nil];
     
+    //d支付通知
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(alipayWXpayStatus:) name:AlipayWXpayStatus object:nil];
+    
     
     //前往登录通知-tabbar
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(isLoginTabBar:) name:@"isLoginTabBar" object:nil];
@@ -159,6 +162,10 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newsRedPoint:) name:JYNewsRedPoint object:nil];
     
     
+    
+    
+    
+    
     //是否需要显示小红点
     [self haveRedPoint];
     
@@ -477,6 +484,24 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshDY" object:nil userInfo:infoDict];
 }
 
+#pragma mark  收到z支付通知
+
+-(void)alipayWXpayStatus:(NSNotification *)notification{
+    
+    NSString * status = [notification object];
+    [self performSelector:@selector(payStatus:) withObject:status afterDelay:2];
+}
+
+-(void)payStatus:(NSString *)status
+{
+    //目前延时两秒
+     NSLog(@"支付状态：%@",status);
+    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+    NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
+    [context evaluateScript:textJS1];
+}
+    
+
 // 收到通知消息
 -(void)afterReceiveNewMsg{
     NSLog(@"afterReceiveNewMsg");
@@ -1224,34 +1249,11 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
 }
 -(void)jsAliPay:(NSString*)str
 {
-    [[AlipaySDK defaultService] payOrder:str fromScheme:@"alisdkjianyu" callback:^(NSDictionary *resultDic) {
-        NSLog(@"reslut = %@",resultDic);
-        //
-        NSInteger orderState=[resultDic[@"resultStatus"] integerValue];
-        if (orderState==9000) {
-            //订单界面支付
-            NSLog(@"支付成功");
-        } else {
-            NSString *returnStr;
-            switch (orderState) {
-                case 8000:
-                    returnStr=@"订单正在处理中";
-                    break;
-                case 4000:
-                    returnStr=@"订单支付失败";
-                    break;
-                case 6001:
-                    returnStr=@"取消支付，订单支付失败";
-                    break;
-                case 6002:
-                    returnStr=@"网络连接出错，订单支付失败";
-                    break;
-                default:
-                    break;
-            }
-            NSLog(@"%@",returnStr);
-        }
-    }];
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
 }
 
 

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

@@ -120,13 +120,13 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
     [recognizer delaysTouchesBegan];
     [self.view addGestureRecognizer:recognizer];
     //手势
-
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshDY:) name:@"refreshDY" object:nil];
     
     
     
     
-//    [self clearWeb];
+    //    [self clearWeb];
 }
 
 -(void)newsRedPoint:(NSNotification *)notificaition
@@ -245,7 +245,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 -(void)webViewFirstRequest{
     
     NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/swordfish/historypush"];
-//swordfish/historypush   swordfish/historypush
+    //swordfish/historypush   swordfish/historypush
     NSLog(@"222第一次加载%@",url);
     url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     kMainQueue(^{
@@ -294,7 +294,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
         if(self.tabBarController.selectedIndex != 1) {
             return;
         }else {
-//            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshMine" object:nil];;
+            //            [[NSNotificationCenter defaultCenter] postNotificationName:@"refreshMine" object:nil];;
         }
         [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
         self.afterOpenPushMessage = YES;
@@ -315,7 +315,12 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
     if (urlStr) {
         if(self.tabBarController.selectedIndex == 1) {
-            [self webViewFirstRequest];
+            
+            //刷新新订阅消息
+            NSString *infoUrl = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
+            
+            infoUrl =  [infoUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:infoUrl]]];
         }
     }
 }
@@ -337,44 +342,44 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
     if([notification.userInfo[@"item_index"] integerValue]!=1) {
         return;
     }
-
+    
     [self webViewRequestByMsg];
 }
 
 - (void)hideTabBar {
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == YES) {
-        return;
-    }
-    UIView *contentView;
-    if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    else
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = YES;
+        if (self.tabBarController.tabBar.hidden == YES) {
+            return;
+        }
+        UIView *contentView;
+        if ( [[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]] )
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
+        else
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x,  contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height + self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = YES;
         
-        });
+    });
     
 }
 - (void)showTabBar{
     kMainQueue(^{
-    if (self.tabBarController.tabBar.hidden == NO)
-    {
-        return;
-    }
-    UIView *contentView;
-    if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
-        
-        contentView = [self.tabBarController.view.subviews objectAtIndex:1];
-    
-    else
+        if (self.tabBarController.tabBar.hidden == NO)
+        {
+            return;
+        }
+        UIView *contentView;
+        if ([[self.tabBarController.view.subviews objectAtIndex:0] isKindOfClass:[UITabBar class]])
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:1];
         
-        contentView = [self.tabBarController.view.subviews objectAtIndex:0];
-    contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
-    self.tabBarController.tabBar.hidden = NO;
+        else
+            
+            contentView = [self.tabBarController.view.subviews objectAtIndex:0];
+        contentView.frame = CGRectMake(contentView.bounds.origin.x, contentView.bounds.origin.y,  contentView.bounds.size.width, contentView.bounds.size.height - self.tabBarController.tabBar.frame.size.height);
+        self.tabBarController.tabBar.hidden = NO;
         
-        });
+    });
 }
 
 //
@@ -388,7 +393,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 }
 
 -(void)judgeIsHidden
-{   
+{
     NSString *current_url = [self.webView stringByEvaluatingJavaScriptFromString:@"document.location.href"];
     //http://w4blmjy.qmx.top/jyapp/free/login?back=index
     NSLog(@"%@",current_url);
@@ -406,10 +411,10 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 #pragma mark  webView代理方法
 - (void)webViewDidFinishLoad:(UIWebView *)webView{
     
-
+    
     
     [self judgeIsHidden];//是否隐藏
-
+    
     
     [self removeNoNetViews];
     [[LXViewControllerManager shareViewControllerManager] hideHud];
@@ -444,7 +449,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-//    [self clearWeb];
+    //    [self clearWeb];
     // Dispose of any resources that can be recreated.
 }
 
@@ -828,7 +833,20 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 //通知刷新页面
 -(void)refreshDY:(NSNotification *)notificaition{
-    [self webViewFirstRequest];
+    
+    
+    //    NSDictionary * infoDict = [notificaition object][@"userInfo"];
+    
+    NSDictionary *infoDict = notificaition.userInfo;
+    NSLog(@"%@",infoDict);
+    if (!infoDict) {
+        [self webViewFirstRequest];
+    }else {
+        NSString *infoUrl = [NSString stringWithFormat:@"%@%@", kHost, infoDict[@"url"]];
+        
+        infoUrl =  [infoUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:infoUrl]]];
+    }
 }
 
 -(void)jsBackUrl:(NSString*)str

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.3</string>
+	<string>2.7.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -86,21 +86,21 @@
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>web-jydev-wky.jianyu360.cn</key>
+			<key>web-jydev-wcj.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>webwcj.qmx.top</key>
+			<key>web-jydev-wky.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>webws.qmx.top</key>
+			<key>web-jydev-ws.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>