适配每日活动达成的中英文的=

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7529389..d1e69a3
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -994,15 +994,36 @@ void TraingCardView::InitImageAnimator() {
     break;\r
   }\r
   case ExerciseTag::Calories: {\r
-    tagString = tagString + "kcal";\r
+    if (ConfigModel::GetInstance()->GetLanguage() == ZH_CN)\r
+    {\r
+      tagString = tagString + "千卡";\r
+    }\r
+    else\r
+    {\r
+      tagString = tagString + "kcal";\r
+    }\r
     break;\r
   }\r
   case ExerciseTag::Distance: {\r
-    tagString = tagString + "km";\r
+    if (ConfigModel::GetInstance()->GetLanguage() == ZH_CN)\r
+    {\r
+      tagString = tagString + "公里";\r
+    }\r
+    else\r
+    {\r
+      tagString = tagString + "km";\r
+    }\r
     break;\r
   }\r
   case ExerciseTag::Steps:\r
-    tagString = tagString + "steps";\r
+    if (ConfigModel::GetInstance()->GetLanguage() == ZH_CN)\r
+    {\r
+      tagString = tagString + "步";\r
+    }\r
+    else\r
+    {\r
+      tagString = tagString + "steps";\r
+    }\r
     break;\r
   default:\r
     break;\r

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 122be79..79fba41
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
@@ -34,6 +34,8 @@
 #endif
 #include <cstdio>
 
+#include "languagecode/LanguageInit.h"
+
 namespace OHOS
 {
 
@@ -266,23 +268,58 @@ namespace OHOS
         {
         case GOAL_CALOREIE:
             tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES);
-            tagString = std::to_string(tag) + "kcal";
+            if (ConfigModel::GetInstance()->GetLanguage() == 0)
+            {
+                tagString = std::to_string(tag) + "千卡";
+            }
+            else
+            {
+                tagString = std::to_string(tag) + "kcal";
+            }
             break;
         case GOAL_FAT:
             tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
-            tagString = std::to_string(tag) + "min";
+            if (ConfigModel::GetInstance()->GetLanguage() == 0)
+            {
+                tagString = std::to_string(tag) + "分钟";
+            }
+            else
+            {
+                tagString = std::to_string(tag) + "min";
+            }
             break;
         case GOAL_STAND:
             tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES);
-            tagString = std::to_string(tag) + "times";
+            if (ConfigModel::GetInstance()->GetLanguage() == 0)
+            {
+                tagString = std::to_string(tag) + "次";
+            }
+            else
+            {
+                tagString = std::to_string(tag) + "times";
+            }
             break;
         case GOAL_DISTANCE:
             tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE);
-            tagString = std::to_string(tag) + "km";
+            if (ConfigModel::GetInstance()->GetLanguage() == 0)
+            {
+                tagString = std::to_string(tag) + "公里";
+            }
+            else
+            {
+                tagString = std::to_string(tag) + "km";
+            }
             break;
         case GOAL_STEP:
             tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
-            tagString = std::to_string(tag) + "steps";
+            if (ConfigModel::GetInstance()->GetLanguage() == 0)
+            {
+                tagString = std::to_string(tag) + "步";
+            }
+            else
+            {
+                tagString = std::to_string(tag) + "steps";
+            }
             break;
         default:
             break;
@@ -440,24 +477,59 @@ namespace OHOS
             {
             case GOAL_CALOREIE:
                 tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES);
-                tagString = std::to_string(tag) + "kcal";
+                if (ConfigModel::GetInstance()->GetLanguage() == 0)
+                {
+                    tagString = std::to_string(tag) + "千卡";
+                }
+                else
+                {
+                    tagString = std::to_string(tag) + "kcal";
+                }
                 break;
             case GOAL_FAT:
                 tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION);
-                tagString = std::to_string(tag) + "minute";
+                if (ConfigModel::GetInstance()->GetLanguage() == 0)
+                {
+                    tagString = std::to_string(tag) + "分钟";
+                }
+                else
+                {
+                    tagString = std::to_string(tag) + "minute";
+                }
                 break;
             case GOAL_STAND:
                 tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES);
-                tagString = std::to_string(tag) + "times";
+                if (ConfigModel::GetInstance()->GetLanguage() == 0)
+                {
+                    tagString = std::to_string(tag) + "次";
+                }
+                else
+                {
+                    tagString = std::to_string(tag) + "times";
+                }
                 break;
             case GOAL_DISTANCE:
                 tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DISTANCE);
-                tagString = std::to_string(tag) + "km";
+                if (ConfigModel::GetInstance()->GetLanguage() == 0)
+                {
+                    tagString = std::to_string(tag) + "公里";
+                }
+                else
+                {
+                    tagString = std::to_string(tag) + "km";
+                }
                 break;
             case GOAL_STEP:
                 tag = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT);
                 ;
-                tagString = std::to_string(tag) + "steps";
+                if (ConfigModel::GetInstance()->GetLanguage() == 0)
+                {
+                    tagString = std::to_string(tag) + "步";
+                }
+                else
+                {
+                    tagString = std::to_string(tag) + "steps";
+                }
                 break;
             default:
                 break;