From: liangzhenying <867174124@qq.com> Date: Fri, 20 Mar 2026 03:46:52 +0000 (+0800) Subject: deepchords兼容联巨兴设备 X-Git-Url: http://git.snicker.com.cn/img/static/gitweb.css?a=commitdiff_plain;h=3b10a5072c452e5dfe7763f7107ae6a6eba8bb34;p=mirrors%2FShenYin.git deepchords兼容联巨兴设备 --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index c8142df..89833d6 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -8,17 +8,25 @@ /* Begin PBXBuildFile section */ 30B13DEF1AA0E4C54D873276 /* Pods_playboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4F1BB919D567C3B6B0EBAA7 /* Pods_playboy.framework */; }; + 3F372ECC2F6BF69800E5C3B2 /* DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; }; 3F8F58292EBCA2B800FFC00B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; }; 3FD1DFED2F0E00BF00A62733 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; }; 3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; platformFilter = ios; }; 644D1BB5EDD3EA1D77C57786 /* Pods_DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */; }; 7666589AAA94A323B6090425 /* Pods_playboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4F1BB919D567C3B6B0EBAA7 /* Pods_playboy.framework */; }; 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */; }; - 817510A595D00CAD05E3772C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - F2E449CAD5874BE652A69B50 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 817510A595D00CAD05E3772C /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + F2E449CAD5874BE652A69B50 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 3F372ECE2F6BF69800E5C3B2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3F887B942E38D8DC00C98658 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 0D54E0EE2F0A61E600A80EE7; + remoteInfo = DeepChordsSdk; + }; 3FD1DFE52F0E00BF00A62733 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 3F887B942E38D8DC00C98658 /* Project object */; @@ -84,35 +92,23 @@ /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 3F372ED22F6BF6A100E5C3B2 /* Exceptions for "DeepChordsSdk" folder in "ShenYin" target */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + StarburstSdkDirect.xcframework, + ); + target = 3F887B9B2E38D8DC00C98658 /* ShenYin */; + }; 3F887BAE2E38D8DD00C98658 /* Exceptions for "ShenYin" folder in "ShenYin" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Channel/DeepChords/DeepChords.plist, - Channel/PLAYBOY/DcSdk/tool/CCBleManager.swift, - Channel/PLAYBOY/DcSdk/tool/CCConfig.swift, - Channel/PLAYBOY/DcSdk/tool/CCDevice.swift, - Channel/PLAYBOY/DcSdk/tool/CCPage.swift, - Channel/PLAYBOY/DcSdk/tool/DcCall.swift, - Channel/PLAYBOY/DcSdk/tool/DcChatManager.swift, - Channel/PLAYBOY/DcSdk/tool/DcChinese2Enligsh.swift, - Channel/PLAYBOY/DcSdk/tool/DcSdkManager.swift, - Channel/PLAYBOY/DcSdk/tool/DcStereo.swift, - Channel/PLAYBOY/DcSdk/tool/DcSubTitle.swift, - Channel/PLAYBOY/DcSdk/tool/DcTcty.swift, - Channel/PLAYBOY/DcSdk/tool/DcXcly.swift, - Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework, - Channel/PLAYBOY/DcSdk/tool/OpusTools.swift, - Channel/PLAYBOY/DcSdk/VC/PbAiFunctionVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbChatVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbChinese2EnglishVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbDialogTranslateVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbHomeVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbModeVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbStereoCallVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbSubTitleVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbTabBC.swift, - Channel/PLAYBOY/DcSdk/VC/PbTctyVC.swift, - Channel/PLAYBOY/DcSdk/VC/PbXclyVC.swift, + Channel/PLAYBOY/Channel/Config/CCBleManager.swift, + Channel/PLAYBOY/Channel/Config/CCConfig.swift, + Channel/PLAYBOY/Channel/Config/CCDevice.swift, + Channel/PLAYBOY/Channel/Config/CCPage.swift, + Channel/PLAYBOY/Channel/UI/PbModeVC.swift, + Channel/PLAYBOY/Channel/UI/PbTabBC.swift, Channel/PLAYBOY/PLAYBOY.plist, Channel/PLAYBOY/PLAYBOY.storyboard, Channel/PLAYBOY/PLAYBOY.xcassets, @@ -130,61 +126,85 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( "/Localized: Channel/DeepChords/DeepChords.storyboard", + Channel/DeepChords/Channel/Config/CCBleManager.swift, + Channel/DeepChords/Channel/Config/CCConfig.swift, + Channel/DeepChords/Channel/Config/CCDevice.swift, + Channel/DeepChords/Channel/Config/CCPage.swift, + Channel/DeepChords/Channel/UI/JoyAiFunctionVC.swift, + Channel/DeepChords/Channel/UI/JoyCallingRecordVC.swift, + Channel/DeepChords/Channel/UI/JoyChatVC.swift, + Channel/DeepChords/Channel/UI/JoyChinese2EnglishVC.swift, + Channel/DeepChords/Channel/UI/JoyDialogTranslateVC.swift, + Channel/DeepChords/Channel/UI/JoyHomeVC.swift, + Channel/DeepChords/Channel/UI/JoyModeVC.swift, + Channel/DeepChords/Channel/UI/JoyStereoCallVC.swift, + Channel/DeepChords/Channel/UI/JoySubTitleVC.swift, + Channel/DeepChords/Channel/UI/JoyTabBC.swift, + Channel/DeepChords/Channel/UI/JoyTctyVC.swift, + Channel/DeepChords/Channel/UI/JoyXclyVC.swift, Channel/DeepChords/DeepChords.plist, Channel/DeepChords/DeepChords.xcassets, - Channel/DeepChords/JoySdk/tool/CCBleManager.swift, - Channel/DeepChords/JoySdk/tool/CCConfig.swift, - Channel/DeepChords/JoySdk/tool/CCDevice.swift, - Channel/DeepChords/JoySdk/tool/CCPage.swift, - Channel/DeepChords/JoySdk/tool/JoyCallRecord.swift, - Channel/DeepChords/JoySdk/tool/JoyChat.swift, - Channel/DeepChords/JoySdk/tool/JoyChinse2English.swift, - Channel/DeepChords/JoySdk/tool/JoyDialog.swift, - Channel/DeepChords/JoySdk/tool/JoyGemAI.framework, - Channel/DeepChords/JoySdk/tool/JoyRecord.swift, - Channel/DeepChords/JoySdk/tool/JoySdkManager.swift, - Channel/DeepChords/JoySdk/tool/JoyTcty.swift, - Channel/DeepChords/JoySdk/VC/JoyAiFunctionVC.swift, - Channel/DeepChords/JoySdk/VC/JoyCallingRecordVC.swift, - Channel/DeepChords/JoySdk/VC/JoyChatVC.swift, - Channel/DeepChords/JoySdk/VC/JoyChinese2EnglishVC.swift, - Channel/DeepChords/JoySdk/VC/JoyDialogTranslateVC.swift, - Channel/DeepChords/JoySdk/VC/JoyHomeVC.swift, - Channel/DeepChords/JoySdk/VC/JoyModeVC.swift, - Channel/DeepChords/JoySdk/VC/JoyStereoCallVC.swift, - Channel/DeepChords/JoySdk/VC/JoySubTitleVC.swift, - Channel/DeepChords/JoySdk/VC/JoyTabBC.swift, - Channel/DeepChords/JoySdk/VC/JoyTctyVC.swift, - Channel/DeepChords/JoySdk/VC/JoyXclyVC.swift, + Channel/DeepChords/Sdk/JoyCallRecord.swift, + Channel/DeepChords/Sdk/JoyChat.swift, + Channel/DeepChords/Sdk/JoyChinse2English.swift, + Channel/DeepChords/Sdk/JoyDialog.swift, + Channel/DeepChords/Sdk/JoyGemAI.framework, + Channel/DeepChords/Sdk/JoyRecord.swift, + Channel/DeepChords/Sdk/JoySdkManager.swift, + Channel/DeepChords/Sdk/JoyTcty.swift, ); target = 3FD1DFE32F0E00BF00A62733 /* playboy */; }; /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */ - 3FCB298D2F6A7BBD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */ = { + 3F372ED32F6BF6A100E5C3B2 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "ShenYin" target */ = { + isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; + attributesByRelativePath = { + StarburstSdkDirect.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + }; + buildPhase = 3FEFE9092F1B252000D82F17 /* Embed Frameworks */; + membershipExceptions = ( + StarburstSdkDirect.xcframework, + ); + }; + 3F372EF42F6CE3CE00E5C3B2 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "ShenYin" target */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; + attributesByRelativePath = { + Channel/DeepChords/Sdk/JoyGemAI.framework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + }; buildPhase = 3FEFE9092F1B252000D82F17 /* Embed Frameworks */; membershipExceptions = ( - Channel/DeepChords/JoySdk/tool/JoyGemAI.framework, + Channel/DeepChords/Sdk/JoyGemAI.framework, + Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework, ); }; - 3FCB29902F6A7DAD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */ = { + 3FCB29902F6A7DAD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "playboy" target */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; + attributesByRelativePath = { + Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + }; buildPhase = 3FD1DFEF2F0E00BF00A62733 /* Embed Frameworks */; membershipExceptions = ( - Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework, + Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework, ); }; - 3FCB2E832F6AAEC8007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */ = { + 3FCB2E832F6AAEC8007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "DeepChordsSdk" target */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; + attributesByRelativePath = { + StarburstSdkDirect.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + }; buildPhase = 3FFB77C52F17A11100EF9A60 /* Embed Frameworks */; membershipExceptions = ( StarburstSdkDirect.xcframework, ); }; - 3FCB2E862F6AAEEE007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */ = { + 3FCB2E862F6AAEEE007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "playboy" target */ = { isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet; + attributesByRelativePath = { + StarburstSdkDirect.xcframework = (CodeSignOnCopy, RemoveHeadersOnCopy, ); + }; buildPhase = 3FD1DFEF2F0E00BF00A62733 /* Embed Frameworks */; membershipExceptions = ( StarburstSdkDirect.xcframework, @@ -196,9 +216,11 @@ 0D54E0F02F0A61E600A80EE7 /* DeepChordsSdk */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( - 3FCB2E832F6AAEC8007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */, + 3F372ED22F6BF6A100E5C3B2 /* Exceptions for "DeepChordsSdk" folder in "ShenYin" target */, + 3F372ED32F6BF6A100E5C3B2 /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "ShenYin" target */, + 3FCB2E832F6AAEC8007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "DeepChordsSdk" target */, 3FCB2E7F2F6AAE8C007AB47F /* Exceptions for "DeepChordsSdk" folder in "playboy" target */, - 3FCB2E862F6AAEEE007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" build phase */, + 3FCB2E862F6AAEEE007AB47F /* Exceptions for "DeepChordsSdk" folder in "Embed Frameworks" phase from "playboy" target */, ); path = DeepChordsSdk; sourceTree = ""; @@ -207,9 +229,9 @@ isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( 3F887BAE2E38D8DD00C98658 /* Exceptions for "ShenYin" folder in "ShenYin" target */, - 3FCB298D2F6A7BBD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */, + 3F372EF42F6CE3CE00E5C3B2 /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "ShenYin" target */, 3FD1DFF52F0E00BF00A62733 /* Exceptions for "ShenYin" folder in "playboy" target */, - 3FCB29902F6A7DAD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" build phase */, + 3FCB29902F6A7DAD007AB47F /* Exceptions for "ShenYin" folder in "Embed Frameworks" phase from "playboy" target */, ); path = ShenYin; sourceTree = ""; @@ -229,8 +251,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F2E449CAD5874BE652A69B50 /* BuildFile in Frameworks */, + F2E449CAD5874BE652A69B50 /* (null) in Frameworks */, 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */, + 3F372ECC2F6BF69800E5C3B2 /* DeepChordsSdk.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -239,7 +262,7 @@ buildActionMask = 2147483647; files = ( 3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */, - 817510A595D00CAD05E3772C /* BuildFile in Frameworks */, + 817510A595D00CAD05E3772C /* (null) in Frameworks */, 30B13DEF1AA0E4C54D873276 /* Pods_playboy.framework in Frameworks */, 7666589AAA94A323B6090425 /* Pods_playboy.framework in Frameworks */, ); @@ -350,6 +373,7 @@ buildRules = ( ); dependencies = ( + 3F372ECF2F6BF69800E5C3B2 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 3F887B9E2E38D8DC00C98658 /* ShenYin */, @@ -457,10 +481,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources.sh\"\n"; @@ -496,10 +524,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-playboy/Pods-playboy-frameworks.sh\"\n"; @@ -535,10 +567,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks.sh\"\n"; @@ -593,6 +629,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 3F372ECF2F6BF69800E5C3B2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 0D54E0EE2F0A61E600A80EE7 /* DeepChordsSdk */; + targetProxy = 3F372ECE2F6BF69800E5C3B2 /* PBXContainerItemProxy */; + }; 3FD1DFE42F0E00BF00A62733 /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; @@ -735,6 +776,7 @@ "$(PROJECT_DIR)/framework", "$(PROJECT_DIR)/ShenYin/Sdk/JoySdk/tool", "$(PROJECT_DIR)/ShenYin/Channel/DeepChords/JoySdk/tool", + "$(PROJECT_DIR)/ShenYin/Channel/DeepChords/Sdk", ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenYin/Channel/DeepChords/DeepChords.plist; @@ -791,6 +833,7 @@ "$(PROJECT_DIR)/framework", "$(PROJECT_DIR)/ShenYin/Sdk/JoySdk/tool", "$(PROJECT_DIR)/ShenYin/Channel/DeepChords/JoySdk/tool", + "$(PROJECT_DIR)/ShenYin/Channel/DeepChords/Sdk", ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenYin/Channel/DeepChords/DeepChords.plist; diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCBleManager.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCBleManager.swift similarity index 67% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCBleManager.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCBleManager.swift index 24f44bf..cda64b3 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCBleManager.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCBleManager.swift @@ -8,20 +8,8 @@ import UIKit import CoreBluetooth import AVFAudio +import DeepChordsSdk -//#if FEATURE_X -//import DeepChordsSdk -//#endif - - -class DCPeripheral{ - var device:CBPeripheral! - var mac = "" - init(device: CBPeripheral!, mac: String = "") { - self.device = device - self.mac = mac - } -} class CCBleManager: NSObject { var discoverDeviceCallback: (([DCPeripheral]) -> Void)? @@ -32,7 +20,7 @@ class CCBleManager: NSObject { var devices: [DCPeripheral] = [] var connectPeripheral: DCPeripheral? static let shared = CCBleManager() - var isConnetd:Bool = false + var isConneted:Bool = false private override init() { super.init() @@ -52,7 +40,7 @@ extension CCBleManager:CBCentralManagerDelegate{ case.unauthorized: break case.poweredOff: - self.isConnetd = false + self.isConneted = false NotificationManager.post(type: .deviceValidChange, objtect: nil) break case.poweredOn: @@ -69,58 +57,52 @@ extension CCBleManager:CBCentralManagerDelegate{ if devices.map({ $0.device }).contains(peripheral) { return } - Logger.debug(peripheral) - -// if let name = peripheral.name,name.hasPrefix("AI") { -// let mac = DcSdkManager.getMac(advertisementData) ?? "" -// devices.append(DCPeripheral(device: peripheral,mac: mac)) -// discoverDeviceCallback?(devices) -// } -// else{ -//// let mac = JoySdkManager.getMac(advertisementData) ?? "" -//// devices.append(DCPeripheral(device: peripheral,mac: mac)) -//// discoverDeviceCallback?(devices) -// } - if CCConfig.sdkType == .joy{ - let mac = JoySdkManager.getMac(advertisementData) ?? "" + Logger.debug("发现设备 ",peripheral) + + if let name = peripheral.name,name.lowercased().contains("deep"),let mac = JoySdkManager.getMac(advertisementData){ + devices.append(DCPeripheral(device: peripheral,mac: mac)) + discoverDeviceCallback?(devices) + } + else if let mac = DcSdkManager.getMac(advertisementData){ devices.append(DCPeripheral(device: peripheral,mac: mac)) discoverDeviceCallback?(devices) } -// else{ -// let mac = DcSdkManager.getMac(advertisementData) ?? "" -// devices.append(DCPeripheral(device: peripheral,mac: mac)) -// discoverDeviceCallback?(devices) -// } } func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) { stopScanDevice() - Logger.debug("蓝牙已连接 \(peripheral)") + Logger.debug("已连接 \(peripheral)") peripheral.delegate = self if CCConfig.sdkType == .joy{ peripheral.discoverServices([CBUUID(string: JoySdkManager.serviceUUID),CBUUID(string: OtaMananger.otaServiceUUId)]); } else{ -// DCBleManager.shared.centralManager(central, didConnect: peripheral) -// peripheral.discoverServices([CBUUID(string: DCBleManager.serviceUUID),CBUUID(string: OtaMananger.otaServiceUUId)]); + DCBleManager.shared.centralManager(central, didConnect: peripheral) + peripheral.discoverServices([CBUUID(string: DCBleManager.serviceUUID),CBUUID(string: OtaMananger.otaServiceUUId)]); } } func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) { - Logger.debug("peripheral: %@ failed to connect", peripheral,"error \(error)") + Logger.debug("连接失败\(peripheral)") + if let err = error { + Logger.debug("error \(err)") + } conetedFailureCallback?(connectPeripheral!) } func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) { - Logger.debug("蓝牙已断开 \(peripheral)","error \(error)") + Logger.debug("蓝牙已断开 \(peripheral)") + if let err = error { + Logger.debug("error \(err)") + } YLprogressHUD.showAutoHiden("蓝牙已断开".l10n) - self.isConnetd = false + self.isConneted = false if CCConfig.sdkType == .joy{ JoySdkManager.shared.bleDisConnected() } else{ -// DCBleManager.shared.centralManager(central, didDisconnectPeripheral: peripheral, error: nil) + DCBleManager.shared.centralManager(central, didDisconnectPeripheral: peripheral, error: nil) } - NotificationManager.post(type: .deviceValidChange, objtect: nil) OtaMananger.shared.otaManager.centralManager(central, didDisconnectPeripheral: peripheral, error: error) + NotificationManager.post(type: .deviceValidChange, objtect: nil) checkConectState() } } @@ -135,16 +117,16 @@ extension CCBleManager: CBPeripheralDelegate { } func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { - if CCConfig.sdkType == .joy{ + if service.uuid.uuidString == OtaMananger.otaServiceUUId{ + OtaMananger.shared.otaManager.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) + } + else if CCConfig.sdkType == .joy{ if (service.uuid.uuidString == JoySdkManager.serviceUUID) { JoySdkManager.shared.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) } - else if service.uuid.uuidString == OtaMananger.otaServiceUUId{ - OtaMananger.shared.otaManager.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) - } } else{ -// DCBleManager.shared.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) + DCBleManager.shared.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) } } @@ -160,7 +142,7 @@ extension CCBleManager: CBPeripheralDelegate { } func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { - // Logger.debug("收到数据 ===uUId ",characteristic.uuid) + //Logger.debug("收到数据 ===uUId ",characteristic.uuid) if CCConfig.sdkType == .joy{ if OtaMananger.isOtadata(characteristic){ if let _ = characteristic.value,error == nil { @@ -176,22 +158,13 @@ extension CCBleManager: CBPeripheralDelegate { } } else{ -// DCBleManager.shared.peripheral(peripheral, didUpdateValueFor: characteristic, error: error) + DCBleManager.shared.peripheral(peripheral, didUpdateValueFor: characteristic, error: error) } } - - func peripheral(_ peripheral: CBPeripheral, didModifyServices invalidatedServices: [CBService]) { - // Accessory's GATT database has updated. Refresh your local cache (if any) - } - - func peripheral(_ peripheral: CBPeripheral, didWriteValueFor characteristic: CBCharacteristic, error: (any Error)?) { - - } } extension CCBleManager{ func startScanDevice() { - // centralManager.stopScan() Logger.debug("扫描中...") Logger.debug("蓝牙状态",centralManager.state.rawValue) devices = [] @@ -202,12 +175,7 @@ extension CCBleManager{ // devices.append(DCPeripheral(device: item,mac: mac)) // } // } - if CCConfig.sdkType == .joy{ - centralManager.scanForPeripherals(withServices: [CBUUID(string: JoySdkManager.serviceUUID)],options: [CBCentralManagerScanOptionAllowDuplicatesKey : false]) - } - else{ -// centralManager.scanForPeripherals(withServices: [CBUUID(string: DCBleManager.serviceUUID)],options: [CBCentralManagerScanOptionAllowDuplicatesKey : false]) - } + centralManager.scanForPeripherals(withServices: [CBUUID(string: JoySdkManager.serviceUUID),CBUUID(string: DCBleManager.serviceUUID)],options: [CBCentralManagerScanOptionAllowDuplicatesKey : false]) discoverDeviceCallback?(devices) } @@ -217,12 +185,12 @@ extension CCBleManager{ func connectPeripheral(_ peripheral: DCPeripheral) { connectPeripheral = peripheral -// if let name = peripheral.device.name,name.hasPrefix("AI") { -// CCDevice.isJoy = false -// } -// else{ -// CCDevice.isJoy = true -// } + if let name = peripheral.device.name,name.lowercased().contains("deep") { + CCConfig.sdkType = .joy + } + else{ + CCConfig.sdkType = .lianJuXing + } CCDevice.initSdk() Logger.debug(peripheral.device.name ?? "","连接中...") centralManager.connect(peripheral.device, options: [CBConnectPeripheralOptionEnableTransportBridgingKey:true]) @@ -230,8 +198,8 @@ extension CCBleManager{ func cancel() { guard let peripheral = connectPeripheral else { return } - if self.isConnetd { - self.isConnetd = false + if self.isConneted { + self.isConneted = false centralManager.cancelPeripheralConnection(peripheral.device) } @@ -257,7 +225,7 @@ extension CCBleManager{ func isConected(mac:String?)->Bool{ guard let mac = mac,let device = connectPeripheral else { return false } if device.mac == mac { - return isConnetd + return isConneted } else{ return false @@ -286,21 +254,6 @@ extension CCBleManager{ } CCBleManager.shared.startScanDevice() } - - func checkSettingsConnected()->[CBPeripheral]{ - if CCConfig.sdkType == .joy { - let list = centralManager.retrieveConnectedPeripherals(withServices: [CBUUID(string: JoySdkManager.serviceUUID)]) - Logger.debug("已连接设备",list) - return list -// return [] - } - else{ -// let list = centralManager.retrieveConnectedPeripherals(withServices: [CBUUID(string: DCBleManager.serviceUUID)]) -// Logger.debug("已连接设备",list) -// return list - return [] - } - } } extension CCBleManager{ @@ -308,7 +261,7 @@ extension CCBleManager{ guard let mac = connectPeripheral?.mac else { return } - if isConnetd { + if isConneted { return } connect(mac: mac) {result in diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCConfig.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift similarity index 98% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCConfig.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift index 4d06c67..4b8111a 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCConfig.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCConfig.swift @@ -9,7 +9,7 @@ class CCConfig{ /// app类型 static let appType = CCAppType.deepchords /// sdk类型 - static let sdkType = CCSdkType.joy + static var sdkType = CCSdkType.joy /// 是否显示北科AI static var showRaisoundChat = false diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCDevice.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCDevice.swift similarity index 61% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCDevice.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCDevice.swift index 8cb2d3d..65ae1b6 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCDevice.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCDevice.swift @@ -5,13 +5,15 @@ // Created by liangshi on 2025/12/25. // import JoyGemAI +import DeepChordsSdk + class CCDevice{ static func initSdk(){ if CCConfig.sdkType == .joy { JoySdkManager.shared.setupSdk() } else{ -// DcSdkManager.shared.initSdk() + DcSdkManager.shared.initSdk() } } static func translate(text:String,from:String,to:String,finished:@escaping ((stream:String,finish:Bool)?)->Void){ @@ -24,10 +26,10 @@ class CCDevice{ } } else{ -// DCText.cancelTranslateByTextWithSplit() -// DCText.translate(text: text, from: from, to: to) { result in -// finished(result) -// } + DCText.cancelTranslateByTextWithSplit() + DCText.translate(text: text, from: from, to: to) { result in + finished(result) + } } } static func summary(text:String,finished:@escaping ((stream:String,finish:Bool)?)->Void){ @@ -40,10 +42,10 @@ class CCDevice{ } } else{ -// DCText.cancelSummaryByTextWithSplit() -// DCText.sumary(text: text) { result in -// finished(result) -// } + DCText.cancelSummaryByTextWithSplit() + DCText.sumary(text: text) { result in + finished(result) + } } } } @@ -66,9 +68,9 @@ extension CCDevice{ } } else{ -// let value:UInt8 = mode == .cancel ? 0:1 -// DCDevice.shared.findDevice(state: value) { result in -// } + let value:UInt8 = mode == .cancel ? 0:1 + DCDevice.shared.findDevice(state: value) { result in + } } } static func getEQMode(finished:@escaping (ModeEffectsType?)->Void){ @@ -102,28 +104,28 @@ extension CCDevice{ // 0x03(爵士) // 0x04(摇滚) // 0x05(自定义) -// DCDevice.shared.getEQ { (arg0,result) in -// guard let (type,list) = arg0 else{ -// finished(nil) -// return -// } -// switch type{ -// case 0: -// finished(.normal) -// case 1: -// finished(.pop) -// case 2: -// finished(.classic) -// case 3: -// finished(.jazz) -// case 4: -// finished(.rock) -// case 5: -// finished(.custom) -// default: -// finished(nil) -// } -// } + DCDevice.shared.getEQ { (arg0,result) in + guard let (type,list) = arg0 else{ + finished(nil) + return + } + switch type{ + case 0: + finished(.normal) + case 1: + finished(.pop) + case 2: + finished(.classic) + case 3: + finished(.jazz) + case 4: + finished(.rock) + case 5: + finished(.custom) + default: + finished(nil) + } + } } } static func setEQMode(_ type:ModeEffectsType){ @@ -148,10 +150,10 @@ extension CCDevice{ Logger.debug("setEQMode:\(err)"); } }else{ -// let value:UInt8 = UInt8(type.rawValue) -// DCDevice.shared.setEQ(type: value) { success in -// -// } + let value:UInt8 = UInt8(type.rawValue) + DCDevice.shared.setEQ(type: value) { success in + + } } } @@ -167,19 +169,19 @@ extension CCDevice{ } } else{ -// DCDevice.shared.getEQ { (arg0,result) in -// guard let (type,list) = arg0 else{ -// finished(nil) -// return -// } -// if type == 5{ -// let nums = list.map { NSNumber(value: $0) } -// finished(nums) -// } -// else{ -// finished(nil) -// } -// } + DCDevice.shared.getEQ { (arg0,result) in + guard let (type,list) = arg0 else{ + finished(nil) + return + } + if type == 5{ + let nums = list.map { NSNumber(value: $0) } + finished(nums) + } + else{ + finished(nil) + } + } } } static func resetCustomEQ(){ @@ -189,20 +191,20 @@ extension CCDevice{ } } else{ -// let list = [ -// 0,0,0,0,0,0,0,0,0,0,0,0 -// ] -// let dispatchGroup = DispatchGroup() -// for (index,item) in list.enumerated() { -// dispatchGroup.enter() -// DCDevice.shared.setCustomEQ(index: UInt8(index), value: item) {result in -// dispatchGroup.leave() -// } -// } -// dispatchGroup.notify(queue:.main) { -// DCDevice.shared.setEQ(type: 0x05) {result in -// } -// } + let list = [ + 0,0,0,0,0,0,0,0,0,0,0,0 + ] + let dispatchGroup = DispatchGroup() + for (index,item) in list.enumerated() { + dispatchGroup.enter() + DCDevice.shared.setCustomEQ(index: UInt8(index), value: item) {result in + dispatchGroup.leave() + } + } + dispatchGroup.notify(queue:.main) { + DCDevice.shared.setEQ(type: 0x05) {result in + } + } } } static func setCustomEQ(index:Int,value:Int){ @@ -212,28 +214,12 @@ extension CCDevice{ } } else{ -// DCDevice.shared.setCustomEQ(index: UInt8(index), value: value) {result in -// } + DCDevice.shared.setCustomEQ(index: UInt8(index), value: value) {result in + } } } } extension CCDevice{ -// static func getMac(finished:@escaping ((_ mac:String?)->Void)) { -// if CCDevice.isJoy { -// JoyGemAIManager.shared().device.macAddress { edr, ble in -// Logger.debug("edr:\(edr),ble:\(ble)"); -// finished(edr.uppercased()) -// } error: { error in -// Logger.debug("\(error!.localizedDescription)") -// finished(nil) -// } -// } -// else{ -//// DCDevice.shared.getSoftVersion {result in -//// finished(result) -//// } -// } -// } static func getDN(finished:@escaping ((_ mac:String?)->Void)) { if CCConfig.sdkType == .joy { JoyGemAIManager.shared().device.getDN { deviceName in @@ -244,8 +230,8 @@ extension CCDevice{ } } else{ -// let dn = DCText.getDeviceName() -// finished(dn) + let dn = DCText.getDeviceName() + finished(dn) } } static func getVersion(finished:@escaping ((_ version:String?)->Void)) { @@ -258,9 +244,9 @@ extension CCDevice{ } } else{ -// DCDevice.shared.getSoftVersion {result in -// finished(result) -// } + DCDevice.shared.getSoftVersion {result in + finished(result) + } } } } diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCPage.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCPage.swift similarity index 85% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCPage.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCPage.swift index 976c189..4545195 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/CCPage.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/Config/CCPage.swift @@ -12,7 +12,7 @@ class CCPage{ App.shared.goToPage(JoyChatVC()) } else{ -// App.shared.goToPage(PbChatVC()) + App.shared.goToPage(PbChatVC()) } } static func gotoFieldRecord(){ @@ -21,7 +21,7 @@ class CCPage{ App.shared.goToPage(JoyXclyVC()) } else{ -// App.shared.goToPage(PbXclyVC()) + App.shared.goToPage(PbXclyVC()) } } static func gotoCallRecord(){ @@ -35,7 +35,7 @@ class CCPage{ } } else{ -// App.shared.goToPage(PbStereoCallVC()) + App.shared.goToPage(PbStereoCallVC()) } } static func gotoChinese2Enlgish(){ @@ -44,7 +44,7 @@ class CCPage{ App.shared.goToPage(JoyChinese2EnglishVC()) } else{ -// App.shared.goToPage(PbChinese2EnglishVC()) + App.shared.goToPage(PbChinese2EnglishVC()) } } static func gotoTcty(){ @@ -53,7 +53,7 @@ class CCPage{ App.shared.goToPage(JoyTctyVC()) } else{ -// App.shared.goToPage(PbTctyVC()) + App.shared.goToPage(PbTctyVC()) } } static func gotoDialogTranslate(){ @@ -62,7 +62,7 @@ class CCPage{ App.shared.goToPage(JoyDialogTranslateVC()) } else{ -// App.shared.goToPage(PbDialogTranslateVC()) + App.shared.goToPage(PbDialogTranslateVC()) } } static func gotoSubTitle(){ diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyAiFunctionVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyAiFunctionVC.swift similarity index 98% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyAiFunctionVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyAiFunctionVC.swift index 7b13d83..2b0550a 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyAiFunctionVC.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyAiFunctionVC.swift @@ -80,7 +80,7 @@ class JoyAiFunctionVC:BaseVC{ } @objc func chatAction(){ if CCBleManager.shared.isConected(mac: device.mac){ -// CCPage.gotoChat() + CCPage.gotoChat() } } @objc func subTitleAction(){ diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyCallingRecordVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyCallingRecordVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyCallingRecordVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyCallingRecordVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyChatVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyChatVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyChatVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyChatVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyChinese2EnglishVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyChinese2EnglishVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyChinese2EnglishVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyChinese2EnglishVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyDialogTranslateVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyDialogTranslateVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyDialogTranslateVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyDialogTranslateVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyHomeVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyHomeVC.swift similarity index 98% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyHomeVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyHomeVC.swift index 211a2da..ba0208b 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyHomeVC.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyHomeVC.swift @@ -87,7 +87,7 @@ class JoyHomeVC:BaseVC{ func reloadData() { DeviceVM.shared.refresh {[weak self] result in self?.collectionView.reloadData() - if CCBleManager.shared.isConnetd{ + if CCBleManager.shared.isConneted{ return } var autoConnetced = false @@ -110,7 +110,6 @@ class JoyHomeVC:BaseVC{ override func navRightViewTapped() { App.shared.goToPage(BleScanVC()) // App.shared.goToPage(CalendarPickerVC()) -// CCBleManager.shared.checkSettingsConnected() // ChatCache.shared.LargeDateDemoSave() } @objc func editAction(){ diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyModeVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyModeVC.swift similarity index 95% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyModeVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyModeVC.swift index 8a6f77b..ccd1e46 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyModeVC.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyModeVC.swift @@ -86,11 +86,11 @@ extension ModeVC{ updateState() } func updateState(){ - self.view.alpha = CCBleManager.shared.isConnetd ? 1:0.5 + self.view.alpha = CCBleManager.shared.isConneted ? 1:0.5 } func selectedModeAction(_ mode:ModeEffectsType){ - if !CCBleManager.shared.isConnetd { + if !CCBleManager.shared.isConneted { return } CCDevice.setEQMode(mode) @@ -99,7 +99,7 @@ extension ModeVC{ } } @objc func findAction(){ - if CCBleManager.shared.isConnetd { + if CCBleManager.shared.isConneted { App.shared.goToPage(FindVC()) } diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyStereoCallVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyStereoCallVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyStereoCallVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyStereoCallVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoySubTitleVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoySubTitleVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoySubTitleVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoySubTitleVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyTabBC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyTabBC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyTabBC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyTabBC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyTctyVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyTctyVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyTctyVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyTctyVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyXclyVC.swift b/ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyXclyVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/VC/JoyXclyVC.swift rename to ShenYin/ShenYin/Channel/DeepChords/Channel/UI/JoyXclyVC.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyCallRecord.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyCallRecord.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyCallRecord.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyCallRecord.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyChat.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyChat.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyChat.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyChat.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyChinse2English.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyChinse2English.swift similarity index 95% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyChinse2English.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyChinse2English.swift index cc97567..8369bc6 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyChinse2English.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyChinse2English.swift @@ -20,8 +20,8 @@ class JoyChinse2English:NSObject{ func start(){ startIndex += 100000 -// JoyGemSIManager.shared().originalLanguage = kJoyGemAILocalizationAuto -// JoyGemSIManager.shared().targetLanguage = kJoyGemAILocalizationAuto + JoyGemSIManager.shared().originalLanguage = kJoyGemAILocalizationAuto + JoyGemSIManager.shared().targetLanguage = kJoyGemAILocalizationAuto JoyGemSIManager.shared().start() // do { // try AVAudioSession.sharedInstance().setCategory(.playAndRecord, options: [.defaultToSpeaker]) diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyDialog.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyDialog.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyDialog.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyDialog.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAI-Swift.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAI-Swift.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAI-Swift.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAI-Swift.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAI.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAI.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAI.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAI.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAIManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAIManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemAIManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemAIManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemCallManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemCallManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemCallManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemCallManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemChatManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemChatManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemChatManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemChatManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemDeviceManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemDeviceManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemDeviceManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemDeviceManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemEnum.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemEnum.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemEnum.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemEnum.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemModel.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemModel.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemModel.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemModel.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemParam.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemParam.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemParam.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemParam.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemRecordManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemRecordManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemRecordManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemRecordManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSIDeviceManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSIDeviceManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSIDeviceManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSIDeviceManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSIManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSIManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSIManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSIManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSubtitleManager.h b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSubtitleManager.h similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Headers/JoyGemSubtitleManager.h rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Headers/JoyGemSubtitleManager.h diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Info.plist b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Info.plist similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Info.plist rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Info.plist diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/JoyGemAI b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/JoyGemAI similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/JoyGemAI rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/JoyGemAI diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.abi.json b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.abi.json similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.abi.json rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.abi.json diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.private.swiftinterface b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.private.swiftinterface similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.private.swiftinterface rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.private.swiftinterface diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftdoc b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftdoc similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftdoc rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftdoc diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftinterface b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftinterface similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftinterface rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftinterface diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftmodule b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftmodule similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftmodule rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/JoyGemAI.swiftmodule/arm64-apple-ios.swiftmodule diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/module.modulemap b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/module.modulemap similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/Modules/module.modulemap rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/Modules/module.modulemap diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/PrivacyInfo.xcprivacy b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/PrivacyInfo.xcprivacy similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/PrivacyInfo.xcprivacy rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/PrivacyInfo.xcprivacy diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/_CodeSignature/CodeResources b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/_CodeSignature/CodeResources similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyGemAI.framework/_CodeSignature/CodeResources rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyGemAI.framework/_CodeSignature/CodeResources diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyRecord.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyRecord.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyRecord.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyRecord.swift diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoySdkManager.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoySdkManager.swift similarity index 99% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoySdkManager.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoySdkManager.swift index d4a3945..6846102 100644 --- a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoySdkManager.swift +++ b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoySdkManager.swift @@ -121,7 +121,7 @@ extension JoySdkManager : JoyGemAIManagerDelegate { DeviceCache.saveLastConnected(mac: CCBleManager.shared.connectPeripheral!.mac) DeviceCache.shared.add(CCBleManager.shared.connectPeripheral!.device.identifier.uuidString, mac: CCBleManager.shared.connectPeripheral!.mac) - CCBleManager.shared.isConnetd = true + CCBleManager.shared.isConneted = true CCBleManager.shared.didConnectDeviceCallback?(CCBleManager.shared.connectPeripheral!) NotificationManager.post(type: .deviceValidChange, objtect: nil) DeviceVM.updateOtaVersion() diff --git a/ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyTcty.swift b/ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyTcty.swift similarity index 100% rename from ShenYin/ShenYin/Channel/DeepChords/JoySdk/tool/JoyTcty.swift rename to ShenYin/ShenYin/Channel/DeepChords/Sdk/JoyTcty.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCBleManager.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCBleManager.swift similarity index 72% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCBleManager.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCBleManager.swift index 0ded3de..3f9c311 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCBleManager.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCBleManager.swift @@ -14,15 +14,6 @@ import DeepChordsSdk //#endif -class DCPeripheral{ - var device:CBPeripheral! - var mac = "" - init(device: CBPeripheral!, mac: String = "") { - self.device = device - self.mac = mac - } -} - class CCBleManager: NSObject { var discoverDeviceCallback: (([DCPeripheral]) -> Void)? var didConnectDeviceCallback: ((DCPeripheral) -> Void)? @@ -32,7 +23,7 @@ class CCBleManager: NSObject { var devices: [DCPeripheral] = [] var connectPeripheral: DCPeripheral? static let shared = CCBleManager() - var isConnetd:Bool = false + var isConneted:Bool = false private override init() { super.init() @@ -52,7 +43,7 @@ extension CCBleManager:CBCentralManagerDelegate{ case.unauthorized: break case.poweredOff: - self.isConnetd = false + self.isConneted = false NotificationManager.post(type: .deviceValidChange, objtect: nil) break case.poweredOn: @@ -84,13 +75,19 @@ extension CCBleManager:CBCentralManagerDelegate{ peripheral.discoverServices([CBUUID(string: DCBleManager.serviceUUID)]); } func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) { - Logger.debug("peripheral: %@ failed to connect", peripheral) + Logger.debug("连接失败\(peripheral)") + if let err = error { + Logger.debug("error \(err)") + } conetedFailureCallback?(connectPeripheral!) } func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) { - Logger.debug("蓝牙已断开 \(peripheral)",error?.localizedDescription ?? "",error.debugDescription) + Logger.debug("蓝牙已断开 \(peripheral)") + if let err = error { + Logger.debug("error \(err)") + } YLprogressHUD.showAutoHiden("蓝牙已断开".l10n) - self.isConnetd = false + self.isConneted = false DCBleManager.shared.centralManager(central, didDisconnectPeripheral: peripheral, error: nil) NotificationManager.post(type: .deviceValidChange, objtect: nil) checkConectState() @@ -109,37 +106,16 @@ extension CCBleManager: CBPeripheralDelegate { func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { DCBleManager.shared.peripheral(peripheral, didDiscoverCharacteristicsFor: service, error: error) } - - func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: (any Error)?) { - } - func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { - //Logger.debug("收到数据 ===uUId ",characteristic.uuid) - DCBleManager.shared.peripheral(peripheral, didUpdateValueFor: characteristic, error: error) - } - - func peripheral(_ peripheral: CBPeripheral, didModifyServices invalidatedServices: [CBService]) { - // Accessory's GATT database has updated. Refresh your local cache (if any) - } - - func peripheral(_ peripheral: CBPeripheral, didWriteValueFor characteristic: CBCharacteristic, error: (any Error)?) { - + DCBleManager.shared.peripheral(peripheral, didUpdateValueFor: characteristic, error: error) } } extension CCBleManager{ func startScanDevice() { - // centralManager.stopScan() Logger.debug("扫描中...") Logger.debug("蓝牙状态",centralManager.state.rawValue) devices = [] - // let list = centralManager.retrieveConnectedPeripherals(withServices: [CBUUID(string: kJoyGemAIServiceUUID)]) - // Logger.debug("已连接设备",list) - // for item in list { - // if let mac = DeviceCache.shared.getMac(item.identifier.uuidString){ - // devices.append(DCPeripheral(device: item,mac: mac)) - // } - // } centralManager.scanForPeripherals(withServices: [CBUUID(string: DCBleManager.serviceUUID)],options: [CBCentralManagerScanOptionAllowDuplicatesKey : false]) discoverDeviceCallback?(devices) } @@ -157,8 +133,8 @@ extension CCBleManager{ func cancel() { guard let peripheral = connectPeripheral else { return } - if self.isConnetd { - self.isConnetd = false + if self.isConneted { + self.isConneted = false centralManager.cancelPeripheralConnection(peripheral.device) } @@ -172,26 +148,18 @@ extension CCBleManager{ } } -extension CCBleManager{ - func joySdkSend(_ data: Data, with characteristic: CBCharacteristic) { - if let connectPeripheral = connectPeripheral{ - connectPeripheral.device.writeValue(data, for: characteristic, type:.withoutResponse) - } - } -} - extension CCBleManager{ func isConected(mac:String)->Bool{ guard let device = connectPeripheral else { return false } if device.mac == mac { - return isConnetd + return isConneted } else{ return false } } - // #连接有问题，应当获取设置里面已连接的设备 + //#连接有问题，应当获取设置里面已连接的设备 func connect(mac:String, finished:@escaping ((Bool) -> Void)){ CCBleManager.shared.cancel() CCBleManager.shared.discoverDeviceCallback = { list in @@ -213,12 +181,6 @@ extension CCBleManager{ } CCBleManager.shared.startScanDevice() } - - func checkSettingsConnected()->[CBPeripheral]{ - let list = centralManager.retrieveConnectedPeripherals(withServices: [CBUUID(string: DCBleManager.serviceUUID)]) - Logger.debug("已连接设备",list) - return list - } } extension CCBleManager{ @@ -226,7 +188,7 @@ extension CCBleManager{ guard let mac = connectPeripheral?.mac else { return } - if isConnetd { + if isConneted { return } connect(mac: mac) {result in diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCConfig.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCConfig.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCConfig.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCDevice.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCDevice.swift similarity index 64% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCDevice.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCDevice.swift index 686b126..cfe7ff0 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCDevice.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCDevice.swift @@ -3,8 +3,7 @@ // ShenYin // // Created by liangshi on 2025/12/25. -// -//import JoyGemAI + import DeepChordsSdk class CCDevice{ static func initSdk(){ @@ -60,57 +59,55 @@ extension CCDevice{ } } static func setEQMode(_ type:ModeEffectsType){ - let value:UInt8 = UInt8(type.rawValue) - DCDevice.shared.setEQ(type: value) { success in - - } + let value:UInt8 = UInt8(type.rawValue) + DCDevice.shared.setEQ(type: value) { success in + + } } - - static func getCustomEQ(finished:@escaping ([NSNumber]?)->Void){ - DCDevice.shared.getEQ { (arg0,result) in - guard let (type,list) = arg0 else{ - finished(nil) - return - } - if type == 5{ - let nums = list.map { NSNumber(value: $0) } - finished(nums) - } - else{ - finished(nil) - } + DCDevice.shared.getEQ { (arg0,result) in + guard let (type,list) = arg0 else{ + finished(nil) + return + } + if type == 5{ + let nums = list.map { NSNumber(value: $0) } + finished(nums) + } + else{ + finished(nil) } + } } static func resetCustomEQ(){ - let list = [ - 0,0,0,0,0,0,0,0,0,0,0,0 - ] - let dispatchGroup = DispatchGroup() - for (index,item) in list.enumerated() { - dispatchGroup.enter() - DCDevice.shared.setCustomEQ(index: UInt8(index), value: item) {result in - dispatchGroup.leave() - } + let list = [ + 0,0,0,0,0,0,0,0,0,0,0,0 + ] + let dispatchGroup = DispatchGroup() + for (index,item) in list.enumerated() { + dispatchGroup.enter() + DCDevice.shared.setCustomEQ(index: UInt8(index), value: item) {result in + dispatchGroup.leave() } - dispatchGroup.notify(queue:.main) { - DCDevice.shared.setEQ(type: 0x05) {result in - } + } + dispatchGroup.notify(queue:.main) { + DCDevice.shared.setEQ(type: 0x05) {result in } + } } static func setCustomEQ(index:Int,value:Int){ - DCDevice.shared.setCustomEQ(index: UInt8(index), value: value) {result in - } + DCDevice.shared.setCustomEQ(index: UInt8(index), value: value) {result in + } } } extension CCDevice{ static func getDN(finished:@escaping ((_ mac:String?)->Void)) { - let dn = DCText.getDeviceName() - finished(dn) + let dn = DCText.getDeviceName() + finished(dn) } static func getVersion(finished:@escaping ((_ version:String?)->Void)) { - DCDevice.shared.getSoftVersion {result in - finished(result) - } + DCDevice.shared.getSoftVersion {result in + finished(result) + } } } diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCPage.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCPage.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/CCPage.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/Config/CCPage.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbAiFunctionVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbAiFunctionVC.swift similarity index 99% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbAiFunctionVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbAiFunctionVC.swift index a296008..b1e74f2 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbAiFunctionVC.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbAiFunctionVC.swift @@ -27,7 +27,7 @@ class PbAiFunctionVC:BaseVC{ override func setupViews() { navBar.title = device.productName navBar.backgroundColor = .color(.bgColor) - navBar.rightView.isHidden = false +// navBar.rightView.isHidden = false navBar.rightView.setTitle("字幕翻译", for: .normal) view.backgroundColor = .color(.bgColor) // navBar.rightView.setImage(UIImage(named: "add_icon"), for: .normal) diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbChatVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbChatVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbChatVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbChatVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbChinese2EnglishVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbChinese2EnglishVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbChinese2EnglishVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbChinese2EnglishVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbDialogTranslateVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbDialogTranslateVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbDialogTranslateVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbDialogTranslateVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbHomeVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbHomeVC.swift similarity index 99% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbHomeVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbHomeVC.swift index 5f57d99..5de3ed7 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbHomeVC.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbHomeVC.swift @@ -92,7 +92,7 @@ class PbHomeVC:BaseVC{ DeviceVM.shared.refresh {[weak self] result in self?.collectionView.isHidden = false self?.collectionView.reloadData() - if CCBleManager.shared.isConnetd{ + if CCBleManager.shared.isConneted{ return } var autoConnetced = false diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbModeVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbModeVC.swift similarity index 95% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbModeVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbModeVC.swift index 819fe7d..677138b 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbModeVC.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbModeVC.swift @@ -81,15 +81,15 @@ extension ModeVC{ updateState() } func updateState(){ - self.findView.alpha = CCBleManager.shared.isConnetd ? 1:0.5 + self.findView.alpha = CCBleManager.shared.isConneted ? 1:0.5 self.navBar.title = CCBleManager.shared.connectPeripheral?.device.name ?? "" - headerView.connetedView.isHidden = !CCBleManager.shared.isConnetd + headerView.connetedView.isHidden = !CCBleManager.shared.isConneted } func selectedModeAction(_ mode:ModeEffectsType){ - if !CCBleManager.shared.isConnetd { + if !CCBleManager.shared.isConneted { return } CCDevice.setEQMode(mode) @@ -98,7 +98,7 @@ extension ModeVC{ } } @objc func findAction(){ - if CCBleManager.shared.isConnetd { + if CCBleManager.shared.isConneted { if CCConfig.appType == .deepchords{ App.shared.goToPage(FindVC()) } diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbStereoCallVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbStereoCallVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbStereoCallVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbStereoCallVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbSubTitleVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbSubTitleVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbSubTitleVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbSubTitleVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbTabBC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbTabBC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbTabBC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbTabBC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbTctyVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbTctyVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbTctyVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbTctyVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbXclyVC.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbXclyVC.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/VC/PbXclyVC.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Channel/UI/PbXclyVC.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcCall.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcCall.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcCall.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcCall.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcChatManager.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcChatManager.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcChatManager.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcChatManager.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcChinese2Enligsh.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcChinese2Enligsh.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcChinese2Enligsh.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcChinese2Enligsh.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcSdkManager.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcSdkManager.swift similarity index 98% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcSdkManager.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcSdkManager.swift index 4cc230f..e4fe6fc 100644 --- a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcSdkManager.swift +++ b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcSdkManager.swift @@ -91,7 +91,7 @@ class DcSdkManager{ DeviceCache.saveLastConnected(mac: device.mac) DeviceCache.shared.add(CCBleManager.shared.connectPeripheral!.device.identifier.uuidString, mac: CCBleManager.shared.connectPeripheral!.mac) - CCBleManager.shared.isConnetd = true + CCBleManager.shared.isConneted = true CCBleManager.shared.didConnectDeviceCallback?(CCBleManager.shared.connectPeripheral!) NotificationManager.post(type: .deviceValidChange, objtect: nil) DeviceVM.updateOtaVersion() diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcStereo.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcStereo.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcStereo.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcStereo.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcSubTitle.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcSubTitle.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcSubTitle.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcSubTitle.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcTcty.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcTcty.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcTcty.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcTcty.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcXcly.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcXcly.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/DcXcly.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/DcXcly.swift diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/Info.plist b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/Info.plist similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/Info.plist rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/Info.plist diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusFormat.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusFormat.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusFormat.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusFormat.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWav.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWav.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWav.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWav.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Info.plist b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Info.plist similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Info.plist rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Info.plist diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/JLAudioUnitKit b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/JLAudioUnitKit similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/JLAudioUnitKit rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/JLAudioUnitKit diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Modules/module.modulemap b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Modules/module.modulemap similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Modules/module.modulemap rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/Modules/module.modulemap diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/readme.txt b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/readme.txt similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/readme.txt rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-arm64/JLAudioUnitKit.framework/readme.txt diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitKit.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLAudioUnitPlayer.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusDecoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncodeConfig.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusEncoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusFormat.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusFormat.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusFormat.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusFormat.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLOpusToOgg.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWav.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWav.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWav.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWav.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLPcmToWtg.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Headers/JLSpeexDecoder.h diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Info.plist b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Info.plist similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Info.plist rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Info.plist diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/JLAudioUnitKit b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/JLAudioUnitKit similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/JLAudioUnitKit rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/JLAudioUnitKit diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Modules/module.modulemap b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Modules/module.modulemap similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Modules/module.modulemap rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/Modules/module.modulemap diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/_CodeSignature/CodeResources b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/_CodeSignature/CodeResources similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/_CodeSignature/CodeResources rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/_CodeSignature/CodeResources diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/readme.txt b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/readme.txt similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/readme.txt rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/JLAudioUnitKit.xcframework/ios-x86_64-simulator/JLAudioUnitKit.framework/readme.txt diff --git a/ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/OpusTools.swift b/ShenYin/ShenYin/Channel/PLAYBOY/Sdk/OpusTools.swift similarity index 100% rename from ShenYin/ShenYin/Channel/PLAYBOY/DcSdk/tool/OpusTools.swift rename to ShenYin/ShenYin/Channel/PLAYBOY/Sdk/OpusTools.swift diff --git a/ShenYin/ShenYin/UI/Home/RecordDetail/RecordDetailVC.swift b/ShenYin/ShenYin/UI/Home/RecordDetail/RecordDetailVC.swift index d09a564..1d76bc3 100644 --- a/ShenYin/ShenYin/UI/Home/RecordDetail/RecordDetailVC.swift +++ b/ShenYin/ShenYin/UI/Home/RecordDetail/RecordDetailVC.swift @@ -410,7 +410,7 @@ extension RecordDetailVC{ } func translateAction(){ translateView.content = "" - if !CCBleManager.shared.isConnetd{ + if !CCBleManager.shared.isConneted{ YLprogressHUD.showAutoHiden("蓝牙已断开".l10n) return } @@ -426,7 +426,7 @@ extension RecordDetailVC{ } func summaryAction(){ summaryView.content = "" - if !CCBleManager.shared.isConnetd{ + if !CCBleManager.shared.isConneted{ YLprogressHUD.showAutoHiden("蓝牙已断开".l10n) return } diff --git a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift index 56cc5e5..011da10 100644 --- a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift +++ b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift @@ -5,6 +5,15 @@ // Created by liangshi on 2025/10/20. // +class DCPeripheral{ + var device:CBPeripheral! + var mac = "" + init(device: CBPeripheral!, mac: String = "") { + self.device = device + self.mac = mac + } +} + class DeviceVM:BaseVM{ static let shared = DeviceVM() var dataList = [HomeDeviceModel]() @@ -157,33 +166,35 @@ extension DeviceVM{ let api = CommomApi.otaUpdateVersion(param:params ) HttpClient.request(api) { (model:ResponseBaseModel,res) in } - settingsConnected() +// settingsConnected() } } } - static func settingsConnected(){ - let list = CCBleManager.shared.checkSettingsConnected() - if list.count == 0{ - CustomAlert.showWith(title: "提示", messgage: "请前往系统设置连接蓝牙") { - - } okCallback: { - if let url = URL(string: "prefs:root=Bluetooth") { - // 检查URL是否可用，然后跳转 - if UIApplication.shared.canOpenURL(url) { - UIApplication.shared.open(url) { (success) in - // 提示用户是否成功打开了设置 - if success { - Logger.debug("成功跳转到蓝牙设置") - } else { - Logger.debug("跳转到设置失败") - } - } - } else { - Logger.debug("链接不可用") - } - } - } - } - } +// static func settingsConnected(){ +// let list = CCBleManager.shared.checkSettingsConnected() +// if list.count == 0{ +// CustomAlert.showWith(title: "提示", messgage: "请前往系统设置连接蓝牙") { +// +// } okCallback: { +// if let url = URL(string: "prefs:root=Bluetooth") { +// // 检查URL是否可用，然后跳转 +// if UIApplication.shared.canOpenURL(url) { +// UIApplication.shared.open(url) { (success) in +// // 提示用户是否成功打开了设置 +// if success { +// Logger.debug("成功跳转到蓝牙设置") +// } else { +// Logger.debug("跳转到设置失败") +// } +// } +// } else { +// Logger.debug("链接不可用") +// } +// } +// } +// } +// } } + + diff --git a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift index 996f343..e2bffba 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift @@ -72,7 +72,7 @@ class UpdateVC:BaseVC{ } } @objc func tapAction(){ - if !CCBleManager.shared.isConnetd{ + if !CCBleManager.shared.isConneted{ YLprogressHUD.showAutoHiden("请先连接设备".l10n) return } diff --git a/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift b/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift index 96e41d0..0a11ae6 100644 --- a/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift +++ b/ShenYin/ShenYin/UI/Mode/ModeEffectsView.swift @@ -70,7 +70,7 @@ class ModeEffectsView: BaseView { } @objc func tapAction(_ tap:UITapGestureRecognizer){ - if !CCBleManager.shared.isConnetd { + if !CCBleManager.shared.isConneted { return } let view = tap.view as! ItemView diff --git a/ShenYin/ShenYin/UI/Raisound/RSRecordBar.swift b/ShenYin/ShenYin/UI/Raisound/RSRecordBar.swift index fb4ff44..41e8810 100644 --- a/ShenYin/ShenYin/UI/Raisound/RSRecordBar.swift +++ b/ShenYin/ShenYin/UI/Raisound/RSRecordBar.swift @@ -78,7 +78,7 @@ class RSRecordBar:BaseView{ updateState() } @objc func startBtnAction(){ - if !CCBleManager.shared.isConnetd { + if !CCBleManager.shared.isConneted { return } startBtn.isHidden = true @@ -102,7 +102,7 @@ class RSRecordBar:BaseView{ updateState() } func updateState(){ - self.alpha = CCBleManager.shared.isConnetd ? 1:0.3 + self.alpha = CCBleManager.shared.isConneted ? 1:0.3 } } diff --git "a/document/\346\200\247\350\203\275\344\274\230\345\214\226.txt" "b/document/\346\200\247\350\203\275\344\274\230\345\214\226.txt" deleted file mode 100644 index 3751488..0000000 --- "a/document/\346\200\247\350\203\275\344\274\230\345\214\226.txt" +++ /dev/null @@ -1,5 +0,0 @@ -我项目中接入StarburstSdk.framework，在oc_StarburstSdk和code两个不同的项目中，代码一样的，但是调用StarburstSdk.framework接口消耗的资源差别很大。code的消耗cpu长期保持在5%左右，而oc_StarburstSdk消耗cpu长期保持在75%以上。两个项目的代码是一样的。我猜测是项目buildSetting的哪些配置不一样引起的，你帮我对比分析看是哪个设置可能影响到 - -code项目中有个StarburstSdk的target,该target生成StarburstSdk.framework，在code项目中运行的时候，消耗的cpu稳定在5%左右，但是将生成的framework嵌入到oc_StarburstSdk项目后，oc_StarburstSdk项目运行消耗的cpu稳定在75%，帮我分析code中的StarburstSdk的settings如何设置才能让生成的framework在其他项目中高效运行 - -http://vjs.zencdn.net/v/oceans.mp4 \ No newline at end of file