Skip to content

Commit ad60f25

Browse files
author
noahcheng
committed
[iOS] update version to relesse-9.5.0.1458
1 parent 39f370c commit ad60f25

File tree

5 files changed

+67
-86
lines changed

5 files changed

+67
-86
lines changed

iOS/Resources/localized/en.lproj/ChatSalonLocalized.strings

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,3 @@
6262
"Demo.TRTC.Buy.chatroom" = "The number of chat rooms created has reached the maximum. Please go to the Tencent Cloud website (xxx) to enable **IM Audio-Video Chat Room** for your account.";
6363
"Demo.TRTC.Buy.grouplimit" = "The number of groups a user is allowed to create and join has exceeded the limit. Please purchase a package. For pricing details, see xxx.";
6464
"Demo.TRTC.Buy.groupmemberlimit" = "The number of group members has exceeded the limit. Please purchase a package. For pricing details, see xxx.";
65-
"Demo.TRTC.Salon.leave" = "Leave The Room...";

iOS/Resources/localized/zh-Hans.lproj/ChatSalonLocalized.strings

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,3 @@
6262
"Demo.TRTC.Buy.chatroom" = "您当前使用的云通讯账号未开通音视频聊天室功能,创建聊天室数量超过限额,请前往腾讯云官网开通【IM音视频聊天室】,地址:xxx";
6363
"Demo.TRTC.Buy.grouplimit" = "单个用户可创建和加入的群组数量超过了限制,请购买相关套餐,价格地址:xxx";
6464
"Demo.TRTC.Buy.groupmemberlimit" = "群成员数量超过限制,请参考,请购买相关套餐,价格地址:xxx";
65-
"Demo.TRTC.Salon.leave" = "正在退出房间...";
66-
67-

iOS/Source/ui/TRTCChatSalonViewController/TRTCChatSalonRootView.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,6 @@ extension TRTCChatSalonRootView: TRTCChatSalonViewResponder {
556556
func recoveryVoiceSetting() {
557557
}
558558

559-
func showExitTip() {
560-
self.makeToast(String.leaveRoomText, duration: 15.0, position: .center)
561-
}
562-
563-
func dismissTip() {
564-
self.hideToast()
565-
}
566559

567560
func audienceListRefresh() {
568561
seatCollection.reloadData()
@@ -677,8 +670,6 @@ fileprivate extension String {
677670
static let alertAudienceTitle = ChatSalonLocalize("Demo.TRTC.Salon.surewanttoleaveroom")
678671
static let alertAudienceConfirm = ChatSalonLocalize("Demo.TRTC.Salon.audienceconfirm")
679672
static let alertAudienceCancel = ChatSalonLocalize("Demo.TRTC.Salon.waitabit")
680-
static let leaveRoomText = ChatSalonLocalize("Demo.TRTC.Salon.leave")
681-
682673
}
683674

684675
fileprivate extension UIColor {

iOS/Source/ui/TRTCChatSalonViewController/TRTCChatSalonViewModel.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ protocol TRTCChatSalonViewResponder: NSObject {
2828
func showAudioEffectView()
2929
func stopPlayBGM() // 停止播放音乐
3030
func recoveryVoiceSetting() // 恢复音效设置
31-
func showExitTip() //退出房间提示
32-
func dismissTip()
33-
3431
}
3532

3633
class TRTCChatSalonViewModel: NSObject {
@@ -107,7 +104,8 @@ class TRTCChatSalonViewModel: NSObject {
107104
debugPrint("chatSalonUserInfo is nil")
108105
return
109106
}
110-
self.viewResponder?.showExitTip()
107+
108+
viewResponder?.popToPrevious()
111109
isExitingRoom = true
112110
if userId == roomInfo.ownerId && roomType == .anchor {
113111
dependencyContainer.destroyRoom(roomId: "\(roomInfo.roomID)") {
@@ -119,16 +117,12 @@ class TRTCChatSalonViewModel: NSObject {
119117
chatSalon.destroyRoom { [weak self] (code, message) in
120118
guard let `self` = self else { return }
121119
self.isExitingRoom = false
122-
self.viewResponder?.dismissTip()
123-
self.viewResponder?.popToPrevious()
124120
}
125121
return
126122
}
127123
chatSalon.exitRoom { [weak self] (code, message) in
128124
guard let `self` = self else { return }
129125
self.isExitingRoom = false
130-
self.viewResponder?.dismissTip()
131-
self.viewResponder?.popToPrevious()
132126
}
133127
}
134128

0 commit comments

Comments
 (0)