alqindiirsyam 2 年之前
父節點
當前提交
a712693b5e

二進制
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Frameworks/WebPKit.framework/Frameworks/libwebp.a


二進制
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Frameworks/WebPKit.framework/WebPKit


二進制
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo


文件差異過大導致無法顯示
+ 226 - 134
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/arm64-apple-ios.abi.json


+ 1 - 0
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/arm64-apple-ios.private.swiftinterface

@@ -30,6 +30,7 @@ public protocol CallBack {
 }
 @_hasMissingDesignatedInitializers final public class API {
   @objc deinit
+  public static func switchUser(cbiI: nuSDKService.CallBack!, sUserID: Swift.String!) throws
   public static func initConnection(bSwitchIP: Swift.Bool!, sAPIK: Swift.String!, aAppMain: UIKit.UIViewController!, cbiI: nuSDKService.CallBack!, sTCPAddr: Swift.String!, nTCPPort: Swift.Int!, sUserID: Swift.String!, sStartWH: Swift.String!) throws
   public static func switchCBI(cbiI: nuSDKService.CallBack!, bLight: Swift.Bool!) throws
   public static func bnuSDKServiceReady() -> Swift.Bool

+ 1 - 0
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/arm64-apple-ios.swiftinterface

@@ -30,6 +30,7 @@ public protocol CallBack {
 }
 @_hasMissingDesignatedInitializers final public class API {
   @objc deinit
+  public static func switchUser(cbiI: nuSDKService.CallBack!, sUserID: Swift.String!) throws
   public static func initConnection(bSwitchIP: Swift.Bool!, sAPIK: Swift.String!, aAppMain: UIKit.UIViewController!, cbiI: nuSDKService.CallBack!, sTCPAddr: Swift.String!, nTCPPort: Swift.Int!, sUserID: Swift.String!, sStartWH: Swift.String!) throws
   public static func switchCBI(cbiI: nuSDKService.CallBack!, bLight: Swift.Bool!) throws
   public static func bnuSDKServiceReady() -> Swift.Bool

二進制
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/Modules/nuSDKService.swiftmodule/arm64-apple-ios.swiftmodule


二進制
appbuilder-ios/NexilisLite/Frameworks/nuSDKService.framework/nuSDKService


+ 1 - 35
appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -259,7 +259,7 @@ public class Nexilis: NSObject {
             Nexilis.dispatch = DispatchGroup()
             Nexilis.dispatch?.enter()
             
-            try API.initConnection(bSwitchIP: true, sAPIK: Nexilis.sAPIKey, aAppMain: nil, cbiI: Callback(), sTCPAddr: Nexilis.ADDRESS, nTCPPort: Nexilis.PORT, sUserID: f_pin, sStartWH: "08:00")
+            try API.switchUser(cbiI: Callback(), sUserID: f_pin)
             
             // wait until connection true
             Nexilis.dispatch?.wait()
@@ -425,32 +425,8 @@ public class Nexilis: NSObject {
         return result
     }
     
-    public static func startAudio(nMode: Int!, bSpeakerOn: Bool!) {
-        
-        let nSessionMode = nMode
-        do {
-            let avAudioSession = AVAudioSession.sharedInstance()
-            try avAudioSession.setInputGain(1.0)
-//            if (bSpeakerOn) {
-//                try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .videoChat), options: [.defaultToSpeaker, .duckOthers, .allowBluetooth])
-//            } else {
-//                try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .videoChat), options: [.duckOthers, .allowBluetooth])
-//            }
-            try avAudioSession.setCategory(.playAndRecord, mode: (nSessionMode == 1 ? .voiceChat : .default), options: [.defaultToSpeaker, .duckOthers, .allowBluetooth])
-            if (bSpeakerOn) {
-                API.adjustVolume(fValue: 10.0)
-            } else {
-                API.adjustVolume(fValue: 0.3)
-            }
-            try avAudioSession.setActive(true, options: .notifyOthersOnDeactivation)
-        } catch {
-        }
-    }
-    
     public static func turnSpeakerOn(bSpeakerOn: Bool!) {
 //         API.pauseAudio()
-//         ViewController.stopAudio()
-//         ViewController.startAudio(nMode: 0, bSpeakerOn: bSpeakerOn)
 //         API.resumeAudio(bSpeakerOn: bSpeakerOn)
         if (bSpeakerOn) {
             API.adjustVolume(fValue: 10.0)
@@ -458,15 +434,6 @@ public class Nexilis: NSObject {
             API.adjustVolume(fValue: 0.3)
         }
     }
-    public static func stopAudio() {
-        do {
-            try AVAudioSession.sharedInstance().setCategory(.ambient)
-            try AVAudioSession.sharedInstance().setMode(.default)
-            try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
-        }catch{
-            print(error)
-        }
-    }
     
     public static func muteMicrophone(isMute: Bool!){
         do {
@@ -1604,7 +1571,6 @@ extension Nexilis: CallDelegate {
             let onGoingCC = UserDefaults.standard.string(forKey: "onGoingCC") ?? ""
             let deviceId = message.split(separator: ",")[0]
             if myData?.offline_mode == "1" || self.stateUnfriend == deviceId {
-                Nexilis.startAudio(nMode: 1, bSpeakerOn: false)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
                     API.terminateCall(sParty: nil)
                 })

+ 1 - 5
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/CallProviderDelegate.swift

@@ -50,8 +50,6 @@ class CallProviderDelegate: NSObject {
                 call.handle = handle
                 call.hasVideo = hasVideo
                 
-                Nexilis.startAudio(nMode: 1, bSpeakerOn: false)
-                
                 self.callManager.addCall(call)
             }
             completion?(error)
@@ -80,9 +78,7 @@ extension CallProviderDelegate: CXProviderDelegate {
         call.hasConnectedDidChange = { [weak self] in
             self?.provider.reportOutgoingCall(with: call.uuid, connectedAt: call.connectDate)
         }
-        if self.callManager.calls.count == 0 {
-            Nexilis.startAudio(nMode: 1, bSpeakerOn: false)
-        } else if self.callManager.calls.count > 0 {
+        if self.callManager.calls.count > 0 {
             self.callManager.setOnHoldStatus(for: self.callManager.calls.last!, to: true)
         }
         action.fulfill()

+ 0 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraVideoViewController.swift

@@ -364,7 +364,6 @@ class QmeraVideoViewController: UIViewController {
         ])
         if isInisiator {
             labelIncomingOutgoing.text = "Outgoing video call".localized() + "..."
-            Nexilis.startAudio(nMode: 2, bSpeakerOn: true)
             API.initiateCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 2, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView, ivRemoteZ: zoomView)
         } else {
             let systemSoundID: SystemSoundID = 1254
@@ -508,7 +507,6 @@ class QmeraVideoViewController: UIViewController {
         } else if goVideoCall == -1 {
             return
         }
-        Nexilis.startAudio(nMode: 2, bSpeakerOn: true)
         API.receiveCCall(sParty: dataPerson[0]["f_pin"]!, nCamIdx: 1, nResIdx: 2, nVQuality: 4, ivRemoteView: listRemoteViewFix, ivLocalView: cameraView,ivRemoteZ: zoomView)
         DispatchQueue.main.async {
             self.myImage.removeFromSuperview()

部分文件因文件數量過多而無法顯示