Merge branch 'feature/私享房需求' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私享房需求

# Conflicts:
#	DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.h
#	DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
#	DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
#	FuSiLive/AppDelegate.m

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

@@ -21,6 +21,11 @@
 
 
 #define FUSUserModule BFModule(FUSUserRouterProtocol)
 #define FUSUserModule BFModule(FUSUserRouterProtocol)
 
 
+/**
+ 登录结果回调，包括成功失败回调
+ */
+typedef void(^FUSLoginSucceedListenerHandler)(void);
+
 NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_BEGIN
 
 
 @protocol FUSUserRouterProtocol <BifrostModuleProtocol>
 @protocol FUSUserRouterProtocol <BifrostModuleProtocol>
@@ -35,6 +40,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 - (void)fus_checkAppStatus;
 - (void)fus_checkAppStatus;
 
 
+/// 监听是否有已经登录的监听
+- (void)fus_loginSucceedListener:(FUSLoginSucceedListenerHandler)loginSucceedListenerHandler;
+
 - (void)fus_enterUserZone:(NSString *)userId;
 - (void)fus_enterUserZone:(NSString *)userId;
 
 
 - (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat;
 - (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat;
@@ -46,6 +54,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///   - extraParm: 额外参数,key参考FUSCommonExtraKeys类
 ///   - extraParm: 额外参数,key参考FUSCommonExtraKeys类
 - (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat extraParm:(NSDictionary *)extraParm;
 - (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat extraParm:(NSDictionary *)extraParm;
 
 
+- (void)fus_enterTopicDetailPage:(NSString *)topicId;
+
 - (void)fus_enterMotorWareVC;
 - (void)fus_enterMotorWareVC;
 
 
 /// 进入任务中心
 /// 进入任务中心

FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>NotificationService.xcscheme_^#shared#^_</key>
 		<key>NotificationService.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>86</integer>
+			<integer>87</integer>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 </dict>
 </dict>

FuSiLive/FuSiLive.entitlements

@@ -8,5 +8,9 @@
 	<array>
 	<array>
 		<string>Default</string>
 		<string>Default</string>
 	</array>
 	</array>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:fusiclub.com</string>
+	</array>
 </dict>
 </dict>
 </plist>
 </plist>

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>89</integer>
+			<integer>84</integer>
 		</dict>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>88</integer>
+			<integer>83</integer>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 </dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>84</integer>
+			<integer>89</integer>
 		</dict>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>85</integer>
+			<integer>86</integer>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 </dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>83</integer>
+			<integer>85</integer>
 		</dict>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>87</integer>
+			<integer>88</integer>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 </dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Other/FUSLoginHelper.h

@@ -29,6 +29,9 @@ typedef void(^loginCompletion)(int code, NSString *msg);
  */
  */
 - (void)fus_readyToLogInWithCompletion:(loginCompletion)loginCompletion;
 - (void)fus_readyToLogInWithCompletion:(loginCompletion)loginCompletion;
 
 
+/// 监听是否有已经登录的监听
+- (void)fus_loginSucceedListener:(FUSLoginSucceedListenerHandler)loginSucceedListenerHandler;
+
 /**
 /**
  手机号码登录
  手机号码登录
  
  

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

@@ -52,6 +52,9 @@
 // Socket 校验 Timer
 // Socket 校验 Timer
 @property (nonatomic, strong) NSTimer *socketCheckTimer;
 @property (nonatomic, strong) NSTimer *socketCheckTimer;
 
 
+/// 登录状态监听
+@property (nonatomic, strong) NSMutableArray<FUSLoginSucceedListenerHandler> *loginListeners;
+
 @end
 @end
 
 
 @implementation FUSLoginHelper
 @implementation FUSLoginHelper
@@ -71,6 +74,14 @@
     return instance;
     return instance;
 }
 }
 
 
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.loginListeners = [NSMutableArray array];
+    }
+    return self;
+}
+
 /**
 /**
  登录准备
  登录准备
  
  
@@ -357,6 +368,13 @@
     if (_loginCompletion) _loginCompletion(1, [NSString fus_localString:@"成功"]);
     if (_loginCompletion) _loginCompletion(1, [NSString fus_localString:@"成功"]);
     _loginCompletion = nil;
     _loginCompletion = nil;
     
     
+    NSArray *loginListeners = [self.loginListeners copy];
+    for (FUSLoginSucceedListenerHandler listener in loginListeners) {
+        listener();
+    }
+    
+    [self.loginListeners removeAllObjects];
+    
     // 注册监听相关通知
     // 注册监听相关通知
     [[FUSRecieveNotificationHelper sharedInstance] fus_setup];
     [[FUSRecieveNotificationHelper sharedInstance] fus_setup];
     
     
@@ -468,6 +486,23 @@
     [[FUSSwiftCacheDataShare share] fus_dealLoginSuccess];
     [[FUSSwiftCacheDataShare share] fus_dealLoginSuccess];
 }
 }
 
 
+
+
+- (void)fus_loginSucceedListener:(FUSLoginSucceedListenerHandler)loginSucceedListenerHandler {
+    
+    if (![FUSCacheDataShare shareStore].userVerifyInfo.uid) {
+        
+        if (loginSucceedListenerHandler) {
+            [self.loginListeners addObject:loginSucceedListenerHandler];
+        }
+        return;
+    } else {
+        if (loginSucceedListenerHandler) {
+            loginSucceedListenerHandler();
+        }
+    }
+}
+
 #pragma mark - Method
 #pragma mark - Method
 /**
 /**
  进行 Socket 连接
  进行 Socket 连接

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Controller/FUSNewsFeedDetailViewController.m

@@ -1255,7 +1255,7 @@
     FUSMyZoneViewController *zoneViewCtrl = [[FUSMyZoneViewController alloc] init];
     FUSMyZoneViewController *zoneViewCtrl = [[FUSMyZoneViewController alloc] init];
     zoneViewCtrl.isFromLiveRoomChat = NO;
     zoneViewCtrl.isFromLiveRoomChat = NO;
     zoneViewCtrl.zoneUid = zoneId;
     zoneViewCtrl.zoneUid = zoneId;
-    zoneViewCtrl.behaviorSrc = 4;
+    zoneViewCtrl.behaviorSrc = @"4";
     [[[UIViewController fus_topViewController] navigationController] pushViewController:zoneViewCtrl animated:YES];
     [[[UIViewController fus_topViewController] navigationController] pushViewController:zoneViewCtrl animated:YES];
 //    [self fus_hideKeyboard];
 //    [self fus_hideKeyboard];
 }
 }

Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m

@@ -89,6 +89,11 @@
 
 
 #pragma mark - Protocal Methods
 #pragma mark - Protocal Methods
 
 
+/// 监听是否有已经登录的监听
+- (void)fus_loginSucceedListener:(FUSLoginSucceedListenerHandler)loginSucceedListenerHandler {
+    [FUSLoginHelper.sharedInstance fus_loginSucceedListener:loginSucceedListenerHandler];
+}
+
 - (FUSPublicHalfScreenPhotoView *)createHalfScreenPhotoViewWithFrame:(CGRect)frame {
 - (FUSPublicHalfScreenPhotoView *)createHalfScreenPhotoViewWithFrame:(CGRect)frame {
     return [[FUSHalfScreenPhotoView alloc] initWithFrameWithClearManager:frame];
     return [[FUSHalfScreenPhotoView alloc] initWithFrameWithClearManager:frame];
 }
 }
@@ -116,55 +121,7 @@
         case 4: {
         case 4: {
             
             
             NSString *topicId = [info[@"topicId"] description];
             NSString *topicId = [info[@"topicId"] description];
-            if ([NSString isNull:topicId]) {
-                return;
-            }
-            
-            [FUSNewsFeedHttpHelper fus_requestDynamicTopicInfo:topicId success:^(NSDictionary * _Nonnull topicInfo, NSDictionary * _Nonnull contentDict, NSString * _Nonnull shareLink) {
-                
-                FUSNewsFeedListModel *listModel = [FUSNewsFeedListModel fus_modelWithDict:topicInfo];
-                if (![NSDictionary isNull:contentDict]) {
-                    listModel.subtitle = contentDict[@"text"];
-                    listModel.title = contentDict[@"title"];
-                    
-                    NSArray *videos = contentDict[@"videos"];
-                    NSArray *images = contentDict[@"images"];
-                    
-                    NSMutableArray *videoModels = [NSMutableArray array];
-                    for (NSDictionary *dict in videos) {
-                        FUSNewsFeedVideoModel *model = [FUSNewsFeedVideoModel fus_modelWithDict:dict];
-                        [videoModels addObject:model];
-                    }
-                    listModel.videos = videoModels;
-                    
-                    NSMutableArray *imageModels = [NSMutableArray array];
-                    for (NSDictionary *dict in images) {
-                        FUSNewsFeedImageModel *model = [FUSNewsFeedImageModel fus_modelWithDict:dict];
-                        [imageModels addObject:model];
-                    }
-                    listModel.images = imageModels;
-                }
-                
-                [FUSNewsFeedDetailViewController fus_showNewsFeedDetailVCWithNewsFeedModel:listModel rootVC:[UIViewController fus_topViewController]];
-                
-            } failure:^(NSDictionary * _Nonnull dict, int code) {
-                
-                if (code == -6024) {
-                    FUSNewsFeedListModel *listModel = [[FUSNewsFeedListModel alloc] init];
-                    listModel.selfLock = NO;
-                    listModel.currency = [dict[@"currency"] integerValue];
-                    listModel.price = [dict[@"price"] description];
-                    listModel.topicId = topicId;
-                    [FUSNewsFeedDetailViewController fus_showNewsFeedDetailVCWithNewsFeedModel:listModel rootVC:[UIViewController fus_topViewController]];
-                    return;
-                }
-                
-                [FUSDialogView fus_showDialog:dict[@"msg"]];
-                
-                FUSNewsFeedListViewController *feedListVC = [[FUSNewsFeedListViewController alloc] init];
-                feedListVC.from = 1;
-                [[UIViewController fus_topViewController].navigationController pushViewController:feedListVC animated:YES];
-            }];
+            [self fus_enterTopicDetailPage:topicId];
             break;
             break;
         }
         }
         default:
         default:
@@ -172,6 +129,58 @@
     }
     }
 }
 }
 
 
+- (void)fus_enterTopicDetailPage:(NSString *)topicId {
+    if ([NSString isNull:topicId]) {
+        return;
+    }
+    
+    [FUSNewsFeedHttpHelper fus_requestDynamicTopicInfo:topicId success:^(NSDictionary * _Nonnull topicInfo, NSDictionary * _Nonnull contentDict, NSString * _Nonnull shareLink) {
+        
+        FUSNewsFeedListModel *listModel = [FUSNewsFeedListModel fus_modelWithDict:topicInfo];
+        if (![NSDictionary isNull:contentDict]) {
+            listModel.subtitle = contentDict[@"text"];
+            listModel.title = contentDict[@"title"];
+            
+            NSArray *videos = contentDict[@"videos"];
+            NSArray *images = contentDict[@"images"];
+            
+            NSMutableArray *videoModels = [NSMutableArray array];
+            for (NSDictionary *dict in videos) {
+                FUSNewsFeedVideoModel *model = [FUSNewsFeedVideoModel fus_modelWithDict:dict];
+                [videoModels addObject:model];
+            }
+            listModel.videos = videoModels;
+            
+            NSMutableArray *imageModels = [NSMutableArray array];
+            for (NSDictionary *dict in images) {
+                FUSNewsFeedImageModel *model = [FUSNewsFeedImageModel fus_modelWithDict:dict];
+                [imageModels addObject:model];
+            }
+            listModel.images = imageModels;
+        }
+        
+        [FUSNewsFeedDetailViewController fus_showNewsFeedDetailVCWithNewsFeedModel:listModel rootVC:[UIViewController fus_topViewController]];
+        
+    } failure:^(NSDictionary * _Nonnull dict, int code) {
+        
+        if (code == -6024) {
+            FUSNewsFeedListModel *listModel = [[FUSNewsFeedListModel alloc] init];
+            listModel.selfLock = NO;
+            listModel.currency = [dict[@"currency"] integerValue];
+            listModel.price = [dict[@"price"] description];
+            listModel.topicId = topicId;
+            [FUSNewsFeedDetailViewController fus_showNewsFeedDetailVCWithNewsFeedModel:listModel rootVC:[UIViewController fus_topViewController]];
+            return;
+        }
+        
+        [FUSDialogView fus_showDialog:dict[@"msg"]];
+        
+        FUSNewsFeedListViewController *feedListVC = [[FUSNewsFeedListViewController alloc] init];
+        feedListVC.from = 1;
+        [[UIViewController fus_topViewController].navigationController pushViewController:feedListVC animated:YES];
+    }];
+}
+
 - (void)fus_enterUserZone:(NSString *)userId {
 - (void)fus_enterUserZone:(NSString *)userId {
     [self fus_enterUserZone:userId isFromLiveRoomChat:FUSConfig.sharedInstanced.liveConfigs.isInRoom];
     [self fus_enterUserZone:userId isFromLiveRoomChat:FUSConfig.sharedInstanced.liveConfigs.isInRoom];
 }
 }