up

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 = 2142024021902;
+				CURRENT_PROJECT_VERSION = 2152024022201;
 				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.4;
+				MARKETING_VERSION = 2.1.5;
 				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 = 2142024021902;
+				CURRENT_PROJECT_VERSION = 2152024022201;
 				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.4;
+				MARKETING_VERSION = 2.1.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Modules/OtherModules/ExerciseModule/Controller/RQCatalogueViewController.m

@@ -16,6 +16,11 @@
 @implementation RQCatalogueViewController
 @dynamic viewModel;
 
+- (void)dealloc
+{
+    RQ_Exercise_Module.isShow_CatalogueView = NO;
+}
+
 #pragma mark - SystemMethod
 - (void)viewDidLoad {
     [super viewDidLoad];

jiaPei/Modules/OtherModules/ExerciseModule/Controller/RQExerciseSettingViewController.m

@@ -17,6 +17,10 @@
 @implementation RQExerciseSettingViewController
 @dynamic viewModel;
 
+- (void)dealloc {
+    RQ_Exercise_Module.isShow_CatalogueView = NO;
+}
+
 #pragma mark - SystemMethod
 - (void)viewDidLoad {
     [super viewDidLoad];

jiaPei/Modules/OtherModules/ExerciseModule/Controller/RQExerciseSubViewController.m

@@ -173,7 +173,9 @@
             if (self.viewModel.questionArr.count == self.number + 1) {
                 [QMUITips showWithText:@"已经是最后一题啦！"];
             } else {
-                [self jumpQuestionWithIndex:self.number + 1];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [self jumpQuestionWithIndex:self.number + 1];
+                });
             }
         }
     }];
@@ -192,6 +194,7 @@
 
 - (void)showCatalogue  {
     @weakify(self)
+    RQ_Exercise_Module.isShow_CatalogueView = YES;
     RQCatalogueViewModel *catalogueViewModel = [[RQCatalogueViewModel alloc] initWithServices:self.viewModel.services params:@{
         RQViewModelIDKey : @(self.number),
         RQViewModelUtilKey : self.viewModel.questionArr,

jiaPei/Modules/OtherModules/ExerciseModule/Controller/RQExerciseViewController.m

@@ -53,8 +53,10 @@
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    if (RQ_Exercise_Module.timer) {
-        [RQ_Exercise_Module.timer setFireDate:[NSDate distantFuture]];
+    if(!RQ_Exercise_Module.isShow_CatalogueView){
+        if (RQ_Exercise_Module.timer) {
+            [RQ_Exercise_Module.timer setFireDate:[NSDate distantFuture]];
+        }
     }
 }
 
@@ -64,10 +66,12 @@
 //    [self.myTitleView removeAllSubviews];
 //    self.myTitleView = nil;
     self.pagerView = nil;
-    [RQ_Exercise_Module.timer invalidate];
-    RQ_Exercise_Module.timer = nil;
-    RQ_Exercise_Module.count = 0;
-    RQ_Exercise_Module.beginDate = nil;
+    if(!RQ_Exercise_Module.isShow_CatalogueView){
+        [RQ_Exercise_Module.timer invalidate];
+        RQ_Exercise_Module.timer = nil;
+        RQ_Exercise_Module.count = 0;
+        RQ_Exercise_Module.beginDate = nil;
+    }
 }
 
 - (void)dealloc {
@@ -150,9 +154,11 @@
 }
 
 - (void)setAction {
+    RQ_Exercise_Module.isShow_CatalogueView = YES;
     RQExerciseSettingViewModel *exerciseSettingViewModel = [[RQExerciseSettingViewModel alloc] initWithServices:self.viewModel.services params:nil];
     RQExerciseSettingViewController *exerciseSettingViewController = [[RQExerciseSettingViewController alloc] initWithViewModel:exerciseSettingViewModel];
     [self presentPanModal:exerciseSettingViewController];
+    
 }
 
 

jiaPei/Modules/OtherModules/ExerciseModule/RQExerciseModule.h

@@ -213,7 +213,7 @@ typedef NS_ENUM(NSUInteger, RQExerciseAlertType) {
 @property (nonatomic, readwrite, strong) NSTimer *timer;
 @property (nonatomic, readwrite, assign) NSUInteger count;
 @property (nonatomic, readwrite, strong) NSDate *beginDate;
-
+@property (nonatomic, readwrite, assign) BOOL isShow_CatalogueView;
 
 @property (nonatomic, readwrite, copy) NSArray *questionArr;
 @property (nonatomic, readwrite, copy) NSArray *correctArr;

jiaPei/Modules/OtherModules/PTObjectMolule/RQPTObjectMolule.m

@@ -111,6 +111,13 @@ static id rq_ptObjectModule = nil;
             array = [testString componentsSeparatedByString:@"@@"];
             [self bindStudentAppCoachIdArr:array];
             return;
+        } else if ([testString containsString:@"#iats#"]) {//ning 新增 二维码 扫描 登录
+            //#DECODE##iats#861766043407976;1708670874970
+            testString = [testString substringFromIndex:6];
+            array = [testString componentsSeparatedByString:@";"];
+//            /iats-api/api/jsjpNotice
+            [self noticeAppjsjpNoticeArr:array];
+            return;
         }
 
         __block NSString *ptSubjectStr;
@@ -186,6 +193,35 @@ static id rq_ptObjectModule = nil;
     }
 }
 
+//通知设备登录成功
+- (void)noticeAppjsjpNoticeArr:(NSArray *)array {
+    NSString *muserId = array[0];
+    NSString *timestamp = array[1];
+    //时间戳判断
+    long long this_timestamp = [[NSDate date] timeIntervalSince1970]*1000;
+    if(this_timestamp-[timestamp longLongValue]>60*5*1000){
+        ShowMsg(@"操作超时！");
+        return;
+    }
+    NSMutableArray *arr = [NSMutableArray array];
+    [arr addPro:@"idcard"   Value:RQ_USER_MANAGER.currentUser.loginCode];
+    [arr addPro:@"imei"   Value:muserId];
+    [arr addPro:@"status"   Value:@"0"];
+    [MBProgressHUD rq_showProgressHUD:@""];
+    [jiaPeiManager requestAnythingWithURL:@"jsjpNotice" array:arr data:nil completion:^(NSDictionary * result) {
+        NSLog(@"dict=%@",result);
+        if(result){
+            int code = [result[@"code"] intValue];
+            if(code==0){
+                //成功
+                NSLog(@"通知设备登录成功");
+            }
+            [RQ_SHARE_FUNCTION showAlertWithMessage:result[@"msg"] completion:nil];
+        }
+        [MBProgressHUD rq_hideHUD];
+    }];
+}
+
 //绑定教练id
 - (void)bindStudentAppCoachIdArr:(NSArray *)array {
     //学员绑定教练ID（新需求） - 2023-07-06

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

@@ -175,7 +175,10 @@
 }
 
 - (void)gotoTrainInfo {
-    if (RQ_USER_MANAGER.isycbd == 1 && RQ_USER_MANAGER.ycbdFaceCount == 0) {
+//    //是否开启活体检测 0-不开启 1-开启 活体检测比对动作数量
+//    if (RQ_USER_MANAGER.isycbd == 1 && RQ_USER_MANAGER.ycbdFaceCount == 0) {
+    //开头有35进入H5
+    if ([RQ_USER_MANAGER.currentUser.city hasPrefix:@"35"]) {
         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/OLD/Util/jiaPeiManager/jiaPeiManager.m

@@ -118,6 +118,13 @@
     if ([imitate1Array containsObject:urlP]) {
         urlDefault = defaultImitateUrl1;
     }
+    //扫码设备-二维码
+    NSArray *noticeArray = @[@"jsjpNotice",
+                              ];
+    if ([noticeArray containsObject:urlP]) {
+        httpUrl = @"http://121.46.4.11:18090/";
+        urlDefault = @"iats-api/api/";
+    }
     
     //模拟计时
     NSArray *imitate2Array = @[@"getTrainInsList",
@@ -141,11 +148,13 @@
                                 @"updateStunocarPhoto",
                                 @"education/imageup",
     ];
-
-    if ([classroomArray containsObject:urlP]) {
-        httpUrl = @"http://121.46.4.11:18081/";
-        urlDefault = @"api/";
+    for (NSString *item in classroomArray) {
+        if ([urlP containsString:item]) {
+            httpUrl = @"http://121.46.4.11:18081/";
+            urlDefault = @"api/";
+        }
     }
+
 	
 	// 远程理论计时
 	NSArray *educationArr = @[@"getCurrentTime",			// 获取当前时间

jiaPei/Utils/Category/BaiDuFaceSDK/BDFaceBaseViewController+RQExtension.m

@@ -19,6 +19,7 @@ static const void *UtilityKey = &UtilityKey;
 @implementation BDFaceBaseViewController (RQExtension)
 //@dynamic faceCheckBodyCompletedBlock;
 
+
 - (void)viewDidAppear:(BOOL)animated {
     self.navigationController.navigationBar.hidden = YES;
 }

jiaPei/Utils/Category/CGXVerticalMenuMoreView/CGXVerticalMenuTitleCell+RQExtension.m

@@ -7,6 +7,8 @@
 
 #import "CGXVerticalMenuTitleCell+RQExtension.h"
 
+// 声明关联对象的键
+static const char *kTitleLabelObjectKey = "kTitleLabelObjectKey";
 @interface CGXVerticalMenuTitleCell (RQExtension)
 
 @end
@@ -14,6 +16,16 @@
 @implementation CGXVerticalMenuTitleCell (RQExtension)
 //@dynamic titleLabel;
 
+
+// 实现属性的 setter 和 getter 方法
+- (void)setTitleLabel:(UILabel *)titleLabel {
+    objc_setAssociatedObject(self, kTitleLabelObjectKey, titleLabel, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (UILabel *)titleLabel {
+    return objc_getAssociatedObject(self, kTitleLabelObjectKey);
+}
+
 - (void)initializeViews
 {
     [super initializeViews];

jiaPei/Utils/Category/CGXVerticalMenuMoreView/CGXVerticalMenuTitleView+RQExtension.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CGXVerticalMenuTitleView (RQExtension)
-@property (nonatomic, assign) CGFloat isFirstClick;//是否第一次点击
+@property (nonatomic, assign) BOOL isFirstClick;//是否第一次点击
 
 @end
 

jiaPei/Utils/Category/CGXVerticalMenuMoreView/CGXVerticalMenuTitleView+RQExtension.m

@@ -20,6 +20,20 @@ static NSString *lastclickedCellFrameMaxYKey = @"lastclickedCellFrameMaxYKey"; /
 
 @implementation CGXVerticalMenuTitleView (RQExtension)
 //@dynamic isFirstClick;
+static const char *NYisFirstClickKey = "NYisFirstClickKey";
+
+- (void)setIsFirstClick:(BOOL)isFirstClick
+{
+    NSNumber *number = [NSNumber numberWithBool:isFirstClick];
+    objc_setAssociatedObject(self, NYisFirstClickKey, number, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (BOOL)isFirstClick
+{
+    NSNumber *number = objc_getAssociatedObject(self, NYisFirstClickKey);
+    return [number boolValue];
+}
+
 
 - (void)initializeData
 {