From: liangzhenying <867174124@qq.com> Date: Sat, 20 Dec 2025 03:45:04 +0000 (+0800) Subject: 修复停止录音，识别文字不全bug。 X-Git-Tag: 1.0.2~29 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=ed8e59cccc1c1c5670da31e2f68c5ef2aa8f8f8a;p=mirrors%2FShenYin.git 修复停止录音，识别文字不全bug。 --- diff --git a/DeepChordsSdk_iOS/DeepChordsSdk/Example/Example/tools/DCSdkManager.swift b/DeepChordsSdk_iOS/DeepChordsSdk/Example/Example/tools/DCSdkManager.swift index f921277..0e39f84 100644 --- a/DeepChordsSdk_iOS/DeepChordsSdk/Example/Example/tools/DCSdkManager.swift +++ b/DeepChordsSdk_iOS/DeepChordsSdk/Example/Example/tools/DCSdkManager.swift @@ -47,9 +47,5 @@ class DCSdkManager{ break } } - - - - } } diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index 0885d42..a790c3b 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -199,10 +199,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"; @@ -252,7 +256,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 104; + CURRENT_PROJECT_VERSION = 1100; DEVELOPMENT_TEAM = G23X75CJ67; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -278,7 +282,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -302,7 +306,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 104; + CURRENT_PROJECT_VERSION = 1100; DEVELOPMENT_TEAM = G23X75CJ67; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -328,7 +332,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.0; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ShenYin/ShenYin/Api/Config.swift b/ShenYin/ShenYin/Api/Config.swift index 90e740b..c2e37a2 100644 --- a/ShenYin/ShenYin/Api/Config.swift +++ b/ShenYin/ShenYin/Api/Config.swift @@ -19,6 +19,7 @@ class DCConfig{ /// 服务器地址 // static let baseURL = "http://118.145.178.188:32000" static let baseURL = "https://app-api.deepchords.com" + //海外版 // static let baseURL = "https://app-api.deepchords-ai.com" /// 用户隐私协议地址 diff --git a/ShenYin/ShenYin/Api/LogManager.swift b/ShenYin/ShenYin/Api/LogManager.swift index 8735333..f61e054 100644 --- a/ShenYin/ShenYin/Api/LogManager.swift +++ b/ShenYin/ShenYin/Api/LogManager.swift @@ -9,7 +9,7 @@ import Foundation /// 日记管理 class Logger { - static var isDebug: Bool = true + static var isDebug: Bool = false fileprivate static let shared = Logger() private var fileHandle:FileHandle? diff --git a/ShenYin/ShenYin/DeepChordsSdk/DeepChordsSdk.swift b/ShenYin/ShenYin/DeepChordsSdk/DeepChordsSdk.swift deleted file mode 100644 index 566046f..0000000 --- a/ShenYin/ShenYin/DeepChordsSdk/DeepChordsSdk.swift +++ /dev/null @@ -1,34 +0,0 @@ -//// -//// DeepChordsSdk.swift -//// ShenYin -//// -//// Created by liangshi on 2025/12/3. -//// -// -//import DeepChordsSdk -// -//class DeepChordsSdk { -// static let shared = DeepChordsSdk() -// -// func initSdk(){ -// DeepChordsAiSdk.shared.initSDK() -// DeepChordsAiSdk.shared.authCallback = { [weak self] (code,string) in -// DCLogger.debug("鉴权结果",code,string) -// if code == 200{ -// -//// App.shared.window?.makeToast("鉴权成功") -// } -// else{ -//// App.shared.window?.makeToast(string) -// } -// } -// -// -// } -// func getVersion(){ -// DCDevice.shared.getHardVersion {[weak self] result in -// if let version = result{ -// } -// } -// } -//} diff --git a/ShenYin/ShenYin/JoySdk/JoyDevice.swift b/ShenYin/ShenYin/JoySdk/JoyDevice.swift index 49006b5..6e18539 100644 --- a/ShenYin/ShenYin/JoySdk/JoyDevice.swift +++ b/ShenYin/ShenYin/JoySdk/JoyDevice.swift @@ -129,3 +129,34 @@ class JoyDevice{ } } } +extension JoyDevice{ + static func getMac(finished:@escaping ((_ mac:String?)->Void)) { + 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) + } + } + static func getDN(finished:@escaping ((_ mac:String?)->Void)) { + // DispatchQueue.main.asyncAfter(deadline:.now() + 2) { + // print("延迟2秒后执行") + // + // } + JoyGemAIManager.shared().device.getDN { deviceName in + finished(deviceName) + } error: { error in + Logger.debug("获取dn失败","\(error!.localizedDescription)") + finished(nil) + } + } + static func getVersion(finished:@escaping ((_ version:String?)->Void)) { + JoyGemAIManager.shared().device.software { version in + finished(version) + } error: { error in + Logger.debug("\(error!.localizedDescription)"); + finished(nil) + } + } +} diff --git a/ShenYin/ShenYin/JoySdk/JoyRecord.swift b/ShenYin/ShenYin/JoySdk/JoyRecord.swift index 081566f..a1f218e 100644 --- a/ShenYin/ShenYin/JoySdk/JoyRecord.swift +++ b/ShenYin/ShenYin/JoySdk/JoyRecord.swift @@ -69,7 +69,7 @@ extension JoyRecord : JoyGemRecordManagerDelegate { } func recordManager(_ manager: JoyGemRecordManager, saveFile path: String) { - recordList.removeAll() +// Logger.debug("path: \(path)") if path.isEmpty { return diff --git a/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift b/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift index 9cb4921..82755ae 100644 --- a/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift +++ b/ShenYin/ShenYin/UI/Home/Device/HomeHeadInfoView.swift @@ -56,7 +56,7 @@ class HomeHeadInfoView: BaseColletionSetionHeader { } func updateUI(){ titleLabel.text = CacheManager.shared.user.info.userName - deviceLabel.text = "\(DeviceVM.shared.dataList.count)" + "个智能设备".l10n + deviceLabel.text = "\(DeviceVM.shared.dataList.count) " + "个智能设备".l10n } func updateColor(_ model:BackgroundModel?){ guard let model = model else { return } diff --git a/ShenYin/ShenYin/UI/Home/FieldRecording/FieldRecordingVC.swift b/ShenYin/ShenYin/UI/Home/FieldRecording/FieldRecordingVC.swift index c44b1a1..7b51575 100644 --- a/ShenYin/ShenYin/UI/Home/FieldRecording/FieldRecordingVC.swift +++ b/ShenYin/ShenYin/UI/Home/FieldRecording/FieldRecordingVC.swift @@ -68,6 +68,7 @@ class FieldRecordingVC:BaseVC{ func setupSdk() { JoySdkManager.shared.record.recordFinish = {[weak self] path in guard let self = self else { return } + Logger.debug("0000000 ===",textView.text ?? "") if !needSave { return } @@ -78,7 +79,7 @@ class FieldRecordingVC:BaseVC{ } v.okTap = { [weak self] text in guard let self = self else{return} - + Logger.debug("111111 ===",textView.text ?? "") let model = RecordDetailModel() model.type = .present model.from = toolBar.leftItem.language diff --git a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift index 29e2313..3ce8842 100644 --- a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift +++ b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift @@ -5,7 +5,7 @@ // Created by liangshi on 2025/10/20. // -import JoyGemAI +//import JoyGemAI class DeviceVM:BaseVM{ static let shared = DeviceVM() var dataList = [HomeDeviceModel]() @@ -70,7 +70,7 @@ extension DeviceVM{ BleManager.shared.cancel() return } - getDN { dn in + JoyDevice.getDN { dn in guard let deviceName = dn else{ BleManager.shared.cancel() self.showError() @@ -140,45 +140,15 @@ extension DeviceVM{ } } -extension DeviceVM{ - static func getMac(finished:@escaping ((_ mac:String?)->Void)) { - 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) - } - } - static func getDN(finished:@escaping ((_ mac:String?)->Void)) { -// DispatchQueue.main.asyncAfter(deadline:.now() + 2) { -// print("延迟2秒后执行") -// -// } - JoyGemAIManager.shared().device.getDN { deviceName in - finished(deviceName) - } error: { error in - Logger.debug("获取dn失败","\(error!.localizedDescription)") - finished(nil) - } - } - static func getVersion(finished:@escaping ((_ version:String?)->Void)) { - JoyGemAIManager.shared().device.software { version in - finished(version) - } error: { error in - Logger.debug("\(error!.localizedDescription)"); - finished(nil) - } - } -} + extension DeviceVM{ static func updateOtaVersion(){ - getVersion { version in + JoyDevice.getVersion { version in guard let v = version else{ return } - getDN { dn in + JoyDevice.getDN { dn in guard let deviceName = dn else{ return } diff --git a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift index 84359c8..38a00fb 100644 --- a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift +++ b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift @@ -99,7 +99,7 @@ class MineUserInfoView: BaseView { guard let self = self else {return} titleLabel.text = CacheManager.shared.user.info.userName icon.kf.setImage(with:CacheManager.shared.user.info.avatar.yc.asUrl ) - deviceLabel.text = "\(DeviceVM.shared.dataList.count)" + "个智能设备".l10n + deviceLabel.text = "\(DeviceVM.shared.dataList.count) " + "个智能设备".l10n } diff --git a/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVM.swift b/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVM.swift index 52df310..36b2197 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVM.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVM.swift @@ -8,12 +8,12 @@ class BleUpdateVM:BaseVM{ static let shared = BleUpdateVM() func checkedUpdate(){ - DeviceVM.getDN {[weak self] dn in + JoyDevice.getDN {[weak self] dn in guard let self = self else{return} guard let deviceName = dn else{ return } - DeviceVM.getVersion {[weak self] version in + JoyDevice.getVersion {[weak self] version in guard let self = self else{return} guard let version = version else{ return diff --git a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift index f0bd3dc..ae888b8 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/UpdateVC.swift @@ -54,7 +54,7 @@ class UpdateVC:BaseVC{ } } override func setupData() { - DeviceVM.getVersion {[weak self] version in + JoyDevice.getVersion {[weak self] version in guard let self = self else{return} let version = version ?? " --" let allText = "当前版本".l10n + "\nV\(version)" diff --git a/ShenYin/ShenYin/lan/english.swift b/ShenYin/ShenYin/lan/english.swift index 347b768..37ef409 100644 --- a/ShenYin/ShenYin/lan/english.swift +++ b/ShenYin/ShenYin/lan/english.swift @@ -7,7 +7,7 @@ let englishMap:[String:String] = [ - "智能" : "Smart AI", + "智能" : "Smart", "模式" : "Mode", "睡眠" : "Sleep", "客服" : "Support",