2.1.6

jiaPei.xcodeproj/project.pbxproj

@@ -11778,7 +11778,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2152024022201;
+				CURRENT_PROJECT_VERSION = 2162024030601;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11816,7 +11816,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11861,7 +11861,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2152024022201;
+				CURRENT_PROJECT_VERSION = 2162024030601;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11899,7 +11899,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Modules/OtherModules/ExerciseModule/View/ExercisePage/RQExerciseQuestionCell.m

@@ -68,6 +68,7 @@
     [self.questionImageView setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
         [[RACScheduler mainThreadScheduler] schedule:^{
             @strongify(self)
+            RQ_Exercise_Module.isShow_CatalogueView = YES;
             [RQControllerHelper.currentViewController presentViewController:self.imagePreviewViewController animated:YES completion:nil];
         }];
     }];
@@ -162,6 +163,7 @@
         // 当需要在退出大图预览时做一些事情的时候，可配合 UIViewController (QMUI) 的 qmui_visibleStateDidChangeBlock 来实现。
         _imagePreviewViewController.qmui_visibleStateDidChangeBlock = ^(QMUIImagePreviewViewController *viewController, QMUIViewControllerVisibleState visibleState) {
             if (visibleState == QMUIViewControllerWillDisappear) {
+                RQ_Exercise_Module.isShow_CatalogueView = NO;
 //                NSInteger exitAtIndex = viewController.imagePreviewView.currentImageIndex;
             }
         };

jiaPei/Modules/TimeModule/ViewModel/itemViewModel/RQTimeSingleItemViewModel.m

@@ -177,8 +177,9 @@
 - (void)gotoTrainInfo {
 //    //是否开启活体检测 0-不开启 1-开启 活体检测比对动作数量
 //    if (RQ_USER_MANAGER.isycbd == 1 && RQ_USER_MANAGER.ycbdFaceCount == 0) {
-    //开头有35进入H5
-    if ([RQ_USER_MANAGER.currentUser.city hasPrefix:@"35"]) {
+    //开头有35进入H5 -  修改登录下发匹配
+    NSString *citystr = [RQ_USER_MANAGER getParamsKey:@"SP_QUERY_TRAIN_CLASS_DQBH"];
+    if ([citystr rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {
         NSURL *URL = [NSURL URLWithString:[NSString stringWithFormat:@"http://fj.jppt.com.cn/jsjp/wechat/toClassHourQueryByStuId.html?stuId=%@&dqbh=%@&app=ios",RQ_USER_MANAGER.currentUser.outId, RQ_USER_MANAGER.currentUser.city]];
         RQCustomWebViewViewController *vc = [[RQCustomWebViewViewController alloc] init];
         vc.url = URL.absoluteString;

jiaPei/NewTheory/View/NYClassRoomPeiCell.m

@@ -178,7 +178,14 @@
                     /// 2.线上活体检测
                     [self stunocarfaceTofacedo:photoid];
                 }else{
-                    ShowMsg(dict[@"msg"]);
+                    if (dict[@"msg"]) {
+                        ShowMsg(dict[@"msg"]);
+                        return;
+                    }
+                    if (dict[@"body"]) {
+                        ShowMsg(dict[@"body"]);
+                        return;
+                    }
                 }
             }];
         }else{
@@ -201,7 +208,14 @@
             }
             else
             {
-                ShowMsg(dict[@"msg"]);
+                if (dict[@"msg"]) {
+                    ShowMsg(dict[@"msg"]);
+                    return;
+                }
+                if (dict[@"body"]) {
+                    ShowMsg(dict[@"body"]);
+                    return;
+                }
             }
         }];
 }
@@ -227,7 +241,14 @@
         }
         else
         {
-            ShowMsg(dict[@"msg"]);
+            if (dict[@"msg"]) {
+                ShowMsg(dict[@"msg"]);
+                return;
+            }
+            if (dict[@"body"]) {
+                ShowMsg(dict[@"body"]);
+                return;
+            }
         }
     }];
 }

jiaPei/NewTheory/View/NYClassRoomPeiPhotoCell.m

@@ -77,6 +77,22 @@
     [self.imagev sd_setImageWithURL:[NSURL URLWithString:cultivatePhotoModel.filepath]];
     self.time_label.text = cultivatePhotoModel.ptime;
     self.valid_time_label.text = [NSString stringWithFormat:@"%zd分钟",cultivatePhotoModel.time];
+    NSString *titleStr = @"训练过程照片";
+    switch (cultivatePhotoModel.event) {
+        case 17:
+            titleStr = @"签到照片";
+            break;
+        case 18:
+            titleStr = @"签退照片";
+            break;
+        case 19:
+            titleStr = @"训练过程照片";
+            break;
+        default:
+            titleStr = @"未知";
+            break;
+    }
+    self.title_label.text = titleStr;
 }
 
 @end