From 23e572295a4d0fab867c3fbcecedcc2c43f6d31d Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 28 Aug 2024 20:32:40 +0800 Subject: [PATCH] =?utf8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?utf8?q?=E5=85=B3=E6=9C=BA=E5=92=8C=E9=87=8D=E5=90=AF=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../include/ShutDownImageAnimatorView.h | 13 +- .../src/RebootAndShutdownModel.cpp | 28 +-- .../src/ShutDownImageAnimatorView.cpp | 39 +++- .../nativeui/settings/src/SettingModel.cpp | 4 +- .../nativeui/system/include/SystemPresenter.h | 8 +- .../nativeui/system/include/SystemRestart.h | 37 ++++ .../nativeui/system/include/SystemShutdown.h | 37 ++++ .../nativeui/system/include/SystemView.h | 27 ++- .../nativeui/system/src/SystemPresenter.cpp | 77 ++++++-- .../nativeui/system/src/SystemRestart.cpp | 168 ++++++++++++++++++ .../nativeui/system/src/SystemShutdown.cpp | 168 ++++++++++++++++++ .../nativeui/system/src/SystemView.cpp | 84 ++++++++- .../fs/user/res/settings/SETTTING_REBOOT.bin | 2 +- .../user/res/settings/SETTTING_SHUTDOWN.bin | 4 +- 14 files changed, 637 insertions(+), 59 deletions(-) create mode 100644 code/sdk/application/wearable/fd230app/nativeui/system/include/SystemRestart.h create mode 100644 code/sdk/application/wearable/fd230app/nativeui/system/include/SystemShutdown.h create mode 100644 code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp create mode 100644 code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h index a779a771c..ae0efbb09 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-20 11:05:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-20 15:11:40 + * @LastEditTime: 2024-08-28 20:21:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/include/ShutDownImageAnimatorView.h */ @@ -18,11 +18,11 @@ namespace OHOS static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y = 0; static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_W = 466; static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_H = 466; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 + static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 + static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 static constexpr const char *ShutDownPaths = "/user/res/RebootAndShutDown/ShutDown/"; // 关机图片路径 - class ShutDownImageAnimatorView + class ShutDownImageAnimatorView : public UIImageAnimatorView::AnimatorStopListener { public: ShutDownImageAnimatorView(); @@ -30,8 +30,11 @@ namespace OHOS static ShutDownImageAnimatorView *GetInstance(); UIViewGroup *ShutDownAnimatorViewInit(void); UIImageAnimatorView *GeShutDownImageAnimatorView(void); + void ShutDownImageAnimator_Start(bool state); + bool GetShutDownImageAnimatorIsStart(void); private: + void OnAnimatorStop(UIView &view) override; void ClearAll(void); bool ShowUpShutDownAnimatorView(); const char **CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages); @@ -40,6 +43,8 @@ namespace OHOS UIImageAnimatorView *shutDownImageAnimatorView{nullptr}; // 关机动画 ImageAnimatorInfo ShutDownImageInfo[SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 关机图像的信息 const char **ShutDownPathsArray{nullptr}; // 关机图片路径数组 + bool isShutDownOperation; + bool isShutDownImageAnimatorStart{false}; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp index 9f042b932..0f11bd09c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp @@ -2,12 +2,12 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-18 14:55:27 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-26 20:56:46 + * @LastEditTime: 2024-08-28 20:23:14 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp */ #include "rebootandshutdown/include/RebootAndShutdownModel.h" -#include "rebootandshutdown/include/RebootAndShutdownPresenter.h" +#include "rebootandshutdown/include/ShutDownImageAnimatorView.h" #include "wearable_log.h" #include "ConfigModel.h" #include "NativeAbility.h" @@ -73,8 +73,8 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PowerKeyLongPressCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } @@ -117,8 +117,8 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PowerKeyDoubleClickCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } @@ -172,8 +172,8 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RebootAndShutdownModel::FuncKeyOnPressCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } @@ -222,8 +222,8 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FuncKeyOnLongPressCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } @@ -298,8 +298,8 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FuncKeyOnClickCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } @@ -371,8 +371,8 @@ namespace OHOS { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FuncKeyDoubleClickCallBack"); - RebootAndShutdownPresenter *rebootAndShutdownPresenter = RebootAndShutdownPresenter::GetInstance(); - if (rebootAndShutdownPresenter != nullptr && true == rebootAndShutdownPresenter->GetIsShutDownImageAnimator()) + ShutDownImageAnimatorView *shutDownImageAnimatorView = ShutDownImageAnimatorView::GetInstance(); + if (shutDownImageAnimatorView != nullptr && true == shutDownImageAnimatorView->GetShutDownImageAnimatorIsStart()) { return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp index f993fafb3..a9504e494 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp @@ -1,9 +1,10 @@ #include "rebootandshutdown/include/ShutDownImageAnimatorView.h" #include "rebootandshutdown/include/RebootAndShutdownPresenter.h" #include "wearable_log.h" +#include namespace OHOS { - + static ShutDownImageAnimatorView *g_pShutDownAnimatorView = nullptr; ShutDownImageAnimatorView::ShutDownImageAnimatorView() { @@ -59,11 +60,39 @@ namespace OHOS } } + void ShutDownImageAnimatorView::OnAnimatorStop(UIView &view) + { + UNUSED(view); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RebootAndShutdownPresenter::OnAnimatorStop"); + if (isShutDownOperation == true) + { + uapi_poweroff_device(); // 关机 + } + else + { + uapi_reboot_device(); // 重启 + } + } + UIImageAnimatorView *ShutDownImageAnimatorView::GeShutDownImageAnimatorView(void) { return shutDownImageAnimatorView; } + // true 关机 false 重启 + void ShutDownImageAnimatorView::ShutDownImageAnimator_Start(bool state) + { + isShutDownOperation = state; + shutDownImageAnimatorView->Start(); + isShutDownImageAnimatorStart = true; + } + + //获取开机动画是否已经开始 + bool ShutDownImageAnimatorView::GetShutDownImageAnimatorIsStart(void) + { + return isShutDownImageAnimatorStart; + } + bool ShutDownImageAnimatorView::ShowUpShutDownAnimatorView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShutDownImageAnimatorView::ShowUpShutDownAnimatorView"); @@ -92,13 +121,7 @@ namespace OHOS shutDownImageAnimatorView->SetImageAnimatorSrc(ShutDownImageInfo, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100); shutDownImageAnimatorView->SetRepeat(false); shutDownImageAnimatorView->SetRepeatTimes(1); - UIImageAnimatorView::AnimatorStopListener *stoplistener = static_cast(RebootAndShutdownPresenter::GetInstance()); - if (stoplistener == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to Create stoplistener!!"); - return false; - } - shutDownImageAnimatorView->SetAnimatorStopListener(stoplistener); + shutDownImageAnimatorView->SetAnimatorStopListener(this); } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp index 7afff696a..31c0f6abc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-18 09:09:13 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-24 10:43:23 + * @LastEditTime: 2024-08-28 20:09:20 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp */ #include "settings/include/SettingModel.h" @@ -36,7 +36,7 @@ namespace OHOS settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, STR_WATCH_FACE, true}; settings[index++] = {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, STR_POWER_SAVE_MODE, true}; settings[index++] = {VIEW_SYSTEM, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true}; - settings[index++] = {VIEW_REBOOTANDSHUTDOWN, PNG_SETTINGS_SHUTDOWN_AND_RESTART, STR_SHUTDOWN_AND_RESTART, true}; + // settings[index++] = {VIEW_REBOOTANDSHUTDOWN, PNG_SETTINGS_SHUTDOWN_AND_RESTART, STR_SHUTDOWN_AND_RESTART, true}; usedLen = index; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemPresenter.h index 050db8fea..3a6c07958 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 18:29:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-25 14:48:37 + * @LastEditTime: 2024-08-28 19:55:18 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemPresenter.h */ @@ -18,11 +18,10 @@ namespace OHOS { - /* ---------------------------- 恢复出厂设置界面按钮的VIEWID --------------------------- */ - static const char *FACTORYRESET_CHECKON = "ShoutDownButtonCheckOn"; // 确认 - static const char *FACTORYRESET_CHECKOFF = "ShoutDownButtonCheckOff"; // 取消 + static const char *FACTORYRESET_CHECKON = "factoryresetButtonCheckOn"; // 确认 + static const char *FACTORYRESET_CHECKOFF = "factoryresetButtonCheckOff"; // 取消 class SystemView; class SystemPresenter : public Presenter, @@ -53,6 +52,7 @@ namespace OHOS private: SystemModel *systemModel; bool X_DRAG_FLAG{false}; + bool isShutDownImageAnimatorStart{false}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemRestart.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemRestart.h new file mode 100644 index 000000000..2b66ade4d --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemRestart.h @@ -0,0 +1,37 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-28 17:29:39 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-28 19:09:57 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemRestart.h + */ +#ifndef _RESTARTVIEW_VIEW_H_ +#define _RESTARTVIEW_VIEW_H_ + +#include "components/ui_label_ext.h" +#include "components/ui_button.h" +#include "components/ui_image_view.h" +#include "components/ui_scroll_view.h" +namespace OHOS +{ + static const char *RESTARTVIEW_CHECKON = "RestartButtonCheckOn"; // 确认 + static const char *RESTARTVIEW_CHECKOFF = "RestartButtonCheckOff"; // 取消 + class SystemRestart + { + public: + SystemRestart(); + ~SystemRestart(); + UIScrollView *SystemRestartViewInit(void); + + private: + void ClearAll(void); + UIScrollView *SystemRestartScrollView = nullptr; + UILabelExt *title{nullptr}; + UILabelExt *note{nullptr}; + UIImageView *image = nullptr; + UIButton *button_ensure = nullptr; + UIButton *button_cancel = nullptr; + }; + +} +#endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemShutdown.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemShutdown.h new file mode 100644 index 000000000..45fb2dc40 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemShutdown.h @@ -0,0 +1,37 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-28 17:29:39 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-28 18:08:10 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemShutdown.h + */ +#ifndef _SHUTDOWN_VIEW_H_ +#define _SHUTDOWN_VIEW_H_ + +#include "components/ui_label_ext.h" +#include "components/ui_button.h" +#include "components/ui_image_view.h" +#include "components/ui_scroll_view.h" +namespace OHOS +{ + static const char *SHUTDOWN_CHECKON = "ShoutDownButtonCheckOn"; // 确认 + static const char *SHUTDOWN_CHECKOFF = "ShoutDownButtonCheckOff"; // 取消 + class SystemShutdown + { + public: + SystemShutdown(); + ~SystemShutdown(); + UIScrollView *SystemShutdownViewInit(void); + + private: + void ClearAll(void); + UIScrollView *SystemShutdownScrollView = nullptr; + UILabelExt *title{nullptr}; + UILabelExt *note{nullptr}; + UIImageView *image = nullptr; + UIButton *button_ensure = nullptr; + UIButton *button_cancel = nullptr; + }; + +} +#endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h index a28c27550..14afb967d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 18:29:39 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-25 16:38:48 + * @LastEditTime: 2024-08-28 19:43:28 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h */ #ifndef SYSTEM_VIEW_H @@ -22,7 +22,9 @@ #include "system/include/SystemFactoryResetView.h" // #include "system/include/Systemupgrade.h" #include "components/ui_toggle_button.h" - +#include "system/include/SystemShutdown.h" +#include "system/include/SystemRestart.h" +#include "rebootandshutdown/include/ShutDownImageAnimatorView.h" namespace OHOS { static constexpr const char *ABOUT_THE_WATCH = "AboutTheWatchButton"; // 关于手表 @@ -30,13 +32,18 @@ namespace OHOS static constexpr const char *SYSTEM_UPGRADE_t = "SystemUpgradeButtonExt_t"; // 点击系统升级 static constexpr const char *WATCH_QR_CODE = "WatchqrcodeButton"; // 手表二维码 static constexpr const char *SYSTEM_LANGUAGE = "SystemLanguageButton"; // 系统语言 + static constexpr const char *RESTART = "RestartButton"; // 重启 + static constexpr const char *SHUTDOWN = "ShutdownButton"; // 关机 static constexpr const char *FACTORY_RESET = "FactoryResetButton"; // 恢复出厂设置 typedef enum { - SYSTEMVIEW = 0, // 系统视图(slice) - ABOUTTHEWATCHVIEW, // 关于手表视图(subView) - FACTORYRESETVIEW, // 恢复出厂设置视图(subView) + SYSTEMVIEW = 0, // 系统视图(slice) + ABOUTTHEWATCHVIEW, // 关于手表视图(subView) + RESTARTVIEW, // 重启视图(subView) + SHUTDOWNVIEW, // 关机视图(subView) + FACTORYRESETVIEW, // 恢复出厂设置视图(subView) + SHUTDOWNANIMATIONVIEW, // 关机动画(subView) MAX_SYSTEMVIEWID, } SYSTEMVIEWID; @@ -78,14 +85,20 @@ namespace OHOS bool ChangeToSystemView(int16_t thisView); bool ChangeToSystemAboutView(int16_t thisView); bool ChangeToSystemFactoryResetView(int16_t thisView); + bool ChangeToSystemRestartView(int16_t thisView); + bool ChangeToSystemShutdownView(int16_t thisView); + bool ChangeToSystemShutdownAnimatorView(int16_t thisView); bool ClickFunc(int16_t interface); bool CheckViewParam(int16_t hideView, int16_t showView); void ChangeView(int16_t hideView, int16_t showView); UIScrollView *GetSystemScrollView(int ViewId); private: - SystemAboutTheWatchView *p_SystemAboutTheWatchView{nullptr}; // 关于手表 - SystemFactoryResetView *p_SystemFactoryResetView{nullptr}; // 恢复出厂设置 + SystemAboutTheWatchView *p_SystemAboutTheWatchView{nullptr}; // 关于手表 + SystemFactoryResetView *p_SystemFactoryResetView{nullptr}; // 恢复出厂设置 + SystemRestart *p_SystemRestart{nullptr}; // 重启 + SystemShutdown *p_SystemShutdown{nullptr}; // 关机 + ShutDownImageAnimatorView *p_ShutDownImageAnimatorView{nullptr}; // 关机动画 private: UILabelButtonExt *SystemViewLabelButtonInit(ButtonConfig &buttonconfig); diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp index 3bb688b7d..f148d9822 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp @@ -100,6 +100,14 @@ namespace OHOS { p_SystemView->ChangeView(ABOUTTHEWATCHVIEW, SYSTEMVIEW); } + else if (&view == p_SystemView->GetSystemScrollView(RESTARTVIEW)) + { + p_SystemView->ChangeView(RESTARTVIEW, SYSTEMVIEW); + } + else if (&view == p_SystemView->GetSystemScrollView(SHUTDOWNVIEW)) + { + p_SystemView->ChangeView(SHUTDOWNVIEW, SYSTEMVIEW); + } else if (&view == p_SystemView->GetSystemScrollView(FACTORYRESETVIEW)) { p_SystemView->ChangeView(FACTORYRESETVIEW, SYSTEMVIEW); @@ -156,13 +164,11 @@ namespace OHOS } else if (strcmp(view.GetViewId(), SYSTEM_UPGRADE) == 0) // 点击进入系统升级视图 { - //p_SystemView->ChangeView(SYSTEMVIEW, SYSTEMLUPGRADE); NativeAbility::GetInstance().EnterSlice(VIEW_SYSTEM_UPDATE); return true; } else if (strcmp(view.GetViewId(), WATCH_QR_CODE) == 0) // 点击进入手表二维码视图 { - //p_SystemView->ChangeView(SYSTEMVIEW, WATCHQRCODE); NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE); return true; } @@ -171,11 +177,51 @@ namespace OHOS NativeAbility::GetInstance().EnterSlice(VIEW_LANGUAGE_SWITCH); return true; } + else if (strcmp(view.GetViewId(), RESTART) == 0) // 点击进入重启界面 + { + p_SystemView->ChangeView(SYSTEMVIEW, RESTARTVIEW); + return true; + } + else if (strcmp(view.GetViewId(), SHUTDOWN) == 0) // 点击进入关机界面 + { + p_SystemView->ChangeView(SYSTEMVIEW, SHUTDOWNVIEW); + return true; + } else if (strcmp(view.GetViewId(), FACTORY_RESET) == 0) // 点击进入恢复出厂设置界面 { p_SystemView->ChangeView(SYSTEMVIEW, FACTORYRESETVIEW); return true; } + else if (strcmp(view.GetViewId(), RESTARTVIEW_CHECKON) == 0) // 重启确认 + { + p_SystemView->ChangeView(RESTARTVIEW, SHUTDOWNANIMATIONVIEW); + start_shutdown_or_reboot(); + shutdown_reboot_prejobs(); + + ShutDownImageAnimatorView::GetInstance()->ShutDownImageAnimator_Start(false); + isShutDownImageAnimatorStart = true; + return true; + } + else if (strcmp(view.GetViewId(), RESTARTVIEW_CHECKOFF) == 0) // 重启取消 + { + p_SystemView->ChangeView(RESTARTVIEW, SYSTEMVIEW); + return true; + } + else if (strcmp(view.GetViewId(), SHUTDOWN_CHECKON) == 0) // 关机确认 + { + p_SystemView->ChangeView(RESTARTVIEW, SHUTDOWNANIMATIONVIEW); + start_shutdown_or_reboot(); + shutdown_reboot_prejobs(); + + ShutDownImageAnimatorView::GetInstance()->ShutDownImageAnimator_Start(true); + isShutDownImageAnimatorStart = true; + return true; + } + else if (strcmp(view.GetViewId(), SHUTDOWN_CHECKOFF) == 0) // 关机取消 + { + p_SystemView->ChangeView(SHUTDOWNVIEW, SYSTEMVIEW); + return true; + } else if (strcmp(view.GetViewId(), FACTORYRESET_CHECKON) == 0) // 恢复出厂设置确认 { do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0); @@ -187,7 +233,6 @@ namespace OHOS return true; } - // if (strcmp(view.GetViewId(), SYSTEM_UPGRADE_t) == 0) //点击是否立即升级 // { // SystemupgradeView::GetInstance()->statr_down_fwpkg(); @@ -208,7 +253,10 @@ namespace OHOS // 如果是power键,且是亮屏状态，按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(); + if (!isShutDownImageAnimatorStart) + { + NativeAbility::GetInstance().Back(); + } } return true; } @@ -219,23 +267,22 @@ namespace OHOS // } #ifdef __cplusplus #if __cplusplus -extern "C" -{ + extern "C" + { #endif /* __cplusplus */ #endif /* __cplusplus */ - void factorytest_enter_test_view(int cmd) - { - if(cmd == 1) - NativeAbility::GetInstance().ChangeSlice(VIEW_TEST); - else - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - } - + void factorytest_enter_test_view(int cmd) + { + if (cmd == 1) + NativeAbility::GetInstance().ChangeSlice(VIEW_TEST); + else + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + } #ifdef __cplusplus #if __cplusplus -} + } #endif /* __cplusplus */ #endif /* __cplusplus */ } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp new file mode 100644 index 000000000..19b8b120f --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp @@ -0,0 +1,168 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-28 17:30:10 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-28 19:25:08 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp + */ +#include "system/include/SystemRestart.h" +#include "BaseView.h" +#include "system/include/SystemPresenter.h" +#include "ui_resource_string.h" +namespace OHOS +{ + SystemRestart::SystemRestart() + { + } + + SystemRestart::~SystemRestart() + { + ClearAll(); + } + + void SystemRestart::ClearAll(void) + { + if (SystemRestartScrollView) + { + SystemRestartScrollView->RemoveAll(); + + if (title) + { + delete title; + title = nullptr; + } + if (note) + { + delete note; + note = nullptr; + } + if (image) + { + delete image; + image = nullptr; + } + if (button_ensure) + { + delete button_ensure; + button_ensure = nullptr; + } + if (button_cancel) + { + delete button_cancel; + button_cancel = nullptr; + } + delete SystemRestartScrollView; + SystemRestartScrollView = nullptr; + } + } + UIScrollView *SystemRestart::SystemRestartViewInit(void) + { + if (SystemRestartScrollView == nullptr) + { + SystemRestartScrollView = new UIScrollView(); + if (SystemRestartScrollView == nullptr) + { + return nullptr; + } + SystemRestartScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + SystemRestartScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + UIView::OnDragListener *draglistener = static_cast(SystemPresenter::GetInstance()); + if (draglistener == nullptr) + { + return nullptr; + } + SystemRestartScrollView->SetOnDragListener(draglistener); + SystemRestartScrollView->SetTouchable(true); + SystemRestartScrollView->SetDraggable(true); + /* -------------------------------------------------------------------------- */ + if (title == nullptr) + { + title = new UILabelExt(); + if (title == nullptr) + { + return nullptr; + } + title->SetPosition(83, 50, 300, 35); // 位置 + title->SetStyle(STYLE_TEXT_FONT, 30); // 字体大小 + title->SetStyle(STYLE_LINE_HEIGHT, 35); // 字体行高 + title->SetTextId(STR_RESTART); // 内容 + title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + title->SetRollSpeed(70); + title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + SystemRestartScrollView->Add(title); + } + /* -------------------------------------------------------------------------- */ + if (image == nullptr) + { + image = new UIImageView(); + if (image == nullptr) + { + return nullptr; + } + image->SetPosition(193, 120, 80, 80); + image->SetSrc("/user/res/settings/SETTTING_REBOOT.bin"); + } + SystemRestartScrollView->Add(image); + /* -------------------------------------------------------------------------- */ + if (note == nullptr) + { + note = new UILabelExt(); + if (note == nullptr) + { + return nullptr; + } + note->SetPosition(53, 232, 360, 35); // 位置 + note->SetStyle(STYLE_TEXT_FONT, 30); // 字体大小 + note->SetStyle(STYLE_LINE_HEIGHT, 35); // 字体行高 + note->SetTextId(STR_RESET_CONFIRM); + note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + note->SetRollSpeed(70); + note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + SystemRestartScrollView->Add(note); + } + /* -------------------------------------------------------------------------- */ + button_cancel = new UIButton(); + if (button_cancel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemRestart::new button_cancel fail!"); + return nullptr; + } + button_cancel->SetPosition(97, 299, 130, 130); + button_cancel->SetViewId(RESTARTVIEW_CHECKOFF); + button_cancel->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + button_cancel->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + button_cancel->SetImagePosition(15, 15); + button_cancel->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); + button_cancel->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + button_cancel->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE); + SystemRestartScrollView->Add(button_cancel); + /* ------------------------ button_ensure ----------------------- */ + button_ensure = new UIButton(); + if (button_ensure == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemRestart::new button_ensure fail!"); + return nullptr; + } + button_ensure->SetPosition(240, 299, 130, 130); + button_ensure->SetViewId(RESTARTVIEW_CHECKON); + button_ensure->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + button_ensure->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + button_ensure->SetImagePosition(15, 15); + button_ensure->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); + button_ensure->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + button_ensure->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE); + SystemRestartScrollView->Add(button_ensure); + UIView::OnClickListener *ButtonOnClick = static_cast(SystemPresenter::GetInstance()); + if (ButtonOnClick == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemRestart::ButtonOnClick is nullptr!"); + return nullptr; + } + button_cancel->SetOnClickListener(ButtonOnClick); + button_ensure->SetOnClickListener(ButtonOnClick); + } + return SystemRestartScrollView; + } +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp new file mode 100644 index 000000000..f80031590 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp @@ -0,0 +1,168 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-28 17:30:10 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-28 18:49:19 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp + */ +#include "system/include/SystemShutdown.h" +#include "BaseView.h" +#include "system/include/SystemPresenter.h" +#include "ui_resource_string.h" +namespace OHOS +{ + SystemShutdown::SystemShutdown() + { + } + + SystemShutdown::~SystemShutdown() + { + ClearAll(); + } + + void SystemShutdown::ClearAll(void) + { + if (SystemShutdownScrollView) + { + SystemShutdownScrollView->RemoveAll(); + + if (title) + { + delete title; + title = nullptr; + } + if (note) + { + delete note; + note = nullptr; + } + if (image) + { + delete image; + image = nullptr; + } + if (button_ensure) + { + delete button_ensure; + button_ensure = nullptr; + } + if (button_cancel) + { + delete button_cancel; + button_cancel = nullptr; + } + delete SystemShutdownScrollView; + SystemShutdownScrollView = nullptr; + } + } + UIScrollView *SystemShutdown::SystemShutdownViewInit(void) + { + if (SystemShutdownScrollView == nullptr) + { + SystemShutdownScrollView = new UIScrollView(); + if (SystemShutdownScrollView == nullptr) + { + return nullptr; + } + SystemShutdownScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + SystemShutdownScrollView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + UIView::OnDragListener *draglistener = static_cast(SystemPresenter::GetInstance()); + if (draglistener == nullptr) + { + return nullptr; + } + SystemShutdownScrollView->SetOnDragListener(draglistener); + SystemShutdownScrollView->SetTouchable(true); + SystemShutdownScrollView->SetDraggable(true); + /* -------------------------------------------------------------------------- */ + if (title == nullptr) + { + title = new UILabelExt(); + if (title == nullptr) + { + return nullptr; + } + title->SetPosition(83, 50, 300, 35); // 位置 + title->SetStyle(STYLE_TEXT_FONT, 30); // 字体大小 + title->SetStyle(STYLE_LINE_HEIGHT, 35); // 字体行高 + title->SetTextId(STR_SHUTDOWN); // 内容 + title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + title->SetRollSpeed(70); + title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + SystemShutdownScrollView->Add(title); + } + /* -------------------------------------------------------------------------- */ + if (image == nullptr) + { + image = new UIImageView(); + if (image == nullptr) + { + return nullptr; + } + image->SetPosition(196, 120, 74, 80); + image->SetSrc("/user/res/settings/SETTTING_SHUTDOWN.bin"); + } + SystemShutdownScrollView->Add(image); + /* -------------------------------------------------------------------------- */ + if (note == nullptr) + { + note = new UILabelExt(); + if (note == nullptr) + { + return nullptr; + } + note->SetPosition(53, 232, 360, 35); // 位置 + note->SetStyle(STYLE_TEXT_FONT, 30); // 字体大小 + note->SetStyle(STYLE_LINE_HEIGHT, 35); // 字体行高 + note->SetTextId(STR_SHUTDOWN_CONFIRM); + note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + note->SetRollSpeed(70); + note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + SystemShutdownScrollView->Add(note); + } + /* -------------------------------------------------------------------------- */ + button_cancel = new UIButton(); + if (button_cancel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemShutdown::new button_cancel fail!"); + return nullptr; + } + button_cancel->SetPosition(97, 299, 130, 130); + button_cancel->SetViewId(SHUTDOWN_CHECKOFF); + button_cancel->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + button_cancel->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + button_cancel->SetImagePosition(15, 15); + button_cancel->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); + button_cancel->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + button_cancel->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE); + SystemShutdownScrollView->Add(button_cancel); + /* ------------------------ button_ensure ----------------------- */ + button_ensure = new UIButton(); + if (button_ensure == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemShutdown::new button_ensure fail!"); + return nullptr; + } + button_ensure->SetPosition(240, 299, 130, 130); + button_ensure->SetViewId(SHUTDOWN_CHECKON); + button_ensure->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + button_ensure->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + button_ensure->SetImagePosition(15, 15); + button_ensure->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED); + button_ensure->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + button_ensure->SetImageSrc(PNG_SYSTEM_CHECK_ON_IMAGE, PNG_SYSTEM_CHECK_ON_IMAGE); + SystemShutdownScrollView->Add(button_ensure); + UIView::OnClickListener *ButtonOnClick = static_cast(SystemPresenter::GetInstance()); + if (ButtonOnClick == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemShutdown::ButtonOnClick is nullptr!"); + return nullptr; + } + button_cancel->SetOnClickListener(ButtonOnClick); + button_ensure->SetOnClickListener(ButtonOnClick); + } + return SystemShutdownScrollView; + } +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp index f45b0725a..75a0326cb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp @@ -67,11 +67,30 @@ namespace OHOS delete p_SystemAboutTheWatchView; p_SystemAboutTheWatchView = nullptr; } + if (p_SystemRestart != nullptr) + { + delete p_SystemRestart; + p_SystemRestart = nullptr; + } + if (p_SystemShutdown != nullptr) + { + delete p_SystemShutdown; + p_SystemShutdown = nullptr; + } if (p_SystemFactoryResetView != nullptr) { delete p_SystemFactoryResetView; p_SystemFactoryResetView = nullptr; } + if (p_ShutDownImageAnimatorView != nullptr) + { + delete p_ShutDownImageAnimatorView; + p_ShutDownImageAnimatorView = nullptr; + } + for (int i = SYSTEMVIEW; i < MAX_SYSTEMVIEWID; i++) + { + SystemScrollView[i] = nullptr; + } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ClearAll end!!"); } @@ -143,7 +162,9 @@ namespace OHOS {273, STR_SYSTEM_UPDATE}, {393, STR_WATCH_QR_CODE}, {513, STR_SYSTEM_LANGUAGE}, - {633, STR_FACTORY_RESET}, + {633, STR_RESTART}, + {753, STR_SHUTDOWN}, + {873, STR_FACTORY_RESET}, }; labelConfig = { .left = 90, @@ -185,7 +206,9 @@ namespace OHOS {240, SYSTEM_UPGRADE}, {360, WATCH_QR_CODE}, {480, SYSTEM_LANGUAGE}, - {600, FACTORY_RESET}, + {600, RESTART}, + {720, SHUTDOWN}, + {840, FACTORY_RESET}, }; for (int i = 0; i < sizeof(buttonSetups) / sizeof(buttonSetups[0]); ++i) @@ -371,6 +394,60 @@ namespace OHOS return true; } + // 重启 + bool SystemView::ChangeToSystemRestartView(int16_t thisView) + { + if (SystemScrollView[thisView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView"); + p_SystemRestart = new SystemRestart(); + if (p_SystemRestart == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: new scrollView[%d] fail", thisView); + return false; + } + SystemScrollView[thisView] = p_SystemRestart->SystemRestartViewInit(); + container_->Add(SystemScrollView[thisView]); + } + return true; + } + + // 关机 + bool SystemView::ChangeToSystemShutdownView(int16_t thisView) + { + if (SystemScrollView[thisView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView"); + p_SystemShutdown = new SystemShutdown(); + if (p_SystemShutdown == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: new scrollView[%d] fail", thisView); + return false; + } + SystemScrollView[thisView] = p_SystemShutdown->SystemShutdownViewInit(); + container_->Add(SystemScrollView[thisView]); + } + return true; + } + + // 关机动画 + bool SystemView::ChangeToSystemShutdownAnimatorView(int16_t thisView) + { + if (SystemScrollView[thisView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView"); + p_ShutDownImageAnimatorView = new ShutDownImageAnimatorView(); + if (p_ShutDownImageAnimatorView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView:: new scrollView[%d] fail", thisView); + return false; + } + SystemScrollView[thisView] = static_cast(p_ShutDownImageAnimatorView->ShutDownAnimatorViewInit()); + container_->Add(SystemScrollView[thisView]); + } + return true; + } + struct SystemViewMapper { const int16_t viewId; @@ -381,6 +458,9 @@ namespace OHOS {SYSTEMVIEW, &SystemView::ChangeToSystemView}, {ABOUTTHEWATCHVIEW, &SystemView::ChangeToSystemAboutView}, {FACTORYRESETVIEW, &SystemView::ChangeToSystemFactoryResetView}, + {RESTARTVIEW, &SystemView::ChangeToSystemRestartView}, + {SHUTDOWNVIEW, &SystemView::ChangeToSystemShutdownView}, + {SHUTDOWNANIMATIONVIEW, &SystemView::ChangeToSystemShutdownAnimatorView}, }; // 根据传入的interface参数执行相应视图ID关联的成员函数。 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin index 38ccdc9e9..61130d272 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94e2a8c1bad2a01632f8feebcbdc71bd4de2947fa9b606f9adcea469ab118a28 +oid sha256:f2805f512f3b8f80012837f62d13befd45b5dfaa65ed63fc58eadb22c9741c56 size 4504 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin index b25e53155..07627c191 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66dad3548d7036af3d8b9c4a28b8effec69a257ec6ef64edb1e08b0f6509cf48 -size 4504 +oid sha256:031c0997afd524904c5a86c376953677f120e8155550b4eaa6bce3c99dbdab31 +size 4184 -- 2.17.1