修护bug

jiaPei/APPdelegateModularForRequest.m

@@ -143,6 +143,8 @@ RQAppEventMod(APPdelegateModularForRequest)
                 NSData *jsonData = [dictInfoModel.dictValue dataUsingEncoding:NSUTF8StringEncoding];
                 NSDictionary *jsonDictionary = [NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:&error];
                 RQ_COMMON_MANAGER.JSJP_APP_VOICE_SET = jsonDictionary;
+            }else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_XM_AD_RATE"]) {
+                RQ_COMMON_MANAGER.JSJP_APP_XM_AD_RATE = [dictInfoModel.dictValue integerValue];
             }else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_CYCLE"]) {
                 RQ_COMMON_MANAGER.JSJP_APP_AD_CYCLE = [dictInfoModel.dictValue integerValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_Is_Online_Media_Image"]) {

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

@@ -53,13 +53,13 @@
     [[[[RACObserve(viewModel, ydtJSModel) takeUntil:self.rac_prepareForReuseSignal] deliverOnMainThread] distinctUntilChanged] subscribeNext:^(RQYDTJSModel *ydtJSModel) {
         @strongify(self)
         if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne) {
-            if (RQ_VIP_Module.isSubject1Vip) {
+            if (RQ_VIP_Module.isSubject1Vip||RQ_USER_MANAGER.tryLookCount>0) {
                 self.bottom_view.hidden = YES;
             } else {
                 self.bottom_view.hidden = NO;
             }
         } else if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour) {
-            if (RQ_VIP_Module.isSubject4Vip) {
+            if (RQ_VIP_Module.isSubject4Vip||RQ_USER_MANAGER.tryLookCount>0) {
                 self.bottom_view.hidden = YES;
             } else {
                 self.bottom_view.hidden = NO;

jiaPei/OLD/Util/SingletonManger/ADViewManager/RQADViewManager.m

@@ -173,7 +173,9 @@ ADSuyiSDKSplashAdDelegate
                         /// 非两个广告以上
                         if (!RQ_VIP_Module.isADVip) {
                             int a = arc4random() % 100;
-                            if (RQ_COMMON_MANAGER.JSJP_APP_AD_RATE > a) {
+                            NSLog(@"RATE=%zd  AD=%d",RQ_COMMON_MANAGER.JSJP_APP_AD_RATE,a);
+                            int date = [RQ_USER_MANAGER.city_dbId isEqualToString:@"3502"]?RQ_COMMON_MANAGER.JSJP_APP_XM_AD_RATE:RQ_COMMON_MANAGER.JSJP_APP_AD_RATE;
+                            if (date > a) {
                                 self.isReady = NO;
                                 _intertitialAd = nil;
                                 [self.intertitialAd loadAdData];
@@ -216,7 +218,9 @@ ADSuyiSDKSplashAdDelegate
                     }
                     case RQADType_InterstitialSplash: {
                         int a = arc4random() % 100;
-                        if (RQ_COMMON_MANAGER.JSJP_APP_AD_RATE > a) {
+                        NSLog(@"RATE=%zd  AD=%d",RQ_COMMON_MANAGER.JSJP_APP_AD_RATE,a);
+                        int date = [RQ_USER_MANAGER.city_dbId isEqualToString:@"3502"]?RQ_COMMON_MANAGER.JSJP_APP_XM_AD_RATE:RQ_COMMON_MANAGER.JSJP_APP_AD_RATE;
+                        if (date > a) {
                             self.isReady = NO;
                             _intertitialAd = nil;
                             [self.intertitialAd loadAdData];

jiaPei/Utils/Manager/CommonManager/RQCommonManager.h

@@ -34,6 +34,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readwrite, assign) BOOL JSJP_APP_ICON_NEED_CHANGE;
 /// 插屏广告出现的概率
 @property (nonatomic, readwrite, assign) NSInteger JSJP_APP_AD_RATE;
+/// 插屏广告出现的概率-2023-09-27 厦门专属
+@property (nonatomic, readwrite, assign) NSInteger JSJP_APP_XM_AD_RATE;
 /// 莆田实操的照片分辨率
 @property (nonatomic, readwrite, copy) NSString *JSJP_APP_PTSC_FBL;
 /// 是否使用旧域名

jiaPei/Utils/Manager/CommonManager/RQCommonManager.m

@@ -216,7 +216,7 @@
 - (NSInteger)JSJP_APP_AD_RATE {
     id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"JSJP_APP_AD_RATE"];
     if (RQObjectIsNil(object)) {
-        return 70;
+        return 50;
     } else {
         NSInteger JSJP_APP_AD_RATE = [object integerValue];
         return JSJP_APP_AD_RATE;
@@ -227,6 +227,21 @@
     [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithInteger:JSJP_APP_AD_RATE] ForKey:@"JSJP_APP_AD_RATE"];
 }
 
+- (NSInteger)JSJP_APP_XM_AD_RATE {
+    id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"JSJP_APP_XM_AD_RATE"];
+    if (RQObjectIsNil(object)) {
+        return 50;
+    } else {
+        NSInteger JSJP_APP_XM_AD_RATE = [object integerValue];
+        return JSJP_APP_XM_AD_RATE;
+    }
+}
+
+- (void)setJSJP_APP_XM_AD_RATE:(NSInteger)JSJP_APP_XM_AD_RATE {
+    [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithInteger:JSJP_APP_XM_AD_RATE] ForKey:@"JSJP_APP_XM_AD_RATE"];
+}
+
+
 
 - (NSString *)JSJP_APP_PTSC_FBL {
     id object = [self getObjectWithKey:@"JSJP_APP_PTSC_FBL"];

jiaPei/Utils/Manager/UserManager/RQUserManager.m

@@ -199,7 +199,9 @@ static id rq_userManager = nil;
         [setArr.rac_sequence.signal subscribeNext:^(RQDictInfoModel *dictInfoModel) {
             if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_OPEN"]) {
                 RQ_COMMON_MANAGER.JSJP_APP_AD_OPEN = [[NSString stringWithFormat:@"%@",dictInfoModel.dictValue] isEqualToString:@"1"]? YES : NO;
-            } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_CYCLE"]) {
+            }else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_XM_AD_RATE"]) {
+                RQ_COMMON_MANAGER.JSJP_APP_XM_AD_RATE = [dictInfoModel.dictValue integerValue];
+            }else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_APP_AD_CYCLE"]) {
                 RQ_COMMON_MANAGER.JSJP_APP_AD_CYCLE = [dictInfoModel.dictValue integerValue];
             } else if ([dictInfoModel.dictLabel isEqualToString:@"JSJP_Is_Online_Media_Image"]) {
                 RQ_COMMON_MANAGER.JSJP_Is_Online_Media_Image = [dictInfoModel.dictValue boolValue];