修改App icon和开播端的欢迎语

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m

@@ -672,64 +672,82 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
  主播进入直播间
  */
 - (void)fus_enterRoom{
-    [FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
+    
+    __weak typeof(self) weakSelf = self;
+    [FUSLiveHttpHelper fus_enterRoomGetPredataWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSDictionary *dataDict) {
         
-        if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
+        NSArray *reminderKey = dataDict[@"reminderKey"];
+        NSDictionary *roomInfo = dataDict[@"roomInfo"];
+        if ([roomInfo[@"uid"] integerValue] != [FUSLiveHelper shareInstance].roomInfoModel.roomId.integerValue) {
             FUSLogInfo(@"不是当前包房");
             return ;
         }
-        
-        // PKview更新
-        if (pkInfo.integerValue == 1) { //在pk中
-            // 审核下不显示PK
-            if(FUSConfig.sharedInstanced.devConfigs.appStatus) return;
-            [FUSLiveHttpHelper fus_getRoomPKInfoWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId  success:^(NSString *status, NSString *remainTime, NSString *winner, NSString *content,NSString *isLikePk,NSArray<FUSPKRoomPKInfoModel *> *userlistArray,NSString *matchId) {
-                if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
-                    FUSLogInfo(@"不是当前包房");
-                    return ;
-                }
-                [[FUSLiveHelper shareInstance].currentFunctionView fus_setupContentViewWithStatus:status remainTime:remainTime winner:winner content:content userlistArray:userlistArray isShowEntrance:YES];
-            } failure:^(NSString *msg, int code) {
-                FUSLogInfo(@"@%",msg);
-            }];
-        }
+       
+        [FUSLiveHelper shareInstance].roomInfoModel.reminderKeys = reminderKey;
+        [self.liveFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
         
         
-        [FUSLiveHelper shareInstance].streamModel.url = streamUrl;
-        
-        if (![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP]] &&
-            ![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT]]) {
-            [[FUSLiveHelper shareInstance] streamModel].ip = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP];
-            [[FUSLiveHelper shareInstance] streamModel].port = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT];
-        }
-        
-        
-        if ([FUSLiveHelper shareInstance].roomInfoModel) {
-            [[FUSLiveHelper shareInstance].roomInfoModel fus_setValueWithModel:roomInfoModel];
-        } else {
-            [FUSLiveHelper shareInstance].roomInfoModel = roomInfoModel;
-        }
         
-        [self.liveFunctionView fus_setupWithRoomInfoModel:roomInfoModel];
-        [FUSSocketMessageHelper fus_socketRoomConnectWithRoomId:roomInfoModel.roomId];
+        [FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
+            
+            if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
+                FUSLogInfo(@"不是当前包房");
+                return ;
+            }
+            
+            // PKview更新
+            if (pkInfo.integerValue == 1) { //在pk中
+                // 审核下不显示PK
+                if(FUSConfig.sharedInstanced.devConfigs.appStatus) return;
+                [FUSLiveHttpHelper fus_getRoomPKInfoWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId  success:^(NSString *status, NSString *remainTime, NSString *winner, NSString *content,NSString *isLikePk,NSArray<FUSPKRoomPKInfoModel *> *userlistArray,NSString *matchId) {
+                    if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
+                        FUSLogInfo(@"不是当前包房");
+                        return ;
+                    }
+                    [[FUSLiveHelper shareInstance].currentFunctionView fus_setupContentViewWithStatus:status remainTime:remainTime winner:winner content:content userlistArray:userlistArray isShowEntrance:YES];
+                } failure:^(NSString *msg, int code) {
+                    FUSLogInfo(@"@%",msg);
+                }];
+            }
+            
+            
+            [FUSLiveHelper shareInstance].streamModel.url = streamUrl;
+            
+            if (![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP]] &&
+                ![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT]]) {
+                [[FUSLiveHelper shareInstance] streamModel].ip = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP];
+                [[FUSLiveHelper shareInstance] streamModel].port = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT];
+            }
+            
+            
+            if ([FUSLiveHelper shareInstance].roomInfoModel) {
+                [[FUSLiveHelper shareInstance].roomInfoModel fus_setValueWithModel:roomInfoModel];
+            } else {
+                [FUSLiveHelper shareInstance].roomInfoModel = roomInfoModel;
+            }
+            
+            [self.liveFunctionView fus_setupWithRoomInfoModel:roomInfoModel];
+            [FUSSocketMessageHelper fus_socketRoomConnectWithRoomId:roomInfoModel.roomId];
+            
+            if ([roomInfoModel.livestate intValue] == 1) {
+                [[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_LIVE_STATE_CHANGE object:@"1"];
+            }
+                    
+        } failure:^(NSDictionary *errorDict, NSString *msg, int code) {
+            [FUSDialogView fus_showDialog:msg];
+        }];
         
-        if ([roomInfoModel.livestate intValue] == 1) {
-            [[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_LIVE_STATE_CHANGE object:@"1"];
-        }
-                
-    } failure:^(NSDictionary *errorDict, NSString *msg, int code) {
+        // 拉取在线用户列表
+        [FUSLiveHttpHelper fus_requestRoomOnlineUsersWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId count:@"0" success:^(NSArray *usersArr) {
+            
+            [self.liveFunctionView fus_setupOnlineUsers:usersArr];
+            
+        } failure:^(NSString *msg, int code) {
+            FUSLogError(@"拉取在线用户列表失败:%@",msg);
+        }];
         
+    } failure:^(NSDictionary * _Nonnull errorDict, NSString * _Nonnull msg, int code) {
         [FUSDialogView fus_showDialog:msg];
-        FUSLogVerbose(@"");
-    }];
-    
-    // 拉取在线用户列表
-    [FUSLiveHttpHelper fus_requestRoomOnlineUsersWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId count:@"0" success:^(NSArray *usersArr) {
-        
-        [self.liveFunctionView fus_setupOnlineUsers:usersArr];
-        
-    } failure:^(NSString *msg, int code) {
-        FUSLogError(@"拉取在线用户列表失败");
     }];
 }
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/View/FUSStartPageSplashView.m

@@ -37,7 +37,7 @@
 
 -(void)fus_createUI{
     self.backgroundColor = [UIColor whiteColor];
-    NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_1" ofType:@"png"];
+    NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_2" ofType:@"png"];
     UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
     self.logoImgView = [[UIImageView alloc] initWithImage:image];
     [self addSubview:self.logoImgView];