设置中实现开机和重启功能,applist 暂定开启手机连接视图
author罗正yun <1732036298@qq.com>
Sat, 23 Dec 2023 04:52:02 +0000 (12:52 +0800)
committer罗正yun <1732036298@qq.com>
Sat, 23 Dec 2023 04:52:02 +0000 (12:52 +0800)
code/sdk/application/wearable/nativeapp/nativeui/applist/src/ApplistModel.cpp
code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemRebootPresenter.cpp
code/sdk/application/wearable/nativeapp/nativeui/system/src/SystemShoutDownPresenter.cpp

index 54cd8e5..74cf394 100755 (executable)
@@ -31,7 +31,7 @@ namespace OHOS
     {VIEW_CONNECT_BLUETOOTH, PNG_APPLIST_BLUETOOTH_IMAGE, PNG_APPLIST_BLUETOOTH_IMAGE, "蓝牙", nullptr},\r
     {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr},\r
     {VIEW_MAIN_STOPWATCH, PNG_APPLIST_CHRONOMETER_IMAGE, PNG_APPLIST_CHRONOMETER_IMAGE, "秒表", nullptr},\r
-    {VIEW_REMIND, PNG_APPLIST_SPORT_IMAGE, PNG_APPLIST_SPORT_IMAGE, "提醒", nullptr},\r
+    {VIEW_CONNECT_PHONE, PNG_APPLIST_SPORT_IMAGE, PNG_APPLIST_SPORT_IMAGE, "连接手机", nullptr},\r
     {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器", nullptr},\r
     {VIEW_BLOODOXY_SAMPLE, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧饱和度", nullptr},\r
     {VIEW_INDOORWALK, PNG_APPLIST_WALK_IMAGE, PNG_APPLIST_WALK_IMAGE, "室内步行", nullptr},\r
index 9ecb936..ffe0072 100755 (executable)
@@ -59,14 +59,18 @@ namespace OHOS
         UNUSED(event);\r
         return true;\r
     }\r
-\r
+    extern "C"\r
+    {\r
+        //重启\r
+        uint32_t mcu_os_sys_reset(uint8_t *para, uint32_t para_len); \r
+    }\r
     bool SystemRebootPresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
 \r
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), REBOOT_CHECKON) == 0)\r
         {\r
-            printf("file:%s line:%d\n shoutdown button check on being clicked\n", __FILE__, __LINE__);\r
+            mcu_os_sys_reset(NULL,NULL);\r
             return true;\r
         }\r
         else if (strcmp(view.GetViewId(), REBOOT_CHECKOFF) == 0)\r
index 18f76ff..b4f0ec3 100755 (executable)
@@ -58,14 +58,17 @@ namespace OHOS
         UNUSED(event);\r
         return true;\r
     }\r
-\r
+    extern "C" {\r
+    //关机\r
+    void uapi_sys_shipmode(uint32_t arg); \r
+    }\r
     bool SystemShoutDownPresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
 \r
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), SHOUTDOWN_BUTTON_CHECKON) == 0)\r
-        {\r
-            printf("file:%s line:%d\n shoutdown button check on being clicked\n", __FILE__, __LINE__);\r
+        { \r
+            uapi_sys_shipmode(0);\r
             return true;\r
         }\r
         else if (strcmp(view.GetViewId(), SHOUTDOWN_BUTTON_CHECKOFF) == 0)\r