From 512be9adf62e86d4f70a36f068fa3707ed09efae Mon Sep 17 00:00:00 2001
From: hcj <1224667075@qq.com>
Date: Tue, 14 Jan 2025 15:35:32 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BABT=E6=9C=8D?=
 =?utf8?q?=E5=8A=A1=E6=97=B6=E5=BA=8F=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4?=
 =?utf8?q?=E7=9A=84=E8=93=9D=E7=89=99=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9?=
 =?utf8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=9A=84=E8=93=9D=E7=89=99=E7=94=B5?=
 =?utf8?q?=E8=AF=9D=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/bluetooth/src/BluetoothModel.cpp |  1 +
 .../nativeui/callerlog/src/CallerLogModel.cpp | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index 2d76de6fc..0bf9d3558 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -175,6 +175,7 @@ static int bluetooth_init_all(void)
     BtInitCallBacks();
     uapi_pbap_pce_reg_callback();
     BtA2dpInit();
+    PhoneServiceInit();
 
     if(uapi_dev_runtime_get_safemode_flag())
     {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
index c6f0621a4..8bdf0c4ce 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -156,6 +156,9 @@ void StatusReset(void)
         #endif
         
         {
+            #ifdef SUPPORT_CAT1_HFP_AG_SERV
+                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT_AUDIO_END, nullptr, 0);
+            #endif
             do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_STOP, nullptr, 0);
         }
     }
@@ -220,19 +223,21 @@ static void CallTimerCallbackProc(int data)
    {    
         if(MainCallingView::GetInstance()->GetDisplayGroup())
         {
-            // if(!MainCallingView::GetInstance()->GetDisplayGroup()->IsVisible())
-            // {
-            //     if( volte_voice_state!=2)
-            //     {
-            //         do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
-            //     }
-            //     else if( && volte_voice_state()!=1)
-            //     {
-            //         do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
-            //     }
-                
+             #ifdef SUPPORT_CAT1_HFP_AG_SERV
+            if(!MainCallingView::GetInstance()->GetDisplayGroup()->IsVisible())
+            {
                
-            // }
+                if( headset_SCO_Is_connect()==false && volte_voice_state()!=1)
+                {
+                    if(volte_voice_state()==2)
+                    {
+                        do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_STOP, nullptr, 0);
+                    }
+                    do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_CAT1_AUDIO_START, nullptr, 0);
+                }
+            }
+            #endif
+
         }
        
        
@@ -937,7 +942,7 @@ CallerLogModel::~CallerLogModel() {}
 void CallerLogModel::InitPhoneService()
 {
     WEARABLE_LOGD(HILOG_MODULE_AAFWK, "CallerLogModel::[InitPhoneService]::Init start");
-    PhoneServiceInit();
+   
     PhoneServiceCb serviceFoution;
 
     serviceFoution.callChanged = PhoneChangeStatusCallback;
-- 
2.17.1