【TUILiveKit】【Android】【iOS】optimize code

lleihai123 · MinTate · commit 2da855df8f36 · 2024-04-26T17:13:34.000+08:00
diff --git a/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/TUILivePreviewFragment.java b/Android/tuilivekit/src/main/java/com/trtc/uikit/livekit/TUILivePreviewFragment.java
@@ -55,7 +55,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         liveRoomTransaction.commit();
 
         LiveDefine.RoomParams params = new LiveDefine.RoomParams();
-        params.maxSeatCount = 8;
+        //The default value is the maximum number of seat supported by the package
+        params.maxSeatCount = 0;
         params.seatMode = TUIRoomDefine.SeatMode.APPLY_TO_TAKE;
         params.roomName = TUILogin.getNickName();
         mTUIVoiceRoomFragment = new TUIVoiceRoomFragment(mVoiceRoomId, LiveDefine.RoomBehavior.PREPARE_CREATE, params);
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -7,7 +7,7 @@ _简体中文 | [English](README.md)_
 ## 产品特性
 
 <p align="center">
-  <img src="Preview/tuilivekit-zh.png"/>
+  <img src="https://github.com/Tencent-RTC/TUILiveKit/blob/main/Preview/tuilivekit-zh.png"/>
 </p>
 
 - **完善的 UI 交互**：我们提供含 UI 的开源组件 TUILiveKit，可以节省您 90% 开发时间，您只需要花费30分钟就可以拥有一款类似抖音的在线直播应用。
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ _[简体中文](README-zh_CN.md) | English_
 ## Product Features
 
 <p align="center">
-  <img src="Preview/tuilivekit-zh.png"/>
+  <img src="https://github.com/Tencent-RTC/TUILiveKit/blob/main/Preview/tuilivekit.png"/>
 </p>
 
 - **Comprehensive UI Interaction**：We provide an open-source component TUILiveKit with UI, which can save you 90% of development time. You only need to spend 30 minutes to have an online live streaming app similar to TikTok.
@@ -40,4 +40,4 @@ Here, we take the UI-included integration TUILiveKit as an example, which is als
 - Welcome to submit [**issue**](https://github.com/tencentyun/TUILiveRoom/issues),  
 - Welcome to join our Telegram Group to communicate with our professional engineers! We are more than happy to hear from you，Click to join: https://t.me/+EPk6TMZEZMM5OGY1
 Or scan the QR code 
-<img src="Preview/telegram-code.jpg"/>
+<img src="https://github.com/Tencent-RTC/TUILiveKit/blob/main/Preview/telegram-code.jpg"/>
diff --git a/iOS/TUILiveKit/Source/Common/Basic/Fluxor/Store.swift b/iOS/TUILiveKit/Source/Common/Basic/Fluxor/Store.swift
@@ -56,6 +56,10 @@ open class Store<State, Environment>: ObservableObject {
         reducers.forEach(register(reducer:))
     }
 
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     // MARK: - Dispatching
 
     /**
diff --git a/iOS/TUILiveKit/Source/Common/UIComponent/AudioEffect/AudioEffectView.swift b/iOS/TUILiveKit/Source/Common/UIComponent/AudioEffect/AudioEffectView.swift
@@ -14,7 +14,6 @@ class AudioEffectView: UIView {
     var backButtonClickClosure: ((UIButton)->Void)?
     
     private var isViewReady: Bool = false
-    private var cancellables = Set<AnyCancellable>()
     
     private let backButton: UIButton = {
         let view = UIButton(type: .system)
diff --git a/iOS/TUILiveKit/Source/LiveRoom/Core/LiveKitStore.swift b/iOS/TUILiveKit/Source/LiveRoom/Core/LiveKitStore.swift
@@ -13,7 +13,6 @@ import Combine
 class LiveKitStore {
     @Published var selfInfo: UserInfo = UserInfo()
     @Published var applyLinkAudienceList: [UserInfo] = []
-    let maxSeatCount: Int = 9
     let musicList: Observable<[MusicInfo]> = Observable(MusicInfo.defaultMusicInfoList())
     let currentMusicInfo: Observable<MusicInfo> = Observable(MusicInfo())
     let isPortrait: Observable<Bool> = Observable(true)
diff --git a/iOS/TUILiveKit/Source/LiveRoom/Core/RoomEngineService.swift b/iOS/TUILiveKit/Source/LiveRoom/Core/RoomEngineService.swift
@@ -82,9 +82,10 @@ extension RoomEngineService {
 
     func enterRoom(roomId: String, onSuccess: @escaping TUISuccessBlock, onError: @escaping TUIErrorBlock) {
         LiveKitLog.info("\(#file)", "\(#line)", "enterRoom:[roomId:\(roomId)]")
-        roomEngine.enterRoom(roomId, roomType: .live) { [weak self] _ in
+        roomEngine.enterRoom(roomId, roomType: .live) { [weak self] roomInfo in
             LiveKitLog.info("\(#file)", "\(#line)", "enterRoom:onSuccess [roomId:\(roomId)]")
             self?.enterRoomSuccess()
+            self?.liveRoomInfo.maxSeatCount = roomInfo?.maxSeatCount ?? 1
             onSuccess()
         } onError: { code, message in
             LiveKitLog.error("\(#file)", "\(#line)", "enterRoom:[roomId:\(roomId),code:\(code) message:\(message)]")
diff --git a/iOS/TUILiveKit/Source/LiveRoom/Data/LiveRoomInfo.swift b/iOS/TUILiveKit/Source/LiveRoom/Data/LiveRoomInfo.swift
@@ -20,6 +20,7 @@ class LiveRoomInfo {
     let linkingAudienceList: Observable<[UserInfo]> = Observable([])
     let roomConfig: RoomConfig = RoomConfig()
     let userLiveStatus: Observable<UserLiveStatus> = Observable(.none)
+    var maxSeatCount:Int = 0
     var giftIncome:Int = 0
     var giftPeopleMap:[String:String] = [:]
     var createTime:TimeInterval = 0
diff --git a/iOS/TUILiveKit/Source/LiveRoom/View/Anchor/AnchorView.swift b/iOS/TUILiveKit/Source/LiveRoom/View/Anchor/AnchorView.swift
@@ -166,7 +166,6 @@ extension AnchorView {
         roomInfo.roomType = .conference
         roomInfo.roomId = liveRoomInfo.roomId.value
         roomInfo.name = liveRoomInfo.name.value
-        roomInfo.maxSeatCount = engineService.liveKitStore.maxSeatCount
         roomInfo.seatMode = .applyToTake
         roomInfo.roomType = .live
         roomInfo.isSeatEnabled = true
diff --git a/iOS/TUILiveKit/Source/LiveRoom/View/Anchor/LivingView/Panel/AnchorLinkControlPanel.swift b/iOS/TUILiveKit/Source/LiveRoom/View/Anchor/LivingView/Panel/AnchorLinkControlPanel.swift
@@ -230,7 +230,7 @@ extension AnchorLinkControlPanel: UITableViewDelegate {
         let label = UILabel(frame: CGRect(x: 24, y: 0, width: headerView.frame.width , height: headerView.frame.height))
         if section == 0 {
             label.text = .localizedReplace(.anchorLinkControlSeatCount,
-                                          replace: "\(linkingAudienceList.count)/\(engineService.liveKitStore.maxSeatCount - 1)")
+                                          replace: "\(linkingAudienceList.count)/\(max(liveRoomInfo.maxSeatCount,1) - 1)")
         } else if section == 1 {
             label.text = .localizedReplace(.anchorLinkControlRequestCount,
                                           replace: "\(applyLinkAudienceList.count)")
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/EngineServiceCenter.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/EngineServiceCenter.swift
@@ -17,8 +17,12 @@ class ServiceCenter: NSObject {
     
     @WeakLazyInjected var store: VoiceRoomStoreProvider?
     
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     private let volumeSubject = CurrentValueSubject<Set<String>, Never>([])
-    private var cancellables: Set<AnyCancellable> = []
+    private var cancellableSet: Set<AnyCancellable> = []
     override init() {
         super.init()
         TUIRoomEngine.sharedInstance().addObserver(self)
@@ -34,7 +38,7 @@ class ServiceCenter: NSObject {
                 guard let store = self?.store else { return }
                 store.dispatch(action: UserActions.onUserVoiceVolumeChanged(payload: speakUsers))
             }
-            .store(in: &cancellables)
+            .store(in: &cancellableSet)
     }
     
 }
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/ErrorService.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/ErrorService.swift
@@ -13,6 +13,10 @@ typealias InternalError = ErrorService.OperateError
 
 class ErrorService {
     
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     /// OperateError
     /// - property:
     ///     - error: TUIError, RoomEngine throw.
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/MediaService.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/MediaService.swift
@@ -14,6 +14,10 @@ class MediaService {
     private let engine = TUIRoomEngine.sharedInstance()
     private var isMicrophoneOpened: Bool = false
     
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     func operateMicrophone(isOpened: Bool) -> AnyPublisher<Bool, InternalError> {
         return Future<Bool, InternalError> { [weak self] promise in
             guard let self = self else { return }
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/RoomService.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/RoomService.swift
@@ -12,6 +12,10 @@ import Combine
 class RoomService {
     private let engine = TUIRoomEngine.sharedInstance()
     
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     func start(roomInfo: TUIRoomInfo) -> AnyPublisher<TUIRoomInfo, InternalError> {
         return createRoom(info: roomInfo)
             .flatMap({ [weak self] () -> AnyPublisher<TUIRoomInfo, InternalError> in
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/SeatService.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/SeatService.swift
@@ -22,6 +22,10 @@ class SeatService {
     
     @WeakLazyInjected var store: VoiceRoomStoreProvider?
     
+    deinit {
+        debugPrint("deinit \(type(of: self))")
+    }
+    
     private var engine: TUIRoomEngine {
         return TUIRoomEngine.sharedInstance()
     }
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Services/UserService.swift b/iOS/TUILiveKit/Source/VoiceRoom/Services/UserService.swift
@@ -39,8 +39,9 @@ class UserService {
     
     func fetchUserList() -> AnyPublisher<[User], InternalError> {
         return Future<[User], InternalError> { [weak self] promise in
-            guard let self = self, let store = self.store else { return }
-            self.engine.getUserList(nextSequence: 0) { userInfoList, sequence in
+            guard let self = self else { return }
+            self.engine.getUserList(nextSequence: 0) { [weak self] userInfoList, sequence in
+                guard let self = self, let store = self.store else { return }
                 let userList = userInfoList.filter { $0.userId != store.selectCurrent(RoomSelectors.getRoomOwnerId) }.map { userInfo in
                     return User(userInfo: userInfo)
                 }
@@ -55,11 +56,12 @@ class UserService {
     func fetchRoomOwnerInfo() -> AnyPublisher<User, InternalError> {
         return Future<User, InternalError> { [weak self] promise in
             guard let self = self else { return }
-            guard let ownerId = store?.selectCurrent(RoomSelectors.getRoomOwnerId) else {
+            guard let store = self.store else {
                 let error = InternalError(error: TUIError.userNotExist, message: TUIError.userNotExist.description)
                 promise(.failure(error))
                 return
             }
+            let ownerId = store.selectCurrent(RoomSelectors.getRoomOwnerId)
             self.engine.getUserInfo(ownerId) { userInfo in
                 if let user = userInfo {
                     promise(.success(User(userInfo: user)))
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Store/MenuDataCreator.swift b/iOS/TUILiveKit/Source/VoiceRoom/Store/MenuDataCreator.swift
@@ -144,7 +144,7 @@ extension MenuDataCreator {
             store.dispatch(action: NavigatorActions.navigatorTo(payload: .seatApplication))
         }
         
-        linkMic.bindStateClosure = { button, cancellables in
+        linkMic.bindStateClosure = { button, cancellableSet in
             guard let store = self.store else { return }
             store
                 .select(SeatSelectors.getSeatApplicationCount)
@@ -153,7 +153,7 @@ extension MenuDataCreator {
                     return count == 0
                 }
                 .assign(to: \MenuButton.redDot.isHidden, on: button)
-                .store(in: &cancellables)
+                .store(in: &cancellableSet)
         }
         menus.append(linkMic)
         var music = ButtonMenuInfo(normalIcon: "live_music_icon")
@@ -183,22 +183,22 @@ extension MenuDataCreator {
                 }
             }
         }
-        linkMic.bindStateClosure = { button, cancellables in
+        linkMic.bindStateClosure = { button, cancellableSet in
             guard let store = self.store else { return }
             store
                 .select(SeatSelectors.getMySeatApplicationId)
                 .receive(on: RunLoop.main)
                 .map { !$0.isEmpty }
                 .assign(to: \MenuButton.isSelected, on: button)
-                .store(in: &cancellables)
+                .store(in: &cancellableSet)
             store
                 .select(UserSelectors.isOnSeat)
                 .receive(on: RunLoop.main)
                 .sink { isOnSeat in
                     let imageName = isOnSeat ? "live_linked_icon" : "live_connection_icon"
                     button.setImage(.liveBundleImage(imageName), for: .normal)
                 }
-                .store(in: &cancellables)
+                .store(in: &cancellableSet)
         }
         menus.append(linkMic)
         var gift = ButtonMenuInfo(normalIcon: "live_gift_icon", normalTitle: "")
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Store/Room/RoomReducer.swift b/iOS/TUILiveKit/Source/VoiceRoom/Store/Room/RoomReducer.swift
@@ -17,6 +17,7 @@ let roomReducer = Reducer<RoomState>(
         state.ownerId = roomInfo.ownerId
         state.seatMode = roomInfo.seatMode
         state.createTime = roomInfo.createTime
+        state.seatCount = roomInfo.maxSeatCount
         state.enterRoomState = .inRoom
     }),
     ReduceOn(RoomActions.leaveSuccess, reduce: { state, action in
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Store/Seat/SeatState.swift b/iOS/TUILiveKit/Source/VoiceRoom/Store/Seat/SeatState.swift
@@ -9,16 +9,7 @@ import Foundation
 import RTCRoomEngine
 
 struct SeatState: Encodable {
-    var seatList: [SeatInfo] = [
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-        SeatInfo(),
-    ]
+    var seatList: [SeatInfo] = []
     
     var seatApplications: [SeatApplication] = []
     var seatApplicationUserMap: [String: User] = [:]
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/Store/VoiceRoomStore.swift b/iOS/TUILiveKit/Source/VoiceRoom/Store/VoiceRoomStore.swift
@@ -9,25 +9,46 @@ import Combine
 
 class VoiceRoomStore {
     
-    var environment = ServiceCenter()
+    var environment: ServiceCenter?
+
     
-    private(set) lazy var operation: Store<OperationState, ServiceCenter> = Store(initialState: OperationState(), environment: self.environment)
+    private(set) lazy var operation: Store<OperationState, ServiceCenter> = {
+        guard let environment = self.environment else {
+            return Store(initialState: OperationState(), environment: ServiceCenter())
+        }
+        return Store(initialState: OperationState(), environment: environment)
+    }()
+
     
     private(set) lazy var navigator: Store<NavigationState, Void> = Store(initialState: NavigationState())
     
     private(set) lazy var viewStore: Store<GlobalViewState, Void> = Store(initialState: GlobalViewState())
-    private var cancellabels: Set<AnyCancellable> = []
+    private var cancellableSet: Set<AnyCancellable> = []
     
     let toastSubject = PassthroughSubject<ToastInfo, Never>()
     let customEventSubject = PassthroughSubject<Action, Never>()
     let errorSubject = PassthroughSubject<ErrorService.OperateError, Never>()
     
     init() {
+        environment = ServiceCenter()
         initializeStore()
         debugPrint("\(type(of: self)) is init.")
     }
     
     deinit {
+        environment = nil
+        
+        operation.unregister(reducer: userReducer)
+        operation.unregister(reducer: roomReducer)
+        operation.unregister(reducer: seatReducer)
+        operation.unregister(reducer: mediaReducer)
+        
+        operation.unregisterEffects(withId: UserEffects.id)
+        operation.unregisterEffects(withId: RoomEffects.id)
+        operation.unregisterEffects(withId: SeatEffects.id)
+        operation.unregisterEffects(withId: MediaEffects.id)
+        operation.unregisterEffects(withId: ErrorEffects.id)
+
         debugPrint("deinit \(type(of: self))")
     }
     
@@ -71,7 +92,7 @@ class VoiceRoomStore {
                 guard let self = self else { return }
                 self.handle(error: error)
             }
-            .store(in: &cancellabels)
+            .store(in: &cancellableSet)
     }
     
     private func initializeNavigationStore() {
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/TUIVoiceRoomViewController.swift b/iOS/TUILiveKit/Source/VoiceRoom/TUIVoiceRoomViewController.swift
@@ -16,7 +16,7 @@ public struct VoiceRoomParams {
     public var isMuteMicrophone: Bool = true
     public var isSoundOnSpeaker: Bool = true
     
-    public var seatCount: Int = 8
+    public var seatCount: Int = 0
     public var seatMode: TUISeatMode = .applyToTake
 }
 
@@ -51,7 +51,7 @@ public class TUIVoiceRoomViewController: UIViewController {
     private lazy var rootView: VoiceRoomRootView = {
         return VoiceRoomRootView(frame: UIScreen.main.bounds)
     }()
-    private var cancellables = Set<AnyCancellable>()
+    private var cancellableSet = Set<AnyCancellable>()
     private var popupViewController: UIViewController?
     
     // MARK: - Public function
@@ -122,7 +122,7 @@ public class TUIVoiceRoomViewController: UIViewController {
         roomInfo.name = roomState.name
         roomInfo.isSeatEnabled = true
         roomInfo.seatMode = roomState.seatMode
-        roomInfo.maxSeatCount = 8
+        roomInfo.maxSeatCount = roomState.seatCount
         roomInfo.roomType = .live
         let config = generateActionParamTuple(param: roomInfo, actions: [])
         store.dispatch(action: RoomActions.start(payload: config))
@@ -193,7 +193,7 @@ extension TUIVoiceRoomViewController {
                 guard let self = self else { return }
                 self.handleMenuPresentEvent(menu: menu)
             }
-            .store(in: &cancellables)
+            .store(in: &cancellableSet)
     }
     
     private func subscribeEnterRoomState() {
@@ -209,7 +209,7 @@ extension TUIVoiceRoomViewController {
                         break
                 }
             }
-            .store(in: &cancellables)
+            .store(in: &cancellableSet)
     }
     
     private func subscribeToast() {
@@ -227,7 +227,7 @@ extension TUIVoiceRoomViewController {
                 }
                 self.view.makeToast(toast.message, duration: toast.duration, position: position)
             }
-            .store(in: &cancellables)
+            .store(in: &cancellableSet)
     }
     
     private func didEnterRoom() {
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/BottomView/BottomMenuView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/BottomView/BottomMenuView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatActionSheet/ListMenuCell.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatActionSheet/ListMenuCell.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatActionSheet/ListMenuView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatActionSheet/ListMenuView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatApplication/SeatApplicationCell.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatApplication/SeatApplicationCell.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatApplication/SeatApplicationListView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/Menu/SeatApplication/SeatApplicationListView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/SeatView/SeatListView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/SeatView/SeatListView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/SeatView/SeatView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/SeatView/SeatView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/VoiceRoomPrepareView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/VoiceRoomPrepareView.swift
diff --git a/iOS/TUILiveKit/Source/VoiceRoom/View/VoiceRoomRootView.swift b/iOS/TUILiveKit/Source/VoiceRoom/View/VoiceRoomRootView.swift

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ open class Store<State, Environment>: ObservableObject {`
`56`	`56`	`reducers.forEach(register(reducer:))`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ deinit {`
	`60`	`+ debugPrint("deinit \(type(of: self))")`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`// MARK: - Dispatching`
`60`	`64`
`61`	`65`	`/**`