修改蓝牙电话接口使用

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/include/PhoneService.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/include/PhoneService.h
index 1e3e4df..8125b00 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/include/PhoneService.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/include/PhoneService.h
@@ -16,8 +16,10 @@
 extern "C" {
 #endif
 
+#define BR_DISCONNECT
+
 #define MULTI_CALL_MAX_NUME 5 // 最大多路通话路数
-#define CALL_LOG_MAX_NUM 30 // 最多记录30条通话记录，超出后删除最老的记录
+#define CALL_LOG_MAX_NUM 20 // 最多记录30条通话记录，超出后删除最老的记录
 #define NAME_SIZE 20
 #define MAX_PHONE_NUM 20
 #define CALL_VOLUME_MAX 15

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp
index 6216bc9..b5a4bc7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp
@@ -44,6 +44,7 @@
 #include "UiConfig.h"
 #include "phoneservice/include/PhoneAGService.h"
 #include "cmath"
+#include "phone_crt.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -690,7 +691,7 @@ static void ConnStateChanged(const bd_addr_t &bdAddr, profile_connect_state_t st
             
             // uapi_pbap_cmd_start_client();
             uapi_save_runtime_log(RUNTIME_LOG_BR_CONNECT_HFP);
-            //SendMsgToMsgCenterService(BT_CONNECTED_TO_MSGCENTER, 0, nullptr, 0);
+
             break;
         case PROFILE_STATE_DISCONNECTING: // 蓝牙连接断连
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ConnStateChanged] BT disconnecting");
@@ -698,11 +699,9 @@ static void ConnStateChanged(const bd_addr_t &bdAddr, profile_connect_state_t st
         case PROFILE_STATE_DISCONNECTED: // 蓝牙断开连接
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ConnStateChanged] BT disconnected");
             BtDisconnectedPro();
-            //if(0==OHOS::uapi_a2dp_snk_get_device_connect_state() && 0==uapi_hfp_connect_state())
-            {
-                SendMsgToUIService(BT_DISCONNECTED_TO_UI, 0, nullptr, 0);
-                //SendMsgToMsgCenterService(BT_DISCONNECTED_TO_MSGCENTER, 0, nullptr, 0);
-            }
+
+            SendMsgToUIService(BT_DISCONNECTED_TO_UI, 0, nullptr, 0);
+ 
             uapi_save_runtime_log(RUNTIME_LOG_BR_DISCONNECT_HFP);
            
             break;
@@ -1340,7 +1339,7 @@ static void CallChangeIncomePro(const PhoneHfpCallInfo &call)
     (void)memcpy_s(&phoneCall->unitCalls, sizeof(PhoneHfpCallInfo), &call, sizeof(PhoneHfpCallInfo));
 
     // 发布电话呼入事件
-    HfpIncomingEventPublish(TOPIC_EVENT_HFP_INCOMMING, phoneCall->unitCalls);
+    // HfpIncomingEventPublish(TOPIC_EVENT_HFP_INCOMMING, phoneCall->unitCalls);
     // 通知手表电话呼入
     CallChangedCb(phoneCall);
 }
@@ -1383,10 +1382,10 @@ static void CallChangeActivePro(const PhoneHfpCallInfo &call)
     (void)memcpy_s(&phoneCall->unitCalls, sizeof(PhoneHfpCallInfo), &call, sizeof(PhoneHfpCallInfo));
     if (phoneCall->operate == OPERATE_PHONE_ACTIVE) {
         // 发布电话接听事件，手表关闭来电通知
-        HfpIncomingEventPublish(TOPIC_EVENT_HFP_PHONE_ACTIVE, phoneCall->unitCalls);
+        // HfpIncomingEventPublish(TOPIC_EVENT_HFP_PHONE_ACTIVE, phoneCall->unitCalls);
     } else if (phoneCall->operate == OPERATE_WATCH_ACTIVE && g_scoFlag == HFP_SCO_STATE_CONNECTED) {
         // 发布手表接听事件，通知切换接听界面
-        HfpIncomingEventPublish(TOPIC_EVENT_HFP_WATCH_ACTIVE, phoneCall->unitCalls);
+        // HfpIncomingEventPublish(TOPIC_EVENT_HFP_WATCH_ACTIVE, phoneCall->unitCalls);
     }
     // 通知手表触发接听
     CallChangedCb(phoneCall);
@@ -1420,7 +1419,7 @@ static void CallChangeFinishPro(const PhoneHfpCallInfo &call)
     AddToCallLogPro(phoneCall);
 
     // 发布电话结束事件
-    HfpIncomingEventPublish(TOPIC_EVENT_HFP_FINISHED, phoneCall->unitCalls);
+    // HfpIncomingEventPublish(TOPIC_EVENT_HFP_FINISHED, phoneCall->unitCalls);
 
     // 通知手表通话结束
     CallChangedCb(phoneCall);
@@ -1456,7 +1455,9 @@ static void CallChangeHeldPro(const PhoneHfpCallInfo &call)
 static void PlayWatchRing(void)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[PlayWatchRing] start");
-    }
+    OHOS::phone_paly_ring();
+
+}
 
 static void CallAudioHandle(const PhoneHfpCallInfo &call)
 {
@@ -1467,7 +1468,7 @@ static void CallAudioHandle(const PhoneHfpCallInfo &call)
         if (call.in_band_ring) {
                             // 播放手机端铃声
                 AudioDn();
-                    } else {
+            } else {
             if (g_scoFlag != HFP_SCO_STATE_CONNECTED) {
                 // 播放手表铃声
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"xxxxxxxxxxx");
@@ -1570,14 +1571,14 @@ static void CallStateChanged(const bd_addr_t &bdAddr, const PhoneHfpCallInfo &ca
     if(call.state==HFP_HF_CALL_STATE_INCOMING || call.state==HFP_HF_CALL_STATE_DIALING 
     || call.state==HFP_HF_CALL_STATE_ALERTING)
     {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(find_address_book,call.number,call.number_len));
+        // GraphicService::GetInstance()->PostGraphicEvent(std::bind(find_address_book,call.number,call.number_len));
     }
    
     if(HFP_HF_CALL_STATE_INCOMING!=call.state)
     {
         PostGraphicEvent(stop_ring);
-       //
     }
+
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "CallStateChanged state:%d", call.state);
     
     switch (call.state) {