更新计时平台 代码

jiaPei.xcodeproj/project.pbxproj

@@ -177,6 +177,7 @@
 		909F0EE62CF06D9F00834944 /* NYHomePageOneBigCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 909F0EE52CF06D9F00834944 /* NYHomePageOneBigCell.xib */; };
 		909F0EE72CF06D9F00834944 /* NYHomePageOneBigCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 909F0EE42CF06D9F00834944 /* NYHomePageOneBigCell.m */; };
 		909F0EED2CF0788A00834944 /* NYHomePageOneBigItemViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 909F0EEC2CF0788A00834944 /* NYHomePageOneBigItemViewModel.m */; };
+		90A271D42D683A6B0052353B /* NYQRCodeVCManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A271D32D683A6B0052353B /* NYQRCodeVCManager.m */; };
 		90A2ACEB2AE7C57000FA6E20 /* RQHTTPService+NYAppleUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A2ACEA2AE7C57000FA6E20 /* RQHTTPService+NYAppleUserInfo.m */; };
 		90A332AE2D093954009DA36D /* NYFailSpecialExerciseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A332AC2D093954009DA36D /* NYFailSpecialExerciseViewController.m */; };
 		90A332AF2D093954009DA36D /* NYFailSpecialExerciseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90A332AD2D093954009DA36D /* NYFailSpecialExerciseViewController.xib */; };
@@ -2084,6 +2085,8 @@
 		909F0EE52CF06D9F00834944 /* NYHomePageOneBigCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYHomePageOneBigCell.xib; sourceTree = "<group>"; };
 		909F0EEB2CF0788A00834944 /* NYHomePageOneBigItemViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYHomePageOneBigItemViewModel.h; sourceTree = "<group>"; };
 		909F0EEC2CF0788A00834944 /* NYHomePageOneBigItemViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYHomePageOneBigItemViewModel.m; sourceTree = "<group>"; };
+		90A271D22D683A6B0052353B /* NYQRCodeVCManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYQRCodeVCManager.h; sourceTree = "<group>"; };
+		90A271D32D683A6B0052353B /* NYQRCodeVCManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYQRCodeVCManager.m; sourceTree = "<group>"; };
 		90A2ACE92AE7C57000FA6E20 /* RQHTTPService+NYAppleUserInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RQHTTPService+NYAppleUserInfo.h"; sourceTree = "<group>"; };
 		90A2ACEA2AE7C57000FA6E20 /* RQHTTPService+NYAppleUserInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RQHTTPService+NYAppleUserInfo.m"; sourceTree = "<group>"; };
 		90A332AB2D093954009DA36D /* NYFailSpecialExerciseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYFailSpecialExerciseViewController.h; sourceTree = "<group>"; };
@@ -7796,6 +7799,8 @@
 				D04DF76727006F72006E3633 /* AlertViewManager */,
 				90798AFF2A517B2500E68461 /* NYSerialQueueManager.h */,
 				90798B002A517B2500E68461 /* NYSerialQueueManager.m */,
+				90A271D22D683A6B0052353B /* NYQRCodeVCManager.h */,
+				90A271D32D683A6B0052353B /* NYQRCodeVCManager.m */,
 			);
 			path = Manager;
 			sourceTree = "<group>";
@@ -11633,6 +11638,7 @@
 				D0D1F6AB283F84E00086C6AE /* RQExerciseOptionSureBtnCell.m in Sources */,
 				18BDCB4C1C4BE733002C9AC0 /* LightingAndSoundVC.m in Sources */,
 				D0354AF4230E322400E1C54D /* ScanResultVC.m in Sources */,
+				90A271D42D683A6B0052353B /* NYQRCodeVCManager.m in Sources */,
 				D02010BD29373AE8001B9F4D /* SLPaddingLabel.m in Sources */,
 				90044C3B2A4E821E003FBBF8 /* NYFloatingSuggestViewModel.m in Sources */,
 				D01CF3BD2892812F009EEA12 /* QMUIConfigurationTemplate.m in Sources */,
@@ -12581,7 +12587,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2302025021902;
+				CURRENT_PROJECT_VERSION = 2322025022101;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12619,7 +12625,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.3.0;
+				MARKETING_VERSION = 2.3.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -12667,7 +12673,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2302025021902;
+				CURRENT_PROJECT_VERSION = 2322025022101;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -12705,7 +12711,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.3.0;
+				MARKETING_VERSION = 2.3.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Images.xcassets/Modules/MainModule/真人讲解灰.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "真人讲解灰.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "真人讲解灰@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "真人讲解灰@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/MainModule/真人讲解蓝.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "真人讲解蓝.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "真人讲解蓝@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "真人讲解蓝@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_学技巧.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_学技巧@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_学技巧@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_破难点.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_破难点@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_破难点@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_解新规.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_解新规@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_解新规@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_讲考点.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_讲考点@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_讲考点@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/小李精选.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "小李精选.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "小李精选@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "小李精选@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Modules/HomePageModule/ViewController/HomePage/RQHomePageViewController.m

@@ -179,6 +179,9 @@
     
     [[[[RACObserve(RQ_COMMON_MANAGER, APP_SWITCH) distinctUntilChanged] deliverOnMainThread] takeUntil:self.rac_willDeallocSignal] subscribeNext:^(id  _Nullable x) {
         @strongify(self)
+        if(RQ_COMMON_MANAGER.APP_SWITCH){
+            self.navigationItem.rightBarButtonItems = @[];
+        }
 //        self.pagerView.defaultSelectedIndex = 0;
 //        self.categoryView.defaultSelectedIndex = 0;
         [self.pagerView reloadData];
@@ -263,7 +266,7 @@
     // 设置扫描状态为正在进行
     self.isScanning = YES;
     [QMUITips showLoadingInView:DefaultTipsParentView];
-    RQQRCodeViewController *vc = [[RQQRCodeViewController alloc] init];
+    RQQRCodeViewController *vc = NY_NYQRCodeVCManager.vc; // [[RQQRCodeViewController alloc] init];
     vc.modalPresentationStyle = UIModalPresentationFullScreen;
     [vc initBlock:^(NSString * _Nonnull result, BOOL isSuccess) {
         if (isSuccess) {

jiaPei/Modules/LoginModule/Model/RQUserModel.h

@@ -134,6 +134,7 @@
 ///未知参数
 @property (nonatomic, readwrite, copy) NSString              * sjjlbh;
 @property (nonatomic, readwrite, copy) NSString              * a_c;
+@property (nonatomic, readwrite, assign) bool isNotGcbd;
 
 - (void)updatePxjdWithPxjd:(NSString *)pxjd;
 - (void)updateNickNameWithNickName:(NSString *)nickName;

jiaPei/Modules/MainModule/MainModule.h

@@ -14,6 +14,8 @@ typedef NS_ENUM(NSUInteger, RQTabBarItemTagType) {
     RQTabBarItemTagTypeCommunity,
     /// 计时
     RQTabBarItemTagTypeTime,
+    /// 真人讲解
+    RQTabBarItemTagTypeLi,
     /// 个人
     RQTabBarItemTagTypeProfile,
 };

jiaPei/Modules/MainModule/ViewController/RQMainTabBarViewController.m

@@ -30,15 +30,17 @@
 
 #pragma mark - Private Method
 - (void)rq_setupAllChildViewController {
-	NSArray *titlesArray = @[@"考试", @"社区", @"计时", @"我的"];
+	NSArray *titlesArray = @[@"考试", @"社区", @"计时",@"真人讲解", @"我的"];
 	NSArray *imageNamesArray = @[@"考试灰",
 								 @"tabbarImg2",
                                  @"计时灰",
+                                 @"真人讲解灰",
                                  @"我的灰"
                                     ];
 	NSArray *selectedImageNamesArray = @[@"考试蓝",
                                          @"tabbarImg2",
                                          @"计时蓝",
+                                         @"真人讲解蓝",
                                          @"我的蓝"
                                         ];
     
@@ -67,6 +69,17 @@
         [[RQBaseNavigationController alloc] initWithRootViewController:timePageViewController];
     });
     
+    ///真人讲解
+    RQBaseNavigationController *livideoNavigationController = ({
+
+        RQTimeViewController *timePageViewController = [[RQTimeViewController alloc] initWithViewModel:self.viewModel.timeViewModel];
+        RQTabBarItemTagType tagType = RQTabBarItemTagTypeLi;
+        /// 配置
+        [self rq_configViewController:timePageViewController imageName:imageNamesArray[tagType] selectedImageName:selectedImageNamesArray[tagType] title:titlesArray[tagType] itemTag:tagType];
+        /// 添加到导航栏的栈底控制器
+        timePageViewController.hidesBottomBarWhenPushed = NO;
+        [[RQBaseNavigationController alloc] initWithRootViewController:timePageViewController];
+    });
 
 	/// 我的
     RQBaseNavigationController *profileNavigationController = ({
@@ -83,7 +96,7 @@
 	});
 	/// 添加到tabBarController的子视图
 //    self.tabBarController.viewControllers = @[homePageNavigationController, profileNavigationController];
-    self.tabBarController.viewControllers = @[homePageNavigationController, timePageNavigationController, profileNavigationController];//开启计时tab
+    self.tabBarController.viewControllers = @[homePageNavigationController, timePageNavigationController,livideoNavigationController, profileNavigationController];//开启计时tab
 //    if(RQ_USER_MANAGER.currentUser.stuNum){
 //        NSLog(@"%@",RQ_USER_MANAGER.currentUser.stuNum);
 //        if ((RQ_USER_MANAGER.isLogin&&![RQ_USER_MANAGER.currentUser.stuNum isEqualToString:@""])||

jiaPei/Modules/OtherModules/SimulateModular/MNQ/MNQtTrainVC.m

@@ -1476,7 +1476,8 @@ static NSString * const kGetMNdevVersion = @"be00038aeded";
      */
     NSLog(@"位置访问失败");
     if (!RQ_AD_MANAGER.isFirstAppLoad) {
-        [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
+        ShowMsg(@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限");
+//        [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
     }
     [locationManager stopUpdatingLocation];
 }

jiaPei/Modules/OtherModules/SimulateModular/ScanPage/Other/MapManager.m

@@ -191,7 +191,8 @@ static NSString *annotationViewIdentifier = @"com.Baidu.BMKPointAnnotation";
     switch (error.code) {
             case BMKLocationErrorDenied: {
                 if (!RQ_AD_MANAGER.isFirstAppLoad) {
-                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
+                    ShowMsg(@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限");
+//                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
                 }
             }
             break;

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

@@ -105,13 +105,16 @@
                 ShowMsg(@"请先关闭理论计时");
                 return;
             }
-            //判断-是否是 辽宁-并且当前是科目一时
-            NSString *citystr = @"yntms,2101,2108";
+            //ning(无奈) 判断-是否是 辽宁-并且当前是科目一时,台州加的3310 温州3303
+            NSString *citystr = @"yntms,2101,2108,3310,3303";
             NSString *pxkm = RQ_USER_MANAGER.currentUser.pxjd;
             NSLog(@"pxkm=%@",pxkm);
             if(pxkm==nil) pxkm=@"1";
             if ([citystr rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {
-                if(pxkm.intValue==1){
+                if(pxkm.intValue==1||
+                   [@"3310" isEqualToString:RQ_USER_MANAGER.currentUser.city]||
+                   [@"3303" isEqualToString:RQ_USER_MANAGER.currentUser.city]){
+                    RQ_USER_MANAGER.cykhPxkmStr = @"1";
                     KVOPeriodVC = [self getNYGetLNTimeVC:1];
                     vc = KVOPeriodVC;
                 }else{

jiaPei/NewTheory/NYBasetjTimeVC.m

@@ -419,7 +419,7 @@ typedef enum {
         }
         int remainder1 = [RQ_USER_MANAGER.currentUser.city isEqualToString:@"3303"]? (int)(self.seconds)%1200 : (int)(self.seconds)%780;
 //        int remainder1 = (int)(self.seconds)%120;
-        if (remainder1 == 0) {
+        if (remainder1 == 0 && RQ_USER_MANAGER.currentUser.isNotGcbd) { //过程照片isNotGcbd
             NSLog(@"在视频的时候-切换成竖屏%zd",RQ_Video_Module.playerController.player.isFullScreen);
             if(RQ_Video_Module.playerController.player.isFullScreen){//在视频的时候-切换成竖屏
                 [RQ_Video_Module backBtnClickActiondo];
@@ -683,6 +683,9 @@ typedef enum {
                                     if (([pxkm isEqualToString:@"2"] || [pxkm isEqualToString:@"3"])) {
                                         pxkm = @"4";
                                     }
+                                    if(self.vcType == TimeVCTypeAJob){//从业
+                                        pxkm = RQ_USER_MANAGER.cykhPxkmStr;
+                                    }
                                     
                                     NSArray* array = [DB_Helper quearyTrain:RQStringIsNotEmpty(RQ_USER_MANAGER.currentUser.outId)? RQ_USER_MANAGER.currentUser.outId : @"" Subject:pxkm];
                                     if (array.count < 1) {
@@ -745,6 +748,7 @@ typedef enum {
                             if (array.count < 1) {
                                 !resultBlock? : resultBlock(YES);
                                 ShowMsg(@"本地无学时明细!");
+                                //[self.timer setFireDate:[NSDate distantPast]];
                                 return;
                             }
                             [RQ_RemoteTheory_MANAGER uploadEduSignOutWithArray:array resultBlock:^(BOOL isSuccess, NSDictionary * _Nonnull signOutDict) {

jiaPei/NewTheory/ViewModel/NYGetjobTimeViewModel.m

@@ -28,7 +28,8 @@
     [super initialize];
     
     self.title = @"从业资格计时";
-    NSString *citystr = @"yntms,2101,2108";
+    //ning(无奈) 判断-是否是 辽宁-并且当前是科目一时,台州加的3310 温州3303
+    NSString *citystr = @"yntms,2101,2108,3310,3303";
     if ([citystr rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {
         self.title = @"理论计时(科一)";
     }

jiaPei/OLD/Util/RQCodeManager/RQQRCodeViewController.m

@@ -41,6 +41,11 @@
 
 - (void)dealloc {
     [self stop];
+    self.scanCode.delegate = nil;
+    self.scanCode.sampleBufferDelegate = nil;
+    self.scanCode = nil;
+    self.scanView = nil;
+    self.rqQRCodeScanResultBlock = nil;
 }
 
 - (void)closePage {
@@ -75,11 +80,6 @@
 - (void)stop {
     [self.scanCode stopRunning];
     [self.scanView stopScanning];
-    self.scanCode.delegate = nil;
-    self.scanCode.sampleBufferDelegate = nil;
-    self.scanCode = nil;
-    self.scanView = nil;
-    self.rqQRCodeScanResultBlock = nil;
 }
 
 - (void)configScanCode {
@@ -93,6 +93,7 @@
                 }
             }
         }];
+        
         return;
     }
 }
@@ -160,10 +161,10 @@
 	if (!_scanCode) {
         _scanCode = [SGScanCode scanCode];
         // 预览视图，必须设置
-        __weak typeof(self) weakSelf = self;
-        _scanCode.preview = weakSelf.view;
-        _scanCode.delegate = weakSelf;
-        _scanCode.sampleBufferDelegate = weakSelf;
+//        __weak typeof(self) weakSelf = self;
+        _scanCode.preview = self.view;
+        _scanCode.delegate = self;
+        _scanCode.sampleBufferDelegate = self;
 	}
 	return _scanCode;
 }

jiaPei/OLD/Util/RQRemoteTheoryManager/RQRemoteTheoryManager.m

@@ -34,6 +34,9 @@ static dispatch_once_t onceToken;
     NSMutableArray *arr = [NSMutableArray array];
     [arr property:RQ_USER_MANAGER.currentUser.outId forKey:@"outId"];
     [arr property:RQ_USER_MANAGER.currentUser.city  forKey:@"dqbh"];
+    if(RQ_USER_MANAGER.cykhPxkmStr.length>0){
+        [arr property:RQ_USER_MANAGER.cykhPxkmStr  forKey:@"pxkm"];
+    }
     [arr property:classidStr forKey:@"classid"];
     
     NSString* method = @"uploadEduSignIn";
@@ -158,7 +161,8 @@ static dispatch_once_t onceToken;
         [arr addObject:[NSDictionary dictionaryWithObjectsAndKeys:RQ_USER_MANAGER.currentUser.city,@"dqbh", nil]];
         [arr addObject:[NSDictionary dictionaryWithObjectsAndKeys:[DES3Util encrypt:str ],@"trainRecord", nil]];
         [arr addObject:[NSDictionary dictionaryWithObjectsAndKeys:record.subject,@"pxkm", nil]];
-
+        
+        
         NSString* method = @"uploadEduSignOut";
         
         [jiaPeiManager requestAnythingWithURL:method array:arr data:nil completion:^(NSDictionary *dict) {

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

@@ -164,7 +164,8 @@ static NSString *annotationViewIdentifier = @"com.Baidu.BMKPointAnnotation";
     switch (error.code) {
             case BMKLocationErrorDenied: {
                 if (!RQ_AD_MANAGER.isFirstAppLoad) {
-                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
+                    ShowMsg(@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限");
+//                    [RQ_SHARE_FUNCTION showAlertWithTitle:@"温馨提示" message:@"请在iPhone的“设置”-“隐私”-“定位服务”功能中，找到“极速驾培”打开位置访问权限" alertControllerStyle:UIAlertControllerStyleAlert cancelButtonTitle:@"确定" otherButtonTitles:nil otherButtonStyles:nil showInWindow:NO completion:nil];
                 }
             }
             break;

jiaPei/OLD/Util/Sqlite/DB_Helper.m

@@ -213,7 +213,8 @@ static FMDatabase *shareDataBase = nil;
             if (RQ_USER_MANAGER.isCykh && RQStringIsNotEmpty(RQ_USER_MANAGER.cykhPxkmStr)) {
                 pxkm = RQ_USER_MANAGER.cykhPxkmStr;
             }
-            NSString *citystr = @"yntms,2101,2108";
+            //ning(无奈) 判断-是否是 辽宁-并且当前是科目一时,台州加的3310 温州3303
+            NSString *citystr = @"yntms,2101,2108,3310,3303";
             if ([citystr rangeOfString:RQ_USER_MANAGER.currentUser.city].location != NSNotFound) {
                 pxkm = RQ_USER_MANAGER.cykhPxkmStr;
             }

jiaPei/PrefixHeader.pch

@@ -86,6 +86,7 @@
 
 
 #pragma mark - Utils
+#import "NYQRCodeVCManager.h"
 #import "RQUtils.h"
 #import "RQShareFunction.h"
 #import "LocationManager.h"

jiaPei/Utils/Manager/NYQRCodeVCManager.h

@@ -0,0 +1,22 @@
+//
+//  NYQRCodeVCManager.h
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/21.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#define NY_NYQRCodeVCManager [NYQRCodeVCManager sharedInstance]
+
+NS_ASSUME_NONNULL_BEGIN
+@class RQQRCodeViewController;
+@interface NYQRCodeVCManager : NSObject
+
+@property (nonatomic,strong) RQQRCodeViewController *vc;
+
++ (instancetype)sharedInstance;
+
+@end
+
+NS_ASSUME_NONNULL_END

jiaPei/Utils/Manager/NYQRCodeVCManager.m

@@ -0,0 +1,33 @@
+//
+//  NYQRCodeVCManager.m
+//  jiaPei
+//
+//  Created by Ning.ge on 2025/2/21.
+//  Copyright © 2025 JCZ. All rights reserved.
+//
+
+#import "NYQRCodeVCManager.h"
+#import "RQQRCodeViewController.h"
+@interface NYQRCodeVCManager ()
+
+@end
+
+@implementation NYQRCodeVCManager
+
++ (instancetype)sharedInstance {
+    static NYQRCodeVCManager *instance;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[NYQRCodeVCManager alloc] init];
+    });
+    return instance;
+}
+
+- (RQQRCodeViewController *)vc{
+    if(!_vc){
+        _vc = [[RQQRCodeViewController alloc] init];
+    }
+    return _vc;
+}
+
+@end