1:添加从业计时-A2-B2判断

2:添加QMLog 打印配置
3:封装到jiaPeiManager

jiaPei.xcodeproj/project.pbxproj

@@ -11445,7 +11445,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1962023060201;
+				CURRENT_PROJECT_VERSION = 1962023060601;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11481,7 +11481,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.5;
+				MARKETING_VERSION = 1.9.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11526,7 +11526,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1962023060201;
+				CURRENT_PROJECT_VERSION = 1962023060601;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11562,7 +11562,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.5;
+				MARKETING_VERSION = 1.9.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/AppDelegate.m

@@ -53,6 +53,7 @@
 #if defined(DEBUG)||defined(_DEBUG)
     /// 调试模式
     [self rq_configDebugModelTools];
+    [QMUIConsole sharedInstance].canShow = NO;
 #endif
     
     // Save the application version info. must write last

jiaPei/Modules/OtherModules/PTObjectMolule/RQPTObjectMolule.m

@@ -181,8 +181,7 @@ static id rq_ptObjectModule = nil;
                                 [uploadTrainFileMnArr addPro:@"sim"              Value:array[0]];///SIM卡号
                                 [uploadTrainFileMnArr addPro:@"event"            Value:array[1]];///扫码类型：1 签到  2签退  3培训过程
                                 [uploadTrainFileMnArr addPro:@"classId"          Value:@""];///課堂ID
-                                [uploadTrainFileMnArr addPro:@"photo"
-                                    Value:str];
+                                [uploadTrainFileMnArr addPro:@"photo"            Value:str];///人脸照片
                                 NSInteger timeStamp = [RQ_SHARE_FUNCTION getTimeStampWithDate:[NSDate date]];
                                 NSString *timeStampStr = [NSString stringWithFormat:@"%@",[NSNumber numberWithInteger:timeStamp]];
                                 if (timeStampStr.length < 10) {

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

@@ -57,7 +57,7 @@
 - (void)gotoVCWithStr:(NSString *)str {
     if ([str isEqualToString:@"理论计时"]) {
         [self gotoPeriod];
-    } else if ([str isEqualToString:@"从业考核"]) {
+    } else if ([str isEqualToString:@"从业考核"]||[str isEqualToString:@"从业计时"]) {
         [self gotoPeriod];
     } else if ([str isEqualToString:@"我的学时"]) {
         [self gotoTrainInfo];

jiaPei/OLD/Util/RQRemoteTheoryManager/RQRemoteTheoryManager.h

@@ -47,9 +47,6 @@ typedef NS_ENUM(NSInteger, LoginFlagType) {
 - (void)uploadEduSignOutWithArray:(NSArray *)trainArray resultBlock:(void (^)(BOOL isSuccess, NSDictionary *signOutDict))resultBlock;
 
 
-
-
-
 @end
 
 NS_ASSUME_NONNULL_END

jiaPei/OLD/Util/RQRemoteTheoryManager/RQRemoteTheoryManager.m

@@ -45,7 +45,6 @@ static dispatch_once_t onceToken;
             !resultBlock? : resultBlock(NO, nil);
             return;
         }
-        
         if ([dict[@"code"] isEqualToString:@"0"]) {
             !resultBlock? : resultBlock(YES, dict);
         } else {
@@ -87,8 +86,10 @@ static dispatch_once_t onceToken;
                                 @"dqbh" :RQ_USER_MANAGER.currentUser.city,
                                 @"classid" :classidStr,
     }.mutableCopy;
+    
     [jiaPeiManager requestAnythingWithURL:method array:arr data:nil completion:^(NSDictionary *dict) {
         [MBProgressHUD rq_hideHUD];
+
         if (!dict) {
             ShowMsg(@"上传照片接口异常！");
             [Bugly reportException:[NSException exceptionWithName:@"uploadEduPic" reason:[reportDic jsonStringEncoded] userInfo:reportDic]];

jiaPei/OLD/Util/SingletonManger/LocationManager/LocationManager.m

@@ -452,7 +452,7 @@ static NSString *annotationViewIdentifier = @"com.Baidu.BMKPointAnnotation";
         
         BMKRecommendStopInfo *info = [recommendStopResult.recommendStopInfoList firstObject];
         NSString *message = [NSString stringWithFormat:@"推荐上车点名称:%@\n推荐上车点地址:%@\n推荐点poi的uid:%@\n距查找点的距离:%.2lf\n经度：%.6lf\n纬度：%.6lf", info.name, info.address, info.uid, info.distance, info.location.longitude, info.location.latitude];
-        [QMUIConsole log:message];
+        [jiaPeiManager QMLogStr:message];
 //        [NSObject rq_showAlertViewWithTitle:@"推荐上车点" message:message confirmTitle:@"确定"];
     } else {
 //        [_mapView removeAnnotations:self.annotationArr];

jiaPei/OLD/Util/jiaPeiManager/jiaPeiManager.h

@@ -45,7 +45,9 @@
  */
 + (void)reLoginWithCompletion:(BlockTypeVo)finishBlcok;
 
-
+//QM-console-log
++ (void)QMLog:(NSString *)urlString obj:(id )obj;
++ (void)QMLogStr:(NSString *)log;
 
 @end
 

jiaPei/OLD/Util/jiaPeiManager/jiaPeiManager.m

@@ -268,7 +268,7 @@
         afSessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
         afSessionManager.responseSerializer.acceptableContentTypes = [afSessionManager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/html"];
         afSessionManager.requestSerializer.timeoutInterval = 30;
-		
+        [jiaPeiManager QMLog:urlS obj:aAarray];
         [afSessionManager POST:urlS parameters:nil headers:nil constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
             
             int k = 0;
@@ -300,12 +300,14 @@
 
             //请求成功
             //NSLog(@"上传图片-----><>%@----><>%@",urlS,dic);
+            [jiaPeiManager QMLog:urlS obj:dic];
             RemoveHUD();
             finishBlock(dic);
         } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
             
             //请求失败
 //            NSLog(@"上传---><>%@",error);
+            [jiaPeiManager QMLog:urlS obj:error.description];
             RemoveHUD();
             //失败的时候 要把失败的事情传输回去
             if ([error.domain isEqualToString:NSURLErrorDomain]) {
@@ -338,7 +340,7 @@
 		}
         //生成请求加密后的url
         NSString *urlS = [jiaPeiManager getURLWithDict:dic urlPre:urlString];
-        
+        [jiaPeiManager QMLog:urlS obj:dic];
         if (![urlString isEqualToString:@"getSchInfoListByTujian"]) {
             NSLog(@"发起请求---urlString---><>%@--->\n%@",urlS,dic);
         }
@@ -366,7 +368,7 @@
             if (![urlString isEqualToString:@"getSchInfoListByTujian"]) {
                 NSLog(@"请求成功123---urlString---><>%@--->\n%@",urlS,dic);
             }
-            
+            [jiaPeiManager QMLog:urlS obj:dic];
 
             finishBlock(dic);
             
@@ -374,7 +376,7 @@
             //请求失败
 //            NSLog(@"请求失败123----><>%@",error);
             RemoveHUD();
-            
+            [jiaPeiManager QMLog:urlS obj:error.description];
             //失败的时候 要把失败的事情传输回去
             if ([error.domain isEqualToString:NSURLErrorDomain]) {
                 // network error
@@ -423,7 +425,7 @@
     AFHTTPSessionManager *afSessionManager = [AFHTTPSessionManager manager];
     afSessionManager.requestSerializer  = [AFJSONRequestSerializer serializer];
     afSessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    
+    [jiaPeiManager QMLog:urlS obj:array];
     [afSessionManager GET:urlS parameters:nil headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         //NSLog(@"请求返回123-------><>%@",responseObject);
         
@@ -437,8 +439,10 @@
                                                               error:nil];
         
         //NSLog(@"请求返回123---------><>%@",dic);
+        [jiaPeiManager QMLog:urlS obj:dic];
         finishBlock(dic);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        [jiaPeiManager QMLog:urlS obj:error.description];
         //失败的时候 要把失败的事情传输回去 @{@"code":@"1",@"body":@"请求失败"}
         //在AFNetworking方法error代码块中
         if ([error.domain isEqualToString:NSURLErrorDomain]) {
@@ -643,6 +647,27 @@
     }];
 }
 
+//QM-console-log
++ (void)QMLog:(NSString *)urlString obj:(id )obj
+{
+#if defined(DEBUG)||defined(_DEBUG)
+    if([QMUIConsole sharedInstance].canShow){
+        NSMutableString *log = [NSMutableString stringWithFormat:@">>>>>>>>>>>>>>>>>>>>>jiaPeiManager>>>>>>>>>>>>>>>>>>>>>>>>>>"];
+        [log appendFormat:@"urlString=======>:%@", urlString];
+        [log appendFormat:@"obj======>:%@", obj];
+        [log appendString:@"<<<<<<<<<<<<<<<<<<<<<jiaPeiManager<<<<<<<<<<<<<<<<<<<<<<<<<<"];
+        [QMUIConsole log:log];
+    }
+#endif
+}
+
++ (void)QMLogStr:(NSString *)log
+{
+    if([QMUIConsole sharedInstance].canShow){
+        [QMUIConsole log:log];
+    }
+}
+
 @end
 
 void DubugLog(NSString *logString)

jiaPei/PeriodVC.m

@@ -270,6 +270,8 @@ typedef enum {
                                                 /// 2.线上活体检测
                                                 [RQ_RemoteTheory_MANAGER edufaceTofaceWithPhotoStr:dic[@"normalImg"] loginFlagType:LoginFlagType_SignIn resultBlock:^(BOOL isSuccess) {
                                                     @strongify(self)
+//#warning 测试阶段-绕开人脸
+//                                                    isSuccess = true;
                                                     if (isSuccess) {
                                                         /// 3.获取线上时间
                                                         [RQ_RemoteTheory_MANAGER getCurrentTimeWithResultBlock:^(BOOL isSuccess, NSDictionary * _Nonnull timeDict) {

jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -156,7 +156,9 @@ static id rq_userManager = nil;
 
 /// 是否从业考核
 - (BOOL)isCykh {
-    return (self.busitype == 11 || self.busitype == 12);
+//    return (self.busitype == 11 || self.busitype == 12);
+    return  ([self.currentUser.carType isEqualToString:@"A2"] || [self.currentUser.carType isEqualToString:@"B2"] ||
+             self.busitype == 11 || self.busitype == 12); //2023-06-06  新需求
 }
 
 - (void)loginUser:(RQUserModel *)user{

jiaPei/Utils/Service/HTTP/RQHTTPService.m

@@ -855,6 +855,20 @@ static id service_ = nil;
 	NSLog(@"response=========>:%@", task.response);
 	NSLog(@"error============>:%@", error);
 	NSLog(@"<<<<<<<<<<<<<<<<<<<<<👆 REQUEST FINISH 👆<<<<<<<<<<<<<<<<<<<<<<<<<<");
+    
+#if defined(DEBUG)||defined(_DEBUG)
+    if([QMUIConsole sharedInstance].canShow){
+        NSMutableString *log = [NSMutableString stringWithFormat:@">>>>>>>>>>>>>>>>>>>>>👇 REQUEST FINISH 👇>>>>>>>>>>>>>>>>>>>>>>>>>>"];
+        [log appendFormat:@"Request%@=======>:%@", error?@"失败":@"成功", task.currentRequest.URL.absoluteString];
+        [log appendFormat:@"requestBody======>:%@", params];
+        [log appendFormat:@"requstHeader=====>:%@", task.currentRequest.allHTTPHeaderFields];
+        [log appendFormat:@"response=========>:%@", task.response];
+        [log appendFormat:@"error============>:%@", error];
+        [log appendString:@"<<<<<<<<<<<<<<<<<<<<<👆 REQUEST FINISH 👆<<<<<<<<<<<<<<<<<<<<<<<<<<"];
+        [QMUIConsole log:log];
+    }
+#endif
+    
 }