通知

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -1056,7 +1056,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1140,7 +1140,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -147,10 +147,6 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"http://web-jydev-xzh.jianyu360.cn/" //徐志恒
 
-
-//#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
-//#define kHost @"https://app2-jytest.jianyu360.cn/" //测试https
-
 //#define kHost @"https://app-jytest.jianyu360.cn/"  //老测试
 //#define kHost @"http://anti.jianyu360.cn/"         //新测试
 //#define kHost @"https://app3-jytest.jianyu360.cn/" //app3测试
@@ -159,9 +155,12 @@ _Pragma("clang diagnostic pop")\
 //#define kHost @"http://res.jianyu360.com/"    //正式http
 
 
+//#define kHost @"http://app2-jytest.jianyu360.cn/"  //测试http
+//#define kHost @"https://app2-jytest.jianyu360.cn/" //测试https
+
 #define kHost @"http://app-i1.jianyu360.com/"   //新正式
 
-//#define kHost @"http://192.168.20.117:8082/"
+
 
 
 

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

@@ -79,7 +79,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
                            @"aliPay",
                            @"skipCamera",
                            @"skipAlbum",
-                           @"appTest",
+                           @"openActivityPage",
         ];
         for (NSString*jsName in jsArr) {
             [config.userContentController addScriptMessageHandler:self name:jsName];
@@ -267,6 +267,8 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
        [self jsSkipCamera:message.body];
     }else if ([message.name isEqualToString:@"skipAlbum"]) {
        [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"openActivityPage"]) {
+       [self jsOpenActivityPage:message.body];
     }else {
         
     }
@@ -773,6 +775,23 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     });
 }
 
+-(void)jsOpenActivityPage:(NSDictionary *)dict {
+    NSDictionary * infoDic = @{@"url":[NSString stringWithFormat:@"%@",dict[@"url"]],
+                               @"rectype":[NSString stringWithFormat:@"%@",dict[@"rectype"]],
+                               @"openid":[NSString stringWithFormat:@"%@",dict[@"openid"]],
+                               };
+    //post请求
+    NSLog(@"%@",[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost]);
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost] parameters:infoDic progress:^(NSProgress *progress) {
+        NSLog(@"成功：%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+    
+}
+
 // web是否可退回上页面
 -(int)jsIsCanBack:(NSString *)str{
     return self.webView.canGoBack ? 1:0;

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

@@ -92,7 +92,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
                            @"aliPay",
                            @"skipCamera",
                            @"skipAlbum",
-                           @"appTest",
+                           @"openActivityPage",
         ];
         for (NSString*jsName in jsArr) {
             [config.userContentController addScriptMessageHandler:self name:jsName];
@@ -282,6 +282,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
        [self jsSkipAlbum:message.body];
     }else if ([message.name isEqualToString:@"skipAlbum"]) {
        [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"openActivityPage"]) {
+       [self jsOpenActivityPage:message.body];
     }else {
         
     }
@@ -790,6 +792,23 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     });
 }
 
+-(void)jsOpenActivityPage:(NSDictionary *)dict {
+    NSDictionary * infoDic = @{@"url":[NSString stringWithFormat:@"%@",dict[@"url"]],
+                               @"rectype":[NSString stringWithFormat:@"%@",dict[@"rectype"]],
+                               @"openid":[NSString stringWithFormat:@"%@",dict[@"openid"]],
+                               };
+    //post请求
+    NSLog(@"%@",[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost]);
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost] parameters:infoDic progress:^(NSProgress *progress) {
+        NSLog(@"成功：%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+    
+}
+
 // web是否可退回上页面
 -(int)jsIsCanBack:(NSString *)str{
     return self.webView.canGoBack ? 1:0;

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

@@ -94,7 +94,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
                            @"chooseTab",
                            @"skipCamera",
                            @"skipAlbum",
-                           @"appTest",
+                           @"openActivityPage",
         ];
         for (NSString*jsName in jsArr) {
             [config.userContentController addScriptMessageHandler:self name:jsName];
@@ -291,6 +291,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
        [self jsSkipCamera:message.body];
     }else if ([message.name isEqualToString:@"skipAlbum"]) {
        [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"openActivityPage"]) {
+       [self jsOpenActivityPage:message.body];
     }else {
         
     }
@@ -1008,11 +1010,34 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     });
 }
 
+-(void)jsOpenActivityPage:(NSDictionary *)dict {
+    NSDictionary * infoDic = @{@"url":[NSString stringWithFormat:@"%@",dict[@"url"]],
+                               @"rectype":[NSString stringWithFormat:@"%@",dict[@"rectype"]],
+                               @"openid":[NSString stringWithFormat:@"%@",dict[@"openid"]],
+                               };
+    //post请求
+    NSLog(@"%@",[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost]);
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost] parameters:infoDic progress:^(NSProgress *progress) {
+        NSLog(@"成功：%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+    
+}
+
+
+
 // web是否可退回上页面
 -(int)jsIsCanBack:(NSString *)str{
     return self.webView.canGoBack ? 1:0;
 }
 
+
+
+
+
 #pragma mark   *****其他方法
 -(void)judgeIsHiddenBottom {
     if(self.tabBarController.selectedIndex == 0) {
@@ -1143,7 +1168,6 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         if (iPhoneX) {
             if (@available(iOS 11.0, *)) {
                 self.webView.frame = CGRectMake(0, 0, WIDTH, HEIGHT);
-                NSLog(@"%@",self.webView)
             }
         }else {
             self.webView.frame = CGRectMake(0, -STATUS_BAR_HEIGHT, WIDTH, HEIGHT+STATUS_BAR_HEIGHT);

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

@@ -87,7 +87,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
                            @"aliPay",
                            @"skipCamera",
                            @"skipAlbum",
-                           @"appTest",
+                           @"openActivityPage",
         ];
         for (NSString*jsName in jsArr) {
             [config.userContentController addScriptMessageHandler:self name:jsName];
@@ -274,6 +274,8 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
        [self jsSkipCamera:message.body];
     }else if ([message.name isEqualToString:@"skipAlbum"]) {
        [self jsSkipAlbum:message.body];
+    }else if ([message.name isEqualToString:@"openActivityPage"]) {
+       [self jsOpenActivityPage:message.body];
     }else {
         
     }
@@ -782,6 +784,23 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     });
 }
 
+-(void)jsOpenActivityPage:(NSDictionary *)dict {
+    NSDictionary * infoDic = @{@"url":[NSString stringWithFormat:@"%@",dict[@"url"]],
+                               @"rectype":[NSString stringWithFormat:@"%@",dict[@"rectype"]],
+                               @"openid":[NSString stringWithFormat:@"%@",dict[@"openid"]],
+                               };
+    //post请求
+    NSLog(@"%@",[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost]);
+    [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/message/receive",kHost] parameters:infoDic progress:^(NSProgress *progress) {
+        NSLog(@"成功：%@",progress);
+    } success:^(id responseObject) {
+        NSLog(@"responseObject=%@",responseObject);
+    } failure:^(NSError *error) {
+        NSLog(@"error=%@",error);
+    }];
+    
+}
+
 // web是否可退回上页面
 -(int)jsIsCanBack:(NSString *)str{
     return self.webView.canGoBack ? 1:0;