优化星历提醒界面的按键退圈

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
index 8be437c..605649c 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
@@ -13,6 +13,10 @@
 #include "traing/include/TraingNomalPresenter.h"
 
 
+#include "custom_runtime.h"
+#include "custom_utils.h"
+#include "common/key_code.h"
+#include "components/root_view.h"
 
 #include "NativeRegisterManager.h"
 namespace OHOS
@@ -86,20 +90,16 @@ namespace OHOS
     }
 
     //增加按键退出
-    bool TraingEphemerisNotePresenter::OnKeyAct(UIView &view, const KeyEvent &event)
-    {
+    bool TraingEphemerisNotePresenter::OnKeyAct(UIView &view, const KeyEvent &event) {
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
-        
-        // 按键按下时退出到训练主界面
-        if (keyState == 1) // 1表示按下
-        {
+        // 如果是power键,且是亮屏状态，按键释放就返回上一级
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&
+            keyState == 1 && uapi_get_screen_state() == 0) {
+            //返回准备页面
             NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
-            return true;
         }
-        UNUSED(view);
-        UNUSED(keyID);
         return true;
-    }
+      }
 } // namespace OHOS