${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHeartRate.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelSteps.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelPower.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelCharge.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenView.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodBandoffView.cpp
${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
enum class DialDataType
{
- DATA_TYPE_FLOAT_BASE = 0,
+ DATA_TYPE_FLOAT_BASE = 0,
DATA_TYPE_STEPS, // 步数
DATA_TYPE_HEART_RATE, // 心率
DATA_TYPE_CALORIE, // 卡路里
DATA_TYPE_TIME_WEEK, // 星期
DATA_TYPE_TIME_MONTH, // 月份
DATA_TYPE_TIME_YEAR, // 年份
+ DATA_TYPE_CHARGE, // 充电状态
DATA_TYPE_MULTI_FLOAT_BASE = 0x2fff, // 多个浮点数据类型基值
void UpdateChargeStuaut(int16_t ChargeStuaut);
private:
- int16_t ChargeStuaut = 0; // 默认没有充电
+ int16_t ChargeStuaut_ = 0; // 默认没有充电 测试为充电
};
}
#endif
\ No newline at end of file
{
#if USE_OFFLINE_DIAL
DialModelTime::GetInstance()->UpdateTime();
- DialModelPower::GetInstance()->UpdatePower();
+ //DialModelPower::GetInstance()->UpdatePower();
dynamic_cast<DialViewGroup *>(view_->GetViewById(WATCH_FACE))->UpdateViewsByPeriodicUpdateData();
#else
dynamic_cast<MainClockView *>(view_->GetViewById(WATCH_FACE))->UpdateTime();
std::string filePath = dynamic_cast<MainPresenterSample *>(presenter_)->GetDialPath();
if (filePath.size() == 0)
{
- filePath = RES_PATH "maomao.bin";
+ filePath = RES_PATH "/dials/dog.bin";
}
mainClockView->SetDial(filePath);
#else
void DialBoxProgressView::HandleFloatData(float data)
{
float ratio = data;
+ //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialBoxProgressView:%d", data);
if (ratio > 1.0f)
{
ratio = 1.0f;
{
return;
}
+#if 1
// 获取电池电压值
float voltage = 0.0F;
value = battery_get_voltage(&voltage);
value_ = value;
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"battery_get_value:%d", value_);
+#endif
+ //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"battery_get_value:%d", value_);
SetValue(value_);
}
}
#include "RegisterDialModel.h"
#include "DialModelCharge.h"
-
-REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HEART_RATE, OHOS::DialModelCharge::GetInstance());
+#include "wearable_log.h"
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_CHARGE, OHOS::DialModelCharge::GetInstance());
namespace OHOS
{
bool DialModelCharge::GetDialFloatData(DialDataType &type, float &out)
{
(void)type;
- out = ChargeStuaut;
+ out = ChargeStuaut_;
+ //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialModelCharge %d", ChargeStuaut_);
return true;
}
- void DialModelCharge::UpdateChargeStuaut(int16_t Charge)
+ void DialModelCharge::UpdateChargeStuaut(int16_t ChargeStuaut)
{
- ChargeStuaut = static_cast<float>(Charge);
+ ChargeStuaut_ = static_cast<float>(ChargeStuaut);
if (onChangeListener_ != nullptr)
{
- onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, ChargeStuaut);
+ onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_CHARGE, ChargeStuaut_);
}
}
}
#include "DialBoxProgressView.h"
#include <string>
#include "battery_hal.h"
+#include "wearable_log.h"
extern uint8_t battery_get_voltage(float *voltage);
REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_POWER, OHOS::DialModelPower::GetInstance());
bool DialModelPower::GetDialFloatData(DialDataType &type, float &out)
{
(void)type;
+#if 0
+ if (power_ == 0)
+ {
+ UpdatePower();
+ }
+#endif
// 获取电池电压值
float voltage = 0.0F;
- power_ = battery_get_voltage(&voltage);
+ power_ = battery_get_voltage(&voltage);//进度条0.1~1;电量1~100
out = static_cast<float>(power_);
+ //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetDialFloatData %d", power_);
return true;
}
void DialModelPower::UpdatePower()
// 获取电池电压值
float voltage = 0.0F;
power_ = battery_get_voltage(&voltage);
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePower %d", power_);
#if 1
if (onChangeListener_ != nullptr)
{
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include
${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativelauncher/include
#include "broadcast_service.h"
#include "AlarmClockModel.h"
#include "AlarmPopUpPresenter.h"
+#include "DialModelCharge.h"
#include "CallerLogModel.h"
#include "notification_manager.h"
#include "NativeAbility.h"
unused(req);
unused(topic);
WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger Plug !");
+ DialModelCharge::GetInstance()->UpdateChargeStuaut(1);
}
void MsgCenterNotifyChargeUnPlugProc(const Topic topic, Request* req)
unused(req);
unused(topic);
WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyProc:: CHarger UnPlug !");
-
+ DialModelCharge::GetInstance()->UpdateChargeStuaut(0);
}
#endif
void MsgCenterNotifyNextDayProc(const Topic topic, Request* req)
+++ /dev/null
-{\r
- "Dialtype": "digits",\r
- "digitspath": "/user/res/clocks/KUMI/",\r
- "digits": {\r
- "timeformat": "24format",\r
- "digitsize": 60,\r
- "playformat": "textdisplay",\r
- "fontsize": 55,\r
- "textdisplay": {\r
- "coordinates": {\r
- "left": 161,\r
- "top": 293\r
- }\r
- }\r
- },\r
- "date": {\r
- "textdisplay": {\r
- "displayformat": "dd",\r
- "font": "STYLE_TEXT_FONT",\r
- "fontsize": 35,\r
- "coordinates": {\r
- "left": 250,\r
- "top": 365\r
- }\r
- }\r
- },\r
- "week": {\r
- "textdisplay": {\r
- "displayformat": {\r
- "weekformat": [\r
- "Sun",\r
- "Mon ",\r
- "Tue ",\r
- "Wed ",\r
- "Thu ",\r
- "Fri ",\r
- "Sat "\r
- ]\r
- },\r
- "fontsize": 35,\r
- "coordinates": {\r
- "left": 181,\r
- "top": 365\r
- }\r
- }\r
- },\r
- "battery": {\r
- "progress": {\r
- "size": {\r
- "width": 31,\r
- "height": 19\r
- },\r
- "coordinates": {\r
- "left": 180,\r
- "top": 30\r
- }\r
- },\r
- "textdisplay": {\r
- "fontsize": 28,\r
- "coordinates": {\r
- "left": 220,\r
- "top": 25\r
- }\r
- }\r
- },\r
- "heartrate": {},\r
- "step": {},\r
- "background": {\r
- "backgroundimagesPath": "/user/res/clocks/KUMI/background.bin"\r
- }\r
-}
\ No newline at end of file
+++ /dev/null
-{\r
- "Dialtype": "digits",\r
- "digitspath": "/user/res/clocks/KUMI/",\r
- "digits": {\r
- "timeformat": "24format",\r
- "digitsize": 60,\r
- "playformat": "textdisplay",\r
- "fontsize": 55,\r
- "textdisplay": {\r
- "coordinates": {\r
- "left": 161,\r
- "top": 293\r
- }\r
- }\r
- },\r
- "date": {\r
- "textdisplay": {\r
- "displayformat": "dd",\r
- "font": "STYLE_TEXT_FONT",\r
- "fontsize": 35,\r
- "coordinates": {\r
- "left": 250,\r
- "top": 365\r
- }\r
- }\r
- },\r
- "week": {\r
- "textdisplay": {\r
- "displayformat": {\r
- "weekformat": [\r
- "Sun",\r
- "Mon ",\r
- "Tue ",\r
- "Wed ",\r
- "Thu ",\r
- "Fri ",\r
- "Sat "\r
- ]\r
- },\r
- "fontsize": 35,\r
- "coordinates": {\r
- "left": 181,\r
- "top": 365\r
- }\r
- }\r
- },\r
- "battery": {\r
- "progress": {\r
- "size": {\r
- "width": 31,\r
- "height": 19\r
- },\r
- "coordinates": {\r
- "left": 180,\r
- "top": 30\r
- }\r
- },\r
- "textdisplay": {\r
- "fontsize": 28,\r
- "coordinates": {\r
- "left": 220,\r
- "top": 25\r
- }\r
- }\r
- },\r
- "heartrate": {},\r
- "step": {},\r
- "background": {\r
- "backgroundimagesPath": "/user/res/clocks/KUMI/background.bin"\r
- }\r
-}
\ No newline at end of file
+++ /dev/null
-{
- "Dialtype": "digits",
- "digitspath": "/user/res/clocks/flowerbud/",
- "digits": {
- "playformat": "textdisplay",
- "timeformat": "24format",
- "digitsize": 100,
- "textdisplay": {
- "coordinates": {
- "left": 55,
- "top": 115
- }
- }
- },
- "date": {
- "textdisplay": {
- "displayformat": "mm月dd日",
- "font": "STYLE_TEXT_FONT",
- "fontsize": 26,
- "coordinates": {
- "left": 63,
- "top": 230
- }
- }
- },
- "week": {
- "textdisplay": {
- "displayformat": {
- "weekformat": [
- "星期天",
- "星期一",
- "星期二",
- "星期三",
- "星期四",
- "星期五",
- "星期六"
- ]
- },
- "fontsize": 26,
- "coordinates": {
- "left": 183,
- "top": 230
- }
- }
- },
- "battery": {
- "progress": {
- "size": {
- "width": 31,
- "height": 19
- },
- "coordinates": {
- "left": 70,
- "top": 283
- }
- },
- "textdisplay": {
- "fontsize": 28,
- "coordinates": {
- "left": 113,
- "top": 275
- }
- }
- },
- "heartrate": {},
- "step": {},
- "background": {
- "backgroundimagesPath": "/user/res/clocks/flowerbud/background.bin"
- }
-}
\ No newline at end of file
+++ /dev/null
-{\r
- "Dialtype": "digits",\r
- "digitspath": "/user/res/clocks/maliao/",\r
- "digits": {\r
- "timeformat": "24format",\r
- "playformat": "textdisplay",\r
- "digitsize": 70,\r
- "textdisplay": {\r
- "coordinates": {\r
- "left": 142,\r
- "top": 310\r
- }\r
- }\r
- },\r
- "date": {\r
- "textdisplay": {\r
- "displayformat": "mm月dd日",\r
- "font": "STYLE_TEXT_FONT",\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 142,\r
- "top": 390\r
- }\r
- }\r
- },\r
- "week": {\r
- "textdisplay": {\r
- "displayformat": {\r
- "weekformat": [\r
- "星期天",\r
- "星期一",\r
- "星期二",\r
- "星期三",\r
- "星期四",\r
- "星期五",\r
- "星期六"\r
- ]\r
- },\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 262,\r
- "top": 390\r
- }\r
- }\r
- },\r
- "battery": {\r
- "progress": {\r
- "size": {\r
- "width": 31,\r
- "height": 19\r
- },\r
- "coordinates": {\r
- "left": 180,\r
- "top": 58\r
- }\r
- },\r
- "textdisplay": {\r
- "fontsize": 28,\r
- "coordinates": {\r
- "left": 228,\r
- "top": 52\r
- }\r
- }\r
- },\r
- "heartrate": {},\r
- "step": {},\r
- "background": {\r
- "backgroundimagesPath": "/user/res/clocks/maliao/background.bin"\r
- }\r
-}
\ No newline at end of file
+++ /dev/null
-{\r
- "Dialtype": "digits",\r
- "digitspath": "/user/res/clocks/maomao/",\r
- "digits": {\r
- "timeformat": "24format",\r
- "playformat": "textdisplay",\r
- "digitspath": "/user/res/clocks/maomao/",\r
- "digitsize": 90,\r
- "textdisplay": {\r
- "coordinates": {\r
- "left": 115,\r
- "top": 290\r
- }\r
- }\r
- },\r
- "date": {\r
- "textdisplay": {\r
- "displayformat": "mm月dd日",\r
- "font": "STYLE_TEXT_FONT",\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 142,\r
- "top": 390\r
- }\r
- }\r
- },\r
- "week": {\r
- "textdisplay": {\r
- "displayformat": {\r
- "weekformat": [\r
- "星期天",\r
- "星期一",\r
- "星期二",\r
- "星期三",\r
- "星期四",\r
- "星期五",\r
- "星期六"\r
- ]\r
- },\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 262,\r
- "top": 390\r
- }\r
- }\r
- },\r
- "battery": {\r
- "progress": {\r
- "size": {\r
- "width": 31,\r
- "height": 19\r
- },\r
- "coordinates": {\r
- "left": 180,\r
- "top": 58\r
- }\r
- },\r
- "textdisplay": {\r
- "fontsize": 28,\r
- "coordinates": {\r
- "left": 228,\r
- "top": 52\r
- }\r
- }\r
- },\r
- "heartrate": {},\r
- "step": {},\r
- "background": {\r
- "backgroundimagesPath": "/user/res/clocks/maomao/background/",\r
- "size": {\r
- "width": 466,\r
- "height": 120\r
- },\r
- "coordinates": {\r
- "left": 0,\r
- "top": 140\r
- },\r
- "background_count": 205,\r
- "background_FPS": 50\r
- }\r
-}
\ No newline at end of file
+++ /dev/null
-{\r
- "Dialtype": "pointer",\r
- "handspath": "/user/res/clocks/momo/",\r
- "hands": {\r
- "hourHand": {\r
- "coordinates": {\r
- "HOUR_POINT_POSITION_X": 221,\r
- "HOUR_POINT_POSITION_Y": 87,\r
- "HOUR_POINT_CENTER_X": 12,\r
- "HOUR_POINT_CENTER_Y": 146\r
- }\r
- },\r
- "minuteHand": {\r
- "coordinates": {\r
- "MINUTE_POINT_POSITION_X": 221,\r
- "MINUTE_POINT_POSITION_Y": 33,\r
- "MINUTE_POINT_CENTER_X": 12,\r
- "MINUTE_POINT_CENTER_Y": 200\r
- }\r
- },\r
- "secondHand": {\r
- "coordinates": {\r
- "SECOND_POINT_POSITION_X": 221,\r
- "SECOND_POINT_POSITION_Y": 28,\r
- "SECOND_POINT_CENTER_X": 12,\r
- "SECOND_POINT_CENTER_Y": 205\r
- }\r
- }\r
- },\r
- "date": {\r
- "textdisplay": {\r
- "displayformat": "mm月dd日",\r
- "font": "STYLE_TEXT_FONT",\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 182,\r
- "top": 360\r
- }\r
- }\r
- },\r
- "week": {\r
- "textdisplay": {\r
- "displayformat": {\r
- "weekformat": [\r
- "星期天",\r
- "星期一",\r
- "星期二",\r
- "星期三",\r
- "星期四",\r
- "星期五",\r
- "星期六"\r
- ]\r
- },\r
- "fontsize": 26,\r
- "coordinates": {\r
- "left": 194,\r
- "top": 400\r
- }\r
- }\r
- },\r
- "battery": {\r
- "progress": {\r
- "size": {\r
- "width": 31,\r
- "height": 19\r
- },\r
- "coordinates": {\r
- "left": 179,\r
- "top": 58\r
- }\r
- },\r
- "textdisplay": {\r
- "fontsize": 28,\r
- "coordinates": {\r
- "left": 226,\r
- "top": 50\r
- }\r
- }\r
- },\r
- "heartrate": {},\r
- "step": {},\r
- "background": {\r
- "backgroundimagesPath": "/user/res/clocks/momo/background.bin"\r
- }\r
-}
\ No newline at end of file