From c5d8c58e5557b2763ca9c865e0706f8b42bd3705 Mon Sep 17 00:00:00 2001
From: hcj <1224667075@qq.com>
Date: Fri, 27 Sep 2024 18:57:24 +0800
Subject: [PATCH] =?utf8?q?SOS=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E4=BF=9D?=
 =?utf8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/alipay/src/AlipaySetting.cpp   |  8 ++++++--
 .../nativeui/phone/src/phoneaddressmodel.cpp         |  4 +---
 .../service/ble_service/blemoder/bletest.cpp         | 12 +++++++++++-
 .../wearable/service/ble_service/blemoder/bletest.h  |  4 ++++
 code/sdk/drivers/peripheral/utils/custom_utils.c     |  6 ++++++
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
index c889eff58..09ad20cfd 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
@@ -10,6 +10,7 @@
 #include "cmsis_os.h"
 #include "AlipaySetting.h"
 #include "AlipayModel.h"
+#include "uicomponents/UIComponents.h"
 
 namespace OHOS {
 static const char *SETTING_TITLE = (char *)"设置";
@@ -111,8 +112,11 @@ bool AlipaySetting::AlipayInitLabel(void)
     }
     uint8_t str[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0};
     presenter_->AlipayGetNickName(str);
-    labelName->SetText((const char *)str);
-    labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_NAME_FONT);
+    uint8_t str_[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0};
+    updata_char((char *)str_,(char *)str,ALIPAY_GET_NICKNAME_MAX_LENGTH);
+    labelName->SetText((const char *)str_);
+    labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, SETTING_NAME_FONT);
+
     labelName->SetPosition(SETTING_NAME_X, SETTING_NAME_Y, SETTING_NAME_WIDTH, SETTING_NAME_HEIGHT);
     labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
     labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
index e63161b7a..9954351eb 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
@@ -356,7 +356,7 @@ namespace OHOS
         return address_number;
     }
 
-    #define SOS_NUMBER_PATH "user/userdata/sos_number.bin"
+    #define SOS_NUMBER_PATH "/user/userdata/sos_number.bin"
 
     #define SOS_NUMBER_MAX 3
 
@@ -371,8 +371,6 @@ namespace OHOS
         {
             for(int i=0;i<sos_num;i++)
             {
-                // char W_buf[20]={0};
-                // memcpy_s(W_buf,20,sos_dail_buf[i],osal_strlen((const char*)sos_dail_buf[i]));
                 fwrite(&sos_number_data[i],1,sizeof(sos_number_t),fp);
             }
             fclose(fp);
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 4f0ecd22d..034ea5c67 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -87,6 +87,16 @@ extern "C" {
 #include "alipay_feature.h"
 #include "transmitting.h"
 
+void ble_sos_data_save(void)
+{
+    OHOS::SOS_number_save();
+}
+
+void ble_SOS_data_init(void)
+{
+    OHOS::SOS_number_init();
+}
+
 void ota_updata_init(void)
 {
    OHOS::get_updatafail_data();
@@ -209,7 +219,7 @@ bool Ble_Set_ScheduleInfo(uint8_t id,uint32_t timetamp_begin,uint32_t timetamp_e
     //printf("delete_before_file now day%d %d %d\r\n ",y,m,d);
 
     // OHOS::C_ScheduleSetByApp(&info_, id - 1, is_end);
-    C_ScheduleSetByApp(&info_, id - 1, is_end);
+    C_ScheduleSetByApp(&info_, id-1, is_end);
 
     if(is_end)
     printf("////////////////////结束///////////////////\r\n");
diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index 1721e7971..a9354a21b 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@ -384,6 +384,10 @@ void ota_updata_init(void);
 
 bool delete_MP3_file_By_ID(uint16_t id);
 
+void ble_sos_data_save(void);
+
+void ble_SOS_data_init(void);
+
 #ifdef __cplusplus
 #if __cplusplus
 }
diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index fcf469b13..3f7c02ddb 100644
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -195,6 +195,8 @@ void shutdown_reboot_prejobs_task(void)
 
     addressbookTowrite();
 
+    ble_sos_data_save();
+
     //保存信息文件
     saveancsdata();
     //保存当天心率数据
@@ -383,7 +385,11 @@ void startup_post_init_task(void)
     }
 
     addressbookToRead(NULL);
+
+    ble_SOS_data_init();
+
     up_report_timer();
+
     read_jsonHistory_weather();
 
     ota_updata_init();
-- 
2.17.1