Browse Source

up 2.2.1 上新版本

openlockPPP 11 months ago
parent
commit
8e4e97e055

+ 4 - 4
jiaPei.xcodeproj/project.pbxproj

@@ -11810,7 +11810,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2192024043001;
+				CURRENT_PROJECT_VERSION = 2212024071301;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11848,7 +11848,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.9;
+				MARKETING_VERSION = 2.2.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11893,7 +11893,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2192024043001;
+				CURRENT_PROJECT_VERSION = 2212024071301;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11931,7 +11931,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.9;
+				MARKETING_VERSION = 2.2.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

BIN
jiaPei.xcworkspace/xcuserdata/mimasigeling.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 0
jiaPei/Modules/LoginModule/Model/RQUserModel.h

@@ -127,6 +127,7 @@
 @property (nonatomic, readwrite, copy) NSString              * verifyLevel;
 @property (nonatomic, readwrite, copy) NSString              * version;
 @property (nonatomic, readwrite, copy) NSString              * ycbdFaceCount;
+@property (nonatomic, readwrite, copy) NSString              * scbdFaceCount;
 @property (nonatomic, readwrite, copy) NSString              * busitype;
 @property (nonatomic, readwrite, copy) NSString              * isOpenScan;
 @property (nonatomic, readwrite, copy) NSString              * qzVideo;

+ 2 - 1
jiaPei/Modules/OtherModules/PTObjectMolule/RQPTObjectMolule.m

@@ -357,7 +357,8 @@ static id rq_ptObjectModule = nil;
                 [arr addPro:@"devlng"           Value:array[4]];///设备经度
                 [arr addPro:@"devlat"           Value:array[3]];///设备纬度
                 method = @"uploadScCodeVerify";
-                faceNum = 3;
+                faceNum = RQ_USER_MANAGER.scbdFaceCount;//后台配置-根据地区变化
+
                 BOOL isOpenWater = array.count > 14? (RQObjectIsNil(array[13])? NO : ![[NSNumber numberWithString:array[13]] boolValue]) : NO;
                 waterMaekArr = isOpenWater? @[[NSDate rq_currentTimestamp],
                                               [NSString stringWithFormat:@"经纬度:%@,%@",[NSString stringWithFormat:@"%f",location.coordinate.longitude],[NSString stringWithFormat:@"%f",location.coordinate.latitude]],

+ 90 - 4
jiaPei/NewTheory/NYBasetjTimeVC.m

@@ -36,6 +36,7 @@ typedef enum {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self.navigationItem setLeftBarButtonItems:@[[UIBarButtonItem rq_backItemWithTitle:@"" imageName:@"back_white" target:self action:@selector(rq_back)]]];
+
 }
 
 /// rq_back事件处理
@@ -43,6 +44,21 @@ typedef enum {
     [self.navigationController popViewControllerAnimated:YES];
 }
 
+// 计算两个时间的差
+- (NSTimeInterval)timeDifferenceExceedingSecondsBetween:(NSString *)thisTime and:(NSString *)nowTime {
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+    
+    NSDate *thisDate = [dateFormatter dateFromString:thisTime];
+    NSDate *nowDate = [dateFormatter dateFromString:nowTime];
+    
+    if (thisDate && nowDate) {
+        NSTimeInterval timeDifference = [nowDate timeIntervalSinceDate:thisDate];
+        return timeDifference;
+    }
+    return 0.0;
+}
+
 #pragma mark           以下内容为-从之前的PeriodVC复制计时逻辑,不做修改。
 #pragma mark           理论计时
 - (void)myInitTheory {
@@ -444,10 +460,7 @@ typedef enum {
                                         [RQ_RemoteTheory_MANAGER uploadEduPicWithClassidStr:self.classIdStr timeStr:timeStr actionPhotoStr:dic[@"actionImg"] loginFlagType:LoginFlagType_Process resultBlock:^(BOOL isSuccess, NSDictionary * _Nonnull uploadEduPicDict) {
                                             @strongify(self)
                                             if (isSuccess) {
-                                                [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"过程验证成功" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:^(NSUInteger selectedOtherButtonIndex) {
-                                                    @strongify(self)
-                                                    [self.timer setFireDate:[NSDate distantPast]];
-                                                }];
+                                                [self lnShowTimeHandler];
                                             } else {
                                                 self.seconds--;
                                                 [self setSecondString:[NSString stringWithFormat:@"%d",(int)self.seconds]];
@@ -487,6 +500,12 @@ typedef enum {
         [self saveTrain];
     }
     
+    //判断-辽宁-晚上23:55分
+    if((int)self.seconds%30==0){
+        NSLog(@"判断-辽宁-晚上23:55分");
+        [self lnShowTime2399Handler];
+    }
+    
     hour   = (int)self.seconds / 3600;
     min    = (int)self.seconds % 3600 / 60;
     second = (int)self.seconds % 3600 % 60;
@@ -521,6 +540,73 @@ typedef enum {
     self.timeLabel.text = [NSString stringWithFormat:@"0%d:%@:%@",hour,min_s,second_s];
 }
 
+//2.4 辽宁-特殊判断 - 拍照上传-超时处理
+- (void)lnShowTimeHandler {
+    @weakify(self)
+    if ([[RQ_USER_MANAGER getParamsKey:@"APP_LN_DQBH"] rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {//是否辽宁
+        
+        NSString *this_timeStr = [self getTimes:self.seconds];//当前计时器时间
+        //提示: 本次训练暂停学时较多. 请先签退, 再重新签到)
+        [RQ_RemoteTheory_MANAGER  getCurrentTimeWithResultBlock:^(BOOL isSuccess, NSDictionary * _Nonnull timeDict) {
+            @strongify(self)
+            if (isSuccess) {
+                NSString *now_timeStr = timeDict[@"body"];
+                //如果-暂停超过15分钟-提示-签退
+                double timecount = fabs([self timeDifferenceExceedingSecondsBetween:this_timeStr and:now_timeStr]);
+                NSLog(@"辽宁timecount=%f",timecount);
+                if(timecount>900){
+                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"本次训练暂停学时较多. 请先签退, 再重新签到" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"签退" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:^(NSUInteger selectedOtherButtonIndex) {
+                        //走-签退-结束计时流程
+                        @strongify(self)
+                        [self btnClick:self.on_offBtn];
+                    }];
+                }else{
+                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"过程验证成功" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:^(NSUInteger selectedOtherButtonIndex) {
+                        @strongify(self)
+                        [self.timer setFireDate:[NSDate distantPast]];
+                    }];
+                }
+            }
+        }];
+        return;
+    }else{//非辽宁-直接提示成功
+        [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"过程验证成功" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:^(NSUInteger selectedOtherButtonIndex) {
+            @strongify(self)
+            [self.timer setFireDate:[NSDate distantPast]];
+        }];
+    }
+}
+
+//2.5 辽宁-特殊判断 - 凌晨提醒签退
+- (void)lnShowTime2399Handler {
+    @weakify(self)
+    if ([[RQ_USER_MANAGER getParamsKey:@"APP_LN_DQBH"] rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {//是否辽宁
+        NSString *time=[myDelegate.begin_Time substringWithRange:NSMakeRange(0, 10)];
+        NSString *time50=[NSString stringWithFormat:@"%@ 23:50:00",time];
+        NSString *time55=[NSString stringWithFormat:@"%@ 23:55:00",time];
+        NSString *this_timeStr = [self getTimes:self.seconds];
+        //如果-暂停超过15分钟-提示-签退
+        double timecount = [self timeDifferenceExceedingSecondsBetween:this_timeStr and:time50];
+        if(timecount<0){
+            double timecount55 = [self timeDifferenceExceedingSecondsBetween:this_timeStr and:time55];
+            if(timecount55<0){
+                [self.timer setFireDate:[NSDate distantFuture]];
+                [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"本次培训即将隔日无效. 请先签退. 0点过后再重新签到" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"签退" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:^(NSUInteger selectedOtherButtonIndex) {
+                    //走-签退-结束计时流程
+                    @strongify(self)
+                    [self btnClick:self.on_offBtn];
+                }];
+                return;
+            }else{
+                ShowMsg(@"本次培训即将隔日无效. 请先签退. 0点过后再重新签到");
+                return;
+            }
+        }
+        //23:55:00 强制签退
+        NSLog(@"this_timeStr=%@   time50=%@  time55=%@  %f",this_timeStr,time50,time55,timecount);
+    }
+}
+
 - (void)stopTimingWithResultBlock:(void (^)(BOOL isSuccessed))resultBlock {
     @weakify(self)
     [self.timer setFireDate:[NSDate distantFuture]];

+ 10 - 10
jiaPei/NewTheory/View/NYClassRoomPeiCell.m

@@ -240,11 +240,11 @@
                     [self stunocarfaceTofacedo:photoid];
                 }else{
                     self.submit_btn.userInteractionEnabled = YES;
-                    if (!RQObjectIsNil(dict[@"msg"])) {
+                    if (!RQObjectIsNil(dict[@"msg"])&&![dict[@"msg"] isEqualToString:@""]) {
                         ShowMsg(dict[@"msg"]);
                         return;
                     }
-                    if (!RQObjectIsNil(dict[@"body"])) {
+                    if (!RQObjectIsNil(dict[@"body"])&&![dict[@"body"] isEqualToString:@""]) {
                         ShowMsg(dict[@"body"]);
                         return;
                     }
@@ -271,11 +271,11 @@
             else
             {
                 self.submit_btn.userInteractionEnabled = YES;
-                if (!RQObjectIsNil(dict[@"msg"])) {
+                if (!RQObjectIsNil(dict[@"msg"])&&![dict[@"msg"] isEqualToString:@""]) {
                     ShowMsg(dict[@"msg"]);
                     return;
                 }
-                if (!RQObjectIsNil(dict[@"body"])) {
+                if (!RQObjectIsNil(dict[@"body"])&&![dict[@"body"] isEqualToString:@""]) {
                     ShowMsg(dict[@"body"]);
                     return;
                 }
@@ -316,11 +316,11 @@
         }
         else
         {
-            if (!RQObjectIsNil(dict[@"msg"])) {
+            if (!RQObjectIsNil(dict[@"msg"])&&![dict[@"msg"] isEqualToString:@""]) {
                 ShowMsg(dict[@"msg"]);
                 return;
             }
-            if (!RQObjectIsNil(dict[@"body"])) {
+            if (!RQObjectIsNil(dict[@"body"])&&![dict[@"body"] isEqualToString:@""]) {
                 ShowMsg(dict[@"body"]);
                 return;
             }
@@ -428,11 +428,11 @@
         else
         {
             [self getClassRoomInfo];//刷新一次
-            if (!RQObjectIsNil(dict[@"msg"])) {
+            if (!RQObjectIsNil(dict[@"msg"])&&![dict[@"msg"] isEqualToString:@""]) {
                 ShowMsg(dict[@"msg"]);
                 return;
             }
-            if (!RQObjectIsNil(dict[@"body"])) {
+            if (!RQObjectIsNil(dict[@"body"])&&![dict[@"body"] isEqualToString:@""]) {
                 ShowMsg(dict[@"body"]);
                 return;
             }
@@ -464,11 +464,11 @@
         }
         else
         {
-            if (!RQObjectIsNil(dict[@"msg"])) {
+            if (!RQObjectIsNil(dict[@"msg"])&&![dict[@"msg"] isEqualToString:@""]) {
                 ShowMsg(dict[@"msg"]);
                 return;
             }
-            if (!RQObjectIsNil(dict[@"body"])) {
+            if (!RQObjectIsNil(dict[@"body"])&&![dict[@"body"] isEqualToString:@""]) {
                 ShowMsg(dict[@"body"]);
                 return;
             }

+ 2 - 2
jiaPei/TrainInfoVC.m

@@ -536,7 +536,7 @@
                     }
                     if (section == 1)
                     {
-                        NSMutableArray *rowArray = (NSMutableArray *)[[dataDic objectForKey:@"2"] objectForKey:@"0"];
+                        NSMutableArray *rowArray = (NSMutableArray *)[[dataDic objectForKey:@"2"] objectForKey:@"1"];
                         if (rowArray.count > 0) {
                             if ([otherDic[@"SRI_TRAIN_TWO_STATUS"] integerValue] == 2) {
                                 label.text = @"审核通过";
@@ -551,7 +551,7 @@
                     }
                     if (section == 2)
                     {
-                        NSMutableArray *rowArray = (NSMutableArray *)[[dataDic objectForKey:@"3"] objectForKey:@"0"];
+                        NSMutableArray *rowArray = (NSMutableArray *)[[dataDic objectForKey:@"3"] objectForKey:@"1"];
                         if (rowArray.count > 0) {
                             if ([otherDic[@"SRI_TRAIN_THREE_STATUS"] integerValue] == 2) {
                                 label.text = @"审核通过";

+ 2 - 0
jiaPei/Utils/Manager/UserManager/RQUserManager.h

@@ -47,6 +47,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSInteger)isycbd;
 /// 活体检测比对动作数量
 - (NSInteger)ycbdFaceCount;
+/// SC活体检测比对动作数量
+- (NSInteger)scbdFaceCount;
 /// sfzb 是否开启作弊 1开启 0不开启
 - (NSInteger)sfzb;
 /// qzgx 是否强制更新 1开启 0不开启

+ 3 - 0
jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -106,6 +106,9 @@ static id rq_userManager = nil;
 - (NSInteger)ycbdFaceCount {
     return RQ_USER_MANAGER.currentUser? (RQStringIsNotEmpty(RQ_USER_MANAGER.currentUser.ycbdFaceCount)? [RQ_USER_MANAGER.currentUser.ycbdFaceCount integerValue] : 0) : NO;
 }
+- (NSInteger)scbdFaceCount {
+    return RQ_USER_MANAGER.currentUser? (RQStringIsNotEmpty(RQ_USER_MANAGER.currentUser.scbdFaceCount)? [RQ_USER_MANAGER.currentUser.scbdFaceCount integerValue] : 0) : NO;
+}
 
 /// sfzb 是否开启作弊 1开启 0不开启
 - (NSInteger)sfzb {