系统：增加卡路里，步数目标值model

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelKcalgoalStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelKcalgoalStr.h
new file mode 100644 (file)
index 0000000..ec3a414
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelKcalgoalStr.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
+ * Description: DialModelCaloriegoal
+ * Author:
+ * Create: 2023-12
+ */
+
+#ifndef DIAL_MODEL_Caloriegoal_H
+#define DIAL_MODEL_Caloriegoal_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS {
+class DialModelCaloriegoal : public DialBaseModel {
+public:
+  DialModelCaloriegoal() {}
+  ~DialModelCaloriegoal() override {}
+  static DialModelCaloriegoal *GetInstance() {
+    static DialModelCaloriegoal instance;
+    return &instance;
+  }
+  bool GetDialFloatData(DialDataType &type, float &out) override;
+  void UpdateCaloriegoal(uint32_t Caloriegoal);
+
+private:
+  float Caloriegoal_ = 0; // 11520.0: default Calorie value as reference
+};
+} // namespace OHOS
+#endif

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelStepgoalStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelStepgoalStr.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialBoxProgressView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialBoxProgressView.cpp
index 746c514..d2d8b1c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialBoxProgressView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialBoxProgressView.cpp
@@ -28,7 +28,7 @@ uint32_t
 DialBoxProgressView::DialBoxDataTypeToBitPattern(DialBoxDataType type) {
   return static_cast<uint32_t>(type) << TYPE_SHIFT;
 }
-
+//增加box不同值颜色绘制
 uint32_t DialBoxProgressView::ConvertToRequiredFormat(DialBoxDataType type,
                                                       float data) {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelKcalgoalStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelKcalgoalStr.cpp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoal.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoal.cpp
deleted file mode 100644 (file)
index a07e2a6..0000000
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoal.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
- * Description: DialModelSteps
- * Author:
- * Create: 2023-12
- */
-
-#include "DialModelStepgoal.h"
-#include "DialBoxProgressView.h"
-#include "RegisterDialModel.h"
-#include "goal/include/goalmodel.h"
-
-REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS_GOAL,
-                   OHOS::DialModelStepgoal::GetInstance());
-
-namespace OHOS {
-bool DialModelStepgoal::GetDialFloatData(DialDataType &type, float &out) {
-  (void)type;
-  out = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat(
-      DialBoxDataType::STEP_TARGET, stepgoal_);
-  return true;
-}
-
-void DialModelStepgoal::UpdateStepgoal(uint32_t steps) {
-  uint32_t step_ = static_cast<float>(steps);
-  uint32_t goal = GoalModel::GetInstance().getstepgoaldata();
-  if (goal > 0) {
-    stepgoal_ = (static_cast<float>(step_) / goal) * 100;
-    if (stepgoal_ > 100)
-      stepgoal_ = 100;
-    stepgoal_ = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat(
-        DialBoxDataType::STEP_TARGET, stepgoal_);
-  }
-  if (onChangeListener_ != nullptr) {
-    onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_STEPS_GOAL,
-                                             stepgoal_);
-  }
-}
-} // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoalMapper.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoalMapper.cpp
new file mode 100644 (file)
index 0000000..a4dfc57
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoalMapper.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
+ * Description: DialModelSteps
+ * Author:
+ * Create: 2023-12
+ */
+
+#include "DialModelStepgoalMapper.h"
+#include "DialBoxProgressView.h"
+#include "RegisterDialModel.h"
+#include "goalMapper/include/goalMappermodel.h"
+
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_STEPS_goalMapper,
+                   OHOS::DialModelStepgoalMapper::GetInstance());
+
+namespace OHOS {
+bool DialModelStepgoalMapper::GetDialFloatData(DialDataType &type, float &out) {
+  (void)type;
+  out = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat(
+      DialBoxDataType::STEP_TARGET, stepgoalMapper_);
+  return true;
+}
+
+void DialModelStepgoalMapper::UpdateStepgoalMapper(uint32_t steps) {
+  uint32_t step_ = static_cast<float>(steps);
+  uint32_t goalMapper = goalMapperModel::GetInstance().getstepgoalMapperdata();
+  if (goalMapper > 0) {
+    stepgoalMapper_ = (static_cast<float>(step_) / goalMapper) * 100;
+    if (stepgoalMapper_ > 100)
+      stepgoalMapper_ = 100;
+    stepgoalMapper_ = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat(
+        DialBoxDataType::STEP_TARGET, stepgoalMapper_);
+  }
+  if (onChangeListener_ != nullptr) {
+    onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_STEPS_goalMapper,
+                                             stepgoalMapper_);
+  }
+}
+} // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoalStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelStepgoalStr.cpp
new file mode 100644 (file)
index 0000000..e69de29