From fdb9457b9f3a0097d04cc679f20ee5da23d535da Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Fri, 23 Feb 2024 15:16:24 +0800 Subject: [PATCH] =?utf8?q?=E6=9B=B4=E6=AD=A3=E5=8E=86=E5=8F=B2=E9=97=AE?= =?utf8?q?=E9=A2=98=EF=BC=9A1.=E9=99=A4=E4=BA=86=E8=A1=A8=E7=9B=98?= =?utf8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=85=B6=E4=BB=96=E7=95=8C=E9=9D=A2?= =?utf8?q?=E4=B8=8D=E5=87=BA=E7=8E=B0=E4=B8=8A=E4=B8=8B=E6=8B=89=E7=95=8C?= =?utf8?q?=E9=9D=A2=EF=BC=9B2.=E5=8F=96=E6=B6=88=E6=88=AA=E5=9B=BE?= =?utf8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=AE=9E=E6=97=B6?= =?utf8?q?=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/blood/src/BloodCardView.cpp | 2 +- .../compass/src/CompassControlView.cpp | 2 +- .../main/include/dial/DialModelCharge.h | 32 +++++++++++++++++++ .../nativeui/main/src/MainViewSample.cpp | 2 +- .../main/src/dial/DialModelCharge.cpp | 30 +++++++++++++++++ .../nativeui/traing/src/TraingView.cpp | 2 +- .../msg_center/src/msg_center_customer.cpp | 2 +- 7 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h create mode 100644 code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp index 4b79f79a3..9b49a7b09 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/blood/src/BloodCardView.cpp @@ -190,7 +190,7 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddButton error!\n"); }; - SetCoverable(true); + // SetCoverable(true); return true; } /*** diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp index 2651ea9b7..bd87bff20 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp @@ -64,7 +64,7 @@ bool CompassControlView::InitView(void) compassView->SetVisible(true); compassCalibrationView->SetVisible(false); } - SetCoverable(true); + // SetCoverable(true); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h new file mode 100644 index 000000000..f35bf6322 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelCharge.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) CompanyNameMagicTag 2023. All rights reserved. + * Description: DialModelCharge + * Author: + * Create: 2023-12 + */ + +#ifndef DIAL_MODEL_Charge_H +#define DIAL_MODEL_Charge_H + +#include "DialBaseModel.h" + +namespace OHOS +{ + class DialModelCharge : public DialBaseModel + { + public: + DialModelCharge() {} + virtual ~DialModelCharge() {} + static DialModelCharge *GetInstance() + { + static DialModelCharge instance; + return &instance; + } + bool GetDialFloatData(DialDataType &type, float &out) override; + void UpdateChargeStuaut(int16_t ChargeStuaut); + + private: + int16_t ChargeStuaut = 0; // 默认没有充电 + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 779cdafc9..1d0a7be9e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -178,7 +178,7 @@ namespace OHOS mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms); mainSwipeGroup->SetLoopState(true); - mainSwipeGroup->EnableScreenCap(true); + mainSwipeGroup->EnableScreenCap(false);//取消屏幕截图展示，使用实时绘制 mainSwipeGroup->RegisterSwipeCallback(callback); SwitchToClockPage(); SetContainerView(mainSwipeGroup); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp new file mode 100644 index 000000000..d0a4da955 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelCharge.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (c) CompanyNameMagicTag 2023. All rights reserved. + * Description: DialModelCharge + * Author: + * Create: 2023-12 + */ + +#include "RegisterDialModel.h" +#include "DialModelCharge.h" + +REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HEART_RATE, OHOS::DialModelCharge::GetInstance()); + +namespace OHOS +{ + bool DialModelCharge::GetDialFloatData(DialDataType &type, float &out) + { + (void)type; + out = ChargeStuaut; + return true; + } + + void DialModelCharge::UpdateChargeStuaut(int16_t Charge) + { + ChargeStuaut = static_cast(Charge); + if (onChangeListener_ != nullptr) + { + onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, ChargeStuaut); + } + } +} diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp index 7a8bce270..992a6efe2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -224,7 +224,7 @@ namespace OHOS { printf("InitImage error!\n"); }; - SetCoverable(true); + // SetCoverable(true); return true; } diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index 3958be9e8..540cd1a3b 100755 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -115,7 +115,7 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req) { unused(req); unused(topic); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !"); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !"); } void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req) -- 2.17.1