修改每日目标默认值以及公里显示

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
index a15e994..a8776dc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
@@ -10,136 +10,132 @@
 
 #include "ActivityModel.h"
 #include "ConfigModel.h"
-#include "cywee_hal.h" 
+#include "cywee_hal.h"
 
 namespace OHOS
 {
 
-    GoalModel::GoalModel()
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GoalModel::GoalModel");
-    }
-
-    GoalModel::~GoalModel()
-    {
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GoalModel::~GoalModel");
-    }
-    uint8_t GoalModel::getstepvalue()
-    {
-        int stepgoal= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
-        int stepdata= OHOS::ActivityModel::GetInstance()->GetStepCounter();
-         //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d %d %f ",stepdata,stepgoal,((float)stepdata/(float)stepgoal) * 100);
-         uint8_t value=  ((float)stepdata/(float)stepgoal) * 100;
-
-         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d",value);
-        if(value>100)
-        {
-            value=100;
-        }
-        return value;
-    }
-    char stepgoalstr[20];
-    char* GoalModel::getstepGoal()
-    {
-       int stepgoal= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
-       memset((void *)stepgoalstr,0,20);
-       sprintf_s(stepgoalstr,20,"/%d",stepgoal);
-       return stepgoalstr;
-    }
-
-    char stepnewstr[20];
-    char* GoalModel::getstepnew()
-    {
-       int stepdata= OHOS::ActivityModel::GetInstance()->GetStepCounter();
-       memset((void *)stepnewstr,0,20);
-       sprintf_s(stepnewstr,20,"%d",stepdata);
-       return stepnewstr;
-    }
-
-    char caloriesgoalstr[20];
-    char* GoalModel::getcaloriesGoal()
-    {
-       int caloriesdata= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES);
-       memset((void *)caloriesgoalstr,0,20);
-       sprintf_s(caloriesgoalstr,20,"/%d",caloriesdata);
-       return caloriesgoalstr;
-    }
-
-    char caloriesnewstr[20];
-    char* GoalModel::getcaloriespnew()
-    {
-       int caloriesdata= get_calories_data();
-
-       memset((void *)caloriesnewstr,0,20);
-       sprintf_s(caloriesnewstr,20,"%d",caloriesdata);
-       return caloriesnewstr;
-    }
-
-    char distancegoalstr[20];
-    char* GoalModel::getdistanceGoal()
-    {
-       int distancedata= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE);
-       memset((void *)distancegoalstr,0,20);
-       sprintf_s(distancegoalstr,20,"/%d",distancedata);
-       return distancegoalstr;
-    }
-
-    char distancenewstr[20];
-    char* GoalModel::getdistancenew()
-    {
-       int distancedata= get_distance_data();
-
-       memset((void *)distancenewstr,0,20);
-       sprintf_s(distancenewstr,20,"%d",distancedata);
-       return distancenewstr;
-    }
-
-    char fatburninggoalstr[20];
-    char* GoalModel::getfatburninggoal()
-    {
-        int fatburningdata= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
-       memset((void *)fatburninggoalstr,0,20);
-       sprintf_s(fatburninggoalstr,20,"/%d",fatburningdata);
-       return fatburninggoalstr;
-    }
-
-    char fatburningnewstr[20];
-    char* GoalModel::getfatburningnew()
-    {
-       int fatburningdata=10;
-
-       memset((void *)fatburningnewstr,0,20);
-       sprintf_s(fatburningnewstr,20,"%d",fatburningdata);
-       return fatburningnewstr;
-    }
-
-    char standstr[20];
-    char* GoalModel::getstandgoal()
-    {
-        int standdata= ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
-       memset((void *)standstr,0,20);
-       sprintf_s(standstr,20,"/%d",standdata);
-       return standstr;
-    }
-
-    char standnewstr[20];
-    char* GoalModel::getstandnew()
-    {
-       int standdata=10;
-
-       memset((void *)standnewstr,0,20);
-       sprintf_s(standnewstr,20,"%d",standdata);
-       return standnewstr;
-    }
-
-
-
-
-    GoalModel &GoalModel::GetInstance()
-    {
-        static GoalModel instance;
-        return instance;
-    }
-
-   
+   GoalModel::GoalModel()
+   {
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GoalModel::GoalModel");
+   }
+
+   GoalModel::~GoalModel()
+   {
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GoalModel::~GoalModel");
+   }
+   uint8_t GoalModel::getstepvalue()
+   {
+      int stepgoal = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
+      int stepdata = OHOS::ActivityModel::GetInstance()->GetStepCounter();
+      // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d %d %f ",stepdata,stepgoal,((float)stepdata/(float)stepgoal) * 100);
+      uint8_t value = ((float)stepdata / (float)stepgoal) * 100;
+
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", value);
+      if (value > 100)
+      {
+         value = 100;
+      }
+      return value;
+   }
+   char stepgoalstr[20];
+   char *GoalModel::getstepGoal()
+   {
+      int stepgoal = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
+      memset((void *)stepgoalstr, 0, 20);
+      sprintf_s(stepgoalstr, 20, "/%d", stepgoal);
+      return stepgoalstr;
+   }
+
+   char stepnewstr[20];
+   char *GoalModel::getstepnew()
+   {
+      int stepdata = OHOS::ActivityModel::GetInstance()->GetStepCounter();
+      memset((void *)stepnewstr, 0, 20);
+      sprintf_s(stepnewstr, 20, "%d", stepdata);
+      return stepnewstr;
+   }
+
+   char caloriesgoalstr[20];
+   char *GoalModel::getcaloriesGoal()
+   {
+      int caloriesdata = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES);
+      memset((void *)caloriesgoalstr, 0, 20);
+      sprintf_s(caloriesgoalstr, 20, "/%d", caloriesdata);
+      return caloriesgoalstr;
+   }
+
+   char caloriesnewstr[20];
+   char *GoalModel::getcaloriespnew()
+   {
+      int caloriesdata = get_calories_data();
+
+      memset((void *)caloriesnewstr, 0, 20);
+      sprintf_s(caloriesnewstr, 20, "%d", caloriesdata);
+      return caloriesnewstr;
+   }
+
+   char distancegoalstr[20];
+   char *GoalModel::getdistanceGoal()
+   {
+      int distancedata = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE);
+      memset((void *)distancegoalstr, 0, 20);
+      sprintf_s(distancegoalstr, 20, "/%d", distancedata);
+      return distancegoalstr;
+   }
+
+   char distancenewstr[20];
+   char *GoalModel::getdistancenew()
+   {
+      float distancedata = (float)get_distance_data() / 1000.0;
+
+      memset((void *)distancenewstr, 0, 20);
+      sprintf_s(distancenewstr, 20, "%f", distancedata);
+      return distancenewstr;
+   }
+
+   char fatburninggoalstr[20];
+   char *GoalModel::getfatburninggoal()
+   {
+      int fatburningdata = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
+      memset((void *)fatburninggoalstr, 0, 20);
+      sprintf_s(fatburninggoalstr, 20, "/%d", fatburningdata);
+      return fatburninggoalstr;
+   }
+
+   char fatburningnewstr[20];
+   char *GoalModel::getfatburningnew()
+   {
+      int fatburningdata = 0;
+
+      memset((void *)fatburningnewstr, 0, 20);
+      sprintf_s(fatburningnewstr, 20, "%d", fatburningdata);
+      return fatburningnewstr;
+   }
+
+   char standstr[20];
+   char *GoalModel::getstandgoal()
+   {
+      int standdata = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
+      memset((void *)standstr, 0, 20);
+      sprintf_s(standstr, 20, "/%d", standdata);
+      return standstr;
+   }
+
+   char standnewstr[20];
+   char *GoalModel::getstandnew()
+   {
+      int standdata = 0;
+
+      memset((void *)standnewstr, 0, 20);
+      sprintf_s(standnewstr, 20, "%d", standdata);
+      return standnewstr;
+   }
+
+   GoalModel &GoalModel::GetInstance()
+   {
+      static GoalModel instance;
+      return instance;
+   }
+
 }
\ No newline at end of file