From: Caisking Date: Mon, 28 Jul 2025 11:59:10 +0000 (+0800) Subject: 修改运动的刷新方式 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a783044503d645aa4ad8826962e1ca117d6a30ce;p=mirrors%2FFD230.git 修改运动的刷新方式 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h index 8e46e56c1..a0ff81f71 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -10,9 +10,10 @@ #include "traing/training_card/include/TrainingDetailView.h" #ifdef SUPPORT_BLE_SERVICE -#include -#include "bleService.h" #include "bleInstruct.h" +#include "bleService.h" +#include + #endif #include "components/root_view.h" @@ -32,11 +33,11 @@ class TrainingDataView; class TrainingDetailView; class TraingModel; class TraingCardPresenter : public Presenter, + public ModelListenerSample, public UIView::OnClickListener, public UIView::OnDragListener, - public UISwipeView::OnSwipeListener, - public RootView::OnKeyActListener, - public ModelListenerSample { + public ListScrollListener, + public RootView::OnKeyActListener { public: TraingCardPresenter(); virtual ~TraingCardPresenter() override; @@ -46,8 +47,8 @@ public: void OnPause() override; void OnResume() override; void OnStop() override; - // void OnTickEvent() override; - void Notify() override; + void OnTickEvent() override; + void Notify() override {} bool OpenSensor(ExerciseClass type); bool ControlSensor(ExerciseState state); @@ -59,11 +60,10 @@ public: void UpdateTimeOfData(); void UpdateDataView(); - /*蓝牙开启运动*/ - #ifdef BLE_SERVER_ENABLE +/*蓝牙开启运动*/ +#ifdef BLE_SERVER_ENABLE bool send_sport_cmd(training_ble *cmd); - #endif - +#endif /*控制*/ void handleStartState(); @@ -75,12 +75,12 @@ private: // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; - void OnSwipe(UISwipeView &view) override; bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 int tag_ = 0; bool opensensorstuats{false}; // bool OnDragEnd(UIView& view, const DragEvent& event) override; + // void OnSwipe(UISwipeView &view) override; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h index a921c84c5..3384a397f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h @@ -2,37 +2,39 @@ * @Date: 2024-04-15 11:46:23 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-04-29 11:13:01 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h + * @FilePath: + * /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h */ #ifndef _TraingCard_VIEW_H #define _TraingCard_VIEW_H - #include "View.h" -#include -#include "components/ui_view_group.h" -#include "components/ui_label.h" -#include "components/ui_label_ext.h" -#include "components/ui_image_view.h" +#include "components/icon_adapter.h" #include "components/ui_button.h" +#include "components/ui_card_page.h" +#include "components/ui_chart.h" +#include "components/ui_cross_view.h" #include "components/ui_image_animator.h" +#include "components/ui_image_view.h" +#include "components/ui_label.h" #include "components/ui_label_button_ext.h" -#include "components/ui_chart.h" +#include "components/ui_label_ext.h" #include "components/ui_list.h" -#include "components/icon_adapter.h" -#include "wearable_log.h" +#include "components/ui_swipe_view.h" +#include "components/ui_view_group.h" #include "ohos_types.h" -#include "components/ui_card_page.h" -#include "traing/include/TraingModel.h" -#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" -#include "components/ui_swipe_view.h" -#include "components/ui_cross_view.h" - #include "traing/include/TraingModel.h" #include "uicomponents/UIComponents.h" +#include "wearable_log.h" +#include + + #include "traing/Training_UiConfig.h" +#include "traing/include/TraingModel.h" #include "traing/training_card/include/TraingCardPresenter.h" +#include "uicomponents/UIComponents.h" + #include "PlayersView.h" #include "traing/training_card/include/TraingDataAllView.h" @@ -41,106 +43,97 @@ #include "traing/training_card/include/TrainingDetailView.h" #include "alipay/include/AlipayModel.h" -namespace OHOS -{ +namespace OHOS { #define BUTTONEXIT "button_exit" #define BUTTONBACK "button_back" #define BUTTONWINOK "buttom_win" #define BUTTONNOTE "button_heart" - enum Control_Card - { - CONTROL = 0, - DATA, - MUSIC - }; - enum PopupType - { - EndPopup, // 结束训练弹窗 - GetTagPopup, // 达到训练目标弹窗 - HeartPopup, // 达到最高心率弹窗 - }; - class TraingCardPresenter; - class TrainingControlView; - class TrainingDataView; - class TrainingDetailView; - class PlayersView; - class TraingCardView : public View - { - - public: - TraingCardView(); - virtual ~TraingCardView(); - static TraingCardView *GetInstance(void); - - void OnStart() override; - - - UICardPage *InitControlPage(void); - UICardPage *InitDataPage(void); - UICardPage *InitMusicPage(void); - - UICardPage *InitDetailPage(void); - - void InitView(); - void DeInit(); - void InitList(); - void PreLoad(void); - - void InitImageAnimator(); - void ShowGetTagView(); - void ShowEndView(); - void ShowHeartView(); - bool RefreshEndView(); - UICrossView *GetTraingCrad(); - int GetCurrentPage(); - void SetPopupViewStatus(PopupType type, bool status); - UIImageAnimatorView *GetAnimator(); - UILabelExt *GetHeartMaxLabel(); - void SetHeartMaxLabel(int maxheart); - - private: - UIView::OnDragListener *draglistener{nullptr}; - TraingCardView(TraingCardView &&) = delete; - TraingCardView &operator=(TraingCardView &&) = delete; - - UICrossView *swipe_ = nullptr; - UIScrollView *endView{nullptr}; - UIScrollView *getView{nullptr}; - UIScrollView *heartView{nullptr}; - TrainingControlView *controlview_{nullptr}; // 控制卡片 - TraingDataAllView *dataallview_{nullptr}; // 数据卡片 - TrainingDetailView *DetailView{nullptr}; // 详细数据卡片 - PlayersView *musicview_{nullptr}; // 音乐卡片 - - /*结束弹窗*/ - UILabelExt *endtitle{nullptr}; // 结束弹窗title - UILabelExt *notelabel{nullptr}; // 提醒label - UILabelExt *endnote{nullptr}; // 是否结束 - UILabelExt *endnotelabel{nullptr}; - UIButton *exit{nullptr}; // 退出按键 - UIButton *back{nullptr}; // 返回按键 - - /*达成训练目标弹窗*/ - UILabelExt *labeltitle = nullptr; - UILabelExt *labeltag = nullptr; - UILabelExt *labelgettag = nullptr; - UILabelExt *labelpre = nullptr; - UILabelButtonExt *buttonok_ = nullptr; - UIImageAnimatorView *imageAnimator{nullptr}; - - /*最高心率提醒弹窗*/ - UILabelExt *hearttitle = nullptr; - UILabelExt *labelnote = nullptr; - UIImageView *heartiamge = nullptr; - UILabelButtonExt *buttonnote_ = nullptr; - - bool viewiInitStatus{false}; - bool momentumFlag{false}; - - std::string winbasePath = "/user/res/Training/training_GIF/win/"; - const ImageInfo **winimageInfos; - ImageAnimatorInfo *winimageAnimatorInfo{nullptr}; - }; +enum Control_Card { CONTROL = 0, DATA, MUSIC }; +enum PopupType { + EndPopup, // 结束训练弹窗 + GetTagPopup, // 达到训练目标弹窗 + HeartPopup, // 达到最高心率弹窗 +}; +class TraingCardPresenter; +class TrainingControlView; +class TrainingDataView; +class TrainingDetailView; +class PlayersView; +class TraingCardView : public View { + +public: + TraingCardView(); + virtual ~TraingCardView(); + static TraingCardView *GetInstance(void); + + void OnStart() override; + + UICardPage *InitControlPage(void); + UICardPage *InitDataPage(void); + UICardPage *InitMusicPage(void); + + UICardPage *InitDetailPage(void); + + void InitView(); + void DeInit(); + void InitList(); + void PreLoad(void); + + void InitImageAnimator(); + void ShowGetTagView(); + void ShowEndView(); + void ShowHeartView(); + bool RefreshEndView(); + UICrossView *GetTraingCrad(); + int GetCurrentPage(); + void SetPopupViewStatus(PopupType type, bool status); + UIImageAnimatorView *GetAnimator(); + UILabelExt *GetHeartMaxLabel(); + void SetHeartMaxLabel(int maxheart); + +private: + UIView::OnDragListener *draglistener{nullptr}; + TraingCardView(TraingCardView &&) = delete; + TraingCardView &operator=(TraingCardView &&) = delete; + + UICrossView *swipe_ = nullptr; + UIScrollView *endView{nullptr}; + UIScrollView *getView{nullptr}; + UIScrollView *heartView{nullptr}; + TrainingControlView *controlview_{nullptr}; // 控制卡片 + TraingDataAllView *dataallview_{nullptr}; // 数据卡片 + UICardPage *DetailView{nullptr}; // 详细数据卡片 + PlayersView *musicview_{nullptr}; // 音乐卡片 + + /*结束弹窗*/ + UILabelExt *endtitle{nullptr}; // 结束弹窗title + UILabelExt *notelabel{nullptr}; // 提醒label + UILabelExt *endnote{nullptr}; // 是否结束 + UILabelExt *endnotelabel{nullptr}; + UIButton *exit{nullptr}; // 退出按键 + UIButton *back{nullptr}; // 返回按键 + + /*达成训练目标弹窗*/ + UILabelExt *labeltitle = nullptr; + UILabelExt *labeltag = nullptr; + UILabelExt *labelgettag = nullptr; + UILabelExt *labelpre = nullptr; + UILabelButtonExt *buttonok_ = nullptr; + UIImageAnimatorView *imageAnimator{nullptr}; + + /*最高心率提醒弹窗*/ + UILabelExt *hearttitle = nullptr; + UILabelExt *labelnote = nullptr; + UIImageView *heartiamge = nullptr; + UILabelButtonExt *buttonnote_ = nullptr; + + bool viewiInitStatus{false}; + bool momentumFlag{false}; + + std::string winbasePath = "/user/res/Training/training_GIF/win/"; + const ImageInfo **winimageInfos; + ImageAnimatorInfo *winimageAnimatorInfo{nullptr}; +}; } // namespace OHOS #endif // TraingCard_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 01743235f..b5578722d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -77,7 +77,6 @@ void TraingCardPresenter::OnStart() { } void TraingCardPresenter::OnPause(void) { - Presenter::OnPause(); } @@ -273,21 +272,9 @@ void TraingCardPresenter::RefreshData(SportData *sportdata) { intensityid); // 释放sportdata内存 } -#if 0 - /*刷新 time 和 data */ - void TraingCardPresenter::OnTickEvent() - { - // 未开启训练 直接退出 - if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General) - return; - // 刷新训练数据界面 现实时间 - TrainingDataView::GetInstance()->UpdataTime(); - // 刷新训练数据界面 心率 卡路里 距离 步数 训练强度 目标完成度 - RefreshData(); - } -#endif #if 1 -void TraingCardPresenter::Notify(void) { +/*刷新 time 和 data */ +void TraingCardPresenter::OnTickEvent(void) { // 如果未开启训练,直接退出 if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General || view_ == nullptr) { @@ -309,7 +296,30 @@ void TraingCardPresenter::Notify(void) { break; // 其他情况不处理 } } +#else +void TraingCardPresenter::Notify(void) { + // 如果未开启训练,直接退出 + if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General || + view_ == nullptr) { + return; + } + + Control_Card cardId = static_cast(view_->GetCurrentPage()); + switch (cardId) { + case Control_Card::CONTROL: { + UpdateTimeOfControl(); // 更新控制界面的时间 + break; + } + case Control_Card::DATA: { + UpdateDataView(); // 更新训练数据视图 + break; + } + default: + break; // 其他情况不处理 + } +} +#endif void TraingCardPresenter::UpdateDataView() { // 刷新计时 UpdateTimeOfData(); @@ -324,7 +334,6 @@ void TraingCardPresenter::UpdateDataView() { SportData *sportdata = TraingModel::GetInstance()->GetSportdata(); RefreshData(sportdata); } -#endif /* --------------------------------- 点击事件处理 * --------------------------------- */ bool TraingCardPresenter::OnClick(UIView &view, const ClickEvent &event) { @@ -383,17 +392,15 @@ bool TraingCardPresenter::OnClick(UIView &view, const ClickEvent &event) { return false; // 没有匹配的操作 } -void TraingCardPresenter::OnSwipe(UISwipeView &view) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::OnSwipe "); - UNUSED(view); - return; -} +// void TraingCardPresenter::OnSwipe(UISwipeView &view) { +// WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TempPresenter::OnSwipe "); +// UNUSED(view); +// return; +// } bool TraingCardPresenter::OnKeyAct(UIView &view, const KeyEvent &event) { /*消耗按键事件*/ return true; } -/* -------------------------------- 协议发起运动处理 - * -------------------------------- */ #ifdef BLE_SERVER_ENABLE bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp index da986c556..e13b8bbe3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp @@ -20,6 +20,11 @@ #include "traing/include/TraingModel.h" #include "uicomponents/UIComponents.h" +#include "common/screen.h" +#include "engines/gfx/gfx_engine_manager.h" +#include "engines/gfx/lite_m_gfx_engine.h" +#include "gfx_utils/mem_api.h" + extern "C" { void StartTimer(); void StopAndResetTimer(); @@ -607,16 +612,8 @@ void TraingCardView ::InitView() { // swipe_->HorAdd(DetailView); swipe_->VerAdd(DetailView, UICrossView::VPage::DOWN_PAGE); - swipe_->SetHorCurrentPage(Control_Card::DATA); // 设置进入索引 [数据] + swipe_->SetHorCurrentPage(Control_Card::CONTROL); // 设置进入索引 [数据] - UISwipeView::OnSwipeListener *onSwipeListener = - static_cast( - OHOS::TraingCardPresenter::GetInstance()); - if (onSwipeListener == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "onSwipeListener is null"); - return; - } - swipe_->SetOnSwipeListener(onSwipeListener); RootView::GetInstance()->SetOnKeyActListener(presenter_); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardView::InitPage over"); @@ -777,6 +774,21 @@ void TraingCardView::OnStart() { AddViewToRootContainer(swipe_); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "swipe_ new ok"); + + Draw(); +#if 0 + ////////////////////////////////////////// + LiteMGfxEngine::GetInstance()->SyncHwDraw(); + ImageInfo info = {0}; + Screen::GetInstance().GetCurrentScreenBitmap(info); + FILE *fp = fopen("/user/userdata/cap.bin", "w+"); + if (fp != nullptr) { + fwrite(info.data, 1, info.dataSize, fp); + fclose(fp); + } + ImageCacheFree(info); + ////////////////////////////////////////////// +#endif } /*设置弹窗状态*/ void TraingCardView::SetPopupViewStatus(PopupType type, bool status) {