From 7a70e512d8029e87384a4bc30fce03445bd61fe2 Mon Sep 17 00:00:00 2001
From: Caisking <Casiking@zhihuishixun.com>
Date: Wed, 25 Jun 2025 17:23:26 +0800
Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8D=E5=90=8C=E4=BA=A7?=
 =?utf8?q?=E5=93=81=E7=9A=84=E5=B9=BF=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../watchQRcode/src/WatchQRCodePresenter.cpp  |  7 +++
 .../ble_service/bleservice/bleService.c       | 53 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

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