Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Android/simpleDemo/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.com.jlbank.ai"
         minSdkVersion 29
         targetSdkVersion 33
-        versionName System.getenv("versionName") ?: "1.0.3"
-        versionCode System.getenv("versionCode")?.toInteger() ?: 285
+        versionName System.getenv("versionName") ?: "1.0.6"
+        versionCode System.getenv("versionCode")?.toInteger() ?: 288
         multiDexEnabled true
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8

package.json

@@ -18,6 +18,7 @@
     "build:app-plus:sit": "uni build -p app-plus --mode sit",
     "build:app-plus:uat": "uni build -p app-plus --mode uat",
     "build:app-plus:prod": "uni build -p app-plus",
+    "b": "uni build -p app-plus",
     "build:h5:dev": "uni build -p h5 --mode development_h5",
     "build:h5": "uni build"
   },

src/components/touch-btn/touch-btn.vue

@@ -173,7 +173,7 @@
 		// 最大录音时长
 		maxRecordDuration: {
 			type: Number,
-			default: 60000
+			default: 58000
 		},
 		adjustPosition: {
 			default: false,
@@ -283,7 +283,7 @@
 		tempText.value = '';
 		allText.value = '';
 		ossKey.value = '';
-		
+		voiceQueue = [];
 		pressTimer = setTimeout(() => {
 			if (!isRecording.value) {
 				console.log('定时器被取消还是进入了');
@@ -628,8 +628,11 @@
 				console.log('录音时长定时器已清除');
 			}
 		};
-		clearRecordingTimer();
-		if (!status) return;
+		
+		if (!status) {
+			clearRecordingTimer();
+			return;
+		}
 		const maxDuration = props.maxRecordDuration;
 		durationTimer = setTimeout(() => {
 			console.log(`录音达到最大时长 ${maxDuration} 秒，自动关闭`);