Merge #1447 into sdk602patch0911 from refs/changes/1447/head

蓝牙接口增加初始化限制

* refs/changes/1447/head: (2 commits squashed)

  - 蓝牙接口增加初始化限制

  - 非4G电话界面结束4G电话场景修改

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1447

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModelC.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModelC.h
index ab02f9f..8f76d5b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModelC.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModelC.h
@@ -31,6 +31,7 @@ int32_t BtA2dpSnkAudioDestroy(void);
 
 int uapi_reconnect_(void);
 
+int get_BT_is_init(void);
 
 #ifdef __cplusplus
 }

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 38743aa..0f7384c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -1809,8 +1809,19 @@ void BleAdvStart(void)
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleAdvStart bt gap_ble_start_adv  ret = 0x%x", ret);\r
 }\r
 //////////////////////////////////A2DP sink端 代码///////////////////////////////////////////////\r
+\r
+int get_BT_is_init()\r
+{\r
+    return g_bluetooth_initialled;\r
+}\r
+\r
 int uapi_a2dp_snk_get_device_connect_state()\r
 {\r
+    if(get_BT_is_init()==0)\r
+    {\r
+        return 0;\r
+    }\r
+\r
     int ret = a2dp_snk_get_device_connect_state(&g_bd_addr);\r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP,"state(int): %d\n", ret);\r
 \r
@@ -1860,6 +1871,11 @@ int uapi_a2dp_snk_connect()
 int uapi_a2dp_snk_connect_()\r
 {\r
 \r
+    if(get_BT_is_init()==0)\r
+    {\r
+        return 0;\r
+    }\r
+\r
     bd_addr_t bdaddr={0};\r
     uapi_get_br_address(&bdaddr);\r
 \r
@@ -1881,6 +1897,10 @@ int uapi_a2dp_snk_disconnect()
 \r
 int uapi_a2dp_snk_disconnect_()\r
 {\r
+    if(get_BT_is_init()==0)\r
+    {\r
+        return 0;\r
+    }\r
     \r
     bd_addr_t bdaddr={0};\r
     uapi_get_br_address(&bdaddr);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
index 3c800e9..a9ca823 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp
@@ -789,6 +789,7 @@ static void ScoStateChanged(const bd_addr_t *bdAddr, hfp_sco_connect_state_t sta
         case HFP_SCO_STATE_CONNECTED:
             // 同步音量
             SyncVolume();
+            
             if(TransCallToMobilePhone_falg)
             {
                 TransCallToMobilePhone();
@@ -2253,6 +2254,11 @@ int TransCallToMobilePhone(void)
 
 int uapi_hfp_disconnect_(void)
 {
+    if( get_BT_is_init()==0)
+    {
+        return 0;
+    }
+
     int ret;
     bd_addr_t bdaddr={0};
     OHOS:: uapi_get_br_address(&bdaddr);
@@ -2266,10 +2272,11 @@ int uapi_hfp_disconnect_(void)
 
 int uapi_hfp_connect_(void)
 {
-    // if(uapi_hfp_connect_state()==1)
-    // {
-    //     return;
-    // }
+     if( get_BT_is_init()==0)
+    {
+        return 0;
+    }
+
     int ret;
     bd_addr_t bdaddr={0};
     OHOS:: uapi_get_br_address(&bdaddr);
@@ -2330,6 +2337,11 @@ int uapi_hfp_connect_(void)
 
 int uapi_hfp_connect_state(void)
 {
+    if( get_BT_is_init()==0)
+    {
+        return 0;
+    }
+
     int ret;
     bd_addr_t bdaddr={0};
     OHOS:: uapi_get_br_address(&bdaddr);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
index 1255602..6d8d8b3 100755 (executable)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
@@ -681,6 +681,8 @@ static void WatchFinishHandle(void)
 {
     if (NotificationManager::GetInstance()->GetWatchCallStatus()) 
     {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetWatchCallStatus !!");
+
         if(get_falg_SOS())
         {
             addcalllog();
@@ -688,14 +690,18 @@ static void WatchFinishHandle(void)
         }
         else
         {
-            if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone)
-            {
-                addcalllog();
-            }
-            else if(uapi_dev_runtime_get_train_status() || transmittingISShow())
+            if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourcePhone
+             || uapi_dev_runtime_get_train_status() || transmittingISShow() )
             {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "addcalllogend !!");
+
                 addcalllog();
-                StatusReset();
+
+                if(uapi_dev_runtime_get_train_status() || transmittingISShow())
+                {
+                    StatusReset();
+                }
+
             }
             else
             {
@@ -801,8 +807,9 @@ void CalldialTimerCallBackProc(int data)
     dail_falg++;
     if(dail_falg>=DIAL_TIME)
     {
-        // cat1_call_hungup_timer();
-        cat1_handle_call_disconnected("callfail");
+        cat1_call_hungup_timer();
+
+        // cat1_handle_call_disconnected((char *)CallerLogModel::GetInstance()->GetPhoneNumber().c_str());
     }
    
 }