根据客户要求修改：press亮屏，press退出应用，取消在applsit界面双击切换applist样式

diff --git a/code/sdk/application/brandy/brandy_standard/input_app.c b/code/sdk/application/brandy/brandy_standard/input_app.c
index f517c7b..9e6ebc0 100755 (executable)
--- a/code/sdk/application/brandy/brandy_standard/input_app.c
+++ b/code/sdk/application/brandy/brandy_standard/input_app.c
@@ -200,16 +200,6 @@ void button_report_event(button_id_t id, event_button_t event)
 
     switch (event) {
         case BUTTON_PWR_PRESS:
-            // #ifdef SUPPORT_POWER_MANAGER
-            // if (!lcd_get_status()) {
-            //     button_report_event_to_pms();
-            //     return;
-            // }
-            // button_report_event_to_pms();
-            // #endif
-            button_report_event_to_gui(id, 1); // 1:press
-            break;
-        case BUTTON_PWR_CLICKUP:
             #ifdef SUPPORT_POWER_MANAGER
             if (!lcd_get_status()) {
                 button_report_event_to_pms();
@@ -217,45 +207,9 @@ void button_report_event(button_id_t id, event_button_t event)
             }
             button_report_event_to_pms();
             #endif
-            button_report_event_to_gui(id, 0); // 0:release
-            break;
-        case BUTTON_PWR_LONGPRESS_3S:
-            button_report_event_to_gui(id, 2); // 2:longpress
-            break;
-        case BUTTON1_PRESS:
-             button_report_event_to_gui(id, 1); // 1:press
-            break;
-        case BUTTON1_CLICKUP:
-             button_report_event_to_gui(id, 0); // 0:release
-        default:
-            break;
-    }
-}
-int button_report_event_(button_id_t id, event_button_t event)
-{
-    input_dev_data_t data;
-    switch (event) {
-        case BUTTON_PWR_PRESS:
-            // #ifdef SUPPORT_POWER_MANAGER
-            // if (!lcd_get_status()) {
-            //     button_report_event_to_pms();
-            //     return;
-            // }
-            // button_report_event_to_pms();
-            // #endif
             button_report_event_to_gui(id, 1); // 1:press
             break;
         case BUTTON_PWR_CLICKUP:
-            #ifdef SUPPORT_POWER_MANAGER
-            if (!lcd_get_status()) {
-                // button_report_event_to_pms();
-                printf("111111\n");
-                const power_display_svr_api_t *display_api = power_display_svr_get_api();
-                errcode_t res = display_api->turn_on_screen();
-                return 1;
-            }
-            button_report_event_to_pms();
-            #endif
             button_report_event_to_gui(id, 0); // 0:release
             break;
         case BUTTON_PWR_LONGPRESS_3S:
@@ -269,7 +223,6 @@ int button_report_event_(button_id_t id, event_button_t event)
         default:
             break;
     }
-    return 0;
 }
 #endif
 
@@ -362,12 +315,7 @@ static void button_send_event_to_ui(button_id_t id, button_report_state_t state)
     event_button_t event = BUTTON_BUTT;
     event = button_event_get(id, state);
 #if defined(ENABLE_UIKIT) || defined(ENABLE_LVGL)
-    // button_report_event(id, event);
-    int res = button_report_event_(id, event);
-    if(res == 1) //等于1是亮屏操作不执行下面的代码
-    {
-        return;
-    }
+    button_report_event(id, event);
 #endif
     if (g_button_common_event_cb[event] != NULL) {
         g_button_common_event_cb[event]();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
index 222aa01..e2281cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
@@ -140,7 +140,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             // 回退
             NativeAbility::GetInstance().Back();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
index 07a338b..876c9a0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsPresenter.cpp
@@ -139,7 +139,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

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 055b56a..bc3397d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
@@ -463,7 +463,7 @@ bool AlarmPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     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
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
     {\r
         NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
index e72ff78..f2c9398 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
@@ -443,7 +443,7 @@ bool AlipayPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     uint16 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
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 1 && uapi_get_screen_state() == 0)\r
     {\r
 \r
         {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
index 6755480..773cc4e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
@@ -131,7 +131,7 @@ bool AssistantPresenter::OnKeyAct(UIView &view, const KeyEvent &event) {
   unsigned short keyState = event.GetState();
   // 如果是power键,且是亮屏状态，按键释放就返回上一级
   if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&
-      keyState == 0 && uapi_get_screen_state() == 0) {
+      keyState == 1 && uapi_get_screen_state() == 0) {
     NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
   }
   return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
index dec150e..c2a5e36 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
@@ -113,7 +113,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NavigateBack();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
index 4e286ff..78b9904 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
@@ -125,7 +125,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&
-            keyState == 0 && uapi_get_screen_state() == 0)
+            keyState == 1 && uapi_get_screen_state() == 0)
         {
             // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
index aa45f88..5032177 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
@@ -242,7 +242,7 @@ bool BluetoothPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     uint16 keyID = event.GetKeyId();\r
     uint16 keyState = event.GetState();\r
     // 如果是power键就返回上一级\r
-    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
     {\r
         //如果是按键退出，退出时需要做一些清理工作\r
         BluetoothEarPhoneView *bluetoothEarPhoneView = BluetoothEarPhoneView::GetInstance();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
index 54241b4..ffbb19b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
@@ -81,7 +81,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorPresenter.cpp
index 49557a5..f6f5c35 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/calculator/src/CalculatorPresenter.cpp
@@ -174,7 +174,7 @@ bool CalculatorPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     uint16 keyID = event.GetKeyId();
     uint16_t keyState = event.GetState();
     // 如果是power键就返回上一级
-    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 0 && uapi_get_screen_state() == 0)
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 1 && uapi_get_screen_state() == 0)
     {
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
         NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarPresenter.cpp
index 7b6c729..7aa81c5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/calendar/src/CalendarPresenter.cpp
@@ -92,7 +92,7 @@ bool CalendarPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     uint16 keyID = event.GetKeyId();
     uint16_t keyState = event.GetState();
     // 如果是power键就返回上一级
-    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 0 && uapi_get_screen_state() == 0)
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&  keyState == 1 && uapi_get_screen_state() == 0)
     {
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
         NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
index 2c2b511..5159016 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
@@ -166,7 +166,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();
         uint16 keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             if(! BluetoothServiceOptionsView::GetInstance()->get_connectview_Visible())
             NativeAbility::GetInstance().Back();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index b63e968..aa764e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -139,7 +139,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
index 6fb96f1..bdd21b4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
@@ -81,7 +81,7 @@ bool MainCompassPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
     uint16_t keyID = event.GetKeyId();
     uint16_t keyState = event.GetState();
     // 如果是power键就返回上一级
-    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
     {
         NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
index b8a69ae..da46478 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp
@@ -253,7 +253,7 @@ namespace OHOS
         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
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index fbe64dc..819075e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
@@ -246,7 +246,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();\r
         unsigned short keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
index 0954996..f9d1ab0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
@@ -106,7 +106,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
index 13ed083..635b86a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
@@ -104,7 +104,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
index b96b937..3b3394d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp
@@ -182,7 +182,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/Maingoalpresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/Maingoalpresenter.cpp
index 75e146a..423680e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/Maingoalpresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/Maingoalpresenter.cpp
@@ -97,7 +97,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp
index 66bf2dd..0c2e64e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp
@@ -124,7 +124,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NavigateBack();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionPresenter.cpp
index 8e042be..926a956 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartDetectionPresenter.cpp
@@ -112,7 +112,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NavigateBack();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp
index 7bd57a1..20ee45b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp
@@ -117,7 +117,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index c075c94..812e174 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -215,7 +215,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
             br_adv_start(20);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
index 7c8f6be..de014ea 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
@@ -140,7 +140,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
index a401373..485e165 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowPresenter.cpp
@@ -89,7 +89,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
index 09c212f..09d26a7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
@@ -146,7 +146,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
index 2d2b0e0..53065b9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
@@ -105,7 +105,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
index 2fa6386..1d813a4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
@@ -165,7 +165,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessagePresenter.cpp
index 3deabbb..68451cd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/obumessage/src/OBUMessagePresenter.cpp
@@ -113,7 +113,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
index fcfd23a..2ee861d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/DialingMethodPresenter.cpp
@@ -189,7 +189,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
             //set_address_number(NULL);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
index 2088764..2f066ca 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/MainPhonePresenter.cpp
@@ -147,7 +147,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
            
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
index 1032dd3..e9f5947 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
@@ -231,7 +231,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();\r
         unsigned short keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().BackCountSlice(1);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
index 0eac333..7f11986 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
@@ -114,7 +114,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();\r
         unsigned short keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

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 04b422d..545c7ae 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-21 10:23:23
+ * @LastEditTime: 2024-10-24 20:17:13
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -52,6 +52,7 @@ namespace OHOS
     {
         if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
         {
+            
             uapi_set_screen_on_api();
             ConfigModel::GetInstance()->SetisFirstTimeStart(false);
             NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
@@ -559,7 +560,7 @@ namespace OHOS
     /*注册所有按键事件*/
     void RebootAndShutdownModel::RegisterAllKeyEvents(void)
     {
-        RegisterPowerKeyDoubleClickEvent();
+        // RegisterPowerKeyDoubleClickEvent();
         RegisterPowerKeyLongPressEvent();
         RegisterFuncKeyPressEvent();
         RegisterFuncKeyLongPressEvent();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index e80c6a5..3b057c6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-20 15:11:17
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-24 17:06:30
+ * @LastEditTime: 2024-10-24 20:17:39
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/RebootAndShutdownPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -215,7 +215,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             if (!isShutDownImageAnimatorStart)
             {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
index 7f8549e..e7846e7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -307,7 +307,7 @@ namespace OHOS
         uint16 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
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
index 5b0aad6..d7c988c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
@@ -139,7 +139,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp
index 38a2895..95e7e2e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp
@@ -268,7 +268,7 @@ bool SafeModeManagerPresenter::OnKeyAct(UIView &view, const KeyEvent &event) {
   unsigned short keyState = event.GetState();
   // 如果是power键,且是亮屏状态，按键释放就返回上一级
   if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&
-      keyState == 0 && uapi_get_screen_state() == 0) {
+      keyState == 1 && uapi_get_screen_state() == 0) {
     // NativeAbility::GetInstance().Back();
   }
   return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
index b7fbb69..74f22b4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
@@ -68,7 +68,7 @@ bool SaveElePresenter::OnKeyAct(UIView &view, const KeyEvent &event) {
   unsigned short keyState = event.GetState();\r
   // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
   if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&\r
-      keyState == 0 && uapi_get_screen_state() == 0) {\r
+      keyState == 1 && uapi_get_screen_state() == 0) {\r
     NativeAbility::GetInstance().Back();\r
   }\r
   return true;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
index 841740c..a5dc54c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp
@@ -153,7 +153,7 @@ namespace OHOS
         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
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp
index 68c4dbf..0feea05 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp
@@ -122,7 +122,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().ChangeSlice(VIEW_SETTING);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp
index 6f28fc7..90d7d52 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp
@@ -114,7 +114,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             // 回退
             NativeAbility::GetInstance().Back();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
index e6421f3..81dfa57 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStylePresenter.cpp
@@ -59,7 +59,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             // 回退
             NativeAbility::GetInstance().Back();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
index 599d59c..0986f91 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
@@ -134,7 +134,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnKeyAct");
         uint16 keyID = event.GetKeyId();
         uint16 keyState = event.GetState();
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp
index 4e6cb06..8e86bfd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp
@@ -100,7 +100,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModePresenter.cpp
index 1e3e32e..57882dc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModePresenter.cpp
@@ -90,7 +90,7 @@ namespace OHOS
         uint16_t keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
index ef7b5bc..805c22a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
@@ -95,7 +95,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
index 2d2be9d..cd5b8a0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@ -110,7 +110,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
index 04c1351..1a9edf1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
@@ -98,7 +98,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
index 33b10d4..97a5d9c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
@@ -302,7 +302,7 @@ namespace OHOS
         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
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r

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 99b5f66..383fb17 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -258,7 +258,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();\r
         uint16 keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             if (!isShutDownImageAnimatorStart)\r
             {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp
index 17b9ff1..f25e354 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp
@@ -109,7 +109,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosPresenter.cpp
index 8ca343a..852ed90 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosPresenter.cpp
@@ -112,7 +112,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
             /*如果是拍照界面需要发送拍照结束的消息*/

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
index 702ff26..b43785e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
@@ -137,7 +137,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();
         uint16 keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
index 0b6736e..f9782fc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
@@ -94,7 +94,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NavigateBack();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
index e14528f..0c55010 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -113,7 +113,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();\r
         unsigned short keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NavigateBack();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
index e14b657..7c5dafa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -117,7 +117,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) &&
-            keyState == 0 && uapi_get_screen_state() == 0)
+            keyState == 1 && uapi_get_screen_state() == 0)
             NavigateBack();
 
         return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
index fea9365..b2a8d21 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
@@ -88,7 +88,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();\r
         unsigned short keyState = event.GetState();\r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NavigateBack();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
index 0486265..adc489d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
@@ -111,7 +111,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
index 6ef37b4..cd788bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
@@ -112,7 +112,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
index 9972a62..0696242 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
@@ -111,7 +111,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
index f411950..59d7395 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
@@ -123,7 +123,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
index 455947b..577a2c4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
@@ -110,7 +110,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
index 6e43f47..59468d0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
@@ -109,7 +109,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();\r
 \r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
index cdcf585..42571f4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
@@ -171,7 +171,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();\r
 \r
         // 如果是power键,且是亮屏状态，按键释放就返回上一级\r
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)\r
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NavigateBack();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
index 4ad1fd7..cd4989e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
@@ -125,7 +125,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
index 3a560e5..d121c34 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
@@ -110,7 +110,7 @@ namespace OHOS
         unsigned short keyState = event.GetState();
 
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
index 6a8c1f8..e934164 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
@@ -158,7 +158,7 @@ namespace OHOS
         unsigned short keyID = event.GetKeyId();
         unsigned short keyState = event.GetState();
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NavigateBack();
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index 0089d48..aaebaaf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -120,7 +120,7 @@ namespace OHOS
         uint16 keyID = event.GetKeyId();
         uint16_t keyState = event.GetState();
         // 如果是power键就返回上一级
-        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
             NativeAbility::GetInstance().Back();
             br_adv_start(20);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp
index 2b545a6..2961a7f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp
@@ -96,7 +96,7 @@ namespace OHOS
         uint16 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
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)\r
         {\r
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);\r
         }\r