Skip to content

pidan / FuSiLive

Go to a project
Commit b1d8b614 by ludi
Options

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

parents d1f9847b 400bae57
Inline Side-by-side
Showing with 11 additions and 11 deletions
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSPublicModels/Live/FUSRoomInfoModel.h
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
@property (nonatomic, strong) FUSLiveThemeModel *theme; @property (nonatomic, strong) FUSLiveThemeModel *theme;
/// 私享房信息 /// 私享房信息
@property (nonatomic, strong) FUSRoomEncryptionData *encryptionData; @property (nonatomic, strong) FUSRoomEncryptionData *__nullable encryptionData;
@property (nonatomic, copy) NSArray<NSString *> *reminderKeys; @property (nonatomic, copy) NSArray<NSString *> *reminderKeys;
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatService.m
...@@ -2524,14 +2524,14 @@ ...@@ -2524,14 +2524,14 @@
liveTitle = [NSString fus_localString:@"我的直播開始啦"]; liveTitle = [NSString fus_localString:@"我的直播開始啦"];
liveContent = [NSString fus_localString:@"房間已開好，快來一起玩耍吧"]; liveContent = [NSString fus_localString:@"房間已開好，快來一起玩耍吧"];
} else { } else {
liveTitle = [NSString fus_versionLocalString:@"我在私密屋直播"]; liveTitle = [NSString fus_versionLocalString:@"我在私享屋直播"];
liveContent = [NSString fus_versionLocalString:@"需要输入密码进入直播屋"]; liveContent = [NSString fus_versionLocalString:@"需要输入密码进入直播屋"];
} }
[self fus_sendLiveRoomShareWithRoomId:roomModel.roomId [self fus_sendLiveRoomShareWithRoomId:roomModel.roomId
pullFlowUrl:roomModel.publishUrl pullFlowUrl:roomModel.publishUrl
liveTitle:liveTitle liveTitle:liveTitle
roomName:roomModel.nickName roomName:roomModel.nickName
content:[NSString fus_localString:@"房間已開好，快來一起玩耍吧"] content:liveContent
roomCover:roomModel.face roomCover:roomModel.face
password:password password:password
toUser:userID toUser:userID
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSShareView/View/FUSShareToolSheetView.swift
...@@ -228,7 +228,7 @@ var isShowShareToolSheetView = true ...@@ -228,7 +228,7 @@ var isShowShareToolSheetView = true
if FUSLiveHelper.shareInstance().roomScopeType == .password { if FUSLiveHelper.shareInstance().roomScopeType == .password {
self.passwordLabel.isHidden = false self.passwordLabel.isHidden = false
self.passwordDescLabel.isHidden = false self.passwordDescLabel.isHidden = false
self.passwordLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.password self.passwordLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.password ?? ""
} else { } else {
self.passwordLabel.isHidden = true self.passwordLabel.isHidden = true
self.passwordDescLabel.isHidden = true self.passwordDescLabel.isHidden = true
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPasswordView.swift
...@@ -112,7 +112,7 @@ import RxSwift ...@@ -112,7 +112,7 @@ import RxSwift
let tipLabel = UILabel() let tipLabel = UILabel()
tipLabel.font = .fus_themeFont(13) tipLabel.font = .fus_themeFont(13)
tipLabel.textColor = .fus_textColorLight2() tipLabel.textColor = .fus_textColorLight2()
tipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.passwordShow tipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.passwordShow ?? ""
contentView.addSubview(tipLabel) contentView.addSubview(tipLabel)
tipLabel.snp.makeConstraints { make in tipLabel.snp.makeConstraints { make in
make.top.equalTo(self.passwordView.snp.bottom).offset(33) make.top.equalTo(self.passwordView.snp.bottom).offset(33)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
...@@ -103,7 +103,7 @@ import FUSCommon ...@@ -103,7 +103,7 @@ import FUSCommon
//这里特殊用户有不一样的逻辑 //这里特殊用户有不一样的逻辑
let iconImagesList = ["live_start_openScope_cell","live_start_passwordScope_cell"/*,"live_start_intimacyScope_cell"*/] let iconImagesList = ["live_start_openScope_cell","live_start_passwordScope_cell"/*,"live_start_intimacyScope_cell"*/]
let titlesList = [String.fus_versionLocalString("公开屋"), .fus_versionLocalString("私享屋")/*, .fus_localString("亲密圈")*/] let titlesList = [String.fus_versionLocalString("公开屋"), .fus_versionLocalString("私享屋")/*, .fus_localString("亲密圈")*/]
let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_versionLocalString("已关闭窗帘，玩家输入密码打开")/*, .fus_localString("仅亲密好友可进入房间")*/] let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_versionLocalString("玩家正确输入密码后可进入屋内")/*, .fus_localString("仅亲密好友可进入房间")*/]
let itemHeight = 56.0 let itemHeight = 56.0
privacyContentView.snp.makeConstraints { make in privacyContentView.snp.makeConstraints { make in
...@@ -116,7 +116,7 @@ import FUSCommon ...@@ -116,7 +116,7 @@ import FUSCommon
for (index, iconStr) in iconImagesList.enumerated() { for (index, iconStr) in iconImagesList.enumerated() {
var canSelect = true var canSelect = true
if index == 0 { if index == 0 {
if FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.liveScopeOpen.intValue == -1 { if FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.liveScopeOpen.intValue == -1 {
canSelect = false canSelect = false
} }
} }
...@@ -183,7 +183,7 @@ import FUSCommon ...@@ -183,7 +183,7 @@ import FUSCommon
switch index{ switch index{
case 0: case 0:
if FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.liveScopeOpen.intValue == -1 { if FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.liveScopeOpen.intValue == -1 {
self.scopeType = .password self.scopeType = .password
} else { } else {
self.scopeType = .open self.scopeType = .open
...@@ -350,7 +350,7 @@ class FUSLiveStartSetPrivacyItemView: UIView { ...@@ -350,7 +350,7 @@ class FUSLiveStartSetPrivacyItemView: UIView {
cantSelectTipLabel.numberOfLines = 0 cantSelectTipLabel.numberOfLines = 0
bgTapBtn.addSubview(cantSelectTipLabel) bgTapBtn.addSubview(cantSelectTipLabel)
cantSelectTipLabel.isHidden = true cantSelectTipLabel.isHidden = true
cantSelectTipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.liveScopeOpenShow cantSelectTipLabel.text = FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.liveScopeOpenShow ?? ""
cantSelectTipLabel.snp.makeConstraints { make in cantSelectTipLabel.snp.makeConstraints { make in
make.right.equalToSuperview().inset(12) make.right.equalToSuperview().inset(12)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartView.swift
...@@ -204,7 +204,7 @@ import FUSCommon ...@@ -204,7 +204,7 @@ import FUSCommon
if succeed { if succeed {
model.scopeType = scopeType model.scopeType = scopeType
model.password = password model.password = password
FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.password = password FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.password = password
self?.startLiveModel.accept(model) self?.startLiveModel.accept(model)
} }
}) })
...@@ -229,7 +229,7 @@ import FUSCommon ...@@ -229,7 +229,7 @@ import FUSCommon
FUSLiveStartSetPasswordView.fus_create(clickHandler: { [weak self] succeed, password in FUSLiveStartSetPasswordView.fus_create(clickHandler: { [weak self] succeed, password in
if succeed { if succeed {
model.password = password model.password = password
FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData.password = password FUSLiveHelper.shareInstance().roomInfoModel?.encryptionData?.password = password
self?.startLiveModel.accept(model) self?.startLiveModel.accept(model)
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment