完善监听电话的绑定反馈

App.vue

@@ -64,6 +64,7 @@
 			this.$store.dispatch("call/startPhoneListener");
 			
 			this.startKeepLive();
+			
 
 
 			// #endif

pages/clueDetail/tabs/callRecord/index.vue

@@ -18,7 +18,7 @@
 							<uni-icons type="trash" size="20" color="#ff6666"></uni-icons>
 						</view>
 					</view>
-					<view class="file_name">{{data.fileName}}</view>
+					<view class="file_name" v-if="data.type === '3'">{{data.fileName}}</view>
 					<view class="call_file">
 						<view class="audio-container">
 							<audio :src="data.fileUrl" controls ></audio>

pages/uploadRecord/index.vue

@@ -7,6 +7,15 @@
 		</u-navbar>
 		<view class="form_wrap">
 			<u--form labelPosition="left" labelWidth="80" :model="form" :rules="rules" ref="form" class="form_wrap">
+				
+				<u-form-item label="线索id">
+					{{clueDetail && clueDetail.id ? clueDetail.id : "-"}}
+				</u-form-item>
+				
+				<u-form-item label="线索名称">
+					{{clueDetail && clueDetail.name ? clueDetail.name : "-"}}
+				</u-form-item>
+				
 				<u-form-item label="操作人">
 					{{userInfo.nickName}}
 				</u-form-item>
@@ -100,6 +109,7 @@
 					caller : '',
 					callee : ''
 				},
+				clueDetail : {},
 				// 对话框相关状态
 				showConfirmDialog: false,
 				selectedFile: {
@@ -113,20 +123,22 @@
 				const storeFormData = this.storeForm;
 				this.form = {
 					...this.form,
-					clueId: this.form.clueId, 
 					caller: storeFormData.caller || '',
 					callee: storeFormData.callee || '',
-					fileUrl: this.form.fileUrl,
-					fileName: this.form.fileName,
-					remark: this.form.remark,
-					type: this.form.type,
-					list: this.form.list
+					fileUrl: storeFormData.fileUrl,
+					fileName: storeFormData.fileName,
+					remark: storeFormData.remark,
+					type: storeFormData.type,
+					list: storeFormData.list
 				};
+				
+				uni.$u.api.getClueMainInfoById({id : this.form.clueId}).then(({data})=>{
+					this.clueDetail = data;
+				})
+				
 				if(!this.form.callee){
 					// 没有准备被叫号码 直接去查线索的telephone
-					uni.$u.api.getClueMainInfoById({id : this.form.clueId}).then(({data})=>{
-						this.form.callee = data.telephone;
-					})
+					this.form.callee = this.clueDetail.telephone;
 				};
 				if(!this.form.caller){
 					// 没有准备主叫号码 直接去尝试获取
@@ -134,6 +146,11 @@
 						this.form.caller = phone;
 					})
 				}
+				if(storeFormData.fileUrl){
+					// 初始化带了fileUrl 说明是从监听那边跳转的
+					this.handleFileChange({ filePath : storeFormData.fileUrl , fileName : storeFormData.fileName });
+				}
+				this.$store.dispatch("call/resetForm");
 			},
 			
 			handleFileChange(file){
@@ -182,6 +199,9 @@
 			},
 			
 			handleNavSaveClick() {
+				if(!this.form.clueId){
+					uni.$u.toast("相关线索id为空");
+				}
 				this.$refs.form.validate().then(async () => {
 					await uni.$u.api.saveClueFile(this.form);
 					uni.$u.toast("保存成功");

store/modules/call.js

@@ -8,7 +8,9 @@ import {
 	allRecorderFilesAction
 } from '@/uni_modules/yao-lister';
 import permision from "@/js_sdk/wa-permission/permission.js";
-import { formatPhoneNumber, simpleDebounce } from '../../utils/util';
+import {
+	formatPhoneNumber
+} from '../../utils/util';
 
 export default {
 	namespaced: true,
@@ -23,12 +25,12 @@ export default {
 		isPhoneListening: false, // 电话监听状态
 		form: {
 			clueId: undefined,
-			fileUrl : undefined,
-			fileName : undefined,
-			type : '3',
-			list : [],
-			caller : '',
-			callee : ''
+			fileUrl: undefined,
+			fileName: undefined,
+			type: '3',
+			list: [],
+			caller: '',
+			callee: ''
 		},
 	},
 	mutations: {
@@ -64,77 +66,109 @@ export default {
 		},
 	},
 	actions: {
-		getFileList({dispatch,state, commit}) {
-			dispatch("checkStoragePermission").then(()=>{
-				if(state.hasStoragePermission){
-					allRecorderFilesAction(res => {
-						if(res && res.length > 0) {
-							// 将文件路径数组转换为包含filePath和fileName的对象数组
-							const fileListPromise = res.map(filePath => {
-								return new Promise((resolve) => {
-									// 从路径中提取文件名
-									const fileName = filePath.split('/').pop();
-									
-									// 获取文件信息，包括创建时间
-									plus.io.resolveLocalFileSystemURL(filePath, (entry) => {
-										entry.getMetadata((metadata) => {
-											resolve({
-												filePath: filePath,
-												fileName: fileName,
-												createTime: metadata.modificationTime ? metadata.modificationTime : 0, // 文件创建时间
-											});
-										}, (error) => {
-											// 如果获取metadata失败，返回基本信息
-											resolve({
-												filePath: filePath,
-												fileName: fileName,
-												createTime: 0, // 设为0，排序时会在最前面
+		// 获取文件列表 - 返回Promise方式
+		getFileList({
+			dispatch,
+			state,
+			commit
+		}) {
+			return new Promise((resolve, reject) => {
+				dispatch("checkStoragePermission").then(() => {
+					if (state.hasStoragePermission) {
+						allRecorderFilesAction(res => {
+							if (res && res.length > 0) {
+								// 将文件路径数组转换为包含filePath和fileName的对象数组
+								const fileListPromise = res.map(filePath => {
+									return new Promise((resolve) => {
+										// 从路径中提取文件名
+										const fileName = filePath.split('/')
+											.pop();
+
+										// 获取文件信息，包括创建时间
+										plus.io.resolveLocalFileSystemURL(
+											filePath, (entry) => {
+												entry.getMetadata((
+													metadata) => {
+													resolve({
+														filePath: filePath,
+														fileName: fileName,
+														createTime: metadata
+															.modificationTime ?
+															metadata
+															.modificationTime :
+															0, // 文件创建时间
+													});
+												}, (error) => {
+													// 如果获取metadata失败，返回基本信息
+													resolve({
+														filePath: filePath,
+														fileName: fileName,
+														createTime: 0, // 设为0，排序时会在最前面
+													});
+												});
+											}, (error) => {
+												// 如果解析文件路径失败，返回基本信息
+												resolve({
+													filePath: filePath,
+													fileName: fileName,
+													createTime: 0,
+													size: 0
+												});
 											});
-										});
-									}, (error) => {
-										// 如果解析文件路径失败，返回基本信息
-										resolve({
-											filePath: filePath,
-											fileName: fileName,
-											createTime: 0,
-											size: 0
-										});
 									});
 								});
-							});
-							
-							// 等待所有文件信息获取完成后进行排序
-							Promise.all(fileListPromise).then((fileList) => {
-								// 按创建时间排序，最新的文件排在前面（降序）
-								fileList.sort((a, b) => {
-									return b.createTime - a.createTime;
+
+								// 等待所有文件信息获取完成后进行排序
+								Promise.all(fileListPromise).then((fileList) => {
+									// 按创建时间排序，最新的文件排在前面（降序）
+									fileList.sort((a, b) => {
+										return b.createTime - a.createTime;
+									});
+
+									// 提交文件列表到state
+									commit('SET_FILE_LIST', {
+										data: fileList
+									});
+									// 返回文件列表
+									resolve(fileList);
+								}).catch((error) => {
+									console.error('获取文件列表失败:', error);
+									// 即使排序失败，也尝试提交原始列表
+									const fallbackFileList = res.map(filePath => {
+										const fileName = filePath.split('/')
+											.pop();
+										return {
+											filePath: filePath,
+											fileName: fileName
+										};
+									});
+									commit('SET_FILE_LIST', {
+										data: fallbackFileList
+									});
+									resolve(fallbackFileList);
 								});
-								
-								// 提交文件列表到state
-								commit('SET_FILE_LIST', { data: fileList });
-							}).catch((error) => {
-								console.error('获取文件列表失败:', error);
-								// 即使排序失败，也尝试提交原始列表
-								const fallbackFileList = res.map(filePath => {
-									const fileName = filePath.split('/').pop();
-									return {
-										filePath: filePath,
-										fileName: fileName
-									};
+							} else {
+								// 没有文件时返回空数组
+								commit('SET_FILE_LIST', {
+									data: []
 								});
-								commit('SET_FILE_LIST', { data: fallbackFileList });
-							});
-						}
-					})
-				}else{
-					dispatch("requestStoragePermission");
-				}
-			})
-			
+								resolve([]);
+							}
+						})
+					} else {
+						dispatch("requestStoragePermission");
+						reject(new Error('没有文件访问权限'));
+					}
+				}).catch(error => {
+					reject(error);
+				});
+			});
 		},
 
 		// 获取用户手机号码
-		getUserPhoneNumber({ commit }) {
+		getUserPhoneNumber({
+			commit
+		}) {
 			return new Promise((resolve, reject) => {
 				// 首先检查权限
 				permision.requestAndroidPermission('android.permission.READ_PHONE_NUMBERS')
@@ -144,41 +178,20 @@ export default {
 							try {
 								const main = plus.android.runtimeMainActivity();
 								const Context = plus.android.importClass('android.content.Context');
-								const TelephonyManager = plus.android.importClass('android.telephony.TelephonyManager');
-								
+								const TelephonyManager = plus.android.importClass(
+									'android.telephony.TelephonyManager');
+
 								const telephonyManager = main.getSystemService(Context.TELEPHONY_SERVICE);
 								const phoneNumber = telephonyManager.getLine1Number();
-								
+
 								if (phoneNumber && phoneNumber.trim() !== '') {
 									// 移除国际区号，保留手机号码
 									const cleanPhoneNumber = formatPhoneNumber(phoneNumber);
 									commit('SET_CALLER_PHONE', cleanPhoneNumber);
 									resolve(cleanPhoneNumber);
 								} else {
-									// 如果获取不到手机号码，尝试使用备选方法
-									try {
-										const SubscriptionManager = plus.android.importClass('android.telephony.SubscriptionManager');
-										const subscriptionManager = main.getSystemService(Context.TELEPHONY_SERVICE);
-										const activeSubscriptionInfoList = subscriptionManager.getActiveSubscriptionInfoList();
-										
-										if (activeSubscriptionInfoList && activeSubscriptionInfoList.size() > 0) {
-											const subscriptionInfo = activeSubscriptionInfoList.get(0);
-											const number = subscriptionInfo.getNumber();
-											if (number && number.trim() !== '') {
-												// 移除国际区号，保留手机号码
-												const cleanPhoneNumber = formatPhoneNumber(number);
-												commit('SET_CALLER_PHONE', cleanPhoneNumber);
-												resolve(cleanPhoneNumber);
-											} else {
-												reject(new Error('无法获取手机号码：SIM卡可能未激活或号码无效'));
-											}
-										} else {
-											reject(new Error('无法获取手机号码：未检测到有效的SIM卡'));
-										}
-									} catch (fallbackError) {
-										console.error('备选方法获取手机号码失败:', fallbackError);
-										reject(new Error('无法获取手机号码：设备可能不支持或运营商限制'));
-									}
+									// 获取不到手机号码
+									reject(new Error('无法获取手机号码：设备可能不支持'));
 								}
 							} catch (error) {
 								console.error('获取手机号码失败:', error);
@@ -195,8 +208,24 @@ export default {
 			});
 		},
 
+		resetForm({
+			commit
+		}) {
+			commit("SET_FORM", {
+				clueId: undefined,
+				fileUrl: undefined,
+				fileName: undefined,
+				type: '3',
+				list: [],
+				caller: '',
+				callee: ''
+			})
+		},
+
 		// 检查所有权限状态
-		checkAllPermissions({ commit }) {
+		checkAllPermissions({
+			commit
+		}) {
 			return new Promise((resolve, reject) => {
 				try {
 					// 检查通话自动录音状态
@@ -208,8 +237,7 @@ export default {
 						commit('SET_STORAGE_PERMISSION', storagePermission);
 
 						// 检查其他权限
-						const permissions = [
-							{
+						const permissions = [{
 								id: 'android.permission.READ_PHONE_STATE',
 								mutation: 'SET_READ_PHONE_STATE_PERMISSION'
 							},
@@ -230,16 +258,19 @@ export default {
 						const permissionPromises = permissions.map(perm => {
 							return permision.requestAndroidPermission(perm.id).then(result => {
 								commit(perm.mutation, result === 1);
-								return { id: perm.id, granted: result === 1 };
+								return {
+									id: perm.id,
+									granted: result === 1
+								};
 							});
 						});
 
 						Promise.all(permissionPromises).then(results => {
-								resolve({
-									autoRecordStatus,
-									storagePermission,
-									permissions: results
-								});
+							resolve({
+								autoRecordStatus,
+								storagePermission,
+								permissions: results
+							});
 						});
 					});
 				} catch (error) {
@@ -249,7 +280,9 @@ export default {
 		},
 
 		// 检查文件访问权限
-		checkStoragePermission({ commit }) {
+		checkStoragePermission({
+			commit
+		}) {
 			return new Promise((resolve) => {
 				let hasPermission = false;
 				try {
@@ -266,13 +299,15 @@ export default {
 
 							if (androidVersion >= 11) {
 								// Android 11及以上版本，使用MANAGE_EXTERNAL_STORAGE权限
-								const Environment = plus.android.importClass('android.os.Environment');
+								const Environment = plus.android.importClass(
+									'android.os.Environment');
 								hasPermission = Environment.isExternalStorageManager();
 								commit('SET_STORAGE_PERMISSION', hasPermission);
 								resolve(hasPermission);
 							} else {
 								// Android 11以下版本，使用READ_EXTERNAL_STORAGE权限
-								permision.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE')
+								permision.requestAndroidPermission(
+										'android.permission.READ_EXTERNAL_STORAGE')
 									.then(result => {
 										hasPermission = result === 1;
 										commit('SET_STORAGE_PERMISSION', hasPermission);
@@ -310,38 +345,29 @@ export default {
 		},
 
 		// 启动电话监听
-		startPhoneListener({ commit, dispatch , state }) {
+		startPhoneListener({
+			commit,
+			dispatch,
+			state
+		}) {
 			try {
-				if(state.isPhoneListening){
+				if (state.isPhoneListening) {
 					// 已经开启监听就不要了
 					return;
 				}
-				dispatch("checkAllPermissions").finally(()=>{
+				// 用于记录上一个状态，检测通话结束
+				let previousState = null;
+				dispatch("checkAllPermissions").finally(() => {
 					startPhoneListener(res => {
-						simpleDebounce(()=>{
-							// 毕竟重复监听 套一个防抖
-							dispatch("handleCallBack");
-						},500)
-						// 14:44:54.429 空闲状态,  监听结果============================== at store/modules/call.js:324
-						
-						// 14:47:29.570 state=12== 2 13417106969
-						
-						// 14:47:29.570 phoneState 通话中
-						
-						// 14:47:29.571 通话中,  监听结果============================== at store/modules/call.js:324
-						
-						// 14:47:35.712 state=12== 0 13417106969
-						
-						// 14:47:35.713 phoneState 空闲状态
-						
-						// 14:47:35.728 空闲状态,  监听结果============================== at store/modules/call.js:324
-						
-						// 14:47:36.220 state=12== 0 13417106969
-						
-						// 14:47:36.220 phoneState 空闲状态
-						
-						// 14:47:36.220 空闲状态,  监听结果============================== at store/modules/call.js:324
-						console.log(res, "监听结果==============================");
+						if (state.form.clueId) {
+							// 是通过app监听打出去触发;
+							dispatch("handleCallBack", {
+								currentState: res,
+								previousState
+							});
+						}
+						// 更新上一个状态
+						previousState = res;
 						commit('SET_PHONE_LISTENING_STATUS', true);
 					});
 				});
@@ -351,14 +377,78 @@ export default {
 				throw error;
 			}
 		},
-		handleCallBack(){
-			
+		handleCallBack({
+			dispatch,
+			commit,
+			state
+		}, {
+			currentState,
+			previousState
+		} = {}) {
+			if (previousState && currentState) {
+				if (previousState === '通话中') {
+					if (currentState === '空闲状态') {
+						// 延迟一下再获取，确保录音文件已经生成
+						setTimeout(() => {
+							dispatch('getLatestRecordingFile').then((file) => {
+								uni.showModal({
+									title: '检测您的拨号行为,是否上传录音？',
+									content: '最新一条电话录音：' + file.fileName +",是否前往关联？",
+									success: function (res) {
+										if (res.confirm) {
+											uni.navigateTo({
+												url: `/pages/uploadRecord/index?clueId=${state.form.clueId}`
+											})
+										} else if (res.cancel) {
+											dispatch("resetForm");
+										}
+									}
+								});
+							}).catch(error => {
+								uni.$u.toast('获取录音文件失败:' + error);
+							});
+						}, 2000); // 延迟1秒获取
+					}
+				}
+			}
+		},
+
+		// 获取最新的录音文件并赋值给form
+		getLatestRecordingFile({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				// 获取文件列表 - 使用return Promise的方式
+				this.dispatch('call/getFileList').then((fileList) => {
+					if (fileList && fileList.length > 0) {
+						// 获取最新创建的录音文件（索引0是最新的）
+						const latestFile = fileList[0];
+
+						// 更新form中的fileUrl和fileName
+						const updatedForm = {
+							...state.form,
+							fileUrl: latestFile.filePath,
+							fileName: latestFile.fileName
+						};
+
+						commit('SET_FORM', updatedForm);
+						resolve(latestFile);
+					} else {
+						reject(new Error('未找到录音文件'));
+					}
+				}).catch(error => {
+					console.error('获取文件列表失败:', error);
+					reject(error);
+				});
+			});
 		},
 		// 停止电话监听
-		stopPhoneListener({ commit }) {
+		stopPhoneListener({
+			commit
+		}) {
 			try {
 				stopPhoneListener(res => {
-					console.log(res, "3123123123");
 					commit('SET_PHONE_LISTENING_STATUS', false);
 				});
 			} catch (error) {
@@ -369,7 +459,10 @@ export default {
 		},
 
 		// 切换电话监听状态
-		togglePhoneListener({ state, dispatch }) {
+		togglePhoneListener({
+			state,
+			dispatch
+		}) {
 			if (state.isPhoneListening) {
 				return dispatch('stopPhoneListener');
 			} else {