From: Caisking <3449750381@qq.com>
Date: Tue, 2 Apr 2024 07:06:33 +0000 (+0800)
Subject: 修复训练Slice部分bug
X-Git-Tag: release_V1.2.70_20241020_135402~1237^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=17018c470e272462f6a3ca75c792a695a49bcca1;p=mirrors%2FFD230.git
修复训练Slice部分bug
---
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 4278eed07..fe8dcad70 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/activity/src/ActivityModel.cpp
@@ -20,7 +20,7 @@
#include "IndoorWalkPresenter.h"
#include "ActivityWeekView.h"
#include "graphic_service.h"
-
+#include "DialModelSteps.h"
using namespace std;
#ifdef __cplusplus
@@ -79,7 +79,6 @@ static void RefreshStepControls(const uint32_t &value, const uint16 &msgId)
if (mainClockView != nullptr) {
GraphicService::GetInstance()->PostGraphicEvent(std::bind(&MainClockView::RefreshStep, mainClockView, value));
}
-
IndoorWalkPresenter *indoorWalkPresenter = OHOS::IndoorWalkPresenter::GetInstance();
if (indoorWalkPresenter != nullptr) {
GraphicService::GetInstance()->PostGraphicEvent(std::bind(&IndoorWalkPresenter::ModifiesSteps,
@@ -123,9 +122,10 @@ static void Notify(void *args, const Topic topic, Request* request)
// counter += *(uint32_t *)request->data;
uint32 counter = *(uint32_t *)request->data;
OHOS::ActivityModel::GetInstance()->ReviseStepCounter(counter);
-
+ OHOS::DialModelSteps::GetInstance()->UpdateSteps(counter);//æ´æ°è¡¨çæ¥æ°
GraphicService::GetInstance()->PostGraphicEvent(std::bind(&ActivityModel::SetStepData,
ActivityModel::GetInstance(), counter));
+
RefreshStepControls(counter, TOPIC_EVENT_STEPDATA_UPDATE);
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
index 8e9758e4d..1c948ef08 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
@@ -53,8 +53,11 @@ namespace OHOS
static const char *en = "user/res/font/en.lang";
static const char *zh = "user/res/font/zh.lang";
- static const uint8_t langcount = 2;
- const char *resFiles[langcount] = {zh, en};
+ static const char *ja = "user/res/font/ja.lang";
+ static const char *de = "user/res/font/de.lang";
+
+ static const uint8_t langcount = 4;
+ const char *resFiles[langcount] = {zh, en, ja, de};
static language *g_planguage{nullptr};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt
new file mode 100644
index 000000000..2042bd6cc
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/Chinese.txt
@@ -0,0 +1,238 @@
+Ò»°ã¶ÍÁ¶
+×ÔÓÉѵÁ·
+¼¡Á¦ÑµÁ·
+·ÉÂÖ³µ/ÊÒÄÚ½¡Éí³µ
+̤²½»ú
+Âþ²½»ú
+HIIT/¸ßÇ¿¶È¼äЪѵÁ·
+½¡Éí
+ÍÅÌå²Ù
+è¤çì
+è¤çìèʽ
+è¤çìţʽ
+è¤çìÑÛ¾µÉßʽ
+è¤çìÓ¢ÐÛʽ1
+è¤çìÓ¢ÐÛʽ2
+è¤çìÓ¢ÐÛʽ3
+è¤çì¹öÂÖ
+ÊÒÍâ×ß·
+ÊÒÍâÅܲ½
+ÊÒÄÚ×ß·
+ÊÒÄÚÅܲ½
+ÊÒÍâÆïÐÐ
+ÌøÉþ
+ƤÀÌá˹
+»ìºÏ½¡Éí
+¹¦ÄÜÐÔѵÁ·
+ÌåÄÜѵÁ·
+õÌȵÀ/ÌßÈ
+È»÷
+×ÔÓɲ«»÷
+¿ÕÊÖµÀ
+»÷½£
+ºËÐÄѵÁ·
+È»÷ÓÐÑõ
+½£µÀ
+µ¥¸Ü
+Ë«¸Ü
+Ñ»·ÑµÁ·
+ÓÐÑõÔ˶¯
+½¡ÃÀ²Ù
+P90X
+ºøÁåѵÁ·
+×ۺϸñ¶·
+ÅÀÂ¥ÌÝ»ú
+¾ÙÖØ
+Barre
+ÊÖÂÖ
+Ìï¾¶
+½ÇÁ¦
+ÉíÐÄÔ˶¯
+ÈáÈí²Ù
+»ìºÍÓÐÑõ
+´«Í³¼¡Á¦ÑµÁ·
+½»²æÑµÁ·
+Ìå²Ù
+½×ÌÝѵÁ·
+ÍÖÔ²»ú
+»®´¬»ú
+Ò»°ãÎ赸
+¶ÇƤÎè
+¾ôÊ¿Îè
+À¶¡Îè
+°ÅÀÙ
+½ÖÎè
+¹ã³¡Îè
+×ð°Í
+Éç½»Îè
+Ìß̤Îè
+Ò»°ãÐÝÏÐÔ˶¯
+»¬ÂÖÁï±ù
+ÎäÊõ
+Ì«¼«È
+ºôÀȦ
+·ÉÅÌ
+·ÉïÚ
+Éä¼ý
+ÆïÂí
+¶ÔÕ½ÓÎÏ·
+·Å·çóÝ
+°ÎºÓ
+íFía
+ÅÀÂ¥ÌÝ
+ÕϰÈü
+µöÓã
+´òÁÔ
+»¬°å³µ
+»¬ÏèÉ¡
+ÍŶӾº¼¼
+½¡ÉíµçÍæ
+½¡ÐÐ
+ÂíÊõÔ˶¯
+ÍæÀÖ
+Ò»°ãÇòÀàÔ˶¯
+ÓðëÇò
+ƹÅÒÇò
+ÍøÇò
+ײÇò
+±£ÁäÇò
+ÅÅÇò
+ë¦×ÓÇò
+ÊÖÇò
+°ôÇò
+ÀÝÇò
+°åÇò
+ÃÀʽéÏéÇò
+ɳ̲×ãÇò
+ɳ̲ÅÅÇò
+é³Çò
+Çú¹÷Çò
+Ӣʽ±ÚÇò
+ÌÙÇò
+¶ã±ÜÇò
+ÀºÇò
+×ãÇò
+¸ß¶û·òÇò
+ÂíÇò
+ÃÀʽ±ÚÇò
+ӢʽéÏéÇò
+ÃÅÇò
+Æ¥¿ËÇò
+´ü¹÷Çò
+Ò»°ãË®Éϻ
+·«´¬
+³åÀË
+·ºÖÛ
+»®ÁúÖÛ
+Çáͧ
+Èüͧ
+Ë®ÉÏĦÍгµ
+Á¢½°³åÀË
+DZˮ
+ÌøË®
+»¬ÏèÉ¡³åÀË
+³åÀË»¬Ë®
+Ë®Çò
+·ç·«³åÀË
+ƯÁ÷»î¶¯
+Ë®Öн¡Éí
+Ë®ÉÏÔ˶¯
+»§ÍâÓÎÓ¾
+ÊÒÄÚÓÎÓ¾
+ÓÎÓ¾_×ÔÓÉʽ
+ÓÎÓ¾_ÍÜʽ
+ÓÎÓ¾_Ñöʽ
+ÓÎÓ¾_µûʽ
+Ò»°ã±ùÉÏÔ˶¯
+Áï±ù
+±ùÇò
+±ùʯºø/±ùºø
+Ñ©ÉÏĦÍгµ
+Ñ©ÇÁ
+¶¬¼¾Á½Ïî
+Ô½Ò°»¬Ñ©
+»¬Ñ©
+µ¥°å»¬Ñ©/»¬Ñ©°å
+ѩЬ½¡ÐÐ
+Ñ©µØÔ˶¯
+Ò»°ã¼«ÏÞÔ˶¯
+»¬°å
+ÅÊÑÒ
+¸ß¿Õµ¯Ìø/±Ä¼«»î¶¯
+ÅÜ¿á
+BMX
+¶¨ÏòÔ½Ò°
+ÌøÉ¡
+Èü³µ
+ÌúÈËÈýÏîÔ˶¯
+³ËµçÌÝ
+³ËÊÖ·öÌÝ
+×öÔ°ÒÕ
+×ö¼ÒÎñ
+ÔÚ³µÀï
+Ú¤Ïë
+¾²Ö¹
+Çãб
+×øÂÖÒÎÒÆ¶¯
+½¡ÉíÀà
+ÇòÀà
+Ë®ÉÏÔ˶¯
+Î赸Àà
+¼«ÏÞÔ˶¯
+±ùÉÏÔ˶¯
+ÐÝÏÐÔ˶¯
+ÆäËû
+Î赸Ô˶¯
+ÇòÀàÔ˶¯
+ÆäËûÔ˶¯
+½¡ÉíÔ˶¯
+ѵÁ·
+¿ìËÙѵÁ·
+ÉèÖÃÄ¿±ê >
+ʱ³¤
+ʱ³¤É趨
+·ÖÖÓ
+¿¨Â·Àï
+¿¨Â·ÀïÉ趨
+ǧ¿¨
+¾àÀë
+¾àÀëÉ趨
+Ã×
+¹«Àï
+²½Êý
+²½ÊýÉ趨
+²½
+ÐÄÂÊ
+ƽ¾ùÐÄÂÊ
+´Î/·Ö
+ƽ¾ùÐÄÂÊ(´Î/·Ö)
+ÖÐ
+½ÏµÍÇ¿¶È
+ÖеÈÇ¿¶È
+¸ßµÈÇ¿¶È
+³¬¸ßÇ¿¶È
+ѵÁ·Ç¿¶È
+ѵÁ·Ç¿¶ÈÓÃÓÚÅжÏÊÇ·ñѵÁ·²»×ã»òÕßѵÁ·Ì«¹ý£¬µ½µ×ʹÐÄÂÊÔö¼Ó¶àÉÙµÄÔ˶¯Ç¿¶È²ÅÊÇ×îºÏÊʵġ£
+¸ÃÇ¿¶ÈÇø¼äÊǶÔÓ¦°ÐÐÄÂÊ£¨ÓɸöÈË»ù±¾×ÊÁϼÆËãµÃ³ö£©Ç¿ÈõµÄʵʱ״̬ÏÔʾ£¬ÓÐÖúÓÚÌá¸ßѵÁ·ÖÊÁ¿
+ѵÁ·×´Ì¬´ú±íµÄÒâÒå
+ÈÈÉíÔ˶¯
+È¼Ö¬Çø
+ÌáÉýÐķλúÄÜ
+רҵÔ˶¯Ô±
+×¢£º¸ÃѵÁ·Ç¿¶È²¢·ÇרҵÔ˶¯ÆÀ¹À£¬Êý¾Ý½ö¹©²Î¿¼
+ѵÁ·ÖÐ
+ÔÝͣѵÁ·
+½áÊø
+ÔÝÍ£
+¼ÌÐø
+Ä¿±êÒÑ´ï³É
+Íê³ÉÄ¿±ê
+È·¶¨
+×¢Òâ
+µ±Ç°Ô˶¯Á¿Ì«Ð¡£¬ÎÞ·¨¼Ç¼ ÊÇ·ñ½áÊøÔ˶¯
+½áÊøÔ˶¯
+ÊÇ·ñ½áÊø±¾´ÎÔ˶¯
+Ä¿±êÍê³É¶È
+ѵÁ·Ê±³¤
+¹Ø±Õ
+¸ü¶à
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_de.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_de.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_ja.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_ja.txt
new file mode 100644
index 000000000..3e6867ec7
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_ja.txt
@@ -0,0 +1,238 @@
+STR_EXERCISE_GENERAL$ä¸è¬çãªãã¬ã¼ãã³ã°
+STR_EXERCISE_FREETRAINING$ããªã¼ãã¬ã¼ãã³ã°
+STR_EXERCISE_RESISTANCETRAINING$çåãã¬ã¼ãã³ã°
+STR_EXERCISE_SPINBIKE$ãã©ã¤ã«ã¼ã/室å
ãã£ãããã¹ã«ã¼ã
+STR_EXERCISE_TREADMILL$ã¹ãããã¼
+STR_EXERCISE_STROLLMACHINE$ã¦ã©ã¼ã¯ãã³
+STR_EXERCISE_HIIT$HIIT/é«å¼·åº¦ã¤ã³ã¿ã¼ãã«ãã¬ã¼ãã³ã°
+STR_EXERCISE_CROSSFIT$ãã£ãããã¹
+STR_EXERCISE_GROUPCALISTHENICS$ãã¹ã
+STR_EXERCISE_YOGA$ã¨ã¬
+STR_EXERCISE_YOGACAT$ã¨ã¬ç«å¼
+STR_EXERCISE_YOGACOW$ã¨ã¬çå¼
+STR_EXERCISE_YOGACOBRA$ã¨ã¬ã³ãã©å¼
+STR_EXERCISE_YOGAHERO1$ã¨ã¬ãã¼ãã¼å¼1
+STR_EXERCISE_YOGAHERO2$ã¨ã¬ãã¼ãã¼å¼2
+STR_EXERCISE_YOGAHERO3$ã¨ã¬ãã¼ãã¼å¼3
+STR_EXERCISE_YOGAROLLING$ã¨ã¬ãã¼ã©ã¼
+STR_EXERCISE_OUTDOORWALKING$å±å¤ã¦ã©ã¼ãã³ã°
+STR_EXERCISE_OUTDOORRUNNING$å±å¤ã©ã³ãã³ã°
+STR_EXERCISE_INDOORWALKING$ã¤ã³ãã¢ã¦ã©ã¼ãã³ã°
+STR_EXERCISE_INDOORRUNNING$ã¤ã³ãã¢ã©ã³ãã³ã°
+STR_EXERCISE_OUTDOORBIKING$å±å¤ãµã¤ã¯ãªã³ã°
+STR_EXERCISE_JUMPINGROPE$ç¸è·³ã³
+STR_EXERCISE_PILATES$ãã©ãã£ã¹
+STR_EXERCISE_CROSS_FIT$ããã¯ã¹ãã£ãããã¹
+STR_EXERCISE_FUNCTIONALTRAINING$æ©è½çãã¬ã¼ãã³ã°
+STR_EXERCISE_PHYSICALTRAINING$ä½åãã¬ã¼ãã³ã°
+STR_EXERCISE_TAEKWONDO$ãã³ã³ãã¼/ããã¯ãã¯ã·ã³ã°
+STR_EXERCISE_BOXING$ãã¯ã·ã³ã°
+STR_EXERCISE_KICKBOXING$ããã¯ãã¯ã·ã³ã°
+STR_EXERCISE_KARATE$空æ
+STR_EXERCISE_FENCING$ãã§ã³ã·ã³ã°
+STR_EXERCISE_CORETRAINING$ã³ã¢ãã¬ã¼ãã³ã°
+STR_EXERCISE_BODYCOMBAT$ãã¯ã·ã³ã°æé
¸ç´
+STR_EXERCISE_KENDO$å£é
+STR_EXERCISE_HORIZONTALBAR$鿣
+STR_EXERCISE_PARALLELBARS$å¹³è¡æ£
+STR_EXERCISE_CIRCUIT$ãµã¤ã¯ã«ãã¬ã¼ãã³ã°
+STR_EXERCISE_AEROBICS$ã¨ã¢ããã¯ã¹
+STR_EXERCISE_CALISTHENICE$ã¨ã¢ããã¯ã¹
+STR_EXERCISE_P90X$P90X
+STR_EXERCISE_KETTLEBELTRAINING$ããããã«ãã¬ã¼ãã³ã°
+STR_EXERCISE_MIXEDMARTIALARTS$ç·åæ ¼éæ
+STR_EXERCISE_STAIRCLIMBINGMACHINE$éæ®µæéæ©
+STR_EXERCISE_WEIGHTLIFTING$ã¦ã¨ã¤ããªããã£ã³ã°
+STR_EXERCISE_BARRE$Barre
+STR_EXERCISE_HANDCYCLING$ãã³ããã¤ã¼ã«
+STR_EXERCISE_TRACKFIELD$é¸ä¸
+STR_EXERCISE_WRESTLING$è§å
+STR_EXERCISE_MINDBODY$å¿èº«éå
+STR_EXERCISE_FLEXIBILITY$æè»ä½æ
+STR_EXERCISE_MIXEDCARDIO$æ··åæé
¸ç´
+STR_EXERCISE_TRADITIONALSTRENGTHTRAINING$徿¥ã®çåãã¬ã¼ãã³ã°
+STR_EXERCISE_CROSSTRAINING$ã¯ãã¹ãã¬ã¼ãã³ã°
+STR_EXERCISE_GYMNASTICS$使
+STR_EXERCISE_STEPTRAINING$ã¹ããããã¬ã¼ãã³ã°
+STR_EXERCISE_ELLIPTICALTRAINER$æ¥åãã·ã³
+STR_EXERCISE_ROWINGMACHINE$ãã¼ã¤ã³ã°ãã·ã³
+STR_DANCING_GENERAL$ä¸è¬ãã³ã¹
+STR_DANCING_BELLY$ããªã¼ãã³ã¹
+STR_DANCING_JAZZ$ã¸ã£ãºãã³ã¹
+STR_DANCING_LATIN$ã©ãã³ãã³ã¹
+STR_DANCING_BALLET$ãã¬ã¨
+STR_DANCING_STREET$ã¹ããªã¼ããã³ã¹
+STR_DANCING_PUBLICSQUARE$ã¹ã¯ã¨ã¢ãã³ã¹
+STR_DANCING_ZUMBA$ãºã³ã
+STR_DANCING_SOCIALDANCE$ã½ã·ã¢ã«ãã³ã¹
+STR_DANCING_TAPDANCE$ã¿ãããã³ã¹
+STR_RECREATIONAL_SPORTS$ä¸è¬ã¬ã¸ã£ã¼ã¹ãã¼ã
+STR_RECREATIONAL_SKATING$ãã¼ã©ã¼ã¹ã±ã¼ã
+STR_RECREATIONAL_MARTIALARTS$æ¦é
+STR_RECREATIONAL_TAICHI$太極æ³
+STR_RECREATIONAL_HULAHOOP$ãã©ãã¼ã
+STR_RECREATIONAL_DISCSPORT$ããªã¹ãã¼
+STR_RECREATIONAL_DARTS$ãã¼ã
+STR_RECREATIONAL_ARCHERY$ã¢ã¼ãã§ãªã¼
+STR_RECREATIONAL_HORSERIDING$馬ã«ä¹ã
+STR_RECREATIONAL_BATTLEGAME$対æ¦ã²ã¼ã
+STR_RECREATIONAL_KITE$å§æã
+STR_RECREATIONAL_TUGOFWAR$ç¶±å¼ã
+STR_RECREATIONAL_SWING$ãã©ã³ã³
+STR_RECREATIONAL_STAIRCLIMBING$éæ®µãç»ã
+STR_RECREATIONAL_OBSTACLERACE$é害ã¬ã¼ã¹
+STR_RECREATIONAL_FISHING$ãã£ãã·ã³ã°
+STR_RECREATIONAL_HUNTING$ç©ã
+STR_RECREATIONAL_SCOOTERRIDING$ã«ã¼ã
+STR_RECREATIONAL_PARAGLIDING$ãã©ã°ã©ã¤ãã¼
+STR_RECREATIONAL_TEAMSPORTS$ãã¼ã ç«¶æ
+STR_RECREATIONAL_FINESSGAMING$ãã£ãããã¹ã²ã¼ã
+STR_RECREATIONAL_HIKING$å¥è¡
+STR_RECREATIONAL_EQUESTRIANSPORTS$馬è¡ã¹ãã¼ã
+STR_RECREATIONAL_PLAY$éã³
+STR_BALL_GAMES$ä¸è¬çãªçæ
+STR_BALL_BADMINTON$ãããã³ãã³
+STR_BALL_TABLETENNIS$åç
+STR_BALL_TENNIS$ããã¹
+STR_BALL_BILLIARDS$ãã¼ã«
+STR_BALL_BOWLING$ãã¦ãªã³ã°
+STR_BALL_VOLLEYBALL$ãã¬ã¼ãã¼ã«
+STR_BALL_SHUTTLECOCK$ããç
+STR_BALL_HANDBALL$ãã³ããã¼ã«
+STR_BALL_BASEBALL$éç
+STR_BALL_SOFTBALL$ã½ãããã¼ã«
+STR_BALL_CRICKET$ã¯ãªã±ãã
+STR_BALL_FOOTBALL$ã¢ã¡ãªã«ã³ããããã¼ã«
+STR_BALL_BEACHSOCCER$ãã¼ããµãã«ã¼
+STR_BALL_BEACHVOLLEYBALL$ãã¼ããã¬ã¼ãã¼ã«
+STR_BALL_CROQUET$ã¯ãã±ãã
+STR_BALL_HOCKEY$ããã±ã¼
+STR_BALL_SQUASH$è±å½å¼ã¹ã«ãã·ã¥
+STR_BALL_SEPAKTAKRAW$ãã¸ãã¼ã«
+STR_BALL_DODGEBALL$ããã¸ãã¼ã«
+STR_BALL_BASKETBALL$ãã¹ã±ãããã¼ã«
+STR_BALL_SOCCER$ãµãã«ã¼ãã¼ã«
+STR_BALL_GOLF$ã´ã«ããã¼ã«
+STR_BALL_POLO$ãã
+STR_BALL_RACQUETBALL$ã¹ã«ãã·ã¥
+STR_BALL_RUGBY$ã©ã°ãã¼
+STR_BALL_GATEBALL$ã²ã¼ããã¼ã«
+STR_BALL_PICKLEBALL$ããã¯ãã¼ã«
+STR_BALL_LACROSSE$ããã°ã¹ãã£ãã¯
+STR_WATER_ACTIVITIES$ä¸è¬æ°´ä¸ã¢ã¯ãã£ããã£
+STR_WATER_SAILING$ã¨ãã
+STR_WATER_SURFING$ãµã¼ãã£ã³
+STR_WATER_WHITEWATERRAFTING$ãã¼ãã³ã°
+STR_WATER_CANOEING$ãã©ã´ã³ãã¼ãæ¼ã
+STR_WATER_KAYAKING$ãã¼ã
+STR_WATER_ROWING$ãã¼ã¤ã³ã°
+STR_WATER_MOTORBOAT$æ°´ä¸ãã¤ã¯
+STR_WATER_SUP$ããã«ãµã¼ãã£ã³
+STR_WATER_SCUBADIVING$ãã¤ãã³ã°
+STR_WATER_DIVING$é£ã³è¾¼ã¿
+STR_WATER_KITESURFING$ãã©ã°ã©ã¤ãã¼ãµã¼ãã£ã³
+STR_WATER_WAKEBOARDING$ã¦ã§ã¤ã¯ãã¼ã
+STR_WATER_POLO$æ°´ç
+STR_WATER_WINDSURFING$ã¦ã£ã³ããµã¼ãã£ã³
+STR_WATER_DRIFTING$ã©ããã£ã³ã°ã¢ã¯ãã£ããã£
+STR_WATER_FITNESS$ã¦ã©ã¼ã¿ã¼ãã£ãããã¹
+STR_WATER_SPORTS$ã¦ã©ã¼ã¿ã¼ã¹ãã¼ã
+STR_WATER_OUTDOORSWIM$ã¢ã¦ããã¢ã¹ã¤ãã³ã°
+STR_WATER_INDOORSWIM$ã¤ã³ãã¢ã¹ã¤ã
+STR_WATER_SWIMFREESTYLE$æ°´æ³³_ããªã¼ã¹ã¿ã¤ã«
+STR_WATER_SWIMBREASTSTROKE$æ°´æ³³_ã«ã¨ã«å¼
+STR_WATER_SWIMBACKSTROKE$æ°´æ³³_ä»°åã
+STR_WATER_SWIMBUTTERFLY$ã¹ã¤ã _ãã¿ãã©ã¤
+STR_ICE_SPORTS$ä¸è¬æ°·ä¸ã¹ãã¼ã
+STR_ICE_SKATING$ã¹ã±ã¼ã
+STR_ICE_HOCKEY$ã¢ã¤ã¹ããã±ã¼
+STR_ICE_CURLING$ã¢ã¤ã¹ã¹ãã¼ã³/ã«ã¼ãªã³ã°
+STR_ICE_SNOWMOBILING$ã¹ãã¼ã¢ã¼ãã«
+STR_ICE_SLED$ãã
+STR_ICE_BIATHLON$å¬ã®2ã¤
+STR_ICE_CROSSCOUNTRYSKING$ã¯ãã¹ã«ã³ããªã¼ã¹ãã¼
+STR_ICE_SKIING$ã¹ãã¼
+STR_ICE_SNOWBOARDING$ã¹ãã¼ãã¼ã/ã¹ãã¼ãã¼ã
+STR_ICE_SNOWSHOEING$ã¹ãã¼ã·ã¥ã¼å¥è¡
+STR_ICE_SNOWSPORTS$ã¹ãã¼ã¹ãã¼ã
+STR_EXTREME_SPORTS$ä¸è¬ã¨ã¯ã¹ããªã¼ã ã¹ãã¼ã
+STR_EXTREME_SKATEBOARDING$ã¹ã±ã¼ããã¼ã
+STR_EXTREME_ROCKCLIMBING$ããã¯ã¯ã©ã¤ãã³ã°
+STR_EXTREME_BUNGEEJUMPING$ãã¤ã¸ã£ã³ã/ãã³ã¸ã¼ã¸ã£ã³ãã¤ãã³ã
+STR_EXTREME_PARKOUR$ãã«ã¯ã¼ã«
+STR_EXTREME_BMX$BMX
+STR_EXTREME_ORIENTERING$ãªãªã¨ã³ãã¼ãªã³ã°
+STR_EXTREME_PARACHUTE$ã¹ã«ã¤ãã¤ãã³ã°
+STR_EXTREME_RACING$ã¬ã¼ã¹
+STR_EXTREME_TRIATHLONS$ãã©ã¤ã¢ã¹ãã³
+STR_OTHER_ELEVATOR$ã¨ã¬ãã¼ã¿ã¼ã«ä¹ã
+STR_OTHER_ESCALATOR$ã¨ã¹ã«ã¬ã¼ã¿ã¼
+STR_OTHER_GARDENING$ã¬ã¼ããã³ã°ããã
+STR_OTHER_HORSEWORK$å®¶äºããã
+STR_OTHER_INVEHICLE$è»ã®ä¸ã§
+STR_OTHER_MEDITATION$çæ³ãã
+STR_OTHER_STILL$鿢
+STR_OTHER_TILTING$徿
+STR_OTHER_WHEELCHAIR$è»æ¤
åã§ç§»å
+STR_EXERCISE_LIST$ãã£ãããã¹ã¯ã©ã¹
+STR_BALL_LIST$ãã¼ã«
+STR_WATER_LIST$ã¦ã©ã¼ã¿ã¼ã¹ãã¼ã
+STR_DANCING_LIST$ãã³ã¹ã¯ã©ã¹
+STR_EXTREME_LIST$ã¨ã¯ã¹ããªã¼ã ã¹ãã¼ã
+STR_ICE_LIST$ã¢ã¤ã¹ã¹ãã¼ã
+STR_RECREATIONAL_LIST$ã¬ã¸ã£ã¼ã¹ãã¼ã
+STR_OTHER_LIST$ãã®ä»
+STR_DANCING_TITLE$ãã³ã¹ã¹ãã¼ã
+STR_BALL_LIST_TITLE$çæ
+STR_OTHER_TITLE$ãã®ä»ã®ã¹ãã¼ã
+STR_EXERCISE_TITLE$ãã£ãããã¹ã¹ãã¼ã
+STR_TRAINING$ãã¬ã¼ãã³ã°
+STR_RAPID_TRAINING$ã¯ã¤ãã¯ãã¬ã¼ãã³ã°
+STR_SET_GOALS$ç®æ¨ã®è¨å®>
+STR_DURATION$æé
+STR_DURATION_SETTING$æéè¨å®
+STR_MINUTES$å
+STR_CALORIE$ã«ããªã¼
+STR_CALORIE_SETTING$ã«ããªã¼è¨å®
+STR_KILOCALORIE$kcal
+STR_DISTANCE$è·é¢
+STR_RANGE_SETTING$è·é¢è¨å®{{STR_RANGE_SETTING$ããããã£ã¦ã}}
+STR_METER$ã¡ã¼ãã«
+STR_KILOMETRE$ããã¡ã¼ãã«
+STR_STEP_NUMBER$ã¹ãããæ°
+STR_STEP_SETTING$ã¹ãããè¨å®
+STR_STEP$ã¹ããã
+STR_HEART_RATE$å¿ææ°
+STR_MEAN_HEART_RATE$å¹³åå¿ææ°
+STR_TIMES_PER_MIN$å/å
+STR_MEAN_HEART_RATE_MIN$å¹³åå¿ææ°ï¼å/åï¼
+STR_IN_THE$ã§
+STR_LOWER_STRENGTH$ä½å¼·åº¦
+STR_MEDIUM_STRENGTH$ä¸ç¨åº¦ã®å¼·ã
+STR_HIGH_STRENGTH$é«å¼·åº¦
+STR_ULTRA_HIGH_STRENGTH$è¶
é«å¼·åº¦
+STR_TRAINING_INTENSITY$ãã¬ã¼ãã³ã°å¼·åº¦
+STR_TRAINING_INTENSITY_DESCRIPTION$ãã¬ã¼ãã³ã°å¼·åº¦ã¯ããã¬ã¼ãã³ã°ä¸è¶³ããã¬ã¼ãã³ã°éå¤ãã夿ããããã«ç¨ããããå¿ææ°ãã©ãã ãå¢å ãããéå強度ãæé©ã§ãããã夿ããã
+STR_INTENSITY_INTERVAL_DESCRIPTION$ãã®å¼·åº¦åºéã¯ç®æ¨å¿ææ°ï¼åäººåºæ¬è³æããè¨ç®ï¼ã®å¼·å¼±ã«å¯¾å¿ãããªã¢ã«ã¿ã¤ã ç¶æ
表示ã§ãããè¨ç·´ã®è³ªãé«ããã®ã«å½¹ç«ã¤ã
+STR_TRAINING_STATE_MEANING$ãã¬ã¼ãã³ã°ç¶æ
ä»£è¡¨ã®æå³
+STR_WARM_UP_EXERCISE$ã¦ã©ã¼ãã³ã°ã¢ãã
+STR_FAT_BURNING_ZONE$èèªçç¼ã¾ã¼ã³
+STR_IMPROVE_CARDIOPULMONARY_FUNCTION$å¿èºæ©è½ã®åä¸
+STR_PROFESSIONAL_ATHLETE$ããã¹ãã¼ã鏿
+STR_TRAINING_INTENSITY_NOTE$注ï¼ãã®ãã¬ã¼ãã³ã°å¼·åº¦ã¯ããã®éåè©ä¾¡ã§ã¯ãªãããã¼ã¿ã¯åèã«ãã¦ãã ããã
+STR_TRAINING_IN_PROGRESS$ãã¬ã¼ãã³ã°ä¸
+STR_BREAK_TRAINING$ãã¬ã¼ãã³ã°ä¸æåæ¢
+STR_FINISH$ã®çµäº
+STR_PAUSE$䏿忢
+STR_RESUME$ç¶è¡
+STR_GOAL_ACHIEVED$ç®æ¨ãéæãã¾ãã
+STR_ACCOMPLISH_GOAL$å®äºç®æ¨
+STR_OK$OK
+STR_LOOK_OUT$注æ
+STR_INSUFFICENT_EXERCISE_AMOUNT$ç¾å¨ã®éåéãå°ãããã¦è¨é²ã§ãã¾ãããéåãçµäºãããã©ãã
+STR_END_MOVEMENT$ã¢ã¼ã·ã§ã³ã®çµäº
+STR_END_THIS_MOVEMENT$ãã®éåãçµäºãããã©ãã
+STR_GOAL_ACCOMPLISHMENT_DEGREE$ç®æ¨éæåº¦
+STR_TRAINING_DURATION$ãã¬ã¼ãã³ã°æé
+STR_OFF$ãªã
+STR_MORE$以ä¸
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml
new file mode 100644
index 000000000..b539e5fba
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
index 76f0859e3..3a3fe5eb2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
@@ -31,9 +31,14 @@ def generate_xml_from_list(input_list, output_file, lang, delimiter):
# ä»å¤é¨æä»¶è¯»åä¸åè¯è¨çåè¡¨æ°æ®ï¼ä½¿ç¨ç¹æ®åé符
input_list_en = read_list_from_file("./input_list_en.txt", "$")
input_list_zh = read_list_from_file("./input_list_zh.txt", "$")
+input_list_ja = read_list_from_file("./input_list_ja.txt", "$")
+input_list_de = read_list_from_file("./input_list_de.txt", "$")
+
# çæä¸åè¯è¨ç XML æä»¶ï¼ä½¿ç¨ç¹æ®åé符
generate_xml_from_list(input_list_en, "./language_en.xml", "en", "$")
generate_xml_from_list(input_list_zh, "./language_zh.xml", "zh", "$")
+generate_xml_from_list(input_list_ja, "./language_ja.xml", "ja", "$")
+generate_xml_from_list(input_list_de, "./language_de.xml", "de", "$")
print("XMLæä»¶çæå®æã")
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
index bd25ae2c5..c011d799b 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang
new file mode 100644
index 000000000..0cbfc10dc
Binary files /dev/null and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
index 62f10104b..08b42bdb4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -51,7 +51,7 @@ enum UIResourceTextId : uint16_t {
STR_EXERCISE_AEROBICS = 38,
STR_EXERCISE_CALISTHENICE = 39,
STR_EXERCISE_P90X = 40,
- STR_EXERCISE_KETTLEBELLTRAINING = 41,
+ STR_EXERCISE_KETTLEBELTRAINING = 41,
STR_EXERCISE_MIXEDMARTIALARTS = 42,
STR_EXERCISE_STAIRCLIMBINGMACHINE = 43,
STR_EXERCISE_WEIGHTLIFTING = 44,
@@ -173,7 +173,7 @@ enum UIResourceTextId : uint16_t {
STR_EXTREME_BUNGEEJUMPING = 160,
STR_EXTREME_PARKOUR = 161,
STR_EXTREME_BMX = 162,
- STR_EXTREME_ORIENTEERING = 163,
+ STR_EXTREME_ORIENTERING = 163,
STR_EXTREME_PARACHUTE = 164,
STR_EXTREME_RACING = 165,
STR_EXTREME_TRIATHLONS = 166,
@@ -241,17 +241,21 @@ enum UIResourceTextId : uint16_t {
STR_ACCOMPLISH_GOAL = 228,
STR_OK = 229,
STR_LOOK_OUT = 230,
- STR_INSUFFICIENT_EXERCISE_AMOUNT = 231,
+ STR_INSUFFICENT_EXERCISE_AMOUNT = 231,
STR_END_MOVEMENT = 232,
STR_END_THIS_MOVEMENT = 233,
STR_GOAL_ACCOMPLISHMENT_DEGREE = 234,
STR_TRAINING_DURATION = 235,
STR_OFF = 236,
STR_MORE = 237,
- STR_MAX_ID = 238,
+ STR_EXERCISE_KETTLEBELLTRAINING = 238,
+ STR_EXTREME_ORIENTEERING = 239,
+ STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,
+ STR_MAX_ID = 241,
}; // UIResourceTextId
enum FontLanguageId : uint8_t {
+ LANGUAGE_ID_JA,
LANGUAGE_ID_ZH,
LANGUAGE_ID_EN,
LANGUAGE_ID_MAX
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
index 68dfe8412..cd291d402 100644
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
index 989bde908..a7ebae573 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
@@ -27,7 +27,7 @@ namespace OHOS
int GetHeartData(void);
private:
- float heartRate_ = 67.0; // 67.0: default heart value as reference
+ float heartRate_ = 0; // 67.0: default heart value as reference
};
}
#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSPO2.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSPO2.h
index 44088c563..7d7ee1ea4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSPO2.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSPO2.h
@@ -27,7 +27,7 @@ namespace OHOS
int GetSPO2Data();
private:
- float SPO2_ = 97; // 97.0: default SPO2 value as reference
+ float SPO2_ = 0; // 97.0: default SPO2 value as reference
};
}
#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h
index 412007dbf..4992777ff 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelSteps.h
@@ -24,7 +24,7 @@ public:
void UpdateSteps(int16_t steps);
private:
- float steps_ = 11520.0; // 11520.0: default step value as reference
+ float steps_ = 0; // 11520.0: default step value as reference
};
}
#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
index 152a43396..75bbae9bc 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
@@ -212,7 +212,7 @@ namespace OHOS
labelButton8_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
// Set additional property
- labelButton8_->SetText("è¡å°å°");
+ labelButton8_->SetText("å¼ ä¸");
labelButton8_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);
labelButton8_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
@@ -255,7 +255,7 @@ namespace OHOS
labelButton9_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
// Set additional property
- labelButton9_->SetText("å¤é");
+ labelButton9_->SetText("å¾ä¸");
labelButton9_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);
labelButton9_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
@@ -356,7 +356,7 @@ namespace OHOS
labelButton13_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
// Set additional property
- labelButton13_->SetText("äºæå¤©");
+ labelButton13_->SetText("æå");
labelButton13_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);
labelButton13_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
@@ -414,7 +414,7 @@ namespace OHOS
labelButton11_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
// Set additional property
- labelButton11_->SetText("èè¸è¸");
+ labelButton11_->SetText("çå
");
labelButton11_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);
labelButton11_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp
index d924430ce..ca5fece4d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp
@@ -1,6 +1,6 @@
#include "AppViewIDs.h"
#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
#include "NativeAbility.h"
#include
@@ -78,7 +78,7 @@ namespace OHOS
}
if (strcmp(view.GetViewId(), BUTTONYES) == 0)
{
- //NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING);
+ NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING);
}
return true;
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
index e0bbd862c..45e9474ee 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -99,6 +99,7 @@ namespace OHOS
{
NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCONTROL);
}
+
return true;
}
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
index 95f635b88..70580c9a2 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
@@ -45,7 +45,7 @@ namespace OHOS
UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent();
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(sporttitle_, 137, 52, 200, 200, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(sporttitle_, 137, 52, 200, 80, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
container_->Add(sporttitle_);
// åå§åButton
TraingModel::GetInstance()->InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
index 472b82c66..c475f049a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -2,13 +2,14 @@
#include "AppViewIDs.h"
#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
#include "NativeAbility.h"
#include
#include
#include
#include "traing/include/TraingPresenter.h"
+#include "traing/include/TraingModel.h"
// #include "TraingView.h"
namespace OHOS
@@ -16,15 +17,18 @@ namespace OHOS
// å½åPresenter屿§å®ä¾åçå
åæé
static TraingPresenter *g_pTraingPresenter = nullptr;
+ QuickTraining *data = new QuickTraining;
TraingPresenter::TraingPresenter()
{
+ data = TraingModel::GetInstance()->GetQuickTraining();
g_pTraingPresenter = this;
}
TraingPresenter::~TraingPresenter()
{
g_pTraingPresenter = nullptr;
+ delete data;
}
TraingPresenter *TraingPresenter::GetInstance()
@@ -60,22 +64,34 @@ namespace OHOS
UNUSED(view);
if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
{
- NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM);
+ NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
}
return true;
}
bool TraingPresenter::OnClick(UIView &view, const ClickEvent &event)
{
- // æ ¹æ®æ§ä»¶idæ¥æ¾æ¯åªä¸ªæ§ä»¶è§¦åäºç¹å»åè°
if (strcmp(view.GetViewId(), BUTTON1) == 0)
{
- NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
+ NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+ TraingModel::GetInstance()->SetSportEvent(data->training1_Text);
+ }
+ if (strcmp(view.GetViewId(), BUTTON2) == 0)
+ {
+ NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+ TraingModel::GetInstance()->SetSportEvent(data->training2_Text);
+ }
+ if (strcmp(view.GetViewId(), BUTTON3) == 0)
+ {
+ NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+ TraingModel::GetInstance()->SetSportEvent(data->training3_Text);
}
if (strcmp(view.GetViewId(), BUTTONMORE) == 0)
{
NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
}
+
+ delete data;
return true;
}
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
index d25d5e15c..37c53277b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
@@ -18,7 +18,7 @@
namespace OHOS
{
static Training_CardView *g_pTraining_CardView{nullptr};
- QuickTraining *data = new QuickTraining;
+ static QuickTraining *data = new QuickTraining;
Training_CardView::Training_CardView()
{
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
index 70ecae192..c6a263514 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
@@ -25,7 +25,7 @@
#include "traing/training_list_fitness/include/TraingFitnessPresenter.h"
#include "traing/training_list_fitness/include/TraingFitnessView.h"
// #include "TraingFitnessView.h"
-
+#include "traing/include/TraingModel.h"
namespace OHOS
{
extern const char *Fitness_buttons[];
@@ -101,6 +101,8 @@ namespace OHOS
UNUSED(event);
TraingFitnessItemView *itemView = static_cast(&view);
AppViewId viewId = itemView->GetTraingFitnessIndex();
+ UIResourceTextId sportid = itemView->GetTraingFitnessId();
+ TraingModel::GetInstance()->SetSportEvent(sportid);
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d\n", viewId);
if (viewId < VIEW_MAX_INTER_APP)
{
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index bd25ae2c5..c011d799b 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
new file mode 100644
index 000000000..0cbfc10dc
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 62f10104b..08b42bdb4 100644
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -51,7 +51,7 @@ enum UIResourceTextId : uint16_t {
STR_EXERCISE_AEROBICS = 38,
STR_EXERCISE_CALISTHENICE = 39,
STR_EXERCISE_P90X = 40,
- STR_EXERCISE_KETTLEBELLTRAINING = 41,
+ STR_EXERCISE_KETTLEBELTRAINING = 41,
STR_EXERCISE_MIXEDMARTIALARTS = 42,
STR_EXERCISE_STAIRCLIMBINGMACHINE = 43,
STR_EXERCISE_WEIGHTLIFTING = 44,
@@ -173,7 +173,7 @@ enum UIResourceTextId : uint16_t {
STR_EXTREME_BUNGEEJUMPING = 160,
STR_EXTREME_PARKOUR = 161,
STR_EXTREME_BMX = 162,
- STR_EXTREME_ORIENTEERING = 163,
+ STR_EXTREME_ORIENTERING = 163,
STR_EXTREME_PARACHUTE = 164,
STR_EXTREME_RACING = 165,
STR_EXTREME_TRIATHLONS = 166,
@@ -241,17 +241,21 @@ enum UIResourceTextId : uint16_t {
STR_ACCOMPLISH_GOAL = 228,
STR_OK = 229,
STR_LOOK_OUT = 230,
- STR_INSUFFICIENT_EXERCISE_AMOUNT = 231,
+ STR_INSUFFICENT_EXERCISE_AMOUNT = 231,
STR_END_MOVEMENT = 232,
STR_END_THIS_MOVEMENT = 233,
STR_GOAL_ACCOMPLISHMENT_DEGREE = 234,
STR_TRAINING_DURATION = 235,
STR_OFF = 236,
STR_MORE = 237,
- STR_MAX_ID = 238,
+ STR_EXERCISE_KETTLEBELLTRAINING = 238,
+ STR_EXTREME_ORIENTEERING = 239,
+ STR_INSUFFICIENT_EXERCISE_AMOUNT = 240,
+ STR_MAX_ID = 241,
}; // UIResourceTextId
enum FontLanguageId : uint8_t {
+ LANGUAGE_ID_JA,
LANGUAGE_ID_ZH,
LANGUAGE_ID_EN,
LANGUAGE_ID_MAX
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 68dfe8412..cd291d402 100644
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ