From: penglei <1624952103@qq.com> Date: Sun, 20 Oct 2024 03:52:01 +0000 (+0800) Subject: 修改开机动画图片路径到“user/res/ReBootAndShutDown” X-Git-Tag: release_V1.2.70_20241020_135402~3^2~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=69e1be39de944cea1cafdb17135ed8e0c4bd59e9;p=mirrors%2FFD230.git 修改开机动画图片路径到“user/res/ReBootAndShutDown” --- diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/1.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/1.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/1.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/10.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/10.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/10.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/10.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/11.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/11.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/11.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/11.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/12.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/12.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/12.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/12.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/13.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/13.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/13.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/13.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/14.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/14.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/14.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/14.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/15.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/15.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/16.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/16.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/17.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/17.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/18.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/18.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/19.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/19.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/2.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/2.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/2.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/20.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/20.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/21.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/21.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/22.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/22.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/23.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/23.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/24.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/24.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/25.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/25.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/26.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/26.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/27.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/27.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/28.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/28.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/29.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/29.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/3.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/3.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/3.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/31.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/31.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/32.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/32.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/33.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/33.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/34.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/34.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/35.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/35.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/36.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/36.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/4.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/4.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/4.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/4.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/5.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/5.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/5.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/5.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/6.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/6.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/7.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/7.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/7.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/7.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/8.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/8.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/8.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/8.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/9.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/9.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/9.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/9.bin diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp index 133454f75..87c6c6881 100755 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp @@ -56,10 +56,10 @@ static OHOS::UIViewGroup* group=nullptr; static OHOS::UIViewGroup* boot_group=nullptr; static OHOS::UIImageAnimatorView* ReBootImageAnimatorView=nullptr; #ifdef CUSTOM_Z1 -static constexpr char *ReBootPaths = "/system/ReBoot/"; //开机图片路径 +static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 #else -static constexpr char *ReBootPaths = "/system/ReBoot/"; //开机图片路径 +static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36; // 图片帧数 #endif static constexpr int16_t REBOOT_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔