From 9a7f68659ac8716551e5c2b92c819b72fc0e4572 Mon Sep 17 00:00:00 2001 From: "snickersun@163.com" Date: Sat, 16 Nov 2024 03:12:51 +0000 Subject: [PATCH] Merge #1405 into sdk602patch0911 from refs/changes/1405/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fileschecksum.txt check_differential.txt 都统一移动到/user下 * refs/changes/1405/head: (3 commits squashed) - fileschecksum.txt check_differential.txt 都统一移动到/user下 - fileschecksum.txt check_differential.txt 都统一移动到/user下 - add AT^POWEROFF Signed-off-by: snickersun@163.com Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1405 --- .../safemodemanager/src/SafeModeManagerModel.cpp | 8 +++----- .../drivers/peripheral/utils/custom_resfile_check.c | 12 ++++-------- code/sdk/drivers/peripheral/utils/custom_utils.h | 2 +- .../drivers/peripheral/utils/custom_utils_at_cmd.c | 9 ++++++++- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerModel.cpp index 522ff9cfc..c2410dc56 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerModel.cpp @@ -43,11 +43,9 @@ extern uint8_t battery_get_voltage(float *voltage); bool resfile_checksum_thread(void); } -#ifdef SINGLE_USER_PARTITION -static const char *CHECK_DIFFERENTIAL_FILE = "/user/system/check_differential.txt"; -#else -static const char *CHECK_DIFFERENTIAL_FILE = "/system/check_differential.txt"; -#endif + +static const char *CHECK_DIFFERENTIAL_FILE = "/user/check_differential.txt"; + void repair_file_start() { OHOS::SafeModeManagerModel::GetInstance()->RepairStart(); } diff --git a/code/sdk/drivers/peripheral/utils/custom_resfile_check.c b/code/sdk/drivers/peripheral/utils/custom_resfile_check.c index 8ea3c8c08..28ddc9c48 100644 --- a/code/sdk/drivers/peripheral/utils/custom_resfile_check.c +++ b/code/sdk/drivers/peripheral/utils/custom_resfile_check.c @@ -42,13 +42,9 @@ #define MAX_FILE_NAME_LEN 256 #define MAX_FILE_CHECKSUM_STR_LEN (256 + 64) -#ifdef SINGLE_USER_PARTITION -#define RESFILE_CHECKSUM_FILE "/user/system/fileschecksum.txt" -#define CHECK_DIFFERENTER_FILE "/user/system/check_differential.txt" -#else -#define RESFILE_CHECKSUM_FILE "/system/fileschecksum.txt" -#define CHECK_DIFFERENTER_FILE "/system/check_differential.txt" -#endif +#define RESFILE_CHECKSUM_FILE "/user/fileschecksum.txt" +#define CHECK_DIFFERENTER_FILE "/user/check_differential.txt" + // #define ENABLE_RESFILECHECK_LOG #ifdef ENABLE_RESFILECHECK_LOG #define LOG_RESCHECK printf @@ -99,7 +95,7 @@ static bool split_argument(char *buf, int inputlen, char *outfilename, int max_o return true; } /** - * 资源文件校验码保存在文件 /system/fileschecksum.txt 中 + * 资源文件校验码保存在文件 /user/fileschecksum.txt 中 * 读出每一行，输入本函数，检测文件是否正常。 * 输入： * /music/ring/ring.mp3,523621,8c0b93aae3b2ee12e6cf58336a092c43 diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h index 1ca2264cd..cd99679da 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@ -358,7 +358,7 @@ void start_save_file_thread(void); void uapi_create_folder(char *dir_path); uint32_t uapi_get_file_size(char *filepath); /** - * 资源文件校验码保存在文件 /system/fileschecksum.txt 中 + * 资源文件校验码保存在文件 /user/fileschecksum.txt 中 * 读出每一行，输入本函数，检测文件是否正常。 * 输入： * /music/ring/ring.mp3,523621,8c0b93aae3b2ee12e6cf58336a092c43 diff --git a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c index cb6134d88..98467ea97 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c @@ -1431,8 +1431,15 @@ static uint32_t Add_VER_txt_atuoota(uint8_t *para, uint32_t paraLen, char *strCo return ERRCODE_SUCC; } +static uint32_t custom_at_poweroff(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + wstp_print("power off device!\n"); + uapi_poweroff_device(); + return ERRCODE_SUCC; +} @@ -1523,7 +1530,7 @@ static const at_cmd_table_t g_custom_utils_cmd[] = { { (char *)"AT^ADDVRETXT", Add_VER_txt_atuoota, (char *)" " }, { (char *)"AT^ADDAUTOOTA", Add_need_addrss_atuoota, (char *)" " }, { (char *)"AT^AUTOOTACHECK", send_check_ota_atuoota, (char *)" " }, - + { (char *)"AT^POWEROFF", custom_at_poweroff, (char *)" " }, }; -- 2.17.1