zhengkun 2 年之前
父节点
当前提交
6171b710c6

+ 2 - 2
ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -1149,7 +1149,7 @@
 				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 76;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1235,7 +1235,7 @@
 				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 74;
+				CURRENT_PROJECT_VERSION = 76;
 				DEVELOPMENT_TEAM = WN4RUJ6RHX;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

二进制
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/zhengkun.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 20
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -143,10 +143,6 @@ _Pragma("clang diagnostic pop")\
 #import <SDWebImage/UIButton+WebCache.h>
 #import "UIImageView+WebCache.h"
 
-////OCR
-//#import <WBOCRService/WBOCRService.h>
-//#import <WBCloudReflectionFaceVerify/WBFaceVerifyCustomerService.h>
-
 #import <GRPCClient/GRPCCall+ChannelArg.h>
 #import <GRPCClient/GRPCCall+Tests.h>
 
@@ -174,27 +170,13 @@ _Pragma("clang diagnostic pop")\
 #import "JhtFileModel.h"
 #import "LoadDocViewController.h"
 
-//#define kHost @"https://web-zyh.jydev.jianyu360.com/" //张雨涵
-//#define kHost @"https://web-ws.jydev.jianyu360.com/" //王山
-//#define kHost @"https://web-zxl.jydev.jianyu360.com/" //张鑫磊
-
-//#define kHost @"https://appdev-jytest.jydev.jianyu360.com/"   //其他测试
 
 //#define kHost @"https://app-jytest.jydev.jianyu360.com/"  //测试1
 //#define kHost @"https://app2-jytest.jydev.jianyu360.com/"  //测试2
-//#define kHost @"https://app5-jytest.jydev.jianyu360.com/"  //测试5
-
-#define kHost @"https://app-i3.jianyu360.cn/"   //新正式
-
-//测试
-//#define OCRAPPID @"TIDAXUV9"
-//#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iGu6HjKkDlKWhcLFmMimw9NjpIBSVubmbZq9LI6yCTVVpJe934uUSpRX+4aGhH3x6M7Uv+aOz232qxVldLxSWeS+16IVVI+uoGILEgpTOLbdNGjtYxAI5X3GdyR9/ZXPHUKbSwNaJWj4svMDm+unKSvshPmZ9we28IzWx0ddxn22w=="
-
+#define kHost @"https://app5-jytest.jydev.jianyu360.com/"  //测试5
 
-//正式
-#define OCRAPPID @"IDA24rmI"
-#define LICENCE @"p78X6jCKNuDQkIOPNl8TNLbULoxMVDkf+gQM18uC0ZARhlA5Cjzk8SuUP+p43Vhr0aH+i/Jmxc8wzdnGdnlqiLCdRYTZYvR7oMol4AP534BxF9GMgqty0x4Hjf2d8usufYq6FT04EjMk9Mudcz0AGyBJGkgLCiKDZNNrCvXC9iG2cYczbyncMrpud8GaWP/O2BhbWuWeoCpqhfOM16agoAHKepGWdhhkZTDOaVPKUMmbaQ8I2dFlk9IfOrmqc1UFO+mni7bJ90T8NjjyOPbcKYtJPFwVjyGzTse9klfXuHgNealpJfvXrTnS85BNZcxYxVh+U3H58Bel+LRnFIVUag=="
 
+//#define kHost @"https://ios.jianyu360.cn/"   //正式版
 
 
 /*

+ 1 - 24
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -566,36 +566,13 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     [self.view addGestureRecognizer:self.recognizer];
     
     
-    
-    
     //定时器-检测错误数据是否超过10个  发送
 //    [NSTimer scheduledTimerWithTimeInterval:180 target:self selector:@selector(errorLogListening) userInfo:nil repeats:YES];
     //监听底部栏
     [NSTimer scheduledTimerWithTimeInterval:3 target:self selector:@selector(bottomOneListening) userInfo:nil repeats:YES];
     //监听购买结果
     [[SKPaymentQueue defaultQueue] addTransactionObserver:self];
-    
-    UIButton *testBtn = [ZKControl createButtonWithFrame:CGRectMake(100, 50, 100, 100) title:@"模拟按钮" imageName:@"" bgImageName:@"" target:self method:@selector(testBtnClick)];
-    [self.webView addSubview:testBtn];
-    
-}
-
--(void)testBtnClick {
-
-    LoadDocViewController *load = [[LoadDocViewController alloc] init];
-    //构建数据
-    JhtFileModel *fileModel = [[JhtFileModel alloc] init];
-    fileModel.fileName = @"aaabbb";
-    fileModel.fileName = [fileModel.fileName stringByRemovingPercentEncoding];
-    fileModel.fileName=[fileModel.fileName stringByReplacingOccurrencesOfString:@"/" withString:@""];
-    fileModel.viewFileType = Type_Unknow;
-    fileModel.url = @"https://jy-datafile.oss-cn-beijing.aliyuncs.com/be2344c786e054e93b6cf476f99d4f287dbd3670e4d7f51995af4ce4b5c69928.doc";
-    fileModel.fileSize = @"";
-    load.titleStr = fileModel.fileName;
-    load.currentFileModel = fileModel;
-    kMainQueue(^{
-        [self presentViewController:load animated:YES completion:nil];
-    });
+        
 }
 
 

+ 1 - 57
ios/JianYuIOS/JianYuIOS/Info.plist

@@ -93,28 +93,7 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
-			<key>app-i2.jianyu360.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>app-jytest.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>app2-jytest.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>app207-jytest.jianyu360.cn</key>
+			<key>ios.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
@@ -128,41 +107,6 @@
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>jy-datafile.oss-cn-beijing.aliyuncs.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>web-jydev-wcj.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>web-jydev-wh.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>web-jydev-ws.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>web-jydev-zxl.jianyu360.cn</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>