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