微信修改

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

@@ -20,7 +20,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "587370683.089795"
+            timestampString = "587372834.348406"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "367"
@@ -29,21 +29,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "587370683.090237"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "404"
-            endingLineNumber = "404"
-            landmarkName = "-application:openURL:sourceApplication:annotation:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -117,7 +117,7 @@ _Pragma("clang diagnostic pop")\
 #define kHost @"https://app-jytest.jianyu360.cn/"//新测试
 
 //#define kHost @"http://web-jydev-wky.jianyu360.cn/" //王凯悦
-
+//1453.5 854
 
 //#define kHost @"https://app1.jianyu360.com/"//弃用
 

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

@@ -57,6 +57,12 @@ JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
 JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 
+//支付相关
+JSExportAs(wxPay, -(void)jsWxPay:(NSString *)jsonString);
+
+JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
+
+
 @end
 
 
@@ -354,9 +360,13 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 {
     //目前延时两秒
     NSLog(@"支付状态：%@",status);
-    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
-    [context evaluateScript:textJS1];
+    
+    if(self.tabBarController.selectedIndex == 2) {
+        JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+        NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
+        [context evaluateScript:textJS1];
+        
+    }
 }
 
 
@@ -995,6 +1005,72 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
     });
 }
 
+
+#pragma mark  支付相关
+
+-(void)jsWxPay:(NSString *)jsonString
+{
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先下载微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    NSError *err;
+    
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+                         
+                                                        options:NSJSONReadingMutableContainers
+                         
+                                                          error:&err];
+    
+    NSLog(@"%@",dic);
+    
+    if(err) {
+        
+        NSLog(@"json解析失败：%@",err);
+        
+        return;
+        
+    }
+    
+    
+    
+    //吊起微信
+    PayReq *request = [[PayReq alloc] init] ;
+    request.openID = dic[@"Appid"];
+    
+    
+    request.partnerId = dic[@"Partnerid"];
+    request.prepayId= dic[@"Prepayid"];
+    request.package = @"Sign=WXPay";
+    request.nonceStr= dic[@"Noncestr"];
+    request.timeStamp= [dic[@"Timestamp"] intValue];
+    request.sign= dic[@"Sign"];
+    
+    
+    
+    kMainQueue(^{
+        [WXApi sendReq:request];
+    });
+    
+    
+    
+    
+    
+}
+-(void)jsAliPay:(NSString*)str
+{
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
+}
+
+
+
 /*
  #pragma mark - Navigation
  

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

@@ -391,9 +391,11 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 {
     //目前延时两秒
     NSLog(@"支付状态：%@",status);
-    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
-    [context evaluateScript:textJS1];
+    if(self.tabBarController.selectedIndex == 3) {
+        JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+        NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
+        [context evaluateScript:textJS1];
+    }
 }
 
 
@@ -1035,11 +1037,11 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 -(void)jsWxPay:(NSString *)jsonString
 {
-    /*
-     {"Prepayid":"wx31091637721432c596f288011332866700","PackageStr":"Sign=WXPay","Noncestr":"3672278166105353OSDXVDiJqjdsBQzz","Timestamp":"1564535754","Sign":"C1A3579B264B8BC984576DFF083AE7C8"}
-     */
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先下载微信再进行支付！" delay:1.5];
+        return;
+    }
     
-    //    NSDictionary *Object=[NSJSONSerialization JSONObjectWithData:dict options:NSJSONReadingMutableLeaves error:nil];
     
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     

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

@@ -517,9 +517,13 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
 {
     //目前延时两秒
      NSLog(@"支付状态：%@",status);
-    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
-    [context evaluateScript:textJS1];
+    
+    if(self.tabBarController.selectedIndex == 0) {
+        JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+        NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
+        [context evaluateScript:textJS1];
+    }
+
 }
     
 
@@ -1217,11 +1221,10 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
 
 -(void)jsWxPay:(NSString *)jsonString
 {
-    /*
-     {"Prepayid":"wx31091637721432c596f288011332866700","PackageStr":"Sign=WXPay","Noncestr":"3672278166105353OSDXVDiJqjdsBQzz","Timestamp":"1564535754","Sign":"C1A3579B264B8BC984576DFF083AE7C8"}
-     */
-    
-//    NSDictionary *Object=[NSJSONSerialization JSONObjectWithData:dict options:NSJSONReadingMutableLeaves error:nil];
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先下载微信再进行支付！" delay:1.5];
+        return;
+    }
     
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     

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

@@ -49,6 +49,13 @@ JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
+
+//支付相关
+JSExportAs(wxPay, -(void)jsWxPay:(NSString *)jsonString);
+
+JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
+
+
 @end
 
 
@@ -360,9 +367,11 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 {
     //目前延时两秒
     NSLog(@"支付状态：%@",status);
-    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
-    [context evaluateScript:textJS1];
+    if(self.tabBarController.selectedIndex == 1) {
+        JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+        NSString * textJS1 = [NSString stringWithFormat:@"payCallBack('%@')", status];
+        [context evaluateScript:textJS1];
+    }
 }
 
 
@@ -971,6 +980,73 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
         [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
     });
 }
+
+
+
+#pragma mark  支付相关
+
+-(void)jsWxPay:(NSString *)jsonString
+{
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先下载微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    NSError *err;
+    
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+                         
+                                                        options:NSJSONReadingMutableContainers
+                         
+                                                          error:&err];
+    
+    NSLog(@"%@",dic);
+    
+    if(err) {
+        
+        NSLog(@"json解析失败：%@",err);
+        
+        return;
+        
+    }
+    
+    
+    
+    //吊起微信
+    PayReq *request = [[PayReq alloc] init] ;
+    request.openID = dic[@"Appid"];
+    
+    
+    request.partnerId = dic[@"Partnerid"];
+    request.prepayId= dic[@"Prepayid"];
+    request.package = @"Sign=WXPay";
+    request.nonceStr= dic[@"Noncestr"];
+    request.timeStamp= [dic[@"Timestamp"] intValue];
+    request.sign= dic[@"Sign"];
+    
+    
+    
+    kMainQueue(^{
+        [WXApi sendReq:request];
+    });
+    
+    
+    
+    
+    
+}
+-(void)jsAliPay:(NSString*)str
+{
+    kMainQueue(^{
+        [[AlipaySDK defaultService] payOrder:str fromScheme:@"jianyuiosapp" callback:nil];
+    });
+    
+    
+}
+
+
 /*
  #pragma mark - Navigation
  

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.3</string>
+	<string>2.7.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>28</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wtloginmqq2</string>

ios/JianYuIOS/JianYuIOS/NewWebController.m

@@ -108,12 +108,16 @@ JSExportAs(aliPay, -(void)jsAliPay:(NSString*)str);
     [context evaluateScript:textJS1];
 }
 
-
 #pragma mark  支付相关
 
 -(void)jsWxPay:(NSString *)jsonString
 {
-
+    if ([LXUserDefaults isInstallWeiXin] != 1) { // 没有安装wx
+        [[LXViewControllerManager shareViewControllerManager] showHudOnlyText:@"请先下载微信再进行支付！" delay:1.5];
+        return;
+    }
+    
+    
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     
     NSError *err;