From: Caisking <3449750381@qq.com> Date: Tue, 24 Dec 2024 13:21:56 +0000 (+0800) Subject: 运动:屏蔽更新model;由model自动去获取 X-Git-Tag: v1.3.113-repair_tp~69 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3dc123d7fe45b33e3406fe330f46e54e81999326;p=mirrors%2FFD230.git 运动:屏蔽更新model;由model自动去获取 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp index 3054a4d88..f738da087 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp @@ -11,6 +11,11 @@ #include "DialModelDistance.h" #include "DialModelStepgoal.h" #include "DialModelSteps.h" +#include "DialModelKcalgoalStr.h" +#include "DialModelKcalgoalValue.h" +#include "DialModelStepgoalStr.h" +#include "DialModelStepgoalValue.h" + #include "IndoorWalkPresenter.h" #include "MainClockView.h" #include "broadcast_service.h" @@ -193,10 +198,15 @@ void ActivityModel::Init() { float distance= OHOS::GoalModel::GetInstance().show_data_distance_refresh(); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ActivityModel::ActivityModel,%d",counter); - DialModelSteps::GetInstance()->UpdateSteps(counter); //更新表盘步数 - DialModelStepgoal::GetInstance()->UpdateStepgoal(counter); //更新表盘目标 - DialModelDistance::GetInstance()->UpdateDistance(distance); //更新表盘距离 - DialModelCalorie::GetInstance()->UpdateCalorie(calories); //更新表盘卡路里 + // DialModelSteps::GetInstance()->UpdateSteps(counter); //更新表盘步数 + // DialModelStepgoal::GetInstance()->UpdateStepgoal(counter); //更新表盘目标 + // DialModelDistance::GetInstance()->UpdateDistance(distance); //更新表盘距离 + // DialModelCalorie::GetInstance()->UpdateCalorie(calories); //更新表盘卡路里 + // DialModelKcalgoalStr::GetInstance() ->UpdateKcalgoalStr(calories);//更新卡路里目标值 + // DialModelKcalgoalValue::GetInstance() ->UpdateKcalgoalValue(calories);//更新卡路里int目标值 + // DialModelStepgoalStr::GetInstance() ->UpdateStepgoalStr(counter);//更新步数目标值 + // DialModelStepgoalValue::GetInstance() ->UpdateStepgoalValue(counter);//更新步数int目标值 + } uint32 ActivityModel::GetStepCounter(void) { return stepCounter; } 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 992590383..346286e25 100644 --- 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 @@ -85,6 +85,11 @@ #include "DialModelCalorie.h" #include "DialModelDistance.h" #include "DialModelStepgoal.h" +#include "DialModelKcalgoalStr.h" +#include "DialModelKcalgoalValue.h" +#include "DialModelStepgoalStr.h" +#include "DialModelStepgoalValue.h" + #include "msg_center_customerC.h" #include "PhoneAGService.h" #include @@ -458,11 +463,14 @@ void MsgCenterNotifystepProc(const Topic topic, Request* req) counter=OHOS::GoalModel::GetInstance().show_data_step_refresh(); uint32_t calories= OHOS::GoalModel::GetInstance().show_data_calories_refresh(); float distance= OHOS::GoalModel::GetInstance().show_data_distance_refresh(); - OHOS::DialModelSteps::GetInstance() ->UpdateSteps(counter);//更新表盘步数 - OHOS::DialModelStepgoal::GetInstance() ->UpdateStepgoal(counter);//更新表盘目标 - OHOS::DialModelDistance::GetInstance() ->UpdateDistance(distance);//更新表盘距离 - OHOS::DialModelCalorie::GetInstance() ->UpdateCalorie(calories);//更新表盘卡路里 - + // OHOS::DialModelSteps::GetInstance() ->UpdateSteps(counter);//更新表盘步数 + // OHOS::DialModelStepgoal::GetInstance() ->UpdateStepgoal(counter);//更新表盘目标 + // OHOS::DialModelDistance::GetInstance() ->UpdateDistance(distance);//更新表盘距离 + // OHOS::DialModelCalorie::GetInstance() ->UpdateCalorie(calories);//更新表盘卡路里 + // OHOS::DialModelKcalgoalStr::GetInstance() ->UpdateKcalgoalStr(calories);//更新卡路里目标值 + // OHOS::DialModelKcalgoalValue::GetInstance() ->UpdateKcalgoalValue(calories);//更新卡路里int目标值 + // OHOS::DialModelStepgoalStr::GetInstance() ->UpdateStepgoalStr(counter);//更新步数目标值 + // OHOS::DialModelStepgoalValue::GetInstance() ->UpdateStepgoalValue(counter);//更新步数int目标值 if(OHOS::GoalView::GetInstance()) {