配置证书

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -894,7 +894,7 @@
 				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = 60;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -916,7 +916,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.3",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
 				);
-				MARKETING_VERSION = 2.9.7;
+				MARKETING_VERSION = 2.9.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -979,7 +979,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = 60;
 				DEVELOPMENT_TEAM = 4S438G3ZUL;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1001,7 +1001,7 @@
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.3",
 					"$(PROJECT_DIR)/JianYuIOS/Libs(第三方)/WeChatSDK1.8.4",
 				);
-				MARKETING_VERSION = 2.9.7;
+				MARKETING_VERSION = 2.9.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

ios/JianYuIOS/JianYuIOS.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/JianYuIOS.xcscheme

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

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -120,13 +120,13 @@ _Pragma("clang diagnostic pop")\
 #define ColorGradientArray [NSArray arrayWithObjects:(id)UIColorFromRGB(0x094303).CGColor,(id)UIColorFromRGB(0x343d32).CGColor,(id)UIColorFromRGB(0xB2B7B7).CGColor, nil]
 
 
+//测试
+//#define OCRAPPID @"TIDAXUV9"
+//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
 
-#define OCRAPPID @"TIDAXUV9"
-#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
-
-
-//#define OCRAPPID @"IDA24rmI"
-//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
+//正式
+#define OCRAPPID @"IDA24rmI"
+#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
 
 
 
@@ -183,12 +183,12 @@ _Pragma("clang diagnostic pop")\
 
 
 //#define kHost @"https://app-jytest.jianyu360.cn/"  //测试1
-
 //#define kHost @"https://app2-jytest.jianyu360.cn/"  //测试2
+//#define kHost @"https://app207-jytest.jianyu360.cn/"   //测试http
+
+#define kHost @"https://app-i3.jianyu360.com/"   //新正式
 
-#define kHost @"https://app-i2.jianyu360.com/"   //新正式
 
-//#define kHost @"https://app207-jytest.jianyu360.cn/"   //测试http
 
 
 

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

@@ -1100,11 +1100,14 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     if([infoDict[@"type"] isEqualToString:@"message"]) {
-        NSString *url = [NSString stringWithFormat:@"%@",urlStr];
-        NSArray * array = [url componentsSeparatedByString:@"=="];
-        url =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        NSArray * array = [urlStr componentsSeparatedByString:@"=="];
+        urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }else if ([infoDict[@"type"] isEqualToString:@"titleMessage"]) {
         NSArray * array = [urlStr componentsSeparatedByString:@"=="];
         urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -1114,9 +1117,8 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
             [self JsOpenExternalLink:@{@"url":urlStr,@"title":titleStr}];
         }
     }else {
-        NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
-        url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        urlStr =  [urlStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }
 }
 
@@ -1408,6 +1410,10 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         return;
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     NSArray * array = [urlStr componentsSeparatedByString:@"=="];
     urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSString * titleStr = @"消息通知";

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

@@ -1129,11 +1129,14 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     if([infoDict[@"type"] isEqualToString:@"message"]) {
-        NSString *url = [NSString stringWithFormat:@"%@",urlStr];
-        NSArray * array = [url componentsSeparatedByString:@"=="];
-        url =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        NSArray * array = [urlStr componentsSeparatedByString:@"=="];
+        urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }else if ([infoDict[@"type"] isEqualToString:@"titleMessage"]) {
         NSArray * array = [urlStr componentsSeparatedByString:@"=="];
         urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -1143,9 +1146,8 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
             [self JsOpenExternalLink:@{@"url":urlStr,@"title":titleStr}];
         }
     }else {
-        NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
-        url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        urlStr =  [urlStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }
 }
 
@@ -1440,6 +1442,10 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         return;
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     NSArray * array = [urlStr componentsSeparatedByString:@"=="];
     urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSString * titleStr = @"消息通知";

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

@@ -1518,11 +1518,14 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     if([infoDict[@"type"] isEqualToString:@"message"]) {
-        NSString *url = [NSString stringWithFormat:@"%@",urlStr];
-        NSArray * array = [url componentsSeparatedByString:@"=="];
-        url =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        NSArray * array = [urlStr componentsSeparatedByString:@"=="];
+        urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }else if ([infoDict[@"type"] isEqualToString:@"titleMessage"]) {
         NSArray * array = [urlStr componentsSeparatedByString:@"=="];
         urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -1532,9 +1535,8 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
             [self JsOpenExternalLink:@{@"url":urlStr,@"title":titleStr}];
         }
     }else {
-        NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
-        url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        urlStr =  [urlStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }
 }
 
@@ -1899,6 +1901,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         return;
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     NSArray * array = [urlStr componentsSeparatedByString:@"=="];
     urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSString * titleStr = @"消息通知";

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

@@ -1116,11 +1116,14 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     if([infoDict[@"type"] isEqualToString:@"message"]) {
-        NSString *url = [NSString stringWithFormat:@"%@",urlStr];
-        NSArray * array = [url componentsSeparatedByString:@"=="];
-        url =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        NSArray * array = [urlStr componentsSeparatedByString:@"=="];
+        urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }else if ([infoDict[@"type"] isEqualToString:@"titleMessage"]) {
         NSArray * array = [urlStr componentsSeparatedByString:@"=="];
         urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -1130,9 +1133,8 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
             [self JsOpenExternalLink:@{@"url":urlStr,@"title":titleStr}];
         }
     }else {
-        NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
-        url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+        urlStr =  [urlStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:urlStr]]];
     }
 }
 
@@ -1413,6 +1415,10 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         return;
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    if ([urlStr containsString:@"https://"]||[urlStr containsString:@"http://"]) {
+    }else {
+        urlStr = [kHost stringByAppendingString:urlStr];
+    }
     NSArray * array = [urlStr componentsSeparatedByString:@"=="];
     urlStr =  [array.firstObject stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSString * titleStr = @"消息通知";

ios/JianYuIOS/JianYuIOS/guide/ZKMethod.h

@@ -54,4 +54,8 @@ typedef NS_ENUM(NSInteger, BoundsType){
 +(UIViewController *)getCurrentVC;//获取当前控制器
 
 
+
+
+
+
 @end