闹钟界面添加按键监听

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 3b646de..e619457 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -37,8 +37,8 @@
 #include "MainCallingView.h"
 #include "MainCallingPresenter.h"
 #include "ActivityPresenter.h"
-#include "MainAlarmView.h"
-#include "AlarmPresenter.h"
+#include "alarm/include/MainAlarmView.h"
+#include "alarm/include/AlarmPresenter.h"
 #include "AlarmPopUpPresenter.h"
 #include "AlarmPopUpView.h"
 #include "MainBluetoothView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
index 5a2bb94..186a213 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
@@ -5,12 +5,13 @@
 * Create: 2021-09-11\r
 */\r
 \r
-#include "AlarmPresenter.h"\r
-#include "MainAlarmView.h"\r
+#include "alarm/include/AlarmPresenter.h"\r
+#include "alarm/include/MainAlarmView.h"\r
 #include "ChangeSliceListener.h"\r
 #include "string"\r
 #include "iostream"\r
 #include "sstream"\r
+#include <custom_utils.h>\r
 \r
 namespace OHOS\r
 {\r
@@ -431,16 +432,15 @@ bool AlarmPresenter::ClickFuncView(UIView &view)
 \r
 bool AlarmPresenter::OnKeyAct(UIView &view, const KeyEvent &event)\r
 {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnKeyAct");\r
-#if 0\r
-uint16 keyID = event.GetKeyId();\r
-// 如果是power键就返回上一级\r
-if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER))\r
-{\r
-    uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-    NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);\r
-}\r
-#endif\r
+    UNUSED(view);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnKeyAct");\r
+    uint16_t keyID = event.GetKeyId();\r
+    uint16_t keyState = event.GetState();\r
+    // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+    {\r
+        NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
+    }\r
     return true;\r
 }\r
 \r