From: SnickerSun Date: Thu, 14 Dec 2023 11:48:07 +0000 (+0800) Subject: 重新定义BUTTON2的Function能力(复制Power键能力)和Power键的能力(Home界面关闭LCD) X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=90c5e4e41bbafaf871329d2c61a48a20b8dc02db;p=mirrors%2FFD230.git 重新定义BUTTON2的Function能力(复制Power键能力)和Power键的能力(Home界面关闭LCD) --- diff --git a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp index 588c9be52..ede223eed 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp @@ -1,141 +1,161 @@ -/* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: KeyPresenter.cpp - * Author: - * Create: 2021-09-18 - */ - -#include "KeyInputListener.h" -#include "common/key_code.h" -#include "AppViewIDs.h" -#include "View.h" -#include "MainViewSample.h" -#include "wearable_log.h" -#include "UiConfig.h" -#include "dock/input_device.h" -#include "notification_manager.h" -#include "AlarmPopUpPresenter.h" -#include "CallerLogModel.h" -#include "MainCallingPresenter.h" - -namespace OHOS { -static bool IsCallingNotify() -{ - uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId(); - if (NotificationManager::GetInstance()->hasNotifyShowing() == true && - (notifyId == TOPIC_EVENT_HFP_INCOMMING || - notifyId == TOPIC_EVENT_HFP_WATCH_ACTIVE || - notifyId == TOPIC_EVENT_HFP_PHONE_TO_WATCH)) { - return true; - } else { - return false; - } -} - -static void PressAlarmNotify() -{ - uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId(); - if (NotificationManager::GetInstance()->hasNotifyShowing() == true && notifyId == TOPIC_EVENT_ALARM_RING) { - AlarmClockModel::GetInstance()->AlarmGetClockNum(); - AlarmPopUpPresenter::GetInstance()->DelayAlarmRing(); - NotificationManager::GetInstance()->StopNotify(); - } -} - -void KeyInputListener::OnKeyPress(void) -{ - pressFlag = 1; // 短按标志 - return; -} - -void KeyInputListener::OnKeyLongPress(const KeyEvent& event) -{ - longPressFlag = 1; // 长按标志 - - uint16 keyID = event.GetKeyId(); - if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) { // 电源按键 - // 切换到关机/重启卡片 - NativeAbility::GetInstance().ChangeSlice(VIEW_REBOOT); - } else if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_FUNC)) { // 功能按键 - // 切换到查看系统版本卡片 - } - return; -} - -void KeyInputListener::CallVolumeDipSwitchControl(uint8_t model) -{ - if (MainCallingPresenter::GetInstance() != nullptr && CallerLogModel::GetInstance()->GetCallStatus()) { - if (CallerLogModel::GetInstance()->GetVolumeScreenStatus() == true) { - volumeSliderEventListener = VolumeSliderEventListener::GetInstance(); - if (volumeSliderEventListener == nullptr) { - return; - } - volumeSliderEventListener->ChangeVolume(model); - } else { - MainCallingPresenter::GetInstance()->HonrsViewChange(); - CallerLogModel::GetInstance()->SetVolumeScreenStatus(true); - } - } -} - -void KeyInputListener::OnKeyRelease(const KeyEvent& event) -{ - uint16_t currentViewId = NativeAbility::GetInstance().GetCurSliceId(); - uint16 keyID = event.GetKeyId(); - if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) { // 电源按键 - if (longPressFlag == 0 && pressFlag == 1) { // 短按电源键 - if (currentViewId == VIEW_MAEKPHONE_SAMPLE || IsCallingNotify() == true) { // 音量卡片 - // 音量+ - CallVolumeDipSwitchControl(1); - } else if (currentViewId != VIEW_MAIN_SAMPLE) { // 主表盘 - PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE, TRANSITION_ZOOM); - } else { - PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 - if (!MainViewSample::GetInstance()->IsMainView()) { // 当前页面为主表盘的其他页面时,切换回主表盘页面 - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); - } else { - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM); - } - } - } - } else if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_FUNC)) { // 功能按键 - if (longPressFlag == 0 && pressFlag == 1) { // 短按功能键 - if (currentViewId == VIEW_MAEKPHONE_SAMPLE || IsCallingNotify() == true) { // 音量卡片 - // 音量- - CallVolumeDipSwitchControl(0); - } else { - // 切换到用户配置的快捷卡片 - } - } - } - - pressFlag = 0; - longPressFlag = 0; - return; -} - -bool KeyInputListener::OnKeyAct(UIView& view, const KeyEvent& event) -{ - UNUSED(view); - - uint8 state = event.GetState(); - - switch (state) { - case InputDevice::STATE_PRESS: // 短按 - OnKeyPress(); - break; -#ifdef __LITEOS_M__ - case InputDevice::STATE_LONG_PRESS: // 长按 - OnKeyLongPress(event); - break; -#endif - case InputDevice::STATE_RELEASE: // 释放 - OnKeyRelease(event); - break; - default: - break; - } - return true; -} -} +/* + * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. + * Description: KeyPresenter.cpp + * Author: + * Create: 2021-09-18 + */ + +#include "KeyInputListener.h" +#include "common/key_code.h" +#include "AppViewIDs.h" +#include "View.h" +#include "MainViewSample.h" +#include "wearable_log.h" +#include "UiConfig.h" +#include "dock/input_device.h" +#include "notification_manager.h" +#include "AlarmPopUpPresenter.h" +#include "CallerLogModel.h" +#include "MainCallingPresenter.h" + +namespace OHOS { +static bool IsCallingNotify() +{ + uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId(); + if (NotificationManager::GetInstance()->hasNotifyShowing() == true && + (notifyId == TOPIC_EVENT_HFP_INCOMMING || + notifyId == TOPIC_EVENT_HFP_WATCH_ACTIVE || + notifyId == TOPIC_EVENT_HFP_PHONE_TO_WATCH)) { + return true; + } else { + return false; + } +} + +static void PressAlarmNotify() +{ + uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId(); + if (NotificationManager::GetInstance()->hasNotifyShowing() == true && notifyId == TOPIC_EVENT_ALARM_RING) { + AlarmClockModel::GetInstance()->AlarmGetClockNum(); + AlarmPopUpPresenter::GetInstance()->DelayAlarmRing(); + NotificationManager::GetInstance()->StopNotify(); + } +} + +void KeyInputListener::OnKeyPress(void) +{ + pressFlag = 1; // 短按标志 + return; +} + +void KeyInputListener::OnKeyLongPress(const KeyEvent& event) +{ + longPressFlag = 1; // 长按标志 + + uint16 keyID = event.GetKeyId(); + WEARABLE_LOGD("","into key! keyID %u\n",keyID); + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) { // 电源按键 + // 切换到关机/重启卡片 + NativeAbility::GetInstance().ChangeSlice(VIEW_REBOOT); + } else if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_FUNC)) { // 功能按键 + // 切换到查看系统版本卡片 + } + return; +} + +void KeyInputListener::CallVolumeDipSwitchControl(uint8_t model) +{ + if (MainCallingPresenter::GetInstance() != nullptr && CallerLogModel::GetInstance()->GetCallStatus()) { + if (CallerLogModel::GetInstance()->GetVolumeScreenStatus() == true) { + volumeSliderEventListener = VolumeSliderEventListener::GetInstance(); + if (volumeSliderEventListener == nullptr) { + return; + } + volumeSliderEventListener->ChangeVolume(model); + } else { + MainCallingPresenter::GetInstance()->HonrsViewChange(); + CallerLogModel::GetInstance()->SetVolumeScreenStatus(true); + } + } +} +extern "C" { + uint32_t mcu_pm_lcd_on(uint8_t *para, uint32_t para_len); + uint32_t mcu_pm_lcd_off(uint8_t *para, uint32_t para_len); + uint8_t mcu_pms_is_screen_on(void); +} +void KeyInputListener::OnKeyRelease(const KeyEvent& event) +{ + uint16_t currentViewId = NativeAbility::GetInstance().GetCurSliceId(); + uint16 keyID = event.GetKeyId(); + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) { // 电源按键 + if (longPressFlag == 0 && pressFlag == 1) { // 短按电源键 + + + if (currentViewId == VIEW_MAEKPHONE_SAMPLE || IsCallingNotify() == true) { // 音量卡片 + // 音量+ + CallVolumeDipSwitchControl(1); + }else if (currentViewId != VIEW_MAIN_SAMPLE) { // 主表盘 + PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE, TRANSITION_ZOOM); + } else { + PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 + if (!MainViewSample::GetInstance()->IsMainView()) { // 当前页面为主表盘的其他页面时,切换回主表盘页面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); + } else { + //power键要进入休眠 + if(mcu_pms_is_screen_on()){ + mcu_pm_lcd_off(NULL,0); + }else{ + mcu_pm_lcd_on(NULL,0); + } + } + } + } + } else if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_FUNC)) { // 功能按键 + if (longPressFlag == 0 && pressFlag == 1) { // 短按功能键 + if (currentViewId == VIEW_MAEKPHONE_SAMPLE || IsCallingNotify() == true) { // 音量卡片 + // 音量- + CallVolumeDipSwitchControl(0); + } else if (currentViewId != VIEW_MAIN_SAMPLE) { // 主表盘 + PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE, TRANSITION_ZOOM); + } else { + PressAlarmNotify(); // 当前为闹钟通知页面时,先处理闹钟再切换页面 + if (!MainViewSample::GetInstance()->IsMainView()) { // 当前页面为主表盘的其他页面时,切换回主表盘页面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); + } else { + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM); + } + } + } + } + + pressFlag = 0; + longPressFlag = 0; + return; +} + +bool KeyInputListener::OnKeyAct(UIView& view, const KeyEvent& event) +{ + UNUSED(view); + + uint8 state = event.GetState(); + + switch (state) { + case InputDevice::STATE_PRESS: // 短按 + OnKeyPress(); + break; +#ifdef __LITEOS_M__ + case InputDevice::STATE_LONG_PRESS: // 长按 + OnKeyLongPress(event); + break; +#endif + case InputDevice::STATE_RELEASE: // 释放 + OnKeyRelease(event); + break; + default: + break; + } + return true; +} +} diff --git a/code/sdk/application/wstp/at_service/app/app_at_process.c b/code/sdk/application/wstp/at_service/app/app_at_process.c index ab0ece693..2be8e1a47 100755 --- a/code/sdk/application/wstp/at_service/app/app_at_process.c +++ b/code/sdk/application/wstp/at_service/app/app_at_process.c @@ -2309,7 +2309,17 @@ static uint32_t mcu_pms_set_screen_state(uint8_t *para, uint32_t para_len) } return ERRCODE_SUCC; } - +uint8_t mcu_pms_is_screen_on(void) +{ + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + screen_state_t state = display_api->get_screen_state(); + wstp_print("app get screen state = %u, on is %u, off is %u. \r\n", state, SCREEN_ON, SCREEN_OFF); + if( state == SCREEN_ON){ + return 1; + }else{ + return 0; + } +} static uint32_t mcu_pms_get_screen_state(uint8_t *para, uint32_t para_len) { unused(para_len);