From: Caisking <3449750381@qq.com> Date: Sat, 12 Oct 2024 12:36:30 +0000 (+0800) Subject: 表盘:取消开机对电量获取的注册 X-Git-Tag: release_V1.2.70_20241020_135402~60^2~1^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=cc5beb552f3ca16a3ff26cb8bf4c8815cc9b51c4;p=mirrors%2FFD230.git 表盘:取消开机对电量获取的注册 --- 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 247f6f445..2837b4df4 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 @@ -1,21 +1,3 @@ -/*** - * @Date: 2024-05-30 15:59:37 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-19 11:44:23 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h - */ -/*** - * @Date: 2024-04-15 10:55:58 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-27 10:01:25 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h - */ -/* - * Copyright (c) CompanyNameMagicTag 2023. All rights reserved. - * Description: DialModelPower - * Author: - * Create: 2023-12 - */ #ifndef DIAL_MODEL_POWER_H #define DIAL_MODEL_POWER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStandby.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStandby.h index 334bb2664..6a52879d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStandby.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStandby.h @@ -1,27 +1,4 @@ -/*** - * @Date: 2024-04-27 11:55:14 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-24 18:34:02 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStandby.h - */ -/*** - * @Date: 2024-04-27 11:55:14 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-27 11:56:11 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStanbyStandby.h - */ -/*** - * @Date: 2024-04-15 10:55:58 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-27 10:01:25 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPowerStanby.h - */ -/* - * Copyright (c) CompanyNameMagicTag 2023. All rights reserved. - * Description: DialModelPowerStanby - * Author: - * Create: 2023-12 - */ + #ifndef DIAL_MODEL_POWER_STANDBY_H #define DIAL_MODEL_POWER_STANDBY_H 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 dc8f4f8e9..95bdf3ca1 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 @@ -34,12 +34,12 @@ namespace OHOS bool DialModelPower::GetDialFloatData(DialDataType &type, float &out) { (void)type; - if (!powerUpdated_) - { - UpdatePower(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePower %d", power_); - return true; - } + // if (!powerUpdated_) + // { + // UpdatePower(); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePower %d", power_); + // return true; + // } float voltage = 0.0F; power_ = battery_get_voltage(&voltage); out = static_cast(power_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp index 6fdcfe21c..5e86d710f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp @@ -1,9 +1,4 @@ -/*** - * @Date: 2024-07-06 16:27:31 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-24 18:31:39 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp - */ + #include "RegisterDialModel.h" #include "DialModelPowerStandby.h" @@ -21,12 +16,12 @@ namespace OHOS bool DialModelPowerStanby::GetDialFloatData(DialDataType &type, float &out) { (void)type; - if (!PowerStanbyUpdated_) - { - UpdatePowerStanby(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePower %d", PowerStanby_); - return true; - } + // if (!PowerStanbyUpdated_) + // { + // UpdatePowerStanby(); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePower %d", PowerStanby_); + // return true; + // } float voltage = 0.0F; PowerStanby_ = battery_get_voltage(&voltage);