diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index eb3df681..72be4024 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -8,8 +8,8 @@ }, { "bundleId" : "cn.com.jlbank.aits", - "certificateFile" : "/Users/jlbank/Desktop/tra-app/certificate/ios/开发证书.p12", - "certificateProfileFile" : "/Users/jlbank/Desktop/tra-app/certificate/ios/jiaixuedev.mobileprovision", + "certificateFile" : "/Users/jlbank/Desktop/lx_uniapp/tra-app/certificate/ios/开发证书.p12", + "certificateProfileFile" : "/Users/jlbank/Desktop/lx_uniapp/tra-app/certificate/ios/jiaixuedev.mobileprovision", "playground" : "standard", "runSignStatus" : 1, "type" : "uni-app:app-ios" diff --git a/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj b/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj index a52e44ed..faf199c8 100755 --- a/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj +++ b/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj @@ -439,7 +439,6 @@ 8EED65A5198A626B000A4449 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; 8EED65A7198A6273000A4449 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; A832515F2F67A4C2001DCF21 /* IJKMediaFrameworkWithSSL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IJKMediaFrameworkWithSSL.framework; path = ../SDK/Libs/IJKMediaFrameworkWithSSL.framework; sourceTree = ""; }; - A86BA3852F63EBE400AF9A88 /* DCloudUTSFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DCloudUTSFoundation.framework; path = ../SDK/Libs/DCloudUTSFoundation.framework; sourceTree = ""; }; A87E07812F6929AE00276C29 /* DCloudUTSFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = DCloudUTSFoundation.framework; sourceTree = ""; }; A87E07882F692EFF00276C29 /* DCUniBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = DCUniBase.framework; sourceTree = ""; }; A88BFB312E2600AC00E932EB /* DCSVProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = DCSVProgressHUD.bundle; path = ../SDK/Bundles/DCSVProgressHUD.bundle; sourceTree = ""; }; @@ -862,7 +861,6 @@ isa = PBXGroup; children = ( A832515F2F67A4C2001DCF21 /* IJKMediaFrameworkWithSSL.framework */, - A86BA3852F63EBE400AF9A88 /* DCloudUTSFoundation.framework */, A8A511A32EEAAD4500D15560 /* libbz2.tbd */, A8A511A12EEAAD0500D15560 /* QuartzCore.framework */, A88BFB3A2E26030300E932EB /* Masonry.framework */, diff --git a/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.xcworkspace/xcuserdata/jlbank.xcuserdatad/UserInterfaceState.xcuserstate b/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.xcworkspace/xcuserdata/jlbank.xcuserdatad/UserInterfaceState.xcuserstate index 39312538..5ff63425 100644 Binary files a/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.xcworkspace/xcuserdata/jlbank.xcuserdatad/UserInterfaceState.xcuserstate and b/Ios/HBuilder-Hello/HBuilder-Hello.xcodeproj/project.xcworkspace/xcuserdata/jlbank.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo index ae494d84..989c4e5e 100644 Binary files a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json index d02c8188..ed61c6b3 100644 --- a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json +++ b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json @@ -3970,226 +3970,6 @@ } ] }, - { - "kind": "Var", - "name": "reuseInt32Array", - "printedName": "reuseInt32Array", - "children": [ - { - "kind": "TypeNominal", - "name": "Optional", - "printedName": "DCloudUTSFoundation.Int32Array?", - "children": [ - { - "kind": "TypeNominal", - "name": "Int32Array", - "printedName": "DCloudUTSFoundation.Int32Array", - "usr": "c:@M@DCloudUTSFoundation@objc(cs)Int32Array" - } - ], - "usr": "s:Sq" - } - ], - "declKind": "Var", - "usr": "s:20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvp", - "mangledName": "$s20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvp", - "moduleName": "unimoduleTyRecording", - "declAttributes": [ - "HasInitialValue", - "HasStorage", - "AccessControl" - ], - "hasStorage": true, - "accessors": [ - { - "kind": "Accessor", - "name": "Get", - "printedName": "Get()", - "children": [ - { - "kind": "TypeNominal", - "name": "Optional", - "printedName": "DCloudUTSFoundation.Int32Array?", - "children": [ - { - "kind": "TypeNominal", - "name": "Int32Array", - "printedName": "DCloudUTSFoundation.Int32Array", - "usr": "c:@M@DCloudUTSFoundation@objc(cs)Int32Array" - } - ], - "usr": "s:Sq" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvg", - "mangledName": "$s20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvg", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "get" - }, - { - "kind": "Accessor", - "name": "Set", - "printedName": "Set()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Optional", - "printedName": "DCloudUTSFoundation.Int32Array?", - "children": [ - { - "kind": "TypeNominal", - "name": "Int32Array", - "printedName": "DCloudUTSFoundation.Int32Array", - "usr": "c:@M@DCloudUTSFoundation@objc(cs)Int32Array" - } - ], - "usr": "s:Sq" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvs", - "mangledName": "$s20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvs", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "set" - }, - { - "kind": "Accessor", - "name": "Modify", - "printedName": "Modify()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvM", - "mangledName": "$s20unimoduleTyRecording15reuseInt32Array19DCloudUTSFoundation0eF0CSgvM", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "_modify" - } - ] - }, - { - "kind": "Var", - "name": "recordedPCMData", - "printedName": "recordedPCMData", - "children": [ - { - "kind": "TypeNominal", - "name": "Array", - "printedName": "[Swift.UInt8]", - "children": [ - { - "kind": "TypeNominal", - "name": "UInt8", - "printedName": "Swift.UInt8", - "usr": "s:s5UInt8V" - } - ], - "usr": "s:Sa" - } - ], - "declKind": "Var", - "usr": "s:20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvp", - "mangledName": "$s20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvp", - "moduleName": "unimoduleTyRecording", - "declAttributes": [ - "HasInitialValue", - "HasStorage", - "AccessControl" - ], - "hasStorage": true, - "accessors": [ - { - "kind": "Accessor", - "name": "Get", - "printedName": "Get()", - "children": [ - { - "kind": "TypeNominal", - "name": "Array", - "printedName": "[Swift.UInt8]", - "children": [ - { - "kind": "TypeNominal", - "name": "UInt8", - "printedName": "Swift.UInt8", - "usr": "s:s5UInt8V" - } - ], - "usr": "s:Sa" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvg", - "mangledName": "$s20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvg", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "get" - }, - { - "kind": "Accessor", - "name": "Set", - "printedName": "Set()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Array", - "printedName": "[Swift.UInt8]", - "children": [ - { - "kind": "TypeNominal", - "name": "UInt8", - "printedName": "Swift.UInt8", - "usr": "s:s5UInt8V" - } - ], - "usr": "s:Sa" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvs", - "mangledName": "$s20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvs", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "set" - }, - { - "kind": "Accessor", - "name": "Modify", - "printedName": "Modify()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - } - ], - "declKind": "Accessor", - "usr": "s:20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvM", - "mangledName": "$s20unimoduleTyRecording15recordedPCMDataSays5UInt8VGvM", - "moduleName": "unimoduleTyRecording", - "implicit": true, - "accessorKind": "_modify" - } - ] - }, { "kind": "Var", "name": "targetSampleRate", @@ -6260,31 +6040,17 @@ "length": 5, "value": "false" }, - { - "filePath": "\/Users\/jlbank\/Desktop\/111\/unimoduleTyRecording\/src\/index.swift", - "kind": "IntegerLiteral", - "offset": 7751, - "length": 4, - "value": "4800" - }, - { - "filePath": "\/Users\/jlbank\/Desktop\/111\/unimoduleTyRecording\/src\/index.swift", - "kind": "Array", - "offset": 7795, - "length": 2, - "value": "[]" - }, { "filePath": "\/Users\/jlbank\/Desktop\/111\/unimoduleTyRecording\/src\/index.swift", "kind": "FloatLiteral", - "offset": 7836, + "offset": 7736, "length": 7, "value": "16000.0" }, { "filePath": "\/Users\/jlbank\/Desktop\/111\/unimoduleTyRecording\/src\/index.swift", "kind": "IntegerLiteral", - "offset": 7876, + "offset": 7776, "length": 1, "value": "1" } diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface index 97abc912..b7431ce0 100644 --- a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface +++ b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface @@ -71,8 +71,6 @@ public var AudioErrors: [unimoduleTyRecording.AudioErrorCode : Swift.String] public var isRecording: Swift.Bool public var audioEngine: AVFAudio.AVAudioEngine? public var inputNode: AVFAudio.AVAudioInputNode? -public var reuseInt32Array: DCloudUTSFoundation.Int32Array? -public var recordedPCMData: [Swift.UInt8] public var targetSampleRate: Swift.Double public var channels: Foundation.NSNumber public var recordStartTime: Foundation.NSNumber? diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftinterface b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftinterface index 97abc912..b7431ce0 100644 --- a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftinterface +++ b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftinterface @@ -71,8 +71,6 @@ public var AudioErrors: [unimoduleTyRecording.AudioErrorCode : Swift.String] public var isRecording: Swift.Bool public var audioEngine: AVFAudio.AVAudioEngine? public var inputNode: AVFAudio.AVAudioInputNode? -public var reuseInt32Array: DCloudUTSFoundation.Int32Array? -public var recordedPCMData: [Swift.UInt8] public var targetSampleRate: Swift.Double public var channels: Foundation.NSNumber public var recordStartTime: Foundation.NSNumber? diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/_CodeSignature/CodeResources b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/_CodeSignature/CodeResources index 09b50554..cb8fd1aa 100644 --- a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/_CodeSignature/CodeResources +++ b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/_CodeSignature/CodeResources @@ -22,15 +22,15 @@ Modules/unimoduleTyRecording.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo - QbjcvbPxe2SMBqPdoCza55av/Tw= + TLOHHDzHkJ5T0ookGp0eUuKiAyU= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json - Z7ggKmxb9JqzIhxdnP1xCbzzZ4k= + pbmeWUh86qZBo+NDNLQTkugcS1Q= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface - LJpDEMNwHf014zr2KuiiwfkstBo= + 3F+Z9ScbP7Joffio7FCaruBCwoM= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftdoc @@ -38,11 +38,11 @@ Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftinterface - LJpDEMNwHf014zr2KuiiwfkstBo= + 3F+Z9ScbP7Joffio7FCaruBCwoM= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftmodule - Pin0pLehK8375qWP03Epfm9w+Pk= + afsK4ngvO+GyKohHC+HTeaJlMQ4= config.json @@ -80,21 +80,21 @@ hash2 - 947SepgiPHcaEuic0DLG2gwt/FS8rF716Trb8QOlqlM= + Eumt+b0A6MowWHNAl4LzHEqx8tqDes6Gkne6WMYV3no= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.abi.json hash2 - B0HE4iiPSTwFN9Pz8MyiSw90PHoeoAGkINkAjKAquCE= + Eg/gzUqHUsddFo7fv6D4oO57364iyyHCDeuVA3FBOyY= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.private.swiftinterface hash2 - +ZduByY3uAsmQpDhqBuZyAWRwjgdV2xjsJkZUbrlw5Q= + V39qYlvjQK7ofWRX95tTDt4mxPb23S3mMFWZi1LxJkA= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftdoc @@ -108,14 +108,14 @@ hash2 - +ZduByY3uAsmQpDhqBuZyAWRwjgdV2xjsJkZUbrlw5Q= + V39qYlvjQK7ofWRX95tTDt4mxPb23S3mMFWZi1LxJkA= Modules/unimoduleTyRecording.swiftmodule/arm64-apple-ios.swiftmodule hash2 - FRUEjsQO4p4SSBQv/tNb1cDT4XQpnurMRxgSUr0nPBI= + vNu7jOeumiVckYl+2jb6jwGCh9aQAKf9KV4Vgrjrc6Y= config.json diff --git a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/unimoduleTyRecording b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/unimoduleTyRecording index b8c19071..80f47c2c 100755 Binary files a/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/unimoduleTyRecording and b/Ios/HBuilder-Hello/unimoduleTyRecording.xcframework/ios-arm64/unimoduleTyRecording.framework/unimoduleTyRecording differ diff --git a/src/components/touch-btn/touch-btn.ts b/src/components/touch-btn/touch-btn.ts index 9e4f8e95..64447e15 100644 --- a/src/components/touch-btn/touch-btn.ts +++ b/src/components/touch-btn/touch-btn.ts @@ -1,4 +1,4 @@ -import { ErrorCode, ShowErrorTipOptions } from './touch-btn.types'; +import { ErrorMessageEnum, ShowErrorTipOptions } from './touch-btn.types'; import { get_base_url } from '@/api/request.js'; import { getPhoneEnvBool } from '@/common/common.js'; const IsAndEnv = getPhoneEnvBool('AND') @@ -69,7 +69,7 @@ export const initWebSocket = (wsUrl : string) : Promise => { * @returns 固定返回false(保持原有返回值类型) */ export function showErrorTip( - errorCode : ErrorCode, + errorMsg : ErrorMessageEnum | string, options : ShowErrorTipOptions = {} ) : boolean { // 解构可选参数,设置默认延迟时间为200ms @@ -78,7 +78,7 @@ export function showErrorTip( // 延迟显示对应的错误提示 setTimeout(() => { uni.showToast({ - title: errorCode, // 直接使用枚举值作为提示文本 + title: errorMsg, // 直接使用枚举值作为提示文本 icon: 'none' }); }, delayTime); // 使用传入的延迟时间(或默认200ms) diff --git a/src/components/touch-btn/touch-btn.types.ts b/src/components/touch-btn/touch-btn.types.ts index 280bc31b..e83e273c 100644 --- a/src/components/touch-btn/touch-btn.types.ts +++ b/src/components/touch-btn/touch-btn.types.ts @@ -24,7 +24,7 @@ export type VoiceToTextSubStatus = export type WorkModeType = 'both' | 'text-only' | 'voice-only' ; /** 错误码枚举 - 直接映射提示文本 */ -export enum ErrorCode { +export enum ErrorMessageEnum { // 网络错误提示 NetworkError = '网络连接失败,请稍后再试!', // 录音时长过短提示 diff --git a/src/components/touch-btn/touch-btn.vue b/src/components/touch-btn/touch-btn.vue index 68d26c0e..853115fd 100644 --- a/src/components/touch-btn/touch-btn.vue +++ b/src/components/touch-btn/touch-btn.vue @@ -116,12 +116,13 @@