修改蓝牙协议的密码字符串

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
index f7b3d8e..b345bf8 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
@@ -22,7 +22,7 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/traing/training_card/include
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/config/include
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/traing/include
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/uiservice/include
-${ROOT_DIR}/application/wearable/fd230app/nativeui/sleep/include
+${ROOT_DIR}/application/wearable/fd230app/nativeui/codedlock/include
 #${ROOT_DIR}/application/wearable/fd230app/nativeui/alarm/include 
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/alarmclockmanage/include 
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/alarmclocktimerconfig/include 

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index 1f6459f..e2ec7f9 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -33,6 +33,7 @@
 #include "TraingModel.h"
 #include "WeatherModel.h"
 #include "SleepModel.h"
+#include "CodedLockModel.h"
 #endif
 
 #include "AlmmgrAlarmClockManage.h"
@@ -555,18 +556,25 @@ void ble_set_password(uint8_t falg, char * data)
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
 
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH,falg);
-
     p_ConfigModel->set_condigData_String(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD,data);
+
+    printf("设置手表密码 %d %s \r\n",falg, data);   
+
+    /*更新model密码配置*/
+    OHOS::CodedLockModel::GetInstance()->SetUserPassWord(data);
+
     return;
 }
 
 uint8_t ble_get_password(void)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
-    std::string str =p_ConfigModel->get_configData_string(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD);
 
+    std::string str =p_ConfigModel->get_configData_string(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD);
     uint8_t falg =p_ConfigModel->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH);
 
+    printf("获取手表密码 %d %s \r\n",falg,str.c_str());
+
     return falg;
    
 }

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 74cb9bd..75ed8bb 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -1630,11 +1630,12 @@ void SetpasswordCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u
 \r
        if(Check_CRC(data,len,crcvalue))\r
        {\r
-        char* buf[6]={0};\r
-        memcpy(buf,&data[1],6);//\r
-\r
+        char* buf[7]={0};\r
+        \r
+        sprintf_s(buf,7,"%d%d%d%d%d%d",data[1],data[2],data[3],data[4],data[5],data[6]);\r
         ble_set_password(data[0],buf);\r
-        printf("%s\r\n",&data[1]);\r
+\r
+        printf("%s\r\n",buf);\r
         \r
         sendBuf[17] = 1;\r
         sendBuf[18] = Calculate_CRC(sendBuf,18);\r