From: Caisking <3449750381@qq.com> Date: Thu, 22 Feb 2024 03:13:32 +0000 (+0800) Subject: 增加电量,电池进度条 X-Git-Tag: release_V1.2.70_20241020_135402~1298^2~19 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d1dc7e35c2943f9bcc858a325127c46e058de999;p=mirrors%2FFD230.git 增加电量,电池进度条 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h index b5ea601ca..ad1f1d59b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialBoxProgressView.h @@ -15,7 +15,7 @@ public: virtual ~DialBoxProgressView(); void HandleFloatData(float data) override; private: - int32_t value_ = -1; + int32_t value_ = 50; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h index c09fbc8fe..e1a9fd4f1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h @@ -10,20 +10,23 @@ #include "DialBaseModel.h" -namespace OHOS { -class DialModelPower : public DialBaseModel { -public: - DialModelPower() {} - virtual ~DialModelPower() {} - static DialModelPower* GetInstance() +namespace OHOS +{ + class DialModelPower : public DialBaseModel { - static DialModelPower instance; - return &instance; - } - bool GetDialFloatData(DialDataType& type, float& out) override; + public: + DialModelPower() {} + virtual ~DialModelPower() {} + static DialModelPower *GetInstance() + { + static DialModelPower instance; + return &instance; + } + bool GetDialFloatData(DialDataType &type, float &out) override; + void UpdatePower(); -private: - int16_t power_ = 90; // 90: default power level -}; + private: + uint8_t power_ = 0; + }; } #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp index e0e1877d8..55d6a942a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp @@ -7,14 +7,32 @@ #include "RegisterDialModel.h" #include "DialModelPower.h" +#include +#include "battery_hal.h" +extern uint8_t battery_get_voltage(float *voltage); REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER, OHOS::DialModelPower::GetInstance()); -namespace OHOS { -bool DialModelPower::GetDialFloatData(DialDataType& type, float& out) +namespace OHOS { - (void)type; - out = power_; - return true; -} + bool DialModelPower::GetDialFloatData(DialDataType &type, float &out) + { + if (power_ == 0) + { + UpdatePower(); + } + (void)type; + out = power_; + return true; + } + void DialModelPower::UpdatePower() + { + // 获取电池电压值 + float voltage = 0.0F; + power_ = battery_get_voltage(&voltage); + if (onChangeListener_ != nullptr) + { + onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_POWER, power_); + } + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h b/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h index 3f7c0614e..6064b9e30 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/include/RotateView.h @@ -44,7 +44,7 @@ namespace OHOS void TestPicker(); void GetTestView(); - bool OnRotateStart(UIView &view, const RotateEvent &event) override; + bool OnRotate(UIView &view, const RotateEvent &event) override; private: UIViewGroup *container_ = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotateView.cpp index 945617b60..f2df842a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotateView.cpp @@ -52,9 +52,10 @@ namespace OHOS { TestPicker(); } - bool RotateView::OnRotateStart(UIView &view, const RotateEvent &event) + bool RotateView::OnRotate(UIView &view, const RotateEvent &event) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnRotateStart"); + return true; } void RotateView::TestPicker() { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maomao.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maomao.bin index 767ad3a7c..e4eace0aa 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maomao.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maomao.bin differ