B2B1。type==11 可以打理论计时bug解决。 6小时-提示msg 解决

jiaPei.xcodeproj/project.pbxproj

@@ -11670,7 +11670,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2012023070902;
+				CURRENT_PROJECT_VERSION = 2022023071301;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11706,7 +11706,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11751,7 +11751,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2012023070902;
+				CURRENT_PROJECT_VERSION = 2022023071301;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11787,7 +11787,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.0.1;
+				MARKETING_VERSION = 2.0.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

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

@@ -74,13 +74,17 @@
     
     NYBasetjTimeVC *vc = nil;
     if(type==0){
-        if(RQ_USER_MANAGER.isCykh){
+        if(RQ_USER_MANAGER.isCykh&&(RQ_USER_MANAGER.busitype == 11 || RQ_USER_MANAGER.busitype == 12)){
             ShowMsg(@"您是从业资格人员，请点击从业计时");
             return;
         }
         if ([myDelegate.tPeriodVC isKindOfClass:[NYTheoryTimeVC class]]) {
             vc = myDelegate.tPeriodVC;
         }else {
+            if(myDelegate.timer){
+                ShowMsg(@"请先关闭从业计时");
+                return;
+            }
             KVOPeriodVC = [self getNYTheoryTimeVC] ;
             vc = KVOPeriodVC;
         }
@@ -88,6 +92,10 @@
         if ([myDelegate.tPeriodVC isKindOfClass:[NYGetjobTimeVC class]]) {
             vc = myDelegate.tPeriodVC;
         }else {
+            if(myDelegate.timer){
+                ShowMsg(@"请先关闭理论计时");
+                return;
+            }
             KVOPeriodVC = [self getNYGetjobTimeVC];
             vc = KVOPeriodVC;
         }

jiaPei/NewTheory/NYBasetjTimeVC.m

@@ -880,7 +880,7 @@ typedef enum {
     
     if ([RQ_USER_MANAGER.currentUser.city isEqualToString:@"3501"]) {
         [RQ_ALERTVIEW_MANAGER showAlertWithTitle:@"温馨提示" message: @"福州培训时间 \n 课堂时间：07:00---22:00 \n 模拟时间：05:00---23:00 \n 实操：05:00---23:00 \n 远程：05:00--23:59:59 \n 请学员注意！避免非培训时间导致学时无效。" confirmTitle:@"确认" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
-            
+            RemoveHUD();
         }];
     }
 }
@@ -1058,7 +1058,7 @@ typedef enum {
 //        [self.popupAtBarButtonItem showWithAnimated:YES];
 //    }
 //}
-
+    
 //从业计时-切换弹窗
 - (BOOL)checkCykhChooseStr {
     @weakify(self)

jiaPei/NewTheory/View/NYTimeRuleCell.h

@@ -14,9 +14,12 @@ NS_ASSUME_NONNULL_BEGIN
 @interface NYTimeRuleCell : RQCommonCollectionViewCell
 @property (weak, nonatomic) IBOutlet UIView *ruleOne;
 @property (weak, nonatomic) IBOutlet UIView *ruleTwo;
+@property (weak, nonatomic) IBOutlet UILabel *ruleTwo_label;
+
 @property (weak, nonatomic) IBOutlet UIView *ruleThree;
 @property (weak, nonatomic) IBOutlet UIView *ruleFour;
 
+
 @property (weak, nonatomic) IBOutlet UIView *ruleMsg;
 
 @property (weak, nonatomic) IBOutlet UIImageView *bgBootomImg;

jiaPei/NewTheory/View/NYTimeRuleCell.m

@@ -60,6 +60,13 @@
     
     self.ruleMsg.layer.backgroundColor = [UIColor colorWithRed:65025/255.0 green:65025/255.0 blue:65025/255.0 alpha:1.0].CGColor;
     self.ruleMsg.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.1600].CGColor;
+    
+    if([RQ_USER_MANAGER.currentUser.city containsString:@"350"]||
+       [RQ_USER_MANAGER.currentUser.city containsString:@"351"])
+    {
+        self.ruleTwo_label.text = [self.ruleTwo_label.text stringByReplacingOccurrencesOfString:@"4学时" withString:@"6学时"];
+    }
+    
 }
 
 @end

jiaPei/NewTheory/View/NYTimeRuleCell.xib

@@ -267,6 +267,7 @@
                 <outlet property="ruleOne" destination="Fz0-tB-ZPz" id="Ohv-Cf-5pf"/>
                 <outlet property="ruleThree" destination="bRb-65-iMO" id="XhV-iW-Ws7"/>
                 <outlet property="ruleTwo" destination="Os5-s3-F5V" id="yQg-Z9-UJx"/>
+                <outlet property="ruleTwo_label" destination="YXh-X7-qns" id="uUe-yq-iKk"/>
             </connections>
             <point key="canvasLocation" x="54.399999999999999" y="41.379310344827587"/>
         </collectionViewCell>

jiaPei/OLD/Util/SingletonManger/ChechBodyManager/CheckBodyManager.m

@@ -56,6 +56,11 @@ static dispatch_once_t onceToken;
     self.checkBodyCompletedBlock = completeBlock;
     self.checkBodyType = checkBodyType;
     self.waterMarkArr = waterMarkArr;
+    //2023-7-11 ning  新需求
+    id alertMsg = [RQ_USER_MANAGER getParamsKey:[NSString stringWithFormat:@"SP_ALERT_%@",RQ_USER_MANAGER.currentUser.city]];
+    if(alertMsg){
+        ShowMsg(alertMsg);
+    }
     // 读取设置配置，启动活体检测与否
     NSNumber *LiveMode = [[NSUserDefaults standardUserDefaults] objectForKey:@"LiveMode"];
     if (LiveMode.boolValue){

jiaPei/Utils/Manager/UserManager/RQUserManager.h

@@ -66,6 +66,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 退出登录
 - (void)logoutUser;
 
+/// 获取了dict value
+- (id)getParamsKey:(NSString *)key;
+
+
 @end
 
 NS_ASSUME_NONNULL_END

jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -262,6 +262,19 @@ static id rq_userManager = nil;
 //    }];
 }
 
+/// 获取了dict value
+- (id)getParamsKey:(NSString *)key {
+    id value = nil;
+    if(RQ_USER_MANAGER.currentUser.params){
+        for (ParamsItem *item in RQ_USER_MANAGER.currentUser.params) {
+            if ([item.KEY isEqualToString:key]) {
+                value = item.VALUE;
+                break;
+            }
+        }
+    }
+    return value;
+}
 
 #pragma mark - LazyLoad
 - (RQLoginViewModel *)loginViewModel {