系统设置显示正确btaddr

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
index 03249d4..09b40ef 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemAboutTheWatchView.h
@@ -24,7 +24,7 @@ namespace OHOS
             int16_t height;\r
             int16_t fontSize;      // 字体大小\r
             int16_t lineHeigh;     // 行高\r
-            const char *text;      // 文本\r
+            char *text;      // 文本\r
             uint8_t lineBreakMode; // 断行模式。\r
         };\r
         UIScrollView *SystemAbouTheWatchtInitIView(void);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index 7f9b49b..88f1040 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -1,6 +1,7 @@
 #include "system/include/SystemAboutTheWatchView.h"\r
 #include "system/include/SystemPresenter.h"\r
 #include "wearable_log.h"\r
+#include "custom_utils.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -258,6 +259,10 @@ namespace OHOS
         }\r
         SystemAboutTheWatchScrollView->Add(BluetoothAddressTitle);\r
         /* -------------------------------------------------------------------------- */\r
+        uint8_t btaddr[64]={0};\r
+        uint32_t len = 64;\r
+        uapi_get_btaddr((uint8_t*)btaddr,&len);\r
+\r
         Config = {\r
             .left = 37,\r
             .top = 651,\r
@@ -265,9 +270,11 @@ namespace OHOS
             .height = 30,\r
             .fontSize = 26,\r
             .lineHeigh = 30,\r
-            .text = "D4:FF:E3:12:00:A4",\r
+            .text = (char*)btaddr,\r
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
         };\r
+\r
+             \r
         BluetoothAddress = InitLabel(Config);\r
         if (BluetoothAddress == nullptr)\r
         {\r
@@ -277,42 +284,42 @@ namespace OHOS
         BluetoothAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
         SystemAboutTheWatchScrollView->Add(BluetoothAddress);\r
         /* -------------------------------------------------------------------------- */\r
-        Config = {\r
-            .left = 173,\r
-            .top = 740,\r
-            .width = 120,\r
-            .height = 35,\r
-            .fontSize = 30,\r
-            .lineHeigh = 35,\r
-            .text = "局域网地址",\r
-            .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
-        };\r
-        LANAddressTitle = InitLabel(Config);\r
-        if (LANAddressTitle == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddressTitle new fail!");\r
-            return nullptr;\r
-        }\r
-        SystemAboutTheWatchScrollView->Add(LANAddressTitle);\r
-        /* -------------------------------------------------------------------------- */\r
-        Config = {\r
-            .left = 37,\r
-            .top = 796,\r
-            .width = 400,\r
-            .height = 30,\r
-            .fontSize = 26,\r
-            .lineHeigh = 30,\r
-            .text = "D4:FF:E3:12:00:A4",\r
-            .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
-        };\r
-        LANAddress = InitLabel(Config);\r
-        if (LANAddress == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!");\r
-            return nullptr;\r
-        }\r
-        LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
-        SystemAboutTheWatchScrollView->Add(LANAddress);\r
+        // Config = {\r
+        //     .left = 173,\r
+        //     .top = 740,\r
+        //     .width = 120,\r
+        //     .height = 35,\r
+        //     .fontSize = 30,\r
+        //     .lineHeigh = 35,\r
+        //     .text = "局域网地址",\r
+        //     .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
+        // };\r
+        // LANAddressTitle = InitLabel(Config);\r
+        // if (LANAddressTitle == nullptr)\r
+        // {\r
+        //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddressTitle new fail!");\r
+        //     return nullptr;\r
+        // }\r
+        // SystemAboutTheWatchScrollView->Add(LANAddressTitle);\r
+        // /* -------------------------------------------------------------------------- */\r
+        // Config = {\r
+        //     .left = 37,\r
+        //     .top = 796,\r
+        //     .width = 400,\r
+        //     .height = 30,\r
+        //     .fontSize = 26,\r
+        //     .lineHeigh = 30,\r
+        //     .text = "D4:FF:E3:12:00:A4",\r
+        //     .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
+        // };\r
+        // LANAddress = InitLabel(Config);\r
+        // if (LANAddress == nullptr)\r
+        // {\r
+        //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::LANAddress new fail!");\r
+        //     return nullptr;\r
+        // }\r
+        // LANAddress->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
+        // SystemAboutTheWatchScrollView->Add(LANAddress);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index a7acc54..6424c1d 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -283,6 +283,28 @@ errcode_t uapi_set_time_from_cat1(char* cat1time)
 
     return ERRCODE_SUCC;
 }       
+#include "bts_le_gap.h"
+
+errcode_t uapi_get_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr)
+{
+    if (buf_btaddr == NULL || len_btaddr == NULL) {
+        return ERRCODE_FAIL;
+    }
+
+    bd_addr_t addr_info;
+    gap_ble_get_local_addr(&addr_info);
+    char str[18] = {0};
+    sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x", addr_info.addr[5], addr_info.addr[4], addr_info.addr[3],
+        addr_info.addr[2], addr_info.addr[1], addr_info.addr[0]);
+#ifdef ALIPAY_CSI_LOG_EXT_ON
+    MyPrintf("addr:%s\n", str);
+#endif
+    *len_btaddr = strlen(str);
+    memcpy(buf_btaddr, str, strlen(str));
+
+    return ERRCODE_SUCC;
+}
+
 
 #if 0
 

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 5a6e68b..8f7fa5a 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -30,6 +30,8 @@ errcode_t uapi_get_timestampe_ms(uint64_t *tm);
 /**根据cat1获取的时间字串设置时间*/
 errcode_t uapi_set_time_from_cat1(char* cat1time);
 
+
+errcode_t uapi_get_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr);
 /**
  * @}
  */