up

jiaPei.xcodeproj/project.pbxproj

@@ -11726,7 +11726,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2102023101802;
+				CURRENT_PROJECT_VERSION = 2112023102001;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11763,7 +11763,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11808,7 +11808,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2102023101802;
+				CURRENT_PROJECT_VERSION = 2112023102001;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11845,7 +11845,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/Modules/HomePageModule/Model/RQHTTPService+RQGetPlaceVideoList.h

@@ -9,7 +9,6 @@
 
 #define RQ_GET_PlaceVideoList            @"https://jsjp-admin.zzxcx.net/jsjp-admin/open-api/vip/video/list"
 
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RQPlaceVideoListModel : RQBaseModel
@@ -46,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param searchStr 搜索关键字
  @return Returns a signal which will send complete, or error.
  */
-- (RACSignal *)getPlaceVideoListWithPageNum:(NSInteger)pageNum pageSize:(NSInteger)pageSize searchString:(NSString *)searchStr;
+- (RACSignal *)getPlaceVideoListWithPageNum:(NSInteger)pageNum pageSize:(NSInteger)pageSize searchString:(NSString *)searchStr examId:(NSString*)examId;
 
 @end
 

jiaPei/Modules/HomePageModule/Model/RQHTTPService+RQGetPlaceVideoList.m

@@ -18,7 +18,7 @@
  @param searchStr 搜索关键字
  @return Returns a signal which will send complete, or error.
  */
-- (RACSignal *)getPlaceVideoListWithPageNum:(NSInteger)pageNum pageSize:(NSInteger)pageSize  searchString:(NSString *)searchStr {
+- (RACSignal *)getPlaceVideoListWithPageNum:(NSInteger)pageNum pageSize:(NSInteger)pageSize  searchString:(NSString *)searchStr examId:(NSString*)examId {
     /// 1. 配置参数
     RQKeyedSubscript *subscript = [RQKeyedSubscript subscript];
     if (pageNum != 0 && pageSize != 0) {
@@ -39,11 +39,11 @@
     /// id
 //    subscript[@"id"] = @0;
     /// 考场编号
-//    subscript[@"examId"] = @0;
+    subscript[@"examId"] = examId;
     /// 视频方向 0:竖 1:横
 //    subscript[@"horizontal"] = @1;
     /// 1:科目一 2:科目二 3：科目三 4:科目四
-//    subscript[@"videoSubject"] = @(subject + 1);
+    subscript[@"videoSubject"] = @(3);
     /// 视频地址
 //    subscript[@"videoUrl"] = @"";
     /// 视频名称

jiaPei/Modules/HomePageModule/ViewModel/HomePage/RQHomePageViewModel.m

@@ -86,7 +86,7 @@
         if (RQStringIsNotEmpty([SAMKeychain rawLogin]) && RQStringIsNotEmpty([SAMKeychain rawLoginPassword]) && RQ_USER_MANAGER.currentUser) {
             RQ_USER_MANAGER.currentUser.channel = RQUserLoginChannelTypeAutoLogin;
             [[RQ_HTTP_Service studentLoginWithLoginCode:[SAMKeychain rawLogin] password:[SAMKeychain rawLoginPassword]] subscribeNext:^(RQUserModel *userModel) {
-                [RQ_USER_MANAGER saveUser:userModel];//更新保存
+//                [RQ_USER_MANAGER saveUser:userModel];//更新保存
                 [subscriber sendNext:userModel];
             } error:^(NSError * _Nullable error) {
                 [subscriber sendError:error];

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/RQPlaceDetailNoteViewModel.m

@@ -86,8 +86,9 @@
         }
         return products;
     };
+     
     ///
-    return [[[RQ_HTTP_Service getPlaceVideoListWithPageNum:0 pageSize:0 searchString:self.placeListModel.name] map:itemsBlock] doError:^(NSError * _Nonnull error) {
+    return [[[RQ_HTTP_Service getPlaceVideoListWithPageNum:0 pageSize:0 searchString:self.placeListModel.name examId:[NSString stringWithFormat:@"%zd",self.placeListModel.id]] map:itemsBlock] doError:^(NSError * _Nonnull error) {
         [QMUITips hideAllTips];
         [QMUITips showError:[NSError rq_tipsFromError:error]];
     }];

jiaPei/Utils/Service/HTTP/HTTPRequest/RQURLParameters.m

@@ -63,6 +63,10 @@
 @implementation RQURLParameters
 
 + (instancetype)urlParametersWithMethod:(NSString *)method path:(NSString *)path parameters:(NSDictionary *)parameters {
+    //控制-测试环境
+    if(!isOfficial){
+        path = [path stringByReplacingOccurrencesOfString:@"jsjp-admin.zzxcx.net" withString:@"jsjp-admin1.zzxcx.net"];
+    }
 	return [[self alloc] initUrlParametersWithMethod:method path:path parameters:parameters];
 }