Merge #275 into sdk602patch0521 from refs/changes/275/head

Code review from snickersun@163.com

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

  - 修复蓝牙耳机扫描窗口不记录历史配对记录问题

  - Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/275

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
index 808ae50..eee47cb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
@@ -222,10 +222,11 @@ void BluetoothEarPhoneView::BtEnable()
     bool results;\r
     // 经典蓝牙扫描\r
     setScanStatus(true); // 开始扫描标记\r
-    BluetoothModel::GetInstance()->SetCaseListClear(); // 扫描list清空\r
+    // BluetoothModel::GetInstance()->SetCaseListClear(); // 扫描list清空\r
+    BluetoothModel::GetInstance()->Init(); //清空list，获取paired devicelist\r
     ret = is_bt_discovering(BT_TRANSPORT_BR_EDR);\r
     if (ret) {\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothEarPhoneView::BtEnable Bt is Discovering");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothEarPhoneView::BtEnable Bt is Discovering");\r
         return;\r
     } else {\r
         results = gap_br_start_discovery();\r

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 fb3f7ae..7e6bac8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -29,7 +29,7 @@
 #include "audio_manager_c_wrapper.h"\r
 #include "bts_avrcp_target.h"\r
 #include "msg_center_msg.h"\r
-\r
+#include "custom_runtime.h"\r
 namespace OHOS {\r
 \r
 #define BT_SPP_TASK_STACK_SIZE 2048\r
@@ -183,32 +183,35 @@ void BluetoothModel::SetUpConnedDevicesList()
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothModel btConnedDevicesList_ new fail");\r
             return;\r
         }\r
-        SetConnedDevicesListClear();\r
-        unsigned int connedDevicesNum = 0;\r
-        bool ret = gap_get_paired_devices_num(&connedDevicesNum);\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Setup GetPariedDevicesNum ret = %d, num = %d", ret, connedDevicesNum);\r
-\r
-        gap_paired_device_info_t *devInfo = (gap_paired_device_info_t*)malloc(sizeof(gap_paired_device_info_t) *connedDevicesNum);\r
-        if (devInfo ==  nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DevInfo malloc failed %u", sizeof(gap_paired_device_info_t) *connedDevicesNum);\r
-            return;\r
-        }\r
-        ret =  gap_get_paired_devices_list(devInfo, (int *)&connedDevicesNum);\r
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpConnedDevicesList gap_get_paired_devices_list ret = %d", ret);\r
+        \r
+    }\r
+    SetConnedDevicesListClear();\r
+    unsigned int connedDevicesNum = 0;\r
+    int btpower = uapi_dev_runtime_get_bt_powerstat();\r
 \r
-        BluetoothCaseInfo caseInfo{};\r
-        for (int i = 0; i < static_cast<int>(connedDevicesNum); ++i) {\r
-            if ((gap_get_device_class((const bd_addr_t *)devInfo[i].addr.addr) & 0x200) != 0) {\r
-                continue;\r
-            }\r
-            (void)memcpy_s(caseInfo.addr, BD_ADDR_LEN,\r
-                           devInfo[i].addr.addr, BD_ADDR_LEN);\r
-            (void)memcpy_s(caseInfo.deviceName, BD_NAME_LEN,\r
-                           devInfo[i].device_name, BD_NAME_LEN);\r
-            AddConnedDevicesCase(caseInfo);\r
+    bool ret = gap_get_paired_devices_num(&connedDevicesNum);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BT Power %s , Setup GetPariedDevicesNum ret = %d, num = %d", btpower==1?"On":"Off",ret, connedDevicesNum);\r
+\r
+    gap_paired_device_info_t *devInfo = (gap_paired_device_info_t*)malloc(sizeof(gap_paired_device_info_t) *connedDevicesNum);\r
+    if (devInfo ==  nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DevInfo malloc failed %u", sizeof(gap_paired_device_info_t) *connedDevicesNum);\r
+        return;\r
+    }\r
+    ret =  gap_get_paired_devices_list(devInfo, (int *)&connedDevicesNum);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpConnedDevicesList gap_get_paired_devices_list ret = %d", ret);\r
+\r
+    BluetoothCaseInfo caseInfo{};\r
+    for (int i = 0; i < static_cast<int>(connedDevicesNum); ++i) {\r
+        if ((gap_get_device_class((const bd_addr_t *)devInfo[i].addr.addr) & 0x200) != 0) {\r
+            continue;\r
         }\r
-        free(devInfo);\r
+        (void)memcpy_s(caseInfo.addr, BD_ADDR_LEN,\r
+                        devInfo[i].addr.addr, BD_ADDR_LEN);\r
+        (void)memcpy_s(caseInfo.deviceName, BD_NAME_LEN,\r
+                        devInfo[i].device_name, BD_NAME_LEN);\r
+        AddConnedDevicesCase(caseInfo);\r
     }\r
+    free(devInfo);\r
 }\r
 \r
 void BluetoothModel::AddConnedDevicesCase(BluetoothCaseInfo caseInfo)\r