up 解决 banner 点击广告问题

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 = 2112023102001;
+				CURRENT_PROJECT_VERSION = 2112023102301;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11808,7 +11808,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2112023102001;
+				CURRENT_PROJECT_VERSION = 2112023102301;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;

jiaPei/APPdelegateModularForRequest.m

@@ -153,8 +153,7 @@ RQAppEventMod(APPdelegateModularForRequest)
                 RQ_COMMON_MANAGER.JSJP_Is_Online_Media_Video = [dictInfoModel.dictValue boolValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_Online_Version"]) {
                 NSInteger customOnlineVersion = [[[NSString stringWithFormat:@"%@",dictInfoModel.dictValue] stringByReplacingOccurrencesOfString:@"." withString:@""] integerValue];
-                RQ_COMMON_MANAGER.APP_SWITCH = (localVersion >= customOnlineVersion);
-                RQ_COMMON_MANAGER.APP_SWITCH = NO;
+                RQ_COMMON_MANAGER.APP_SWITCH = (localVersion > customOnlineVersion);
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_ICON_NEED_CHANGE"]) {
                 RQ_COMMON_MANAGER.JSJP_APP_ICON_NEED_CHANGE = [dictInfoModel.dictValue boolValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_RATE"]) {
@@ -172,21 +171,6 @@ RQAppEventMod(APPdelegateModularForRequest)
         
     }];
     
-    //    [[RQ_HTTP_Service getConfigKeyWithDictType:@"Online_Version"] subscribeNext:^(id  _Nullable x) {
-    //        NSInteger customOnlineVersion = [[[NSString stringWithFormat:@"%@",x] stringByReplacingOccurrencesOfString:@"." withString:@""] integerValue];
-    //        /// 本地版本大于等于内部版本（审核的时候本地版本一定等于内部版本，上线后本地版本一定小余内部版本）
-    //        RQ_COMMON_MANAGER.APP_SWITCH = localVersion >= customOnlineVersion;
-    //    } error:^(NSError * _Nullable error) {
-    //        [self getAppStoreVersionWithComplete:^(NSInteger onlineVersion) {
-    //            if (onlineVersion != 0) {
-    //                /// 本地版本大于线上版本（审核的时候本地版本一定大于线上版本，上线后本地版本一定等于线上版本(有延迟...所以作为备选方案)）
-    //                RQ_COMMON_MANAGER.APP_SWITCH = localVersion > onlineVersion;
-    //            } else {
-    //                RQ_COMMON_MANAGER.APP_SWITCH = NO;
-    //            }
-    //        }];
-    //    }];
-    
 }
 
 @end

jiaPei/Modules/HomePageModule/View/HomePage/RQHomePageADCell.m

@@ -52,33 +52,38 @@
 
 #pragma mark - SDCycleScrollViewDelegate
 - (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index {
+    if (RQ_COMMON_MANAGER.APP_SWITCH)return;//审核阶段不显示
     if (self.adArray.count >= 1) {
         if (index == 1) return;
     } else {
         if (index >= self.adArray.count) return;
     }
-    NSDictionary *dic = self.adArray[index];
-    [RQ_SHARE_FUNCTION saveObjectWithObject:dic ForKey:@"currentSelectDic"];
-    
-    NSString *skipType = dic[@"OPENTYPE"];
-    
-    if ([skipType isEqualToString:@"1"]) {
-        [RQ_SHARE_FUNCTION gotoWebViewWithUrlStr:dic[@"URL"]];
-    }else{
-        if ([dic[@"ADTYPE"] isEqualToString:@"2"]) {
-            [RQ_SHARE_FUNCTION miniwithUserName:dic[@"URL"] path:dic[@"AI_XCX_URL"]? : @""];
-        } else if ([dic[@"ADTYPE"] isEqualToString:@"1"]) {
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:dic[@"URL"]] options:@{} completionHandler:^(BOOL success) {
-                
-            }];
-        } else if ([dic[@"ADTYPE"] isEqualToString:@"3"]) {
-            WXSubscribeMsgReq *req = [[WXSubscribeMsgReq alloc] init];
-            req.scene = 1;
-            req.templateId = @"1iZwYeI2QtSXZ3rTRkQ42wgRkd7NSINzem8R-LvtHYw";
-            req.reserved = @"";
-            [WXApi sendReq:req completion:nil];
+    @try {
+        NSDictionary *dic = self.adArray[index];
+        [RQ_SHARE_FUNCTION saveObjectWithObject:dic ForKey:@"currentSelectDic"];
+        
+        NSString *skipType = dic[@"OPENTYPE"];
+        if ([skipType isEqualToString:@"1"]) {
+            [RQ_SHARE_FUNCTION gotoWebViewWithUrlStr:dic[@"URL"]];
+        }else{
+            if ([dic[@"ADTYPE"] isEqualToString:@"2"]) {
+                [RQ_SHARE_FUNCTION miniwithUserName:dic[@"URL"] path:dic[@"AI_XCX_URL"]? : @""];
+            } else if ([dic[@"ADTYPE"] isEqualToString:@"1"]) {
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:dic[@"URL"]] options:@{} completionHandler:^(BOOL success) {
+                    
+                }];
+            } else if ([dic[@"ADTYPE"] isEqualToString:@"3"]) {
+                WXSubscribeMsgReq *req = [[WXSubscribeMsgReq alloc] init];
+                req.scene = 1;
+                req.templateId = @"1iZwYeI2QtSXZ3rTRkQ42wgRkd7NSINzem8R-LvtHYw";
+                req.reserved = @"";
+                [WXApi sendReq:req completion:nil];
+            }
         }
+    } @catch (NSException *exception) {
+        NSLog(@"%@",exception.description);
     }
+    
 }
 
 - (SDCycleScrollView *)myCycleScrollView {

jiaPei/Modules/HomePageModule/View/HomePage/RQHomePageSubjectModuleCell.m

@@ -30,7 +30,7 @@
 
 - (void)bindViewModel:(RQHomePageSubjectModuleItemViewModel *)viewModel {
     _viewModel = viewModel;
-    _subjectThreeView.hidden = RQ_COMMON_MANAGER.APP_SWITCH;
+    _subjectThreeView.hidden = NO; // RQ_COMMON_MANAGER.APP_SWITCH;
     [_subjectThreeView setTapActionWithBlock:^(UITapGestureRecognizer *tap) {
         [RQ_VIP_Module isVipWithSubject:0 complete:^(BOOL isVip) {
             if (RQ_VIP_Module.isVip) {

jiaPei/Modules/HomePageModule/View/HomePage/RQHomeSubPageVideoCell.m

@@ -35,21 +35,19 @@
     [_videoImageView yy_setImageWithURL:[NSURL URLWithString:viewModel.videosItem.coverFileUrl] placeholder:RQWebVideoImagePlaceholder()];
     _videoDurationLabel.text = [NSString getMMSSFromSS:viewModel.videosItem.videoDuration];
     _myTtitleLabel.text = viewModel.videosItem.title;
-    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
-        [[RACSignal combineLatest:@[RACObserve(RQ_VIP_Module, isSubject2Vip), RACObserve(RQ_VIP_Module, isSubject3Vip)] reduce:^id (NSNumber *isSubjectTwoVip, NSNumber *isSubjectThreeVip) {
-            if ((viewModel.videosItem.subject == 1 && RQ_VIP_Module.isSubject2Vip) || (viewModel.videosItem.subject == 2 && RQ_VIP_Module.isSubject3Vip)) {
-                self.videoPermissionStateModel.tryLookShow = NO;
-                self.videoPermissionStateModel.vipShow = NO;
-            } else {
-                self.videoPermissionStateModel.tryLookShow = (viewModel.videosItem.permission == 1);
-                self.videoPermissionStateModel.vipShow = (viewModel.videosItem.permission == 2);
-            }
-            return self.videoPermissionStateModel;
-        }] subscribeNext:^(RQVideoPermissionStateModel *videoPermissionStateModel) {
-            _tryLookBtn.hidden = !videoPermissionStateModel.tryLookShow;
-            _vipBtn.hidden = !videoPermissionStateModel.vipShow;
-        }];
-    }
+    [[RACSignal combineLatest:@[RACObserve(RQ_VIP_Module, isSubject2Vip), RACObserve(RQ_VIP_Module, isSubject3Vip)] reduce:^id (NSNumber *isSubjectTwoVip, NSNumber *isSubjectThreeVip) {
+        if ((viewModel.videosItem.subject == 1 && RQ_VIP_Module.isSubject2Vip) || (viewModel.videosItem.subject == 2 && RQ_VIP_Module.isSubject3Vip)) {
+            self.videoPermissionStateModel.tryLookShow = NO;
+            self.videoPermissionStateModel.vipShow = NO;
+        } else {
+            self.videoPermissionStateModel.tryLookShow = (viewModel.videosItem.permission == 1);
+            self.videoPermissionStateModel.vipShow = (viewModel.videosItem.permission == 2);
+        }
+        return self.videoPermissionStateModel;
+    }] subscribeNext:^(RQVideoPermissionStateModel *videoPermissionStateModel) {
+        _tryLookBtn.hidden = !videoPermissionStateModel.tryLookShow;
+        _vipBtn.hidden = !videoPermissionStateModel.vipShow;
+    }];
 }
 
 #pragma mark - SystemMethods

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

@@ -185,17 +185,7 @@
     //投诉建议
     [self addFloatingSuggestView];
 
-//    [[RACSignal combineLatest:@[RACObserve(RQ_VIP_Module, isVip), RACObserve(RQ_COMMON_MANAGER, APP_SWITCH)] reduce:^id (NSNumber *isVip, NSNumber *APP_SWITCH) {
-//        if (RQ_VIP_Module.isVip && RQ_COMMON_MANAGER.APP_SWITCH) {
-//            return @(NO);
-//        } else {
-//            return @(RQ_COMMON_MANAGER.APP_SWITCH);
-//        }
-//    }] subscribeNext:^(NSNumber *APP_SWITCH) {
-//        if (APP_SWITCH.boolValue != RQ_COMMON_MANAGER.APP_SWITCH) {
-//            RQ_COMMON_MANAGER.APP_SWITCH = NO;
-//        }
-//    }];
+
 }
 
 

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

@@ -101,15 +101,8 @@
             return (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.group12123] : @[self.group, self.group12123, group4]) : ((self.homePageSubjectType == RQHomePageSubjectType_SubjectThree)? (RQArrayIsEmpty(dspListModelArr)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.groupDriveMethods, self.group12123, group4]) : @[self.group, self.group0, self.group1, self.group2]);
         } else {
             if (self.homePageSubjectType == RQHomePageSubjectType_SubjectTwo) {
-//                if (RQ_COMMON_MANAGER.APP_SWITCH && !RQ_VIP_Module.isSubject2Vip) {
-//                    self.group0.itemViewModels = @[];
-//                    group3.itemViewModels = @[];
-//                }
                 return RQArrayIsEmpty(group3.itemViewModels)? (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123] : @[self.group, self.group0, self.group12123, group4]) : (RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.group0, self.group12123, group3] : @[self.group, self.group0, self.group12123, group3, group4]);
             } else if (self.homePageSubjectType == RQHomePageSubjectType_SubjectThree) {
-//                if (RQ_COMMON_MANAGER.APP_SWITCH && !RQ_VIP_Module.isSubject3Vip) {
-//                    self.group0.itemViewModels = @[];
-//                }
                 return RQArrayIsEmpty(group4.itemViewModels)? @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123] : @[self.group, self.groupKaoChang, self.groupSubject3Module, self.group0, self.groupDriveMethods, self.group12123, group4];
             } else {
                 return [RQ_YDTQuestion_Module.isZhiGeZheng isEqualToString:@"YES"]? @[self.group, self.group0, self.group1, self.group12123] : ( RQArrayIsEmpty(group3.itemViewModels)? @[self.group, self.group0, self.group1, self.group2] : @[self.group, self.group0, self.group1, self.group2, group3]);
@@ -414,20 +407,17 @@
     @[
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"专项练习" iconImgStr:@"专项练习"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"错题收藏" iconImgStr:@"错题收藏"],
-    ] : (RQ_COMMON_MANAGER.APP_SWITCH? @[
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"精选500题" iconImgStr:@"精选500题"],
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"新规秘卷" iconImgStr:@"新规秘卷"],
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"专项练习" iconImgStr:@"专项练习"],
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"真实考场" iconImgStr:@"真实考场"],
-        [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"错题收藏" iconImgStr:@"错题收藏"],
-    ] : @[
+    ] :
+    (
+     @[
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"VIP课程" iconImgStr:(self.homePageSubjectType == RQHomePageSubjectType_SubjectOne)? @"科一VIP" : @"科四VIP"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"精选500题" iconImgStr:@"精选500题"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"新规秘卷" iconImgStr:@"新规秘卷"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"专项练习" iconImgStr:@"专项练习"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"真实考场" iconImgStr:@"真实考场"],
         [[RQHomePageOneOrFourItemModel alloc] initWithTitleStr:@"错题收藏" iconImgStr:@"错题收藏"],
-    ]);
+    ]
+     );
 }
 
 - (NSArray *)leftTitleArr {

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

@@ -13,8 +13,10 @@
         CGFloat width = RQ_SCREEN_WIDTH - 32.f;
         self.itemSize = CGSizeMake(width, width * (239.f / 345.f));
         self.operation = ^{
-            RQPlaceListViewModel *viewModel = [[RQPlaceListViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
-            [RQ_APPDELEGATE.services pushViewModel:viewModel animated:YES];
+            if (RQ_USER_MANAGER.isShouldLogin) {
+                RQPlaceListViewModel *viewModel = [[RQPlaceListViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{}];
+                [RQ_APPDELEGATE.services pushViewModel:viewModel animated:YES];
+            }
         };
     }
     return self;

jiaPei/Modules/OtherModules/ExerciseModule/View/ExercisePage/RQExerciseAnswerCell.m

@@ -133,7 +133,7 @@
         } size:CGSizeMake(RQ_FIT_HORIZONTAL(128.f), RQ_FIT_HORIZONTAL(34.f)) cornerRadius:QQRadiusMakeSame(RQ_FIT_HORIZONTAL(34.f) / 2.f)] forState:UIControlStateNormal];
         
         
-        NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+        NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
         self.skill_bottom_layout.constant = 16.f;
         if(RQ_USER_MANAGER.tryLookCount>0 && line == 1){//是否试看
             line = 0;

jiaPei/Modules/OtherModules/ExerciseModule/ViewModel/ExercisePage/itemViewModel/RQExerciseAnswerItemViewModel.m

@@ -94,7 +94,7 @@
                     }
                 }
                 self.skillString = text;
-                NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+                NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
                 if (RQ_USER_MANAGER.tryLookCount>0 && line==1){//试看
                     line = 0;
                 }
@@ -112,7 +112,7 @@
 //重写 skillHeight get 方法
 - (CGFloat)skillHeight{
     CGFloat skillH = _skillHeight;
-    NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+    NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
     if (RQ_USER_MANAGER.tryLookCount>0 && line==1){//试看
         line = 0;
     }
@@ -123,7 +123,7 @@
 //重写 rowHeight get 方法
 - (CGFloat)rowHeight{
     CGFloat rowH = _exRowHeight + self.skillHeight;
-    NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+    NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
     if (RQ_USER_MANAGER.tryLookCount>0 && line==1){//试看
         rowH = rowH + 40.f;
     }
@@ -156,7 +156,7 @@
 {
     if (RQ_COMMON_MANAGER.JSJP_APP_VOICE) {//读题-是否开启
         //是vip
-        NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+        NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
         if (RQ_USER_MANAGER.tryLookCount>0 && line==1){//试看
             line = 0;
         }

jiaPei/Modules/OtherModules/VIPModule/RQVIPModule.m

@@ -193,7 +193,8 @@ static id rq_VIPModule = nil;
                 }
                 RQ_VIP_Module.isADVip = (isAds >=2);
                 RQ_VIP_Module.isVip = result;
-                complete(result? result : (RQ_COMMON_MANAGER.APP_SWITCH? YES : NO));
+//                complete(result? result : (RQ_COMMON_MANAGER.APP_SWITCH? YES : NO));
+                complete(result? result :NO);
             }
         } error:^(NSError * _Nullable error) {
             [MBProgressHUD rq_showErrorTips:error];

jiaPei/Modules/OtherModules/VideoModule/RQVideoModule.m

@@ -55,7 +55,7 @@ static id rq_VideoModule = nil;
 
 - (BOOL)isCanWatchWithVideosItem:(VideosItem *)videosItem {
     if (RQ_USER_MANAGER.isLogin) {
-        if (!RQ_COMMON_MANAGER.APP_SWITCH) {
+//        if (!RQ_COMMON_MANAGER.APP_SWITCH) {
             if (videosItem.videoType == RQVideoType_KaoChang) {
                 if (videosItem.permission == 2) {
                     if (videosItem.placeVideoListModel.placeListModel.isCheckVip) {
@@ -94,9 +94,9 @@ static id rq_VideoModule = nil;
                     return YES;
                 }
             }
-        } else {
-            return YES;
-        }
+//        } else {
+//            return YES;
+//        }
     } else {
         if (videosItem.permission == 0) {
             return YES;
@@ -190,7 +190,7 @@ static id rq_VideoModule = nil;
         isBuy = [RQ_COMMON_MANAGER.vipListArr containsObject:videoItem.placeVideoListModel.examName];
     }];
     
-    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
+//    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
         self.playerController.player.playerPlayTimeChanged = ^(id<ZFPlayerMediaPlayback>  _Nonnull asset, NSTimeInterval currentTime, NSTimeInterval duration) {
 //            @strongify(self)
             if (videoItem.permission == 1) {
@@ -255,7 +255,7 @@ static id rq_VideoModule = nil;
                 }
             }
         };
-    }
+//    }
     
     
     self.playerController.currentPlayerManager.playerDidToEnd = ^(id<ZFPlayerMediaPlayback>  _Nonnull asset) {

jiaPei/Modules/OtherModules/VideoModule/View/RQVideoDetailSubPageCell.m

@@ -61,7 +61,7 @@
         }
     }];
 
-    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
+//    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
         [[RACSignal combineLatest:@[RACObserve(RQ_VIP_Module, isSubject2Vip), RACObserve(RQ_VIP_Module, isSubject3Vip)] reduce:^id (NSNumber *isSubjectTwoVip, NSNumber *isSubjectThreeVip) {
             @strongify(self)
             if ((viewModel.videosItem.subject == 1 && RQ_VIP_Module.isSubject2Vip) || (viewModel.videosItem.subject == 2 && RQ_VIP_Module.isSubject3Vip)) {
@@ -77,7 +77,7 @@
             self.tryLookBtn.hidden = !videoPermissionStateModel.tryLookShow;
             self.vipBtn.hidden = !videoPermissionStateModel.vipShow;
         }];
-    }
+//    }
     
     [[[RACObserve(viewModel.videosItem.placeVideoListModel, permission) deliverOnMainThread] takeUntil:self.rac_prepareForReuseSignal] subscribeNext:^(id  _Nullable x) {
         @strongify(self)

jiaPei/Modules/OtherModules/VideoModule/View/RQVideoListCell.m

@@ -41,7 +41,7 @@
     self.model = model;
     VideosItem *videosItem = (VideosItem *)model.dataModel;
     self.videoTitleLabel.text = videosItem.title;
-    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
+//    if (!RQ_COMMON_MANAGER.APP_SWITCH) {
         [[RACSignal combineLatest:@[RACObserve(RQ_VIP_Module, isSubject2Vip), RACObserve(RQ_VIP_Module, isSubject3Vip)] reduce:^id (NSNumber *isSubjectTwoVip, NSNumber *isSubjectThreeVip) {
             @strongify(self)
             if ((videosItem.subject == 1 && RQ_VIP_Module.isSubject2Vip) || (videosItem.subject == 2 && RQ_VIP_Module.isSubject3Vip)) {
@@ -57,7 +57,7 @@
             self.tryLookBtn.hidden = !videoPermissionStateModel.tryLookShow;
             self.vipBtn.hidden = !videoPermissionStateModel.vipShow;
         }];
-    }
+//    }
     
     
     [self.videoImageView yy_setImageWithURL:[NSURL URLWithString:videosItem.coverFileUrl] placeholder:[UIImage imageNamed:@"videoPlaceholder"]];

jiaPei/Modules/ProfileModule/View/RQProfileUserAndVipCell.m

@@ -47,7 +47,8 @@
     maskLayer.fillColor = [UIColor redColor].CGColor;
     maskLayer.lineWidth = 1;
     
-    CGFloat cellHeight = RQ_COMMON_MANAGER.APP_SWITCH? RQ_FIT_HORIZONTAL(158.f) : RQ_FIT_HORIZONTAL(328.f);
+//    CGFloat cellHeight = RQ_COMMON_MANAGER.APP_SWITCH? RQ_FIT_HORIZONTAL(158.f) : RQ_FIT_HORIZONTAL(328.f);
+    CGFloat cellHeight = RQ_FIT_HORIZONTAL(328.f);
     CGFloat a = RQ_FIT_HORIZONTAL(22.f);
     CGFloat radius = (((RQ_SCREEN_WIDTH / 2.f) * (RQ_SCREEN_WIDTH / 2.f)) - (a * a)) / (2 * a);
     UIBezierPath* aPath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(RQ_SCREEN_WIDTH / 2.f, cellHeight - radius) radius:radius  startAngle:0 endAngle:M_PI * 2 clockwise:YES];

jiaPei/Modules/ProfileModule/ViewModel/RQSettingViewModel.m

@@ -93,7 +93,7 @@
                 [self.services pushViewModel:aboutViewModel animated:YES];
             } else if ([arrowItem.title isEqualToString:@"注销账号"]) {
                 [[RACScheduler mainThreadScheduler] schedule:^{
-                    [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_SignOut title:@"注销账号" message:RQ_COMMON_MANAGER.APP_SWITCH? @"注销账号将会永久删除当前用户所有数据，请谨慎操作！" : @"注销账号将会永久删除当前用户所有数据，VIP用户的VIP权益也将失效，请谨慎操作！" confirmTitle:@"确认" cancelTitle:@"取消" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
+                    [RQ_ALERTVIEW_MANAGER showAlertWithAlertType:RQAlertType_SignOut title:@"注销账号" message: @"注销账号将会永久删除当前用户所有数据，VIP用户的VIP权益也将失效，请谨慎操作！" confirmTitle:@"确认" cancelTitle:@"取消" confirmAction:^(__kindof QMUIDialogViewController * _Nonnull dialogViewController) {
                         [MBProgressHUD rq_showProgressHUD:@"注销中"];
                          RACCommand *zxCommand = [[RACCommand alloc] initWithSignalBlock:^RACSignal *(NSNumber * selected) {
                              return [self zx];

jiaPei/Modules/ProfileModule/ViewModel/itemViewModel/RQProfileUserAndVipItemViewModel.m

@@ -20,7 +20,8 @@
         self.userModel = user;
         [[RACObserve(RQ_COMMON_MANAGER, APP_SWITCH) takeUntil:self.rac_willDeallocSignal] subscribeNext:^(id  _Nullable x) {
             @strongify(self)
-            self.itemSize = CGSizeMake(RQ_SCREEN_WIDTH, RQ_COMMON_MANAGER.APP_SWITCH? RQ_FIT_HORIZONTAL(158.f) : RQ_FIT_HORIZONTAL(328.f));
+//            self.itemSize = CGSizeMake(RQ_SCREEN_WIDTH, RQ_COMMON_MANAGER.APP_SWITCH? RQ_FIT_HORIZONTAL(158.f) : RQ_FIT_HORIZONTAL(328.f));
+            self.itemSize = CGSizeMake(RQ_SCREEN_WIDTH, RQ_FIT_HORIZONTAL(328.f));
         }];
     }
     return self;

jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -209,8 +209,8 @@ static id rq_userManager = nil;
                 RQ_COMMON_MANAGER.JSJP_Is_Online_Media_Video = [dictInfoModel.dictValue boolValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_Online_Version"]) {
                 NSInteger customOnlineVersion = [[[NSString stringWithFormat:@"%@",dictInfoModel.dictValue] stringByReplacingOccurrencesOfString:@"." withString:@""] integerValue];
-                RQ_COMMON_MANAGER.APP_SWITCH = (localVersion >= customOnlineVersion);
-                RQ_COMMON_MANAGER.APP_SWITCH = NO;
+                RQ_COMMON_MANAGER.APP_SWITCH = (localVersion > customOnlineVersion);
+                //RQ_COMMON_MANAGER.APP_SWITCH = NO;
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_ICON_NEED_CHANGE"]) {
                 RQ_COMMON_MANAGER.JSJP_APP_ICON_NEED_CHANGE = [dictInfoModel.dictValue boolValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_RATE"]) {