增加不同产品的广播

diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index aaebaaf..dd9fd56 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -157,7 +157,14 @@ namespace OHOS
     {
         /*实例：https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=7a:8c:2d:61:9a:fc*/
         /*m=后边的值为手表 mac 地址，前面部分为固定格式*/
+
+        #if defined(BOARD_W9)
+        std::string QRCodeStr = "https://app.W9.com/";
+        #elif defined(BOARD_N9)
+        std::string QRCodeStr = "https://app.N9.com/";
+        #else
         std::string QRCodeStr = "https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=";
+        #endif
         std::string MacAddress = GetCurrentWatchMacAddress(); // 假设这是获取当前手表 Mac 地址的函数
         QRCodeStr += MacAddress;
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QRCodeStr:%s", QRCodeStr.c_str());

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index c09a761..d948c43 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -314,8 +314,16 @@ static void svr_ble_adv_data_set(int adv_id)
 \r
     adv_data[adv_data_len++] = 0x0f;//长度 \r
     adv_data[adv_data_len++] = 0xff;//数据类型 manufactory data\r
+#if defined(BOARD_W9) \r
+    adv_data[adv_data_len++] = 'W';\r
+    adv_data[adv_data_len++] = '9';\r
+#elif defined(BOARD_N9)\r
+    adv_data[adv_data_len++] = 'N';\r
+    adv_data[adv_data_len++] = '9';\r
+#else \r
     adv_data[adv_data_len++] = 'J';\r
     adv_data[adv_data_len++] = 'H';\r
+#endif\r
     adv_data[adv_data_len++] = bond_flag;//是否绑定\r
     adv_data[adv_data_len++] = ble_data_mac_switch[5];\r
     adv_data[adv_data_len++] = ble_data_mac_switch[4];\r
@@ -324,8 +332,16 @@ static void svr_ble_adv_data_set(int adv_id)
     adv_data[adv_data_len++] = ble_data_mac_switch[1];\r
     adv_data[adv_data_len++] = ble_data_mac_switch[0];\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adv_data_info.adv_length.adv_data_len:%d\r\n",adv_data_len);\r
-    adv_data[adv_data_len++] = 0x05;//未知 app\r
+#if defined(BOARD_W9) \r
+    adv_data[adv_data_len++] = 0x06; //w9 app\r
+    adv_data[adv_data_len++] = 0x06;\r
+#elif defined(BOARD_N9) \r
+    adv_data[adv_data_len++] = 0x07; //n9 app\r
+    adv_data[adv_data_len++] = 0x07;\r
+#else\r
+    adv_data[adv_data_len++] = 0x05;\r
     adv_data[adv_data_len++] = 0x05;\r
+#endif\r
 \r
     uint8_t _major,_mid,_minor;\r
     uapi_get_fw_version(&_major,&_mid,&_minor);\r
@@ -963,8 +979,16 @@ static void srv_ble_add_chart_decr_battery(uint8_t server_id,uint16_t srv_handle
 \r
     battery_point_val[12] = 0;//消息推送开关 默认是关闭 0\r
     battery_point_val[13] = 0;//多媒体开关\r
+    #if defined(BOARD_W9) \r
+    battery_point_val[14] = 6;//客户编号\r
+    battery_point_val[15] = 6;//产品编号\r
+    #elif defined(BOARD_N9) \r
+    battery_point_val[14] = 7;//客户编号\r
+    battery_point_val[15] = 7;//产品编号\r
+    #else\r
     battery_point_val[14] = 5;//客户编号\r
     battery_point_val[15] = 5;//产品编号\r
+    #endif\r
 \r
     battery_point_val[16] = 0;//硬件版本号\r
     battery_point_val[17] = 1;\r
@@ -1676,8 +1700,17 @@ errcode_t svr_ble_read_data_value_updata_noyify(void)//2ae2
 \r
     battery_point_val[12] = 0;//消息推送开关 默认是关闭 0\r
     battery_point_val[13] = 0;//多媒体开关\r
+    \r
+    #if defined(BOARD_W9) \r
+    battery_point_val[14] = 6;//客户编号\r
+    battery_point_val[15] = 6;//产品编号\r
+    #elif defined(BOARD_N9) \r
+    battery_point_val[14] = 7;//客户编号\r
+    battery_point_val[15] = 7;//产品编号\r
+    #else\r
     battery_point_val[14] = 5;//客户编号\r
     battery_point_val[15] = 5;//产品编号\r
+    #endif\r
 \r
     battery_point_val[16] = 0;//硬件版本号\r
     battery_point_val[17] = 1;\r
@@ -1728,8 +1761,17 @@ errcode_t svr_ble_read_data_value_updata_noyify_test(uint8_t test)//2ae2
 \r
     battery_point_val[12] = 0;//消息推送开关 默认是关闭 0\r
     battery_point_val[13] = 0;//多媒体开关\r
+\r
+    #if defined(BOARD_W9) \r
+    battery_point_val[14] = 6;//客户编号\r
+    battery_point_val[15] = 6;//产品编号\r
+    #elif defined(BOARD_N9) \r
+    battery_point_val[14] = 7;//客户编号\r
+    battery_point_val[15] = 7;//产品编号\r
+    #else\r
     battery_point_val[14] = 5;//客户编号\r
     battery_point_val[15] = 5;//产品编号\r
+    #endif\r
 \r
     battery_point_val[16] = 0;//硬件版本号\r
     battery_point_val[17] = 1;\r
@@ -1785,8 +1827,17 @@ static void svr_ble_bt_gatts_req_read_cb(uint8_t server_id, uint16_t conn_id, ga
 \r
     battery_point_val[12] = 0;//消息推送开关 默认是关闭 0\r
     battery_point_val[13] = 0;//多媒体开关\r
+\r
+    #if defined(BOARD_W9) \r
+    battery_point_val[14] = 6;//客户编号\r
+    battery_point_val[15] = 6;//产品编号\r
+    #elif defined(BOARD_N9) \r
+    battery_point_val[14] = 7;//客户编号\r
+    battery_point_val[15] = 7;//产品编号\r
+    #else\r
     battery_point_val[14] = 5;//客户编号\r
     battery_point_val[15] = 5;//产品编号\r
+    #endif\r
 \r
     battery_point_val[16] = 0;//硬件版本号\r
     battery_point_val[17] = 1;\r