fixed bugs

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/ChatRouter/FUSChatPublicDefine.m

@@ -17,27 +17,27 @@
 
 
 /// 官方消息类型
 /// 官方消息类型
 + (NSString *)fus_officialMsgType {
 + (NSString *)fus_officialMsgType {
-    return @"fus_singleChatMsgType";
+    return @"fus_officialMsgType";
 }
 }
 
 
 /// fusi官方消息类型
 /// fusi官方消息类型
 + (NSString *)fus_fusiAccompanyMsgType {
 + (NSString *)fus_fusiAccompanyMsgType {
-    return @"fus_singleChatMsgType";
+    return @"fus_fusiAccompanyMsgType";
 }
 }
 
 
 /// 官方通知消息类型
 /// 官方通知消息类型
 + (NSString *)fus_notificationMsgType {
 + (NSString *)fus_notificationMsgType {
-    return @"fus_singleChatMsgType";
+    return @"fus_notificationMsgType";
 }
 }
 
 
 /// 声视讯聊天记录消息类型
 /// 声视讯聊天记录消息类型
 + (NSString *)fus_singleLiveRecordType {
 + (NSString *)fus_singleLiveRecordType {
-    return @"fus_singleChatMsgType";
+    return @"fus_singleLiveRecordType";
 }
 }
 
 
 /// 动态消息类型
 /// 动态消息类型
 + (NSString *)fus_newsfeedMsgType {
 + (NSString *)fus_newsfeedMsgType {
-    return @"fus_singleChatMsgType";
+    return @"fus_newsfeedMsgType";
 }
 }
 
 
 #pragma mark - 客服id
 #pragma mark - 客服id

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m

@@ -402,11 +402,11 @@
     
     
     [FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:^(BOOL oldDev) {
     [FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:^(BOOL oldDev) {
         if (oldDev) {
         if (oldDev) {
-            for (int i = 0; i <_views.count; i++) {
-                FUSLinkMicroHeaderView *userView = _views[i];
+            for (int i = 0; i <self.views.count; i++) {
+                FUSLinkMicroHeaderView *userView = self.views[i];
                 userView.cancelAnim = YES;
                 userView.cancelAnim = YES;
-                if (i < _models.count) {
-                    userView.model = [_models objectAtIndex:i];
+                if (i < self.models.count) {
+                    userView.model = [self.models objectAtIndex:i];
                 }else{
                 }else{
                     userView.model = nil;
                     userView.model = nil;
                 }
                 }
@@ -490,7 +490,6 @@
 }
 }
 
 
 /// 更新尺寸
 /// 更新尺寸
-/// @param index 
 - (void)fus_updateHeaderViewSizeWithIndex:(NSInteger)index{
 - (void)fus_updateHeaderViewSizeWithIndex:(NSInteger)index{
 
 
     [UIView animateWithDuration:0.3 animations:^{
     [UIView animateWithDuration:0.3 animations:^{
@@ -499,12 +498,12 @@
         if (FUSLocalizationHelper.isArbicLanguage) {
         if (FUSLocalizationHelper.isArbicLanguage) {
             tempX = self.width - self.height;
             tempX = self.width - self.height;
         }
         }
-        for (int i = 0; i <_views.count; i++) {
-            FUSLinkMicroHeaderView *userView = _views[i];
+        for (int i = 0; i <self.views.count; i++) {
+            FUSLinkMicroHeaderView *userView = self.views[i];
             
             
             CGFloat headerViewW = self.height;
             CGFloat headerViewW = self.height;
-            if ((_models.count*self.height*1.2 + VIEW_MARGIN * (_models.count-1)) > UIView.fus_screenW) {
-                headerViewW = (UIView.fus_screenW - VIEW_MARGIN*(_models.count-1))/(_models.count*1.2);
+            if ((self.models.count*self.height*1.2 + VIEW_MARGIN * (self.models.count-1)) > UIView.fus_screenW) {
+                headerViewW = (UIView.fus_screenW - VIEW_MARGIN*(self.models.count-1))/(self.models.count*1.2);
             }
             }
             userView.size = CGSizeMake(headerViewW, headerViewW);
             userView.size = CGSizeMake(headerViewW, headerViewW);
             
             
@@ -665,7 +664,6 @@
 }
 }
 
 
 /// 处理新列表和老列表的数据
 /// 处理新列表和老列表的数据
-/// @param models
 - (void)fus_dealListDataModels:(NSArray *)models{
 - (void)fus_dealListDataModels:(NSArray *)models{
         
         
     NSDictionary *tempDict = self.modelInfo;
     NSDictionary *tempDict = self.modelInfo;
@@ -874,7 +872,6 @@
 #pragma mark - 接收到通知处理
 #pragma mark - 接收到通知处理
 
 
 /// 用户收到主播发送连麦邀请
 /// 用户收到主播发送连麦邀请
-/// @param noti
 - (void)receiveUserLinkSendMicInviteResult:(NSNotification *)noti{
 - (void)receiveUserLinkSendMicInviteResult:(NSNotification *)noti{
     
     
     FUSSocketMessageModel *messageModel = noti.object;
     FUSSocketMessageModel *messageModel = noti.object;

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m

@@ -86,7 +86,7 @@
     [self.searchBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"fus_home_navi_search_icon"] forState:UIControlStateNormal];
     [self.searchBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"fus_home_navi_search_icon"] forState:UIControlStateNormal];
     
     
     [self.selectedAllBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_unselected"] forState:UIControlStateNormal];
     [self.selectedAllBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_unselected"] forState:UIControlStateNormal];
-    [self.selectedAllBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_selected"] forState:UIControlStateNormal];
+    [self.selectedAllBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_share_check_selected"] forState:UIControlStateSelected];
     
     
     [self.selectedAllBtn setTitle:[NSString fus_localString:@"全选"] forState:UIControlStateNormal];
     [self.selectedAllBtn setTitle:[NSString fus_localString:@"全选"] forState:UIControlStateNormal];
     self.selectedAllBtn.semanticContentAttribute = FUSRTL.isRTL ? UISemanticContentAttributeForceLeftToRight : UISemanticContentAttributeForceRightToLeft;
     self.selectedAllBtn.semanticContentAttribute = FUSRTL.isRTL ? UISemanticContentAttributeForceLeftToRight : UISemanticContentAttributeForceRightToLeft;

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

@@ -149,14 +149,16 @@
     [FUSRouter.chatRouter fus_initiativeHandUpConversation];
     [FUSRouter.chatRouter fus_initiativeHandUpConversation];
     [FUSRouter.chatRouter fus_logOffWithSuccess:nil failure:nil];
     [FUSRouter.chatRouter fus_logOffWithSuccess:nil failure:nil];
     [[FUSLoginHelper sharedInstance] logOut];
     [[FUSLoginHelper sharedInstance] logOut];
-    
-    [FUSAlertView showAlertWithTitle:nil message:message cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {
     // 转跳到启动页
     // 转跳到启动页
     FUSStartPageViewController *startPageVC = [[FUSStartPageViewController alloc] initNeedWaitTime:NO];
     FUSStartPageViewController *startPageVC = [[FUSStartPageViewController alloc] initNeedWaitTime:NO];
     UINavigationController *navGuide = [[UINavigationController alloc] initWithRootViewController:startPageVC];
     UINavigationController *navGuide = [[UINavigationController alloc] initWithRootViewController:startPageVC];
     [[[[UIApplication sharedApplication] delegate] window] setRootViewController:navGuide];
     [[[[UIApplication sharedApplication] delegate] window] setRootViewController:navGuide];
     [navGuide popToRootViewControllerAnimated:YES];
     [navGuide popToRootViewControllerAnimated:YES];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [FUSAlertView showAlertWithTitle:nil message:message cancelButtonTitle:[NSString fus_localString:@"确定"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {
         }];
         }];
+    });
 }
 }
 
 
 // 主播推荐
 // 主播推荐

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Search/Controller/FUSMainSearchViewController.m

@@ -126,7 +126,7 @@
     _searchTableView.tableFooterView = [[UIView alloc] init];
     _searchTableView.tableFooterView = [[UIView alloc] init];
     _searchTableView.delegate = self;
     _searchTableView.delegate = self;
     _searchTableView.dataSource = self;
     _searchTableView.dataSource = self;
-    [_searchTableView registerNib:[UINib nibWithNibName:CELL_INDENTIFIER bundle:[FUSUserCenterBunble bundle]] forCellReuseIdentifier:CELL_INDENTIFIER];
+    [_searchTableView registerNib:[UINib nibWithNibName:CELL_INDENTIFIER bundle:[FUSCommonBundle bundle]] forCellReuseIdentifier:CELL_INDENTIFIER];
     _searchTableView.backgroundColor = UIColor.fus_appBGColor;
     _searchTableView.backgroundColor = UIColor.fus_appBGColor;
     self.panScrollableView = _searchTableView;
     self.panScrollableView = _searchTableView;
     if (_searchType == FUSSearchTypePeopleNetwork || _searchType == FUSSearchTypeIntimacyNetwork) {
     if (_searchType == FUSSearchTypePeopleNetwork || _searchType == FUSSearchTypeIntimacyNetwork) {