From: Caisking <3449750381@qq.com> Date: Mon, 15 Jul 2024 03:26:27 +0000 (+0800) Subject: 训练记录增加按键回退适配 X-Git-Tag: release_V1.2.70_20241020_135402~807^2~14 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7bf0becf2413c13674479c721ab6a7b8990dbc02;p=mirrors%2FFD230.git 训练记录增加按键回退适配 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h index 6b9c10260..6fbed41e8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h @@ -1,4 +1,10 @@ -/*** +/*** + * @Date: 2024-05-20 19:40:41 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-07-15 11:08:58 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h + */ +/*** * @Date: 2024-05-20 19:40:41 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-06 16:36:57 @@ -23,7 +29,8 @@ namespace OHOS class TraingRecordPresenter : public Presenter, public UIView::OnClickListener, - public UIView::OnDragListener + public UIView::OnDragListener, + public RootView::OnKeyActListener { public: TraingRecordPresenter(); @@ -40,6 +47,7 @@ namespace OHOS bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; bool OnDragEnd(UIView &view, const DragEvent &event) override; + bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 TraingRecordModel *p_TraingRecordModel{nullptr}; }; 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 a5de12bff..65ff88b2e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp @@ -16,6 +16,9 @@ #include "traingrecord/include/TraingRecordModel.h" #include "traing/include/TraingEnddataView.h" +#include "KeyInputListener.h" +#include "custom_utils.h" +#include "common/key_code.h" // #include "TraingRecordView.h" namespace OHOS @@ -118,4 +121,17 @@ namespace OHOS } return false; } + // 增加按键事件 + bool TraingRecordPresenter::OnKeyAct(UIView &view, const KeyEvent &event) + { + unsigned short keyID = event.GetKeyId(); + unsigned short keyState = event.GetState(); + // 如果是power键,且是亮屏状态,按键释放就返回上一级 + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) + { + // 回退 + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM); + } + return true; + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp index 83adffa5a..5363fc6b0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp @@ -275,6 +275,10 @@ namespace OHOS ShowRecordView(); PreLoad(); RootView::GetInstance()->Add(container_); + SetContainerView(container_); + // 增加按键监听 + RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::TraingRecordPresenter::GetInstance(); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); } void TraingRecordView::AddToTraingRecordList(const TraingRecordItem &item) {