From 9649d0a651bef91b8f611ecb089a412a0c76b272 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 27 May 2024 09:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MessageElements/AudioMessage/index.js         |  7 ++++++-
 .../TUIChat/components/MessageInput/index.js      | 15 +++++++++++++--
 .../TUIChat/components/MessageInput/index.wxml    | 14 ++++++++++++--
 .../TUIChat/components/MessageList/index.js       |  9 +++++++++
 TUIChatService/TUIKit/components/TUIChat/index.js |  3 +++
 .../TUIKit/components/TUIChat/index.wxml          |  5 ++++-
 6 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
index f783cbd..532cd74 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
@@ -37,6 +37,7 @@ Component({
   lifetimes: {
     detached() {
       myaudio.stop();
+       wx.setStorageSync('currentAudioId', '')
     },
   },
 
@@ -80,6 +81,8 @@ Component({
     
       const  { id } = e.currentTarget.dataset;
       const { audioSave } = this.data;
+      console.log(id);
+      wx.setStorageSync('currentAudioId',id)
        this.triggerEvent("closeAudio",false)
       // 设置状态
       audioSave.forEach((message, index) => {
@@ -128,7 +131,9 @@ Component({
         return;
       });
     },
-
+    stopmy(){
+        myaudio.stop();
+    },
     // 音频停止
     audioStop(e) {
       const { key } = e.currentTarget.dataset;
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
index 68177e4..23b15d6 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -120,6 +120,7 @@ Component({
     serviceInfo:{},
     baseInfo:{},
     family_id:'',
+    fresh:true,
     patient_user_id:'',
     extensionArea: false,
     sendMessageBtn: false,
@@ -188,10 +189,16 @@ Component({
   lifetimes: {
     attached() {
       let _this = this;
+     
       // 加载声音录制管理器
       this.recorderManager = wx.getRecorderManager();
       this.recorderManager.onStop(async(resData) => {
+        this.setData({
+            fresh:!this.data.fresh
+        })
+       
         wx.hideLoading();
+       
         if (this.data.canSend) {
           if (resData.duration < 1000) {
             wx.showToast({
@@ -596,6 +603,10 @@ this.setData({
    },
     // 长按录音
     handleLongPress(e) {
+       this.triggerEvent('closeAudio',false);
+        if(this.timer){
+            clearInterval(this.timer)
+        }
       this.openRecord(e,this.recording)
     },
     recording(e,THIS){
@@ -612,11 +623,11 @@ this.setData({
         encodeBitRate: 192000, // 编码码率
         format: 'aac', // 音频格式，选择此格式创建的音频消息，可以在即时通信 IM 全平台（Android、iOS、微信小程序和Web）互通
       });
-
+      
       THIS.timer=setInterval(()=>{
         if(THIS.data.recordtime>=60){
           THIS.handleTouchEnd();
-         clearInterval(THIS.timer);
+          //clearInterval(THIS.timer);
        
         };
         THIS.setData({
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index d206d3a..ade7b9f 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -22,11 +22,21 @@
                 bindlinechange="inputBindLinechange"
                 />
         </view>
-        <view wx:if="{{isAudio}}" class="TUI-message-input-main"
+        <view wx:if="{{isAudio && fresh}}" 
+         id="talk1"
+        class="TUI-message-input-main"
+        catchlongpress="handleLongPress"
+        catchtouchmove="handleTouchMove"
+        catchtouchend="handleTouchEnd"
+        catchtouchcancel="handleTouchCancel"
+            style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
+            <text >{{text}}</text>
+        </view>
+        <view wx:elif="{{isAudio && !fresh}}" 
+        id="talk2" class="TUI-message-input-main"
         catchlongpress="handleLongPress"
         catchtouchmove="handleTouchMove"
         catchtouchend="handleTouchEnd"
-        catchtap="handleTouchCancel"
         catchtouchcancel="handleTouchCancel"
             style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
             <text >{{text}}</text>
diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js
index 3b904a0..062dd73 100644
--- a/TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -320,12 +320,21 @@ Component({
     },
     closeAudio(data){
       //关闭其他语音
+      let currentAudioId= wx.getStorageSync('currentAudioId');
       this.data.messageList.forEach((item)=>{
         if(item.type=="TIMSoundElem"){
           let ele=this.selectComponent('#audio'+item.ID);
+          if(item.ID!=currentAudioId){
+           
+              ele.stopmy();
+          }
           ele.setData({
             isPlay:false
           })
+          //console.log(ele);
+         
+          //ele.stopmy();
+         //console.log(ele)
          
         }
         
diff --git a/TUIChatService/TUIKit/components/TUIChat/index.js b/TUIChatService/TUIKit/components/TUIChat/index.js
index f64b0ad..31da3f5 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.js
+++ b/TUIChatService/TUIKit/components/TUIChat/index.js
@@ -234,6 +234,9 @@ Component({
    * 组件的方法列表
    */
   methods: {
+      closeAudio(){
+        this.selectComponent('#MessageList').closeAudio();
+      },
       checkChuFang(order_inquiry_id){
         api.getDoctorPrescriptionCheck({order_inquiry_id: order_inquiry_id}).then(response => {
             let status = response.data.status
diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml
index f900166..c01fdc0 100644
--- a/TUIChatService/TUIKit/components/TUIChat/index.wxml
+++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml
@@ -73,8 +73,11 @@
   <!-- wx:if="{{baseInfo.inquiry_status==4}}" -->
   <view class="input-area" style="{{input_area_style}}" >
     <!-- wx:if="{{showChat}}" -->
+    <!-- bind:closeAudio="closeAudio" -->
     <view class="message-input" style="{{viewData.style}}" >
-      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" 
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" 
+      bind:closeAudio="closeAudio"
+      id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" 
       serviceInfo="{{serviceInfo}}"
       isEditTime="{{isEditTime}}" 
       videoInfo="{{videoInfo}}"