修改 About页面 蓝牙地址，名称，imei的显示

优化蓝牙地址名称nv存储

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
index 679706e..b70fd37 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
@@ -315,10 +315,13 @@ namespace OHOS
         }
         testAboutTheWatchScrollView->Add(BluetoothAddressTitle);
         /* -------------------------------------------------------------------------- */
-        uint8_t btaddr[64]={0};
+        uint8_t btaddr[6] ={0};
+        uint8_t btaddr_str[64]={0};
         uint32_t len = 64;
-        errcode_t ret = uapi_get_btaddr((uint8_t*)btaddr,&len);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btaddr %s , ret 0x%X\n",btaddr,ret);
+        errcode_t ret = uapi_get_nv_btaddr((uint8_t*)btaddr,&len);
+        sprintf((char*)btaddr_str , "%02X:%02X:%02X:%02X:%02X:%02X",btaddr[0],btaddr[1],btaddr[2],btaddr[3],btaddr[4],btaddr[5]);
+
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btaddr %s , ret 0x%X\n",btaddr_str,ret);
         Config = {
             .left = 37,
             .top = 651,
@@ -326,10 +329,10 @@ namespace OHOS
             .height = 30,
             .fontSize = 26,
             .lineHeigh = 30,
-            .text = (char*)btaddr,
+            .text = "",
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,
         };
-
+        Config.text = (char*)btaddr_str;
              
         BluetoothAddress = InitLabel(Config);
         if (BluetoothAddress == nullptr)
@@ -361,7 +364,7 @@ namespace OHOS
        
          uint8_t ble_name[20] = {0};
         uint32_t ble_name_len ;
-        ret = uapi_get_btname(ble_name, &ble_name_len);
+        ret = uapi_get_nv_btname(ble_name, &ble_name_len);
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btname %s ,ret 0x%X\n",ble_name,ret);
        
         Config = {
@@ -371,9 +374,10 @@ namespace OHOS
             .height = 30,
             .fontSize = 26,
             .lineHeigh = 30,
-            .text = (char*)ble_name,
+            .text ="",
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,
         };
+        Config.text =  (char*)ble_name;
         LANAddress = InitLabel(Config);
         if (LANAddress == nullptr)
         {

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 5b38231..b8769e1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -3,6 +3,27 @@
 #include "wearable_log.h"\r
 #include "custom_utils.h"\r
 #include "config/include/ConfigModel.h"\r
+\r
+#define  WATCH_ABOUT_TITLE_HEIGHT   50\r
+#define  WATCH_ABOUT_VALUE_HEIGHT   80\r
+#define  WATCH_NAME_POS_TOP         160\r
+#define  WATCH_NAME_VALUE_POS_TOP       (WATCH_NAME_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT )\r
+#define  WATCH_FIRMWARE_POS_TOP         (WATCH_NAME_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_FIRMWARE_VALUE_POS_TOP   (WATCH_FIRMWARE_POS_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_BT_NAME_TOP              (WATCH_FIRMWARE_VALUE_POS_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_BT_NAME_VALUE_TOP        (WATCH_BT_NAME_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_BT_ADDR_TOP              (WATCH_BT_NAME_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_BT_ADDR_VALUE_TOP        (WATCH_BT_ADDR_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_MODEM_VERSION_TOP        (WATCH_BT_ADDR_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_MODEM_VERSION_VALUE_TOP  (WATCH_MODEM_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_MODEM_APP_VERSION_TOP    (WATCH_MODEM_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_MODEM_APP_VERSION_VALUE_TOP  (WATCH_MODEM_APP_VERSION_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_IMEI_TOP                 (WATCH_MODEM_APP_VERSION_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_IMEI_VALUE_TOP           (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+#define  WATCH_FONT_TOP                 (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define  WATCH_FONT_VALUE_TOP           (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
+\r
+\r
 namespace OHOS\r
 {\r
 \r
@@ -145,7 +166,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 160,\r
+            .top = WATCH_NAME_POS_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -163,7 +184,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 37,\r
-            .top = 216,\r
+            .top = WATCH_NAME_VALUE_POS_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
@@ -182,7 +203,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 305,\r
+            .top = WATCH_FIRMWARE_POS_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -203,7 +224,7 @@ namespace OHOS
         uapi_get_buildversion((uint8_t*)version_buf,version_len);\r
         Config = {\r
             .left = 37,\r
-            .top = 341,\r
+            .top = WATCH_FIRMWARE_VALUE_POS_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
@@ -222,12 +243,12 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 450,\r
+            .top = WATCH_IMEI_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
             .lineHeigh = 35,\r
-            .text = "算法版本",\r
+            .text = "IMEI",\r
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
         };\r
         AlgorithmVersionTitle = InitLabel(Config);\r
@@ -240,14 +261,15 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 37,\r
-            .top = 506,\r
+            .top = WATCH_IMEI_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
             .lineHeigh = 30,\r
-            .text = "V02.03.01 OTA88",\r
+            .text = "",\r
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
         };\r
+        Config.text = ConfigModel::GetInstance()->Getimei();\r
         AlgorithmVersion = InitLabel(Config);\r
         if (AlgorithmVersion == nullptr)\r
         {\r
@@ -259,7 +281,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 595,\r
+            .top = WATCH_BT_ADDR_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -275,21 +297,24 @@ namespace OHOS
         }\r
         SystemAboutTheWatchScrollView->Add(BluetoothAddressTitle);\r
         /* -------------------------------------------------------------------------- */\r
-        uint8_t btaddr[64]={0};\r
+        uint8_t btaddr[6] ={0};\r
+        uint8_t btaddr_str[64]={0};\r
         uint32_t len = 64;\r
-        errcode_t ret = uapi_get_btaddr((uint8_t*)btaddr,&len);\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btaddr %s , ret 0x%X\n",btaddr,ret);\r
+        errcode_t ret = uapi_get_nv_btaddr((uint8_t*)btaddr,&len);\r
+        sprintf((char*)btaddr_str , "%02X:%02X:%02X:%02X:%02X:%02X",btaddr[0],btaddr[1],btaddr[2],btaddr[3],btaddr[4],btaddr[5]);\r
+\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btaddr %s , ret 0x%X\n",btaddr_str,ret);\r
         Config = {\r
             .left = 37,\r
-            .top = 651,\r
+            .top = WATCH_BT_ADDR_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
             .lineHeigh = 30,\r
-            .text = (char*)btaddr,\r
+            .text = "",\r
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
         };\r
-\r
+        Config.text = (char*)btaddr_str; \r
              \r
         BluetoothAddress = InitLabel(Config);\r
         if (BluetoothAddress == nullptr)\r
@@ -302,7 +327,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 740,\r
+            .top = WATCH_BT_NAME_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -321,19 +346,20 @@ namespace OHOS
        \r
          uint8_t ble_name[20] = {0};\r
         uint32_t ble_name_len ;\r
-        ret = uapi_get_btname(ble_name, &ble_name_len);\r
+        ret = uapi_get_nv_btname(ble_name, &ble_name_len);\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"get btname %s ,ret 0x%X\n",ble_name,ret);\r
        \r
         Config = {\r
             .left = 37,\r
-            .top = 796,\r
+            .top = WATCH_BT_NAME_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
             .lineHeigh = 30,\r
-            .text = (char*)ble_name,\r
+            .text = "",\r
             .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS,\r
         };\r
+        Config.text = (char*)ble_name; \r
         LANAddress = InitLabel(Config);\r
         if (LANAddress == nullptr)\r
         {\r
@@ -345,7 +371,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 173,\r
-            .top = 885,\r
+            .top = WATCH_FONT_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -363,7 +389,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 37,\r
-            .top = 941,\r
+            .top = WATCH_FONT_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
@@ -382,12 +408,12 @@ namespace OHOS
 \r
         Config = {\r
             .left = 173,\r
-            .top = 885+145,\r
+            .top = WATCH_MODEM_VERSION_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
             .lineHeigh = 35,\r
-            .text = "CAT1mode",\r
+            .text = "4G Modem",\r
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,\r
         };\r
         CAT1Title = InitLabel(Config);\r
@@ -400,7 +426,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 37,\r
-            .top = 941+145,\r
+            .top = WATCH_MODEM_VERSION_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r
@@ -420,7 +446,7 @@ namespace OHOS
 \r
          Config = {\r
             .left = 173,\r
-            .top = 885+145*2,\r
+            .top = WATCH_MODEM_APP_VERSION_TOP,\r
             .width = 120,\r
             .height = 35,\r
             .fontSize = 30,\r
@@ -438,7 +464,7 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = 37,\r
-            .top = 941+145*2,\r
+            .top = WATCH_MODEM_APP_VERSION_VALUE_TOP,\r
             .width = 400,\r
             .height = 30,\r
             .fontSize = 26,\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index ca12878..1d896b3 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -502,7 +502,7 @@ errcode_t uapi_set_nv_btaddr(uint8_t *buf_btaddr, uint32_t len_btaddr)
       
         return nvRet; 
     } 
-    printf("set nv local_addr : ******%02x%02x%02x\n", buf_btaddr[2], buf_btaddr[1], buf_btaddr[0]);
+    printf("set nv local_addr : ******%02x%02x%02x\n", buf_btaddr[3], buf_btaddr[4], buf_btaddr[5]);
     
 #endif
     
@@ -592,10 +592,10 @@ errcode_t init_btaddr_btname(void)
     {   
         //默认是：281106856959
         printf("是默认值,修改地址\n");
-        bd_addr[0] = rand() % 0xFF;
-        bd_addr[1] = rand() % 0xFF;
-        bd_addr[2] = rand() % 0xFF;  
-        printf("uapi_set_nv_btaddr : ******%02x%02x%02x\n", bd_addr[2], bd_addr[1], bd_addr[0]);
+        bd_addr[5] = rand() % 0xFF;
+        bd_addr[4] = rand() % 0xFF;
+        bd_addr[3] = rand() % 0xFF;  
+        printf("uapi_set_nv_btaddr : ******%02x%02x%02x\n", bd_addr[3], bd_addr[4], bd_addr[5]);
 
         ret = uapi_set_nv_btaddr(bd_addr, addrlen);
         if (ret != ERRCODE_SUCC) { 
@@ -619,7 +619,7 @@ errcode_t init_btaddr_btname(void)
     {   
         //默认是：WatchSoar
         printf("是默认值,修改名称\n");
-        sprintf_s((char*)(name),sizeof(name),"WatchSoar%02X%02X",bd_addr[1],bd_addr[0]);
+        sprintf_s((char*)(name),sizeof(name),"WSoar%02X%02X",bd_addr[4],bd_addr[5]);
         printf("uapi_set_nv_btname  %s , namelen %d\n",name,namelen);
         ret = uapi_set_nv_btname(name,strlen((char*)name));
         if (ret != ERRCODE_SUCC) { 

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 221f7a9..e4abda2 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -50,6 +50,9 @@ int32_t uapi_get_screen_state(void);
 
 errcode_t uapi_get_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr);
 errcode_t uapi_get_btname(uint8_t *buf_btname, uint32_t *len_btname);
+errcode_t uapi_get_nv_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr);
+errcode_t uapi_get_nv_btname(uint8_t *buf_btname, uint32_t *len_btname);
+
 
 errcode_t init_btaddr_btname(void);
 errcode_t disable_bt_service(void);