解决一个召回弹窗不显示的问题

DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m

@@ -572,7 +572,7 @@ NSString * const kEVENT_RECHARGE_FIRST_RECHARGE_WINDOW_RECEIVE_OFFICIAL_RECAHARG
             
             
             NSString *pid = dataDict[@"pid"];
             NSString *pid = dataDict[@"pid"];
             NSString *packageid = dataDict[@"packageid"];
             NSString *packageid = dataDict[@"packageid"];
-            NSMutableDictionary *trackEventDict = [@{@"roomid":FUSConfig.sharedInstanced.liveConfigs.currentRoomId,@"userid":[FUSCacheDataShare shareStore].userDetailInfo.uid,@"pkg":FUSConfig.sharedInstanced.appConfigs.appPKG,@"pid":pid,@"packageid":packageid} mutableCopy];
+            NSMutableDictionary *trackEventDict = [@{@"roomid":FUSConfig.sharedInstanced.liveConfigs.currentRoomId ?: @"",@"userid":[FUSCacheDataShare shareStore].userDetailInfo.uid,@"pkg":FUSConfig.sharedInstanced.appConfigs.appPKG,@"pid":pid,@"packageid":packageid} mutableCopy];
             if ([NSString isNull:pid]) {
             if ([NSString isNull:pid]) {
                 [FUSDialogView fus_showDialog:[NSString fus_localString:@"储值失败"]];
                 [FUSDialogView fus_showDialog:[NSString fus_localString:@"储值失败"]];
                 [trackEventDict setObject:@"rechargefail" forKey:@"result"];
                 [trackEventDict setObject:@"rechargefail" forKey:@"result"];

DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/DataShare/FUSSwiftCacheDataShare.swift

@@ -76,6 +76,11 @@ import RxSwift
         get { FUSSwiftCacheDataShare.share.switchStintConfig.value }
         get { FUSSwiftCacheDataShare.share.switchStintConfig.value }
         set { FUSSwiftCacheDataShare.share.switchStintConfig.accept(newValue) }
         set { FUSSwiftCacheDataShare.share.switchStintConfig.accept(newValue) }
     }
     }
+    /// 是否是新注册用户
+    @objc public var oc_isNewRegister: Bool {
+        get { FUSSwiftCacheDataShare.share.isNewRegister.value }
+        set { FUSSwiftCacheDataShare.share.isNewRegister.accept(newValue) }
+    }
     
     
     // - swift PART
     // - swift PART
     /// 当前是否登录
     /// 当前是否登录
@@ -143,6 +148,8 @@ import RxSwift
     public var settingDataTemplateGetList: BehaviorRelay<[String : Any]> = .init(value: .init())
     public var settingDataTemplateGetList: BehaviorRelay<[String : Any]> = .init(value: .init())
     /// 获取平台开关限制
     /// 获取平台开关限制
     public var switchStintConfig: BehaviorRelay<FUSSwitchStintConfigModel?> = .init(value: nil)
     public var switchStintConfig: BehaviorRelay<FUSSwitchStintConfigModel?> = .init(value: nil)
+    /// 是否是新注册用户
+    public let isNewRegister = BehaviorRelay<Bool>(value: false)
     
     
     
     
     // - common part
     // - common part
@@ -256,6 +263,7 @@ import RxSwift
         self.settingConfigModel.accept(nil)
         self.settingConfigModel.accept(nil)
         self.bindAgentCodeSuccessData = nil
         self.bindAgentCodeSuccessData = nil
         self.registeredBindsuccess = 0
         self.registeredBindsuccess = 0
+        self.isNewRegister.accept(false)
     }
     }
     /// 请求背包头部
     /// 请求背包头部
     func fus_requestBackpackTypeList(from: ReadCacheFromType){
     func fus_requestBackpackTypeList(from: ReadCacheFromType){

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h

@@ -99,7 +99,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)fus_showSettingMicDivideViewWithSettingItemList:(NSArray *)divideList selectedItem:(NSString *)selectedItem changedHandler:(void(^)(NSDictionary<NSString *,id> * _Nonnull selectedDict, NSString *percent))changedHandler;
 - (void)fus_showSettingMicDivideViewWithSettingItemList:(NSArray *)divideList selectedItem:(NSString *)selectedItem changedHandler:(void(^)(NSDictionary<NSString *,id> * _Nonnull selectedDict, NSString *percent))changedHandler;
 
 
 /// 每日签到相关
 /// 每日签到相关
-- (void)fus_getDailyCheckInData;
+- (void)fus_getDailyCheckInDataWithSuccess:(void(^)(void))success;
 
 
 - (void)fus_writeDataToNewsFeedMessageTableWithDict:(NSDictionary *)newsFeedMsgDict;
 - (void)fus_writeDataToNewsFeedMessageTableWithDict:(NSDictionary *)newsFeedMsgDict;
 
 

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings

@@ -3067,7 +3067,7 @@
 
 
 "我在私享屋直播" = "我在私享屋直播";
 "我在私享屋直播" = "我在私享屋直播";
 
 
-"需要输入密码进入直播屋" = "需要輸入密碼進入直播屋";
+"需要输入密码进入直播屋~" = "需要輸入密碼進入直播屋~";
 
 
 "密码：" = "密碼：";
 "密码：" = "密碼：";
 
 

FuSiLive.xcodeproj/project.pbxproj

@@ -672,7 +672,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260011;
+				CURRENT_PROJECT_VERSION = 202506260012;
 				DEFINES_MODULE = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
@@ -940,7 +940,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260011;
+				CURRENT_PROJECT_VERSION = 202506260012;
 				DEFINES_MODULE = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
 				ENABLE_ON_DEMAND_RESOURCES = NO;

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m

@@ -2525,7 +2525,7 @@
             liveContent = [NSString fus_localString:@"房間已開好，快來一起玩耍吧"];
             liveContent = [NSString fus_localString:@"房間已開好，快來一起玩耍吧"];
         } else {
         } else {
             liveTitle = [NSString fus_localString:@"我在私享屋直播"];
             liveTitle = [NSString fus_localString:@"我在私享屋直播"];
-            liveContent = [NSString fus_localString:@"需要输入密码进入直播屋"];
+            liveContent = [NSString fus_localString:@"需要输入密码进入直播屋~"];
         }
         }
         [self fus_sendLiveRoomShareWithRoomId:roomModel.roomId
         [self fus_sendLiveRoomShareWithRoomId:roomModel.roomId
                                  pullFlowUrl:roomModel.publishUrl
                                  pullFlowUrl:roomModel.publishUrl

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/FUSHomePageViewController.m

@@ -18,6 +18,7 @@
 #import "FUSOpenScreenPushHelp.h"
 #import "FUSOpenScreenPushHelp.h"
 // 导入通知框架
 // 导入通知框架
 #import <UserNotifications/UserNotifications.h>
 #import <UserNotifications/UserNotifications.h>
+#import <FUSCommon/FUSCommon-Swift.h>
 
 
 @interface FUSHomePageViewController ()<UIScrollViewDelegate, FUSFloatTabbarViewDelegate, FUSHomeViewBaseDelegate>
 @interface FUSHomePageViewController ()<UIScrollViewDelegate, FUSFloatTabbarViewDelegate, FUSHomeViewBaseDelegate>
 
 
@@ -38,6 +39,9 @@
 
 
 @property (nonatomic, assign) BOOL isShowNewUserAlert;
 @property (nonatomic, assign) BOOL isShowNewUserAlert;
 
 
+/// 是否加载过AppStartPush，因为这个东西有socket相关，需要socket连接成功才行
+@property (nonatomic, assign) BOOL isLoadAppStartPush;
+
 @end
 @end
 
 
 @implementation FUSHomePageViewController
 @implementation FUSHomePageViewController
@@ -49,12 +53,20 @@
     self.homeTabbarShouldScrollToHide = NO;
     self.homeTabbarShouldScrollToHide = NO;
     self.firstLoad = YES;
     self.firstLoad = YES;
     self.isShowNewUserAlert = NO;
     self.isShowNewUserAlert = NO;
+    self.isLoadAppStartPush = NO;
     
     
     [self fus_createTabbarView];
     [self fus_createTabbarView];
     [self fus_createHomeScrollView];
     [self fus_createHomeScrollView];
     
     
     [self.view bringSubviewToFront:self.tabbarView];
     [self.view bringSubviewToFront:self.tabbarView];
-    [FUSRouter.userRouter fus_getDailyCheckInData];
+    MJWeakSelf
+    [FUSRouter.userRouter fus_getDailyCheckInDataWithSuccess:^{
+        if ([[FUSSocketManager fus_socket] isConnected] == YES) {
+            if (weakSelf.isLoadAppStartPush == NO) {
+                [weakSelf fus_getAppStartPush];
+            }
+        }
+    }];
     [self fus_registNotification];
     [self fus_registNotification];
     [self pushMarkAppTipsToUser];
     [self pushMarkAppTipsToUser];
 }
 }
@@ -70,6 +82,7 @@
                                                object:nil];
                                                object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_enterForegroundNotification) name:UIApplicationWillEnterForegroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_enterForegroundNotification) name:UIApplicationWillEnterForegroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newRegistRecommend:) name:FUSUserNotificationKeys.fus_NEW_REGISTER_RECOMMEND object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newRegistRecommend:) name:FUSUserNotificationKeys.fus_NEW_REGISTER_RECOMMEND object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(socketDidConnect) name:kFUSSocketReconnectedNotification object:nil];
 }
 }
 
 
 -(void)fus_createHomeScrollView{
 -(void)fus_createHomeScrollView{
@@ -141,6 +154,17 @@
         }];
         }];
     }
     }
 }
 }
+/// 开屏页相关，ff有，但是fusi没有，后续需要注意一下
+-(void)fus_getAppStartPush{
+    //TODO: 这个ff有相关的东西，但是fusi没有，后续得跟进一下
+    // 这里是用socket来获得推荐列表相关的，但是ff是用请求来获得的，逻辑非常不一样，不太清楚哪边才是对的，但是这里经过测试，逻辑也符合预期，先不动吧，后续再说
+    self.isLoadAppStartPush = YES;
+    [FUSBaoFangHttpHelper fus_requestStartPageAlertWithSuccess:^(NSArray *checkInModels, FUSOpenScreenPushModel *openScreenPushModel, NSInteger type) {
+        
+    } failure:^(NSString *msg, int code) {
+        
+    }];
+}
 
 
 #pragma mark - 开屏推送相关  ludy:  这里我看老包也没有使用，先记着，到时候需要的时候就直接用
 #pragma mark - 开屏推送相关  ludy:  这里我看老包也没有使用，先记着，到时候需要的时候就直接用
 - (void)fus_getOpenScreenPushData {
 - (void)fus_getOpenScreenPushData {
@@ -300,6 +324,12 @@
     };
     };
 }
 }
 
 
+-(void)socketDidConnect{
+    if (self.isLoadAppStartPush == NO) {
+        [self fus_getAppStartPush];
+    }
+}
+
 #pragma mark --- FUSHomeViewBaseDelegate
 #pragma mark --- FUSHomeViewBaseDelegate
 - (void)fus_homeView:(UIView *)view didUpdateScrollViewCntentMaxHeightWithFloor:(CGFloat)maxHeight{
 - (void)fus_homeView:(UIView *)view didUpdateScrollViewCntentMaxHeightWithFloor:(CGFloat)maxHeight{
 //    self.tabbarView.shouldBarCenterTransparency = maxHeight > (UIView.fus_screenH - [FUSFloatTabbarView fus_barHeight]);
 //    self.tabbarView.shouldBarCenterTransparency = maxHeight > (UIView.fus_screenH - [FUSFloatTabbarView fus_barHeight]);

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/Main/Other/FUSBaoFangHttpHelper.h

@@ -155,4 +155,8 @@ typedef enum : NSUInteger {
                                          success:(void(^)(void))success
                                          success:(void(^)(void))success
                                          failure:(void(^)(NSString *msg,int code))failure;
                                          failure:(void(^)(NSString *msg,int code))failure;
 
 
+/// 启动弹窗
++(void)fus_requestStartPageAlertWithSuccess:(void(^)(NSArray *checkInModels, FUSOpenScreenPushModel *openScreenPushModel, NSInteger type))success
+                                    failure:(void(^)(NSString *msg,int code))failure;
+
 @end
 @end

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/Main/Other/FUSBaoFangHttpHelper.m

@@ -342,4 +342,35 @@
     }];
     }];
 }
 }
 
 
++ (void)fus_requestStartPageAlertWithSuccess:(void (^)(NSArray *, FUSOpenScreenPushModel *, NSInteger))success failure:(void (^)(NSString *, int))failure{
+    [FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_requestStartPageAlert params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
+        
+        NSDictionary *resultJson = dataDict[@"result"];
+        NSInteger type = [resultJson[@"type"] integerValue];
+        
+        if (type == 1) {
+            NSDictionary *openScreenData = resultJson[@"openScreenData"];
+            FUSOpenScreenPushModel *model = [[FUSOpenScreenPushModel alloc] init];
+            model.oid = [openScreenData[@"id"] description];
+            model.jumptype = [openScreenData[@"jumptype"] description];
+            model.img = openScreenData[@"imgs"];
+            model.url = [openScreenData[@"url"] description];
+            success(nil, model, type);
+        }
+        else if (type == 2 || type == 3){
+            if ([resultJson[@"checkInData"] isKindOfClass:[NSArray class]]) {
+                success(resultJson[@"checkInData"], nil, type);
+            }
+            else if ([resultJson[@"checkInData"] isKindOfClass:[NSDictionary class]]){
+                success(@[resultJson[@"checkInData"]], nil, type);
+            }
+        }
+        
+    } failure:^(NSDictionary * _Nullable dataDict, int code) {
+        if (failure) {
+            failure(FAILURE_MESSAGE, code);
+        }
+    }];
+}
+
 @end
 @end

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.h

@@ -391,6 +391,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 设置新人7天签到提醒
 /// 设置新人7天签到提醒
 + (NSString *)fus_URL_USER_NOVICE_CHECKIN_REMIND_SET;
 + (NSString *)fus_URL_USER_NOVICE_CHECKIN_REMIND_SET;
 
 
+/// 启动弹窗
++ (NSString *)fus_URL_requestStartPageAlert;
+
 /// 回拍 类型（1：追踪、2：送礼）
 /// 回拍 类型（1：追踪、2：送礼）
 + (NSString *)fus_URL_LIVE_PAT_REPLY;
 + (NSString *)fus_URL_LIVE_PAT_REPLY;
 
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m

@@ -702,6 +702,11 @@
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/novice/checkin/remind/set"];
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/novice/checkin/remind/set"];
 }
 }
 
 
+/// 启动弹窗
++ (NSString *)fus_URL_requestStartPageAlert{
+    return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/index/v2/startPage"];
+}
+
 @end
 @end
 
 
 
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSStartPageViewController.m

@@ -773,6 +773,7 @@
             
             
             if (dataDict && [dataDict[@"code"] integerValue] == 1) {
             if (dataDict && [dataDict[@"code"] integerValue] == 1) {
                 BOOL isNewRegister = [dataDict[@"inReg"] boolValue];
                 BOOL isNewRegister = [dataDict[@"inReg"] boolValue];
+                [FUSSwiftCacheDataShare share].oc_isNewRegister = isNewRegister;
                 [[NSUserDefaults standardUserDefaults] setObject:@(isNewRegister) forKey:FUSUserUDKeys.fus_NEW_USER_REGIST];
                 [[NSUserDefaults standardUserDefaults] setObject:@(isNewRegister) forKey:FUSUserUDKeys.fus_NEW_USER_REGIST];
                 if (isNewRegister) {
                 if (isNewRegister) {
                     // FireBase 注册统计
                     // FireBase 注册统计

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Other/FUSLoginHttpHelper.m

@@ -332,6 +332,7 @@
         [FUSCacheDataShare shareStore].origin = nil;
         [FUSCacheDataShare shareStore].origin = nil;
         [FUSCacheDataShare shareStore].originType = nil;
         [FUSCacheDataShare shareStore].originType = nil;
         [FUSCacheDataShare shareStore].agentCode = nil;
         [FUSCacheDataShare shareStore].agentCode = nil;
+        [FUSSwiftCacheDataShare share].oc_isNewRegister = YES;
         if (success) success(dataDict);
         if (success) success(dataDict);
     } failure:^(NSDictionary *dataDict, int code) {
     } failure:^(NSDictionary *dataDict, int code) {
         if (code == -911 && skip == 0) {
         if (code == -911 && skip == 0) {

Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m

@@ -309,7 +309,7 @@
 }
 }
 
 
 /// 每日签到相关
 /// 每日签到相关
-- (void)fus_getDailyCheckInData {
+- (void)fus_getDailyCheckInDataWithSuccess:(void (^)(void))success {
     if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
     if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
         return;
         return;
     }
     }
@@ -318,8 +318,9 @@
         if (model) {
         if (model) {
             [self fus_showDailyCheckInView:model];
             [self fus_showDailyCheckInView:model];
         }
         }
+        success();
     } failure:^(NSString *msg, int code) {
     } failure:^(NSString *msg, int code) {
-        
+        success();
     }];
     }];
 }
 }
 
 
@@ -820,7 +821,9 @@
         [agentView showWithView:[UIWindow fus_keyWindow]];
         [agentView showWithView:[UIWindow fus_keyWindow]];
     } else if ([jumpType isEqualToString:@"yazhai://_check_in"]) {
     } else if ([jumpType isEqualToString:@"yazhai://_check_in"]) {
         
         
-        [self fus_getDailyCheckInData];
+        [self fus_getDailyCheckInDataWithSuccess:^{
+            
+        }];
     } else if ([jumpType isEqualToString:@"yazhai://_jump_url"]) {
     } else if ([jumpType isEqualToString:@"yazhai://_jump_url"]) {
         
         
         FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
         FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];