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

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings

@@ -3182,6 +3182,10 @@
 
 "收到%@" = "收到%@";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你追踪她们。";
+
+"快点去关注自己喜欢的主播吧~" = "快点去追踪自己喜欢的主播吧~";
+
 "绑定邀请码" = "绑定邀请码";
 
 "邀请码QRCode保存失败" = "邀请码QRCode保存失败";

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

@@ -3182,6 +3182,10 @@
 
 "收到%@" = "收到%@";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "%@的尊貴新玩家，歡迎遠道而來。\n主播們在等你，希望你追蹤她們。";
+
+"快点去关注自己喜欢的主播吧~" = "快點去追蹤自己喜歡的主播吧~";
+
 "绑定邀请码" = "綁定邀請碼";
 
 "邀请码QRCode保存失败" = "邀請碼QRCode保存失敗";

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings

@@ -3182,6 +3182,10 @@
 
 "收到%@" = "Received %@";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "%@ welcome you to come from afar. Live broadcasters are waiting for you to follow";
+
+"快点去关注自己喜欢的主播吧~" = "Hurry up and follow your favorite broadcasters~";
+
 "绑定邀请码" = "Bind invitation code";
 
 "邀请码QRCode保存失败" = "Failed to save invitation code QRCode";

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings

@@ -3160,6 +3160,10 @@
 
 "收到%@" = "%@を受け取りました";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "%@新規プレイヤーの皆様、遠方からのご来場大歓迎です。 ライブ配信者があなたを待っています。フォローをお待ちしています";
+
+"快点去关注自己喜欢的主播吧~" = "急いでお気に入りの配信者をフォローしましょう〜";
+
 "绑定邀请码" = "招待コードをバインドする";
 
 "邀请码QRCode保存失败" = "招待コードQRコードの保存に失敗しました";

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings

@@ -3154,6 +3154,10 @@
 
 "收到%@" = "ได้รับ %@";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "เรียนผู้เล่นใหม่ของ %@ ยินดีต้อนรับที่มาจากแดนไกล ผู้ถ่ายทอดสดกำลังรอคุณอยู่และคาดหวังให้คุณติดตาม";
+
+"快点去关注自己喜欢的主播吧~" = "เร็วเข้าและติดตามผู้ถ่ายทอดสดคนโปรดของคุณ~";
+
 "绑定邀请码" = "โค้ดเชิญผูกมัด";
 
 "邀请码QRCode保存失败" = "ไม่สามารถบันทึกรหัสคำเชิญ QRCode ได้";

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings

@@ -3160,6 +3160,10 @@
 
 "收到%@" = "Đã nhận %@";
 
+"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。" = "Kính gửi những người chơi mới của %@, chào mừng các bạn từ phương xa đến. Các đài truyền hình trực tiếp đang chờ đợi bạn và mong đợi sự theo dõi của bạn";
+
+"快点去关注自己喜欢的主播吧~" = "Hãy nhanh tay theo dõi những người phát sóng yêu thích của bạn~";
+
 "绑定邀请码" = "Mã mời liên kết";
 
 "邀请码QRCode保存失败" = "Không lưu được mã mời QRCode";
@@ -3177,4 +3181,3 @@
 "扫描邀请码QRCode图片完成绑定" = "Quét mã mời QRCode hình ảnh để hoàn tất việc đóng sách";
 
 "请联系您的邀请人获取邀请码" = "Vui lòng liên hệ với người mời để lấy mã mời";
-

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSChatCallHelper.swift

@@ -93,9 +93,9 @@ import SJAttributesStringMaker
     let otherCallVersionStage = BehaviorRelay<Int>(value: 0)
     
     /// 透传的cmd信息
-    let chatIMCMDMessage = PublishSubject<(Int, [String: Any], EMMessage)>()
-    @objc public func fus_receiveChatIMCMDMessage(cmd: Int, dataDict: [String: Any], msg: EMMessage){
-        chatIMCMDMessage.onNext((cmd, dataDict, msg))
+    let chatIMCMDMessage = PublishSubject<(Int, [String: Any], EMMessage, String)>()
+    @objc public func fus_receiveChatIMCMDMessage(cmd: Int, dataDict: [String: Any], msg: EMMessage, talkId:NSString){
+        chatIMCMDMessage.onNext((cmd, dataDict, msg, String(talkId)))
     }
     /// 透传的socket
     let socketListener = PublishSubject<(Int, [String: Any])>()
@@ -875,7 +875,7 @@ import SJAttributesStringMaker
     
     private func setupCMDMessage() {
         
-        chatIMCMDMessage.subscribe(onNext: {[weak self] cmd, json, msg in
+        chatIMCMDMessage.subscribe(onNext: {[weak self] cmd, json, msg, fromUserId in
             guard let self = self else { return }
             guard let cmd = FUSIMMessageCMD.init(rawValue: cmd) else { return }
             
@@ -923,11 +923,12 @@ import SJAttributesStringMaker
                 let otherVersion = json.fus_intValue(key: AnyHashable.ChatParam.callVersion)
                 self.otherCallVersionStage.accept(otherVersion)
                 
+            
                 let orderId = json[AnyHashable.CallParam.orderId] as? String ?? ""
-                let fromUid = msg.from ?? ""
+                let fromUid = fromUserId
 //                let nickname = json[AnyHashable.CallParam.nickname].stringValue
-                
                 self.answerCallResponHandler(fromUid: fromUid, orderId: orderId)
+            
                 
             case .receiverRefuse, .receiverNoResponse, .callerCancle, .hangUpCall, .busyToAnswerCall:
                 // 对方拒绝了自己的通话邀请

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

@@ -3650,8 +3650,9 @@ typedef NS_ENUM(NSInteger, FUSIMChatMessageType) {
         //更新对方的个人信息
         [self fus_updateReceiveMessageChatUserInfoDBWithMessage:message];
         
+        NSString *talkId = [NSString stringWithFormat:@"%@",message.from];
         // 传入信息处理(历史问题),处理7，8，11，12，13，14，16，17，20，21，24
-        [FUSChatCallHelper.shared fus_receiveChatIMCMDMessageWithCmd:cmdType dataDict:extraDict msg:message];
+        [FUSChatCallHelper.shared fus_receiveChatIMCMDMessageWithCmd:cmdType dataDict:extraDict msg:message talkId:talkId];
         
         switch (cmdType) {
 //            case CMD_INSTRUCT_CODE_RECEIVER_IS_LIVING: // 如果对方正在直播 直接挂断

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

@@ -129,15 +129,25 @@
 // 搭建标题 View
 - (void)initTitleView
 {
-    _titleView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, self.width, 0)];
-    if (_isFullScreen) _titleView.height = 0;
+    _titleView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, self.width, 168 + UIView.fus_SafeTop)];
     [self addSubview:_titleView];
-    UILabel *titleLabel = [[UILabel alloc] initWithFrame:_titleView.bounds];
-    titleLabel.font = [UIFont fus_themeFont:15];
-    titleLabel.text = [NSString fus_localString:@""];
-    titleLabel.textColor = [UIColor whiteColor];
+    
+    UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 30 + UIView.fus_SafeTop, 183, 43)];
+    imageView.centerX = _titleView.width / 2.0;
+    imageView.contentMode = UIViewContentModeScaleAspectFit;
+    imageView.image = [UIImage com_ImageNamed:@"common_push_notice_img"];
+    [_titleView addSubview:imageView];
+    
+    UILabel *titleLabel = [[UILabel alloc] init];
+    titleLabel.font = [UIFont fus_themeMediumFont:13];
+    titleLabel.numberOfLines = 0;
+    titleLabel.textColor = [UIColor colorWithWhite:1 alpha:0.8];
+    titleLabel.text = [NSString stringWithFormat:[NSString fus_localString:@"%@的尊贵新玩家，欢迎远道而来。\n主播们在等你，希望你关注她们。"],FUSConfig.sharedInstanced.appConfigs.appName];
     titleLabel.textAlignment = NSTextAlignmentCenter;
-    titleLabel.center = CGPointMake(_titleView.width / 2.0, _titleView.height / 2.0);
+    CGSize size = [titleLabel.text sizeWithFont:titleLabel.font maxWidth:UIView.fus_screenW - 120 maxHeight:MAXFLOAT];
+    titleLabel.size = size;
+    titleLabel.y = imageView.bottom + 26;
+    titleLabel.centerX = imageView.centerX;
     [_titleView addSubview:titleLabel];
 }
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift

@@ -263,18 +263,16 @@ import FUSCommon
 //            FUSIndicator.dismissProgress()
             FUSLoadingIndicator.fus_dismiss()
             FUSLiveHelper.shareInstance().roomScopeType = scopeType
-            switch scopeType{
-            case .open:
-                //TODO: 文案:added by pidan
-                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到全公开模式，所有人可进入房间"))
-            case .password:
-                //TODO: 文案:added by pidan
-                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到私享屋模式，仅追踪直播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动"))
-//            case .intimacy:
-//                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到亲密圈模式，仅亲密好友的用户可进入房间，直播时长不计入直播奖励活动"))
-            @unknown default:
-                break
-            }
+//            switch scopeType{
+//            case .open:
+////                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到全公开模式，所有人可进入房间"))
+//            case .password:
+////                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到私享屋模式，仅追踪直播超过24小时的粉丝可进入房间，直播时长不计入直播奖励活动"))
+////            case .intimacy:
+////                FUSDialogView.fus_showDialog(.fus_localString("房间已切换到亲密圈模式，仅亲密好友的用户可进入房间，直播时长不计入直播奖励活动"))
+//            @unknown default:
+//                break
+//            }
         }, failure: { msg, code in
             
             FUSLoadingIndicator.fus_dismiss()

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSNoticeSettingViewController.m

@@ -53,6 +53,8 @@
 /// 页码
 @property (nonatomic, assign) NSInteger page;
 
+@property (nonatomic, strong) FUSEmptyView *emptyView;
+
 @end
 
 @implementation FUSNoticeSettingViewController
@@ -161,8 +163,12 @@
         
         if (pageList.count == 0) {
             [self.tableView.mj_footer endRefreshingWithNoMoreData];
+            
+            self.tableView.tableFooterView = self.emptyView;
         } else {
             [self.tableView.mj_footer endRefreshing];
+            
+            self.tableView.tableFooterView = nil;
         }
         
         [self.tableView reloadData];
@@ -171,6 +177,17 @@
     }];
 }
 
+
+- (FUSEmptyView *)emptyView{
+    if (!_emptyView) {
+        _emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, self.view.width, 260)];
+        _emptyView.backgroundColor = [UIColor clearColor];
+        [_emptyView fus_setEmptyViewIcon:UIImage.fus_emptyImg title:[NSString fus_localString:@"快点去关注自己喜欢的主播吧~"] buttonTittle:nil];
+    }
+    return _emptyView;
+}
+
+
 - (void)fus_setupFooters {
     
     if (self.liveUserGroup == nil) {