备份-细节修改

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/shutdown.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "shutdown@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -153,7 +153,7 @@ _Pragma("clang diagnostic pop")\
 
 
 #define kHost @"http://web-jydev-ws.jianyu360.cn/" //王山
-//
+
 //#define kHost @"http://web-jydev-zyh.jianyu360.cn/" //张雨涵
 
 //#define kHost @"http://web-jydev-wcj.jianyu360.cn/" //王传近
@@ -164,15 +164,7 @@ _Pragma("clang diagnostic pop")\
 
 //#define kHost @"http://web-jydev-xzh.jianyu360.cn/" //徐志恒
 
-
-
-
-//#define kHost @"https://res.jianyu360.com/"   //正式https
-//#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/"   //新正式
 

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

@@ -61,10 +61,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     return _progressView;
 }
 //弹框
--(ZKClipboardView *)clipboardView
-{
+-(ZKClipboardView *)clipboardView{
     if(!_clipboardView) {
-        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 175)];
+        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 180+90)];
         _clipboardView.delegate = self;
     }
     return _clipboardView;
@@ -944,6 +943,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
             }
             [self.verifyMsgView show];
             
+            NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",@""];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
+            
         }];
     }));
     
@@ -967,8 +969,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         [[WBFaceVerifyCustomerService sharedInstance] loginInLiveCheckAndCompareWithSourceImageService:userId nonce:nonce sign:sign appid:OCRAPPID orderNo:orderNo apiVersion:@"1.0.0" licence:LICENCE faceType:WBFaceVerifyLivingType_Action faceId:faceId sdkConfig:config success:^{
             
         } failure:^(WBFaceError * _Nonnull error) {
-            self.verifyMsgView.descTitle = @"活体检测失败";
-            [self.verifyMsgView show];
+            
         }];
     }));
 }
@@ -985,6 +986,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
         NSLog(@"活体检测失败");
         self.verifyMsgView.descTitle = @"活体检测失败";
         [self.verifyMsgView show];
+        
+        NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",@""];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
     }
 }
 
@@ -1525,7 +1529,7 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
     
 -(void)openTheClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 2) {
-        NSLog(@"百宝箱打开指定粘贴板url");
+        NSLog(@"菜单三打开指定粘贴板url");
         NSDictionary *dict = notificaition.userInfo;
         NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
         tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];

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

@@ -75,10 +75,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     return _progressView;
 }
 //弹框
--(ZKClipboardView *)clipboardView
-{
+-(ZKClipboardView *)clipboardView{
     if(!_clipboardView) {
-        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 175)];
+        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 180+90)];
         _clipboardView.delegate = self;
     }
     return _clipboardView;
@@ -971,6 +970,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
             }
             [self.verifyMsgView show];
             
+            NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",@""];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
+            
         }];
     }));
     
@@ -994,8 +996,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         [[WBFaceVerifyCustomerService sharedInstance] loginInLiveCheckAndCompareWithSourceImageService:userId nonce:nonce sign:sign appid:OCRAPPID orderNo:orderNo apiVersion:@"1.0.0" licence:LICENCE faceType:WBFaceVerifyLivingType_Action faceId:faceId sdkConfig:config success:^{
             
         } failure:^(WBFaceError * _Nonnull error) {
-            self.verifyMsgView.descTitle = @"活体检测失败";
-            [self.verifyMsgView show];
+            
         }];
     }));
 }
@@ -1012,6 +1013,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
         NSLog(@"活体检测失败");
         self.verifyMsgView.descTitle = @"活体检测失败";
         [self.verifyMsgView show];
+        
+        NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",@""];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
     }
 }
 
@@ -1563,7 +1567,7 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
     
 -(void)openTheClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 3) {
-        NSLog(@"我的打开指定粘贴板url");
+        NSLog(@"菜单四打开指定粘贴板url");
         NSDictionary *dict = notificaition.userInfo;
         NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
         tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];

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

@@ -70,10 +70,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     return _verifyMsgView;
 }
 //弹框
--(ZKClipboardView *)clipboardView
-{
+-(ZKClipboardView *)clipboardView{
     if(!_clipboardView) {
-        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 175)];
+        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 180+90)];
         _clipboardView.delegate = self;
     }
     return _clipboardView;
@@ -1233,6 +1232,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
             }
             [self.verifyMsgView show];
             
+            NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",@""];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
+            
+            
         }];
     }));
     
@@ -1256,8 +1259,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         [[WBFaceVerifyCustomerService sharedInstance] loginInLiveCheckAndCompareWithSourceImageService:userId nonce:nonce sign:sign appid:OCRAPPID orderNo:orderNo apiVersion:@"1.0.0" licence:LICENCE faceType:WBFaceVerifyLivingType_Action faceId:faceId sdkConfig:config success:^{
             
         } failure:^(WBFaceError * _Nonnull error) {
-            self.verifyMsgView.descTitle = @"活体检测失败";
-            [self.verifyMsgView show];
+            
         }];
     }));
 }
@@ -1274,6 +1276,9 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
         NSLog(@"活体检测失败");
         self.verifyMsgView.descTitle = @"活体检测失败";
         [self.verifyMsgView show];
+        
+        NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",@""];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
     }
 }
 
@@ -2008,7 +2013,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     
 -(void)openTheClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 0) {
-        NSLog(@"首页打开指定粘贴板url");
+        NSLog(@"菜单一打开指定粘贴板url");
         NSDictionary *dict = notificaition.userInfo;
         NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
         tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];

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

@@ -69,10 +69,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     return _progressView;
 }
 //弹框
--(ZKClipboardView *)clipboardView
-{
+-(ZKClipboardView *)clipboardView{
     if(!_clipboardView) {
-        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 175)];
+        _clipboardView = [[ZKClipboardView alloc]initWithFrame:CGRectMake(0, 0, WIDTH*0.8, 180+90)];
         _clipboardView.delegate = self;
     }
     return _clipboardView;
@@ -957,6 +956,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
             }
             [self.verifyMsgView show];
             
+            NSString *textJS =  [NSString stringWithFormat:@"ocrVerifyResult('%@')",@""];
+            [self isExitCallToJS:textJS withMethodName:@"ocrVerifyResult"];
+            
         }];
     }));
     
@@ -980,8 +982,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         [[WBFaceVerifyCustomerService sharedInstance] loginInLiveCheckAndCompareWithSourceImageService:userId nonce:nonce sign:sign appid:OCRAPPID orderNo:orderNo apiVersion:@"1.0.0" licence:LICENCE faceType:WBFaceVerifyLivingType_Action faceId:faceId sdkConfig:config success:^{
             
         } failure:^(WBFaceError * _Nonnull error) {
-            self.verifyMsgView.descTitle = @"活体检测失败";
-            [self.verifyMsgView show];
+            
         }];
     }));
 }
@@ -998,6 +999,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
         NSLog(@"活体检测失败");
         self.verifyMsgView.descTitle = @"活体检测失败";
         [self.verifyMsgView show];
+        
+        NSString *textJS =  [NSString stringWithFormat:@"faceVerifyResult('%@')",@""];
+        [self isExitCallToJS:textJS withMethodName:@"faceVerifyResult"];
     }
 }
 
@@ -1539,7 +1543,7 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
     
 -(void)openTheClipboard:(NSNotification *)notificaition{
     if(self.tabBarController.selectedIndex == 1) {
-        NSLog(@"订阅打开指定粘贴板url");
+        NSLog(@"菜单二打开指定粘贴板url");
         NSDictionary *dict = notificaition.userInfo;
         NSString *tmpUrl = [NSString stringWithFormat:@"%@%@", kHost, dict[@"url"]];
         tmpUrl =  [tmpUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -91,28 +91,28 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
-			<key>app2-jytest.jianyu360.cn</key>
+			<key>app-i1.jianyu360.com</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>app207-jytest.jianyu360.cn</key>
+			<key>app2-jytest.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>jpush.cn</key>
+			<key>app207-jytest.jianyu360.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>res.jianyu360.com</key>
+			<key>jpush.cn</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>

ios/JianYuIOS/JianYuIOS/tool/ZKClipboardView.m

@@ -26,34 +26,42 @@
 {
     if (self = [super initWithFrame:frame]) {
         
-        self.backgroundColor = [UIColor whiteColor];
-        self.layer.masksToBounds = YES;
-        self.layer.cornerRadius = 10;
+        self.backgroundColor = [UIColor clearColor];
         
         
-        UIImageView *imageV = [ZKControl createImageViewFrame:CGRectMake(20, 20, 50, 50) imageName:@""];
-        [self addSubview:imageV];
+        UIButton *downBtn = [ZKControl createButtonWithFrame:CGRectMake(self.width-35, 0, 25, 25) title:@"" titleColor:[UIColor whiteColor] titleFont:15 imageName:@"shutdown" bgImageName:nil target:self method:@selector(downBtnClick)];
+        [self addSubview:downBtn];
+        
+        
+        UIView *contentView = [ZKControl createViewWithFrame:CGRectMake(0, 40, self.width, self.height-90) color:[UIColor whiteColor]];
+        contentView.layer.masksToBounds = YES;
+        contentView.layer.cornerRadius = 10;
+        [self addSubview:contentView];
+        
+        UIImageView *imageV = [ZKControl createImageViewFrame:CGRectMake(20, 20, 55, 55) imageName:@""];
+        [contentView addSubview:imageV];
         self.iconImageV = imageV;
+       
+        
         
-        UILabel *titleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, 25, self.width-imageV.right-10, 18) font:15 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x000000) bgColor:nil];
-        [self addSubview:titleLabel];
+        
+        UILabel *titleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, 25, self.width-imageV.right-10, 18) font:15 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x171826) bgColor:nil];
+        [contentView addSubview:titleLabel];
         self.titleLabel = titleLabel;
         
-        UILabel *subtitleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, titleLabel.bottom+2, titleLabel.width, 25) font:13 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x000000) bgColor:nil];
-        subtitleLabel.alpha = 0.5;
-        [self addSubview:subtitleLabel];
+        UILabel *subtitleLabel = [ZKControl createLabelWithFrame:CGRectMake(imageV.right+10, titleLabel.bottom+2, titleLabel.width, 25) font:13 text:@"" TextAlignment:NSTextAlignmentLeft TextColor:UIColorFromRGB(0x5F5E64) bgColor:nil];
+        [contentView addSubview:subtitleLabel];
         self.subtitleLabel = subtitleLabel;
         
-        UIButton *button = [ZKControl createButtonWithFrame:CGRectMake(20, imageV.bottom+25, self.width-40, 40) title:@"" titleColor:[UIColor whiteColor] titleFont:15 imageName:nil bgImageName:nil target:self method:@selector(doneClick)];
+        UIButton *button = [ZKControl createButtonWithFrame:CGRectMake(20, imageV.bottom+25, self.width-40, 40) title:@"" titleColor:UIColorFromRGB(0xF7F9FA) titleFont:15 imageName:nil bgImageName:nil target:self method:@selector(doneClick)];
         button.layer.cornerRadius = 5;
         button.layer.masksToBounds = YES;
-        button.backgroundColor = UIColorRGBA(92, 188, 206, 1);
-        [self addSubview:button];
+        button.backgroundColor = UIColorFromRGB(0x2ABED1);
+        [contentView addSubview:button];
         self.doneBtn = button;
         
-        UILabel *bottomLabel = [ZKControl createLabelWithFrame:CGRectMake(0, button.bottom, self.width, 40) font:13 text:@"" TextAlignment:NSTextAlignmentCenter TextColor:UIColorFromRGB(0x000000) bgColor:nil];
-        bottomLabel.alpha = 0.5;
-        [self addSubview:bottomLabel];
+        UILabel *bottomLabel = [ZKControl createLabelWithFrame:CGRectMake(0, button.bottom, self.width, 40) font:12 text:@"" TextAlignment:NSTextAlignmentCenter TextColor:UIColorFromRGB(0x9B9CA3) bgColor:nil];
+        [contentView addSubview:bottomLabel];
         self.bottomLabel = bottomLabel;
 //
 
@@ -87,8 +95,10 @@
 }
 - (void)setImgUrl:(NSString *)imgUrl {
     _imgUrl = imgUrl;
-    //加载网络图片-测试本地
-    self.iconImageV.image = [UIImage imageNamed:@"logo"];
+    NSURL *photourl = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@",kHost,imgUrl]];
+    //url请求实在UI主线程中进行的
+    UIImage *images = [UIImage imageWithData:[NSData dataWithContentsOfURL:photourl]];//通过网络url获取uiimage
+    self.iconImageV.image = images;
     
 }
 - (void)setAppUrl:(NSString *)appUrl {
@@ -111,6 +121,11 @@
     [self.delegate clipboardClick:self.appUrl];
 }
 
+
+-(void)downBtnClick {
+     [[ZKModal sharedInstance] hide];
+}
+
 -(void)show
 {
     [[ZKModal sharedInstance] showWithContentView:self andAnimated:YES];