Fix a series of test bugs and add intelligent customer service

Author: eddardliu

call/TUICallKit_Swift/Bridge/Chat/ChatCallEventSubscriber.swift

@@ -0,0 +1,57 @@
+//
+//  ChatCallEventSubscriber.swift
+//  TUICallKit
+//
+import AtomicXCore
+import Foundation
+
+public final class ChatCallEventSubscriber: NSObject {
+    public static let shared = ChatCallEventSubscriber()
+
+    private static let startCallEventName = Notification.Name("tuicallkit.startCall")
+    private static let startJoinEventName = Notification.Name("tuicallkit.startJoin")
+    private static let keyParticipantIDs = "participantIds"
+    private static let keyMediaType = "mediaType"
+    private static let keyChatGroupID = "chatGroupId"
+    private static let keyTimeout = "timeout"
+    private static let keyCallID = "callId"
+
+    private var isSubscribed = false
+
+    private override init() {
+        super.init()
+    }
+
+    public func ensureSubscribed() {
+        guard !isSubscribed else { return }
+        isSubscribed = true
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(handleStartCallEvent(_:)),
+                                               name: Self.startCallEventName,
+                                               object: nil)
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(handleStartJoinEvent(_:)),
+                                               name: Self.startJoinEventName,
+                                               object: nil)
+    }
+
+    @objc private func handleStartCallEvent(_ notification: Notification) {
+        guard let userInfo = notification.userInfo,
+              let participantIDs = userInfo[Self.keyParticipantIDs] as? [String],
+              !participantIDs.isEmpty else { return }
+        let mediaType: CallMediaType = (userInfo[Self.keyMediaType] as? String) == "video" ? .video : .audio
+        let chatGroupID = userInfo[Self.keyChatGroupID] as? String ?? ""
+        let timeout = userInfo[Self.keyTimeout] as? Int ?? 30
+
+        var callParams = CallParams()
+        callParams.chatGroupId = chatGroupID
+        callParams.timeout = timeout
+        TUICallKit.createInstance().calls(userIdList: participantIDs, mediaType: mediaType, params: callParams, completion: nil)
+    }
+
+    
+    @objc private func handleStartJoinEvent(_ notification: Notification) {
+        guard let callID = notification.userInfo?[Self.keyCallID] as? String, !callID.isEmpty else { return }
+        TUICallKit.createInstance().join(callId: callID, completion: nil)
+    }
+}

call/TUICallKit_Swift/Bridge/Chat/Deprecated/SwiftLoad.swift

@@ -15,7 +15,9 @@ extension NSObject {
         NotificationCenter.default.addObserver(self, selector: #selector(initSdkSuccess(_:)),
                                                name: Notification.Name.TUIInitSdkSuccess,
                                                object: nil)
-        
+
+        ChatCallEventSubscriber.shared.ensureSubscribed()
+
         TUICore.registerService(TUICore_TUICallingService, object: TUICallKitService.instance)
 
         TUICore.registerService(TUICore_TUIAudioMessageRecordService, object: TUIAudioMessageRecordService.instance)

call/TUICallKit_Swift/TUICallKit.swift

@@ -15,6 +15,7 @@ public class TUICallKit: NSObject {
      */
     @objc
     public static func createInstance() -> TUICallKit {
+        ChatCallEventSubscriber.shared.ensureSubscribed()
         return TUICallKitImpl.shared
     }
 

call/TUICallKit_Swift/TUICallKitImpl.swift

@@ -11,7 +11,6 @@ import UIKit
 import AtomicX
 import AtomicXCore
 import Combine
-import AtomicX
 
 #if canImport(TXLiteAVSDK_TRTC)
 import TXLiteAVSDK_TRTC
@@ -25,7 +24,6 @@ import RTCRoomEngine
 class TUICallKitImpl: TUICallKit {
     static let shared = TUICallKitImpl()
     private var cancellables = Set<AnyCancellable>()
-    private var hasSetDefaultDeviceState = false
 
     let globalState = GlobalState()
     let viewState = ViewState()
@@ -55,7 +53,7 @@ class TUICallKitImpl: TUICallKit {
             completion?(.failure(ErrorInfo(code: Int(ERROR_PARAM_INVALID), message: "Invalid screen orientation value")))
             return
         }
-        globalState.orientation = Orientation(rawValue: orientation) ?? .portrait
+        globalState.orientation = targetOrientation
         completion?(.success(()))
     }
 
@@ -257,18 +255,6 @@ extension TUICallKitImpl {
             .store(in: &cancellables)
     }
 
-    private func handleCallParticipantStatusChanged(_ newStatus: CallParticipantStatus) {
-        switch newStatus {
-        case .accept:
-            if !hasSetDefaultDeviceState {
-                setDefaultDeviceState()
-                hasSetDefaultDeviceState = true
-            }
-        default:
-            break
-        }
-    }
-    
     func unSubscribeCallState() {
         cancellables.removeAll()
     }
@@ -326,6 +312,19 @@ extension TUICallKitImpl {
         }
     }
 
+    private func handleCallParticipantStatusChanged(_ newStatus: CallParticipantStatus) {
+        if newStatus == .accept {
+            let mediaType = CallStore.shared.state.value.activeCall.mediaType
+            CallManager.shared.openLocalMicrophone()
+            if mediaType == .audio {
+                CallManager.shared.setAudioRoute(.earpiece)
+            } else if mediaType == .video {
+                CallManager.shared.setAudioRoute(.speakerphone)
+                CallManager.shared.openLocalCameraIfPermitted()
+            }
+        }
+    }
+    
     @objc func setupCallEngine() {
         LoginStore.shared.login(sdkAppID: TUILogin.getSdkAppID(), userID: TUILogin.getUserID() ?? "", userSig: TUILogin.getUserSig() ?? "", completion: nil)
         TUICallEngine.createInstance().`init`(TUILogin.getSdkAppID(), userId: TUILogin.getUserID() ?? "", userSig: TUILogin.getUserSig() ?? "") { [weak self] in
@@ -452,7 +451,7 @@ extension TUICallKitImpl {
                 guard let self = self else { return }
                 if !callId.isEmpty {
                     if isCaller() && globalState.enableAITranscriber {
-                        startRealtimeTranscriber(callID: callId)
+                        AITranscriberStore.create(roomID: callId).startRealtimeTranscriber(config: TranscriberSettings.config, completion: nil)
                     }
                 }
             }
@@ -461,50 +460,55 @@ extension TUICallKitImpl {
 
     func handleCallEvent(_ event: CallEvent) {
         switch event {
-        case .onCallStarted(_, _):
-            if !hasSetDefaultDeviceState {
-                setDefaultDeviceState()
-                hasSetDefaultDeviceState = true
+        case let .onCallStarted(callId: _, mediaType: mediaType):
+            CallManager.shared.openLocalMicrophone()
+            if mediaType == .audio {
+                CallManager.shared.setAudioRoute(.earpiece)
+            } else if mediaType == .video {
+                CallManager.shared.setAudioRoute(.speakerphone)
+                CallManager.shared.openLocalCameraIfPermitted()
             }
             showCallKitViewController(isCaller: true)
+            
         case let .onCallReceived(callId, mediaType, _):
             KeyMetrics.countUV(eventId: .received, callId: callId)
             if mediaType == .video {
                 CallManager.shared.openLocalCameraIfPermitted()
             }
             showCallKitViewController(isCaller: false)
 
-        case let .onCallEnded(callId: _, mediaType: _, reason: reason, userId: userId):
+        case let .onCallEnded(callId: callId, mediaType: _, reason: reason, userId: userId):
+            AITranscriberStore.create(roomID: callId).stopRealtimeTranscriber()
             TranscriberSettings.reset()
-            hasSetDefaultDeviceState = false
             TEBeautyView.releaseSharedInstance()
             handleCallEndedWithResidence(reason: reason, userId: userId)
+            DeviceStore.shared.reset()
         default:
             break
         }
     }
-
+    
     func handleCallEndedWithResidence(reason: CallEndReason, userId: String) {
         let selfInfo = CallStore.shared.state.value.selfInfo
         let activeCall = CallStore.shared.state.value.activeCall
         let isGroupCall = !activeCall.chatGroupId.isEmpty || activeCall.inviteeIds.count > 1
         let triggeredBySelf = !selfInfo.id.isEmpty && userId == selfInfo.id
-
+        
         guard !selfInfo.id.isEmpty else { closeCallKitViewController(); return }
         guard !triggeredBySelf else { closeCallKitViewController(); return }
         guard !isGroupCall else { closeCallKitViewController(); return }
         guard let messageKey = endCallHintKey(for: reason) else { closeCallKitViewController(); return }
-
+        
         let message = TUICallKitLocalize(key: messageKey)
         guard !message.isEmpty else { closeCallKitViewController(); return }
         guard let callMainViewController = WindowManager.shared.currentCallMainViewController() else {
             closeCallKitViewController()
             return
         }
-
+        
         callMainViewController.showEndCallHint(text: message)
     }
-
+    
     private func endCallHintKey(for reason: CallEndReason) -> String? {
         switch reason {
         case .hangup:
@@ -522,21 +526,6 @@ extension TUICallKitImpl {
         }
     }
 
-    func setDefaultDeviceState() {
-        let activeCall = CallStore.shared.state.value.activeCall
-        let mediaType = activeCall.mediaType
-        let deviceStore = DeviceStore.shared
-        
-        deviceStore.openLocalMicrophone(completion: nil)
-        
-        if mediaType == .audio {
-            deviceStore.setAudioRoute(.earpiece)
-        } else {
-            deviceStore.setAudioRoute(.speakerphone)
-            deviceStore.openLocalCamera(isFront: true, completion: nil)
-        }
-    }
-    
     func showIMErrorMessage(code: Int32, message: String?) {
         let errorMessage = TUITool.convertIMError(Int(code), msg: convertCallKitError(code: code, message: message))
         let eventId = getToastEventId(for: code)
@@ -608,41 +597,9 @@ extension TUICallKitImpl {
             duration: .long
         )
     }
-}
-
-// MARK: - AI Transcriber
-extension TUICallKitImpl {
-    private static let vadConfigKey = "Liteav.Audio.common.enable.send.eos.packet.in.dtx"
 
     private func isCaller() -> Bool {
         let state = CallStore.shared.state.value
         return state.selfInfo.id == state.activeCall.inviterId
     }
-    
-    private func startRealtimeTranscriber(callID: String) {
-        AITranscriberStore.create(roomID: callID).startRealtimeTranscriber(config: TranscriberSettings.config, completion: nil)
-        closeVAD()
-    }
-        
-    private func closeVAD() {
-        callExperimentalAPI(withConfig: [
-            "key": Self.vadConfigKey,
-            "action": "reset"
-        ])
-        callExperimentalAPI(withConfig: [
-            "key": Self.vadConfigKey,
-            "value": 0,
-            "default": 0
-        ])
-    }
-    
-    private func callExperimentalAPI(withConfig config: [String: Any]) {
-        let jsonObj: [String: Any] = [
-            "api": "setPrivateConfig",
-            "params": ["configs": [config]]
-        ]
-        guard let data = try? JSONSerialization.data(withJSONObject: jsonObj),
-              let jsonStr = String(data: data, encoding: .utf8) else { return }
-        TRTCCloud.sharedInstance().callExperimentalAPI(jsonStr)
-    }
 }

call/TUICallKit_Swift/View/CallView/CallView.swift

@@ -102,12 +102,13 @@ extension CallView {
         addSubview(backgroundBlurView)
         addSubview(callCoreView)
         addSubview(waitingParticipantsView)
-        addSubview(singleCallControlsView)
         addSubview(multiCallControlsView)
         addSubview(aiSubtitle)
         addSubview(callTranscriberView)
         addSubview(timerView)
         addSubview(hintView)
+
+        callCoreView.callViewAdapter = self
     }
 
     private func activateConstraints() {
@@ -137,11 +138,6 @@ extension CallView {
             make.centerY.equalToSuperview()
         }
 
-        singleCallControlsView.snp.remakeConstraints { make in
-            make.leading.trailing.bottom.equalToSuperview()
-            make.height.equalTo(260.scale375Height())
-        }
-        
         multiCallControlsView.snp.remakeConstraints { make in
             make.leading.trailing.bottom.equalToSuperview()
             make.height.equalTo(260.scale375Height())
@@ -352,24 +348,14 @@ extension CallView {
 // MARK: - Subscribe
 extension CallView {
     private func subscribeCallState() {
-        let callStateSelector = StatePublisherSelector { (state: CallState) -> (CallParticipantStatus, String, String, String, [String]) in
-            let selfInfo = CallStore.shared.state.value.selfInfo
-            let activeCall = state.activeCall
-            return (selfInfo.status, selfInfo.id, activeCall.inviterId, activeCall.chatGroupId, activeCall.inviteeIds)
-        }
-        
-        CallStore.shared.state.subscribe(callStateSelector)
-            .removeDuplicates { prev, current in
-                return prev.0 == current.0 &&
-                prev.1 == current.1 &&
-                prev.2 == current.2 &&
-                prev.3 == current.3 &&
-                prev.4 == current.4
-            }
+        CallStore.shared.state
+            .subscribe(StatePublisherSelector(keyPath: \.selfInfo.status))
+            .removeDuplicates()
             .receive(on: RunLoop.main)
             .sink { [weak self] _ in
-                self?.updateControlsView()
-                self?.updateCamera()
+                guard let self = self else { return }
+                self.updateControlsView()
+                self.updateCamera()
             }
             .store(in: &cancellables)
 
@@ -418,3 +404,35 @@ extension CallView: MultiCallControlsViewDelegate {
         updateTranscriberViewConstraints()
     }
 }
+
+// MARK: - CallViewAdapter
+extension CallView: CallViewAdapter {
+    public func onCreateOverlayView(layout: CallLayoutTemplate) -> UIView? {
+        guard layout == .float else { return nil }
+
+        let container = OverlayContainerView()
+        container.backgroundColor = .clear
+        container.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+
+        singleCallControlsView.removeFromSuperview()
+        container.addSubview(singleCallControlsView)
+
+        let isSingleAudioCall = CallStore.shared.state.value.activeCall.mediaType == .audio
+        let controlsHeight: CGFloat = isSingleAudioCall ? 144.scale375Height() : 260.scale375Height()
+
+        singleCallControlsView.snp.remakeConstraints { make in
+            make.leading.trailing.bottom.equalToSuperview()
+            make.height.equalTo(controlsHeight)
+        }
+
+        return container
+    }
+}
+
+private final class OverlayContainerView: UIView {
+    override func didMoveToSuperview() {
+        super.didMoveToSuperview()
+        guard let superview = superview else { return }
+        frame = superview.bounds
+    }
+}