【iOS】【TUICallkit】Upgrade to 2.7.0.1145

Author: noahcheng

iOS/Example/App/AppDelegate.swift

@@ -9,6 +9,7 @@
 import UIKit
 import UserNotifications
 import ImSDK_Plus
+import TIMPush
 
 #if canImport(TUICallKit_Swift)
 import TUICallKit_Swift
@@ -25,92 +26,45 @@ import TXLiteAVSDK_Professional
 /// You need to register a developer certificate with Apple, download and generate the certificate (P12 file) in their developer accounts, and upload the generated P12 file to the Tencent certificate console.
 /// The console will automatically generate a certificate ID and pass it to the `businessID` parameter.
 #if DEBUG
-let businessID: Int32 = 0
+let business_id: Int32 = 0
 #else
-let businessID: Int32 = 0
+let business_id: Int32 = 0
 #endif
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    var deviceToken: Data? = nil
-    var unreadNumber: UInt64 = 0
-    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        
-        /// Configuration Apple Push Notification Service (APNs)
-        registerRemoteNotifications(with: application)
-        V2TIMManager.sharedInstance().setAPNSListener(self)
-        V2TIMManager.sharedInstance().addConversationListener(listener: self)
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(registerIfLoggedIn(_:)),
+        NotificationCenter.default.addObserver(self, selector: #selector(configIfLoggedIn(_:)),
                                                name: Notification.Name("TUILoginSuccessNotification"),
                                                object: nil)
-        
         return true
     }
 
-}
-
-// MARK: - Configuration Apple Push Notification Service (APNs)
-
-extension AppDelegate: V2TIMConversationListener, V2TIMAPNSListener {
-    
-    // Register Remote Notifications
-    func registerRemoteNotifications(with application: UIApplication) {
-        UNUserNotificationCenter.current().requestAuthorization(options: [.alert,.badge,.sound]) { (isGrand, error) in
-            if let error = error {
-                debugPrint("Error requesting authorization for remote notifications: \(error.localizedDescription)")
-            } else {
-                DispatchQueue.main.async {
-                    application.registerForRemoteNotifications()
-                }
-            }
-        }
-    }
-    
-    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-        print("Register device token success")
-        self.deviceToken = deviceToken
-    }
-    
-    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-        debugPrint("Failed to register for remote notifications: \(error.localizedDescription)")
-    }
-    
-    @objc func registerIfLoggedIn(_ notification: Notification) {
+    @objc func configIfLoggedIn(_ notification: Notification) {
         DispatchQueue.main.async {
             TUICallKit.createInstance().enableFloatWindow(enable: SettingsConfig.share.floatWindow)
 #if canImport(TUICallKit_Swift)
             TUICallKit.createInstance().enableVirtualBackground(enable: SettingsConfig.share.enableVirtualBackground)
             TUICallKit.createInstance().enableIncomingBanner(enable: SettingsConfig.share.enableIncomingBanner)
 #endif
         }
-        
-        let config = V2TIMAPNSConfig()
-        config.token = deviceToken
-        config.businessID = businessID
-        V2TIMManager.sharedInstance()?.setAPNS(config, succ: {
-            debugPrint("setAPNS success")
-        }, fail: { code, msg in
-            debugPrint("setAPNS error code:\(code), error: \(msg ?? "nil")")
-        })
-    }
-    
-    // When the unread message count changes, save the new unread message count
-    func onTotalUnreadMessageCountChanged(_ totalUnreadCount: UInt64) {
-        unreadNumber = totalUnreadCount;
     }
-    
-    // The app goes to the background and reports the custom unread message count
-    func onSetAPPUnreadCount() -> UInt32 {
-        // 1. Get the custom badge number
-        var customBadgeNumber : UInt64 = 0
-        // 2. Add the unread message count of IM
-        customBadgeNumber += unreadNumber;
-        // 3. Use the IM SDK to report to the IM server
-        return UInt32(customBadgeNumber);
+}
+
+// MARK: - Configuration Apple Push Notification Service (APNs)
+
+extension AppDelegate: TIMPushDelegate {
+    func businessID() -> Int32 {
+        return business_id;
     }
 
+    //    func applicationGroupID() -> String {
+    //        return "";
+    //    }
+    //
+    //    func onRemoteNotificationReceived(_ notice: String?) -> Bool {
+    //
+    //    }
 }

iOS/Example/App/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.7.0</string>
 	<key>CFBundleVersion</key>
-	<string>1130</string>
+	<string>1145</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

iOS/Example/Podfile

@@ -9,6 +9,7 @@ target 'TUICallKitApp' do
   pod 'Alamofire', '~> 5.6.4'
   pod 'Kingfisher', '<= 6.3.1'
   pod 'SnapKit'
+  pod 'TIMPush'
   pod 'TUICallKit-Swift', :path => "../", :subspecs => ["Professional"]
 
 end

iOS/TUICallKit-Swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'TUICallKit-Swift'
-  spec.version      = '2.6.0.1080'
+  spec.version      = '2.7.0.1145'
   spec.platform     = :ios
   spec.ios.deployment_target = '12.0'
   spec.license      = { :type => 'Proprietary',
@@ -29,7 +29,7 @@ Pod::Spec.new do |spec|
 
   spec.subspec 'TRTC' do |trtc|
     trtc.dependency 'TXLiteAVSDK_TRTC'
-    trtc.dependency 'TUICallEngine/TRTC', '~> 2.6.0.1080'
+    trtc.dependency 'TUICallEngine/TRTC', '~> 2.7.0.1145'
     trtc.source_files = 'TUICallKit-Swift/**/*.{h,m,mm,swift}'
     trtc.resource_bundles = {
       'TUICallKitBundle' => ['TUICallKit-Swift/Resources/**/*.strings', 'TUICallKit-Swift/Resources/AudioFile', 'TUICallKit-Swift/Resources/*.xcassets']
@@ -39,7 +39,7 @@ Pod::Spec.new do |spec|
 
   spec.subspec 'Professional' do |professional|
     professional.dependency 'TXLiteAVSDK_Professional'
-    professional.dependency 'TUICallEngine/Professional', '~> 2.6.0.1080'
+    professional.dependency 'TUICallEngine/Professional', '~> 2.7.0.1145'
     professional.source_files = 'TUICallKit-Swift/**/*.{h,m,mm,swift}'
     professional.resource_bundles = {
       'TUICallKitBundle' => ['TUICallKit-Swift/Resources/**/*.strings', 'TUICallKit-Swift/Resources/AudioFile', 'TUICallKit-Swift/Resources/*.xcassets']

iOS/TUICallKit-Swift/Service/SwiftLoad.swift

@@ -27,7 +27,7 @@ extension NSObject {
                                   object: TUICallKitExtension.instance)
         TUICore.registerExtension(TUICore_TUIContactExtension_FriendProfileActionMenu_MinimalistExtensionID,
                                   object: TUICallKitExtension.instance)
-        TUICore.registerExtension(TUICore_TUIGroupExtension_GroupInfoCardActionMenu_MinimalistExtensionID,
+        TUICore.registerExtension(TUICore_TUIContactExtension_GroupInfoCardActionMenu_MinimalistExtensionID,
                                   object: TUICallKitExtension.instance)
 
         TUICore.registerExtension(TUICore_TUIChatExtension_ChatViewTopArea_ClassicExtensionID,

iOS/TUICallKit-Swift/Service/TUICallKitExtension.swift

@@ -17,14 +17,14 @@ class TUICallKitExtension: NSObject, TUIExtensionProtocol {
     func launchCall(type: TUICallMediaType, groupID: String, pushVC: UINavigationController, isClassic: Bool) {
         if !groupID.isEmpty {
             var requestParam: [String: Any] = [:]
-            requestParam[TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_GroupID] = groupID
-            requestParam[TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_Name] =
+            requestParam[TUICore_TUIContactObjectFactory_SelectGroupMemberVC_GroupID] = groupID
+            requestParam[TUICore_TUIContactObjectFactory_SelectGroupMemberVC_Name] =
             TUIGlobalization.getLocalizedString(forKey: "Make-a-call", bundle: TUIKitLocalizableBundle)
-            let viewControllerKey = isClassic ? TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_Classic :
-            TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_Minimalist
+            let viewControllerKey = isClassic ? TUICore_TUIContactObjectFactory_SelectGroupMemberVC_Classic :
+            TUICore_TUIContactObjectFactory_SelectGroupMemberVC_Minimalist
             pushVC.push(viewControllerKey, param: requestParam) { [weak self] responseData in
                 guard let self = self else { return }
-                guard let modelList = responseData[TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_ResultUserList]
+                guard let modelList = responseData[TUICore_TUIContactObjectFactory_SelectGroupMemberVC_ResultUserList]
                         as? [AnyObject] else { return }
                 let userIDs: [String] = modelList.compactMap { $0.userId }
                 self.startCall(groupID: groupID, userIDs: userIDs, callingType: type)
@@ -100,7 +100,7 @@ class TUICallKitExtension: NSObject, TUIExtensionProtocol {
             return getFriendProfileActionMenuExtensionForClassicContact(param: param)
         } else if extensionID == TUICore_TUIContactExtension_FriendProfileActionMenu_MinimalistExtensionID {
             return getFriendProfileActionMenuExtensionForMinimalistContact(param: param)
-        } else if extensionID == TUICore_TUIGroupExtension_GroupInfoCardActionMenu_MinimalistExtensionID {
+        } else if extensionID == TUICore_TUIContactExtension_GroupInfoCardActionMenu_MinimalistExtensionID {
             return getGroupInfoCardActionMenuExtensionForMinimalistGroup(param: param)
         } else {
             return nil
@@ -266,7 +266,7 @@ class TUICallKitExtension: NSObject, TUIExtensionProtocol {
         guard let param = param else { return nil }
 
         var result: [TUIExtensionInfo] = []
-        guard let filterVideoCall = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_FilterVideoCall] as? Bool else { return nil }
+        guard let filterVideoCall = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_FilterVideoCall] as? Bool else { return nil }
         if !filterVideoCall {
             let videoInfo = TUIExtensionInfo()
             videoInfo.weight = 100
@@ -275,16 +275,16 @@ class TUICallKitExtension: NSObject, TUIExtensionProtocol {
             videoInfo.text = TUICoreDefineConvert.getTIMCommonLocalizableString(key: "TUIKitVideo")
             videoInfo.onClicked = {[weak self] param in
                 guard let self = self else { return }
-                guard let pushVC = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_PushVC] as? UINavigationController else { return }
-                guard let groupID = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_GroupID] as? String else { return }
+                guard let pushVC = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_PushVC] as? UINavigationController else { return }
+                guard let groupID = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_GroupID] as? String else { return }
                 if !groupID.isEmpty {
                     self.launchCall(type: .video, groupID: groupID, pushVC: pushVC, isClassic: false)
                 }
             }
             result.append(videoInfo)
         }
 
-        guard let filterAudioCall = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_FilterAudioCall] as? Bool else { return nil }
+        guard let filterAudioCall = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_FilterAudioCall] as? Bool else { return nil }
         if !filterAudioCall {
             let audioInfo = TUIExtensionInfo()
             audioInfo.weight = 200
@@ -293,8 +293,8 @@ class TUICallKitExtension: NSObject, TUIExtensionProtocol {
             audioInfo.text = TUICoreDefineConvert.getTIMCommonLocalizableString(key: "TUIKitAudio")
             audioInfo.onClicked = {[weak self] param in
                 guard let self = self else { return }
-                guard let pushVC = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_PushVC] as? UINavigationController else { return }
-                guard let groupID = param[TUICore_TUIGroupExtension_GroupInfoCardActionMenu_GroupID] as? String else { return }
+                guard let pushVC = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_PushVC] as? UINavigationController else { return }
+                guard let groupID = param[TUICore_TUIContactExtension_GroupInfoCardActionMenu_GroupID] as? String else { return }
                 if !groupID.isEmpty {
                     self.launchCall(type: .audio, groupID: groupID, pushVC: pushVC, isClassic: false)
                 }

iOS/TUICallKit-Swift/View/Component/InviteUserButton.swift

@@ -80,7 +80,7 @@ class InviteUserButton: UIView {
     }
 
     func tui_valueCallback(param: [AnyHashable: Any]) {
-        guard let selectUserList = param[TUICore_TUIGroupObjectFactory_SelectGroupMemberVC_ResultUserList] as? [TUIUserModel] else { return }
+        guard let selectUserList = param[TUICore_TUIContactObjectFactory_SelectGroupMemberVC_ResultUserList] as? [TUIUserModel] else { return }
         if selectUserList.count > 0 {
             return
         }

iOS/TUICallKit-Swift/ViewModel/Component/Recents/TUICallRecordCallsViewModel.swift

@@ -172,11 +172,11 @@ class TUICallRecordCallsViewModel {
         }
 
         if !groupId.isEmpty {
-            let param: [String: Any] = [TUICore_TUIGroupObjectFactory_GetGroupInfoVC_GroupID: groupId]
+            let param: [String: Any] = [TUICore_TUIContactObjectFactory_GetGroupInfoVC_GroupID: groupId]
             if TUICallKitRecordCallsUIStyle.classic == recordCallsUIStyle {
-                navigationController.push(TUICore_TUIGroupObjectFactory_GetGroupInfoVC_Classic, param: param, forResult: nil)
+                navigationController.push(TUICore_TUIContactObjectFactory_GetGroupInfoVC_Classic, param: param, forResult: nil)
             } else {
-                navigationController.push(TUICore_TUIGroupObjectFactory_GetGroupInfoVC_Minimalist, param: param, forResult: nil)
+                navigationController.push(TUICore_TUIContactObjectFactory_GetGroupInfoVC_Minimalist, param: param, forResult: nil)
             }
         } else if !userId.isEmpty {
             getUserOrFriendProfileVCWithUserID(userId: userId) { viewController in