From: luozheng <1732036298@qq.com> Date: Mon, 21 Oct 2024 10:42:10 +0000 (+0800) Subject: Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: fd230_release_V1.3.102~188^2~23 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1236%2Fhead;p=mirrors%2FFD230.git Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 --- e0c24baaacb0d36a94b7f7fb4cad431e2ced464f diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 4fa5527dd,13bd86c85..0f7e5b822 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@@ -65,15 -65,11 +65,15 @@@ namespace OHO #define DOUBLES 2 #define APP_RES_PATH "/user/res" +#ifdef SINGLE_USER_PARTITION +#define APP_MUSIC_PATH "/user/music/user_music" +#else #define APP_MUSIC_PATH "/user/userdata/music" +#endif #define APP_VIDEO_PATH "/user/video" - #define APP_DEFAULT_DIAL_PATH "/user/dial" /*默认表盘安装路径*/ - #define APP_DOWNLOAD_DIAL_PATH "/user/userdata/dial" /*表盘市场安装路径*/ - #define APP_CUSTOM_DIAL_PATH "/user/userdata/custom_dial" /*自定义表盘安装路径*/ + #define APP_DEFAULT_DIAL_PATH "/user/dial/res_dial" /*默认表盘安装路径*/ + #define APP_DOWNLOAD_DIAL_PATH "/user/dial/offline_dial" /*表盘市场安装路径*/ + #define APP_CUSTOM_DIAL_PATH "/user/dial/custom_dial" /*自定义表盘安装路径*/ #define APP_LIST_PATH "/user/res/applist_icon" #define APP_HEARET_ICON_PATH "/user/res/heart_chart/hearticon"//心率动画 diff --cc code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h index 57cddc5ac,b4849c483..14b3f1673 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h @@@ -8,22 -8,22 +8,22 @@@ #include #define TOTAL_MUSIC_SPACE (10 * 1024 * 1024) // 10M -#define TOTAL_MUSIC_SPACE_PATH "/user/musci/usermusci" +#define TOTAL_MUSIC_SPACE_PATH "/user/music/user_music" #define TOTAL_RECORDING_SPACE (10 * 1024 * 1024) // 10M -#define TOTAL_RECORDING_SPACE_PATH "/user/musci/recording" +#define TOTAL_RECORDING_SPACE_PATH "/user/music/recording" #define TOTAL_RING_SPACE (2 * 1024 * 1024) // 2M -#define TOTAL_RING_SPACE_PATH "/user/musci/ring" +#define TOTAL_RING_SPACE_PATH "/user/music/ring" #define TOTAL_DIAL_SPACE (27 * 1024 * 1024) // 27M - #define TOTAL_DIAL_SPACE_PATH "/user/dial/offlinedial" + #define TOTAL_DIAL_SPACE_PATH "/user/dial/offline_dial" #define TOTAL_RES_DIAL_SPACE (7 * 1024 * 1024) // 7M - #define TOTAL_RES_DIAL_SPACE_PATH "/user/dial/resdial" + #define TOTAL_RES_DIAL_SPACE_PATH "/user/dial/res_dial" #define TOTAL_CUSTOM_DAIL_SPACE (1 * 1024 * 1024) // 1M - #define TOTAL_CUSTOM_DAIL_SPACE_PATH "/user/dial/customdial" + #define TOTAL_CUSTOM_DAIL_SPACE_PATH "/user/dial/custom_dial" #define TOTAL_SYSTEM_SPACE (5 * 1024 * 1024) // 5M #define TOTAL_SYSTEM_SPACE_PATH "/user/system" diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c index 3e7069d67,47d000078..26cb5ea9f --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@@ -2071,11 -2071,12 +2071,14 @@@ void uapi_restore_factory_setting(void resume_report_log(); #ifdef SINGLE_USER_PARTITION - char *filebuf[] = {"/user/system/ConfigModel.json", - "/user/userdata", - "/user/system/kvstore", - "/user/music/user_music", - "/user/music/recording", + char *filebuf[] = { + "/user/system/ConfigModel.json", + "/user/userdata", + "/user/system/kvstore", ++ "/user/music/user_music", ++ "/user/music/recording", + "/user/dial/custom_dial/", //自定义表盘 + "/user/dial/offline_dial/",//离线表盘 }; #else