From: 罗正yun <1732036298@qq.com> Date: Sat, 23 Dec 2023 04:52:02 +0000 (+0800) Subject: 设置中实现开机和重启功能,applist 暂定开启手机连接视图 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2528f2f3175d14c92eb9a851c62dd56ff532c246;p=mirrors%2FFD230.git 设置中实现开机和重启功能,applist 暂定开启手机连接视图 --- diff --git a/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp index 54cd8e53c..74cf39440 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp @@ -31,7 +31,7 @@ namespace OHOS {VIEW_CONNECT_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙", nullptr}, {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr}, {VIEW_MAIN_STOPWATCH, PNG_APPLIST_CHRONOMETER_IMAGE, PNG_APPLIST_CHRONOMETER_IMAGE, "秒表", nullptr}, - {VIEW_REMIND, PNG_APPLIST_SPORT_IMAGE, PNG_APPLIST_SPORT_IMAGE, "提醒", nullptr}, + {VIEW_CONNECT_PHONE, PNG_APPLIST_SPORT_IMAGE, PNG_APPLIST_SPORT_IMAGE, "连接手机", nullptr}, {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器", nullptr}, {VIEW_BLOODOXY_SAMPLE, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧饱和度", nullptr}, {VIEW_INDOORWALK, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_WALK_IMAGE, "室内步行", nullptr}, diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp index 9ecb9363b..ffe00720b 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp @@ -59,14 +59,18 @@ namespace OHOS UNUSED(event); return true; } - + extern "C" + { + //重启 + uint32_t mcu_os_sys_reset(uint8_t *para, uint32_t para_len); + } bool SystemRebootPresenter::OnClick(UIView &view, const ClickEvent &event) { // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), REBOOT_CHECKON) == 0) { - printf("file:%s line:%d\n shoutdown button check on being clicked\n", __FILE__, __LINE__); + mcu_os_sys_reset(NULL,NULL); return true; } else if (strcmp(view.GetViewId(), REBOOT_CHECKOFF) == 0) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp index 18f76ff75..b4f0ec387 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp @@ -58,14 +58,17 @@ namespace OHOS UNUSED(event); return true; } - + extern "C" { + //关机 + void uapi_sys_shipmode(uint32_t arg); + } bool SystemShoutDownPresenter::OnClick(UIView &view, const ClickEvent &event) { // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), SHOUTDOWN_BUTTON_CHECKON) == 0) - { - printf("file:%s line:%d\n shoutdown button check on being clicked\n", __FILE__, __LINE__); + { + uapi_sys_shipmode(0); return true; } else if (strcmp(view.GetViewId(), SHOUTDOWN_BUTTON_CHECKOFF) == 0)