增加语言脚本 优化语言Slice位置

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index 6953c70..4a17e0b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -305,11 +305,11 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/countdown/src/StartCountDownView.cpp
 
     # 语言切换
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchListAdapter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchListitemView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchPresenter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchView.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/src/LanguageSwitchModel.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/src/LanguageSwitchView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/src/LanguageSwitchModel.cpp
 
     #秒表
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
@@ -337,7 +337,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/motionrecognition/src/MotionRecognitionView.cpp
 
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/language/LanguageInit.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/languagecode/LanguageInit.cpp
 
     #查找手机
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/findphone/src/FindPhonePresenter.cpp

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 3b9c238..4506ada 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -118,7 +118,7 @@
 #include "common/graphic_startup.h"
 #include "font/ui_font.h"
 #include "font/font_global_manager.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 
 #include "rotate/include/RotateView.h"
 #include "rotate/include/RotatePresenter.h"
@@ -159,8 +159,8 @@
 #include "findphone/include/FindPhonePresenter.h"
 #include "findphone/include/FindPhoneView.h"
 
-#include "language/include/LanguageSwitchPresenter.h"
-#include "language/include/LanguageSwitchView.h"
+#include "languagecode/include/LanguageSwitchPresenter.h"
+#include "languagecode/include/LanguageSwitchView.h"
 
 #include "stopwatch/include/MainStopWatchPresenter.h"
 #include "stopwatch/include/MainStopWatchView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceChatContentListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceChatContentListAdapter.h
index 0826b7d..5bbb8c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceChatContentListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AivoiceChatContentListAdapter.h
@@ -3,7 +3,7 @@
  * @Date: 2024-03-28 14:26:55
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-07-05 20:57:34
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/AivoiceChatContentListAdapter.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/AivoiceChatContentListAdapter.h
  */
 #ifndef AIVOICE_CHAT_CONTENT_LIST_ADAPTER_H
 #define AIVOICE_CHAT_CONTENT_LIST_ADAPTER_H
@@ -11,7 +11,7 @@
 #include "components/abstract_adapter.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_list.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 #include "UiConfig.h"
 #include <list>
 #include "aivoice/include/AivoiceChatContentListItemView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index f9f33ae..38ce1d8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -133,12 +133,12 @@ extern "C"
         IUnknown *api = NULL;\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic);\r
 \r
-       \r
         void *publishData = nullptr;\r
         if (size > 0)\r
         {\r
             publishData = malloc(size);\r
-            if (publishData == nullptr) {\r
+            if (publishData == nullptr)\r
+            {\r
                 return;\r
             }\r
             ret = memcpy_s(publishData, size, (const void *)data, size);\r
@@ -149,9 +149,9 @@ extern "C"
                 return;\r
             }\r
         }\r
-  \r
-        Request request = {.msgId = topic, .len = size, .msgValue = 0,.data = publishData};\r
-        \r
+\r
+        Request request = {.msgId = topic, .len = size, .msgValue = 0, .data = publishData};\r
+\r
         /* public request */\r
         api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);\r
         if (api == NULL)\r
@@ -182,12 +182,12 @@ extern "C"
 \r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish topic=%u!!", topic);\r
 \r
-\r
         void *publishData = nullptr;\r
         if (size > 0)\r
         {\r
             publishData = malloc(size);\r
-            if (publishData == nullptr) {\r
+            if (publishData == nullptr)\r
+            {\r
                 return;\r
             }\r
             ret = memcpy_s(publishData, size, (const void *)&data, size);\r
@@ -198,9 +198,9 @@ extern "C"
                 return;\r
             }\r
         }\r
-  \r
-        Request request = {.msgId = topic, .len = size, .msgValue = 0,.data = publishData};\r
-        \r
+\r
+        Request request = {.msgId = topic, .len = size, .msgValue = 0, .data = publishData};\r
+\r
         /* public request */\r
         api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);\r
         if (api == nullptr)\r
@@ -299,9 +299,9 @@ extern "C"
                 {\r
                     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "It's bedtime in 20 minutes");\r
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "20分钟后要睡觉啦!");\r
-                    AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
                     // 设置状态为睡眠提醒\r
                     OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEEPNOTIFY);\r
+                    AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
                 }\r
             }\r
             // 退出睡眠模式\r
@@ -311,12 +311,12 @@ extern "C"
                 uapi_dev_runtime_set_nap_status(1);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");\r
+                // 设置状态为小睡\r
+                OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
                     // 早安提醒\r
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
-                    // 设置状态为小睡\r
-                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
                 }\r
                 if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())\r
                 {\r
@@ -333,11 +333,11 @@ extern "C"
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
                 // 睡眠弹窗\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");\r
+                // 设置状态为睡眠\r
+                OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP);\r
                 if (curTime.tm_hour == sleep_time_hour && curTime.tm_min == sleep_time_min && curTime.tm_sec == 0)\r
                 {\r
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
-                    // 设置状态为睡眠\r
-                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP);\r
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据\r
                 }\r
                 if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb())\r

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
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
index 4bad2f5..bd842a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
@@ -468,4 +468,8 @@ STR_THINKING$Thinking
 STR_CANCEL$Cancel\r
 STR_CONNECT_TIMEOUT$Connection Timeout\r
 STR_PLEASE_RESTART_CHAT$Please restart the conversation\r
-STR_CONTINUE_CHAT$Continue the conversation
\ No newline at end of file
+STR_CONTINUE_CHAT$Continue the conversation\r
+STR_AIMODELS_DOUBAO$Cici\r
+STR_AIMODES_WENXINYIYAN$ERNIE Bot\r
+STR_AIMODES_KIMI$Kimi\r
+STR_AIMODES_CHATGPT$ChatGPT
\ No newline at end of file

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
deleted file mode 100644 (file)
index 3e6867e..0000000
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_ja.txt
+++ /dev/null
@@ -1,238 +0,0 @@
-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/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
index 7b00911..407425a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
@@ -468,4 +468,8 @@ STR_THINKING$正在思考...
 STR_CANCEL$取消\r
 STR_CONNECT_TIMEOUT$连接超时\r
 STR_PLEASE_RESTART_CHAT$请重新开始对话\r
-STR_CONTINUE_CHAT$继续对话
\ No newline at end of file
+STR_CONTINUE_CHAT$继续对话\r
+STR_AIMODELS_DOUBAO$豆包\r
+STR_AIMODES_WENXINYIYAN$文心一言\r
+STR_AIMODES_KIMI$Kimi\r
+STR_AIMODES_CHATGPT$ChatGPT
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
index 1335d7b..be26e19 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
@@ -470,4 +470,8 @@
        <lanstr id="STR_CONNECT_TIMEOUT" value="Connection Timeout"/>
        <lanstr id="STR_PLEASE_RESTART_CHAT" value="Please restart the conversation"/>
        <lanstr id="STR_CONTINUE_CHAT" value="Continue the conversation"/>
+       <lanstr id="STR_AIMODELS_DOUBAO" value="Cici"/>
+       <lanstr id="STR_AIMODES_WENXINYIYAN" value="ERNIE Bot"/>
+       <lanstr id="STR_AIMODES_KIMI" value="Kimi"/>
+       <lanstr id="STR_AIMODES_CHATGPT" value="ChatGPT"/>
 </language>

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
deleted file mode 100644 (file)
index b539e5f..0000000
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<language id="language" direct="ltr" languageinfo="ja">
-       <lanstr id="STR_EXERCISE_GENERAL" value="一般的なトレーニング"/>
-       <lanstr id="STR_EXERCISE_FREETRAINING" value="フリートレーニング"/>
-       <lanstr id="STR_EXERCISE_RESISTANCETRAINING" value="筋力トレーニング"/>
-       <lanstr id="STR_EXERCISE_SPINBIKE" value="フライカート/室内フィットネスカート"/>
-       <lanstr id="STR_EXERCISE_TREADMILL" value="ステッパー"/>
-       <lanstr id="STR_EXERCISE_STROLLMACHINE" value="ウォークマン"/>
-       <lanstr id="STR_EXERCISE_HIIT" value="HIIT/高強度インターバルトレーニング"/>
-       <lanstr id="STR_EXERCISE_CROSSFIT" value="フィットネス"/>
-       <lanstr id="STR_EXERCISE_GROUPCALISTHENICS" value="マステ"/>
-       <lanstr id="STR_EXERCISE_YOGA" value="ヨガ"/>
-       <lanstr id="STR_EXERCISE_YOGACAT" value="ヨガ猫式"/>
-       <lanstr id="STR_EXERCISE_YOGACOW" value="ヨガ牛式"/>
-       <lanstr id="STR_EXERCISE_YOGACOBRA" value="ヨガコブラ式"/>
-       <lanstr id="STR_EXERCISE_YOGAHERO1" value="ヨガヒーロー式1"/>
-       <lanstr id="STR_EXERCISE_YOGAHERO2" value="ヨガヒーロー式2"/>
-       <lanstr id="STR_EXERCISE_YOGAHERO3" value="ヨガヒーロー式3"/>
-       <lanstr id="STR_EXERCISE_YOGAROLLING" value="ヨガローラー"/>
-       <lanstr id="STR_EXERCISE_OUTDOORWALKING" value="屋外ウォーキング"/>
-       <lanstr id="STR_EXERCISE_OUTDOORRUNNING" value="屋外ランニング"/>
-       <lanstr id="STR_EXERCISE_INDOORWALKING" value="インドアウォーキング"/>
-       <lanstr id="STR_EXERCISE_INDOORRUNNING" value="インドアランニング"/>
-       <lanstr id="STR_EXERCISE_OUTDOORBIKING" value="屋外サイクリング"/>
-       <lanstr id="STR_EXERCISE_JUMPINGROPE" value="縄跳び"/>
-       <lanstr id="STR_EXERCISE_PILATES" value="ピラティス"/>
-       <lanstr id="STR_EXERCISE_CROSS_FIT" value="ミックスフィットネス"/>
-       <lanstr id="STR_EXERCISE_FUNCTIONALTRAINING" value="機能的トレーニング"/>
-       <lanstr id="STR_EXERCISE_PHYSICALTRAINING" value="体力トレーニング"/>
-       <lanstr id="STR_EXERCISE_TAEKWONDO" value="テコンドー/キックボクシング"/>
-       <lanstr id="STR_EXERCISE_BOXING" value="ボクシング"/>
-       <lanstr id="STR_EXERCISE_KICKBOXING" value="キックボクシング"/>
-       <lanstr id="STR_EXERCISE_KARATE" value="空手"/>
-       <lanstr id="STR_EXERCISE_FENCING" value="フェンシング"/>
-       <lanstr id="STR_EXERCISE_CORETRAINING" value="コアトレーニング"/>
-       <lanstr id="STR_EXERCISE_BODYCOMBAT" value="ボクシング有酸素"/>
-       <lanstr id="STR_EXERCISE_KENDO" value="剣道"/>
-       <lanstr id="STR_EXERCISE_HORIZONTALBAR" value="鉄棒"/>
-       <lanstr id="STR_EXERCISE_PARALLELBARS" value="平行棒"/>
-       <lanstr id="STR_EXERCISE_CIRCUIT" value="サイクルトレーニング"/>
-       <lanstr id="STR_EXERCISE_AEROBICS" value="エアロビクス"/>
-       <lanstr id="STR_EXERCISE_CALISTHENICE" value="エアロビクス"/>
-       <lanstr id="STR_EXERCISE_P90X" value="P90X"/>
-       <lanstr id="STR_EXERCISE_KETTLEBELTRAINING" value="ポットベルトレーニング"/>
-       <lanstr id="STR_EXERCISE_MIXEDMARTIALARTS" value="総合格闘技"/>
-       <lanstr id="STR_EXERCISE_STAIRCLIMBINGMACHINE" value="階段昇降機"/>
-       <lanstr id="STR_EXERCISE_WEIGHTLIFTING" value="ウエイトリフティング"/>
-       <lanstr id="STR_EXERCISE_BARRE" value="Barre"/>
-       <lanstr id="STR_EXERCISE_HANDCYCLING" value="ハンドホイール"/>
-       <lanstr id="STR_EXERCISE_TRACKFIELD" value="陸上"/>
-       <lanstr id="STR_EXERCISE_WRESTLING" value="角力"/>
-       <lanstr id="STR_EXERCISE_MINDBODY" value="心身運動"/>
-       <lanstr id="STR_EXERCISE_FLEXIBILITY" value="柔軟体操"/>
-       <lanstr id="STR_EXERCISE_MIXEDCARDIO" value="混合有酸素"/>
-       <lanstr id="STR_EXERCISE_TRADITIONALSTRENGTHTRAINING" value="従来の筋力トレーニング"/>
-       <lanstr id="STR_EXERCISE_CROSSTRAINING" value="クロストレーニング"/>
-       <lanstr id="STR_EXERCISE_GYMNASTICS" value="体操"/>
-       <lanstr id="STR_EXERCISE_STEPTRAINING" value="ステップトレーニング"/>
-       <lanstr id="STR_EXERCISE_ELLIPTICALTRAINER" value="楕円マシン"/>
-       <lanstr id="STR_EXERCISE_ROWINGMACHINE" value="ローイングマシン"/>
-       <lanstr id="STR_DANCING_GENERAL" value="一般ダンス"/>
-       <lanstr id="STR_DANCING_BELLY" value="ベリーダンス"/>
-       <lanstr id="STR_DANCING_JAZZ" value="ジャズダンス"/>
-       <lanstr id="STR_DANCING_LATIN" value="ラテンダンス"/>
-       <lanstr id="STR_DANCING_BALLET" value="バレエ"/>
-       <lanstr id="STR_DANCING_STREET" value="ストリートダンス"/>
-       <lanstr id="STR_DANCING_PUBLICSQUARE" value="スクエアダンス"/>
-       <lanstr id="STR_DANCING_ZUMBA" value="ズンバ"/>
-       <lanstr id="STR_DANCING_SOCIALDANCE" value="ソシアルダンス"/>
-       <lanstr id="STR_DANCING_TAPDANCE" value="タップダンス"/>
-       <lanstr id="STR_RECREATIONAL_SPORTS" value="一般レジャースポーツ"/>
-       <lanstr id="STR_RECREATIONAL_SKATING" value="ローラースケート"/>
-       <lanstr id="STR_RECREATIONAL_MARTIALARTS" value="武道"/>
-       <lanstr id="STR_RECREATIONAL_TAICHI" value="太極拳"/>
-       <lanstr id="STR_RECREATIONAL_HULAHOOP" value="フラフープ"/>
-       <lanstr id="STR_RECREATIONAL_DISCSPORT" value="フリスビー"/>
-       <lanstr id="STR_RECREATIONAL_DARTS" value="ダーツ"/>
-       <lanstr id="STR_RECREATIONAL_ARCHERY" value="アーチェリー"/>
-       <lanstr id="STR_RECREATIONAL_HORSERIDING" value="馬に乗る"/>
-       <lanstr id="STR_RECREATIONAL_BATTLEGAME" value="対戦ゲーム"/>
-       <lanstr id="STR_RECREATIONAL_KITE" value="凧揚げ"/>
-       <lanstr id="STR_RECREATIONAL_TUGOFWAR" value="綱引き"/>
-       <lanstr id="STR_RECREATIONAL_SWING" value="ブランコ"/>
-       <lanstr id="STR_RECREATIONAL_STAIRCLIMBING" value="階段を登る"/>
-       <lanstr id="STR_RECREATIONAL_OBSTACLERACE" value="障害レース"/>
-       <lanstr id="STR_RECREATIONAL_FISHING" value="フィッシング"/>
-       <lanstr id="STR_RECREATIONAL_HUNTING" value="狩り"/>
-       <lanstr id="STR_RECREATIONAL_SCOOTERRIDING" value="カート"/>
-       <lanstr id="STR_RECREATIONAL_PARAGLIDING" value="パラグライダー"/>
-       <lanstr id="STR_RECREATIONAL_TEAMSPORTS" value="チーム競技"/>
-       <lanstr id="STR_RECREATIONAL_FINESSGAMING" value="フィットネスゲーム"/>
-       <lanstr id="STR_RECREATIONAL_HIKING" value="健行"/>
-       <lanstr id="STR_RECREATIONAL_EQUESTRIANSPORTS" value="馬術スポーツ"/>
-       <lanstr id="STR_RECREATIONAL_PLAY" value="遊び"/>
-       <lanstr id="STR_BALL_GAMES" value="一般的な球技"/>
-       <lanstr id="STR_BALL_BADMINTON" value="バドミントン"/>
-       <lanstr id="STR_BALL_TABLETENNIS" value="卓球"/>
-       <lanstr id="STR_BALL_TENNIS" value="テニス"/>
-       <lanstr id="STR_BALL_BILLIARDS" value="ボール"/>
-       <lanstr id="STR_BALL_BOWLING" value="ボウリング"/>
-       <lanstr id="STR_BALL_VOLLEYBALL" value="バレーボール"/>
-       <lanstr id="STR_BALL_SHUTTLECOCK" value="けん玉"/>
-       <lanstr id="STR_BALL_HANDBALL" value="ハンドボール"/>
-       <lanstr id="STR_BALL_BASEBALL" value="野球"/>
-       <lanstr id="STR_BALL_SOFTBALL" value="ソフトボール"/>
-       <lanstr id="STR_BALL_CRICKET" value="クリケット"/>
-       <lanstr id="STR_BALL_FOOTBALL" value="アメリカンフットボール"/>
-       <lanstr id="STR_BALL_BEACHSOCCER" value="ビーチサッカー"/>
-       <lanstr id="STR_BALL_BEACHVOLLEYBALL" value="ビーチバレーボール"/>
-       <lanstr id="STR_BALL_CROQUET" value="クロケット"/>
-       <lanstr id="STR_BALL_HOCKEY" value="ホッケー"/>
-       <lanstr id="STR_BALL_SQUASH" value="英国式スカッシュ"/>
-       <lanstr id="STR_BALL_SEPAKTAKRAW" value="フジボール"/>
-       <lanstr id="STR_BALL_DODGEBALL" value="ドッジボール"/>
-       <lanstr id="STR_BALL_BASKETBALL" value="バスケットボール"/>
-       <lanstr id="STR_BALL_SOCCER" value="サッカーボール"/>
-       <lanstr id="STR_BALL_GOLF" value="ゴルフボール"/>
-       <lanstr id="STR_BALL_POLO" value="ポロ"/>
-       <lanstr id="STR_BALL_RACQUETBALL" value="スカッシュ"/>
-       <lanstr id="STR_BALL_RUGBY" value="ラグビー"/>
-       <lanstr id="STR_BALL_GATEBALL" value="ゲートボール"/>
-       <lanstr id="STR_BALL_PICKLEBALL" value="ピックボール"/>
-       <lanstr id="STR_BALL_LACROSSE" value="バッグスティック"/>
-       <lanstr id="STR_WATER_ACTIVITIES" value="一般水上アクティビティ"/>
-       <lanstr id="STR_WATER_SAILING" value="ヨット"/>
-       <lanstr id="STR_WATER_SURFING" value="サーフィン"/>
-       <lanstr id="STR_WATER_WHITEWATERRAFTING" value="ロービング"/>
-       <lanstr id="STR_WATER_CANOEING" value="ドラゴンボート漕ぎ"/>
-       <lanstr id="STR_WATER_KAYAKING" value="ボート"/>
-       <lanstr id="STR_WATER_ROWING" value="ローイング"/>
-       <lanstr id="STR_WATER_MOTORBOAT" value="水上バイク"/>
-       <lanstr id="STR_WATER_SUP" value="パドルサーフィン"/>
-       <lanstr id="STR_WATER_SCUBADIVING" value="ダイビング"/>
-       <lanstr id="STR_WATER_DIVING" value="飛び込み"/>
-       <lanstr id="STR_WATER_KITESURFING" value="パラグライダーサーフィン"/>
-       <lanstr id="STR_WATER_WAKEBOARDING" value="ウェイクボード"/>
-       <lanstr id="STR_WATER_POLO" value="水球"/>
-       <lanstr id="STR_WATER_WINDSURFING" value="ウィンドサーフィン"/>
-       <lanstr id="STR_WATER_DRIFTING" value="ラフティングアクティビティ"/>
-       <lanstr id="STR_WATER_FITNESS" value="ウォーターフィットネス"/>
-       <lanstr id="STR_WATER_SPORTS" value="ウォータースポーツ"/>
-       <lanstr id="STR_WATER_OUTDOORSWIM" value="アウトドアスイミング"/>
-       <lanstr id="STR_WATER_INDOORSWIM" value="インドアスイム"/>
-       <lanstr id="STR_WATER_SWIMFREESTYLE" value="水泳_フリースタイル"/>
-       <lanstr id="STR_WATER_SWIMBREASTSTROKE" value="水泳_カエル式"/>
-       <lanstr id="STR_WATER_SWIMBACKSTROKE" value="水泳_仰向け"/>
-       <lanstr id="STR_WATER_SWIMBUTTERFLY" value="スイム_バタフライ"/>
-       <lanstr id="STR_ICE_SPORTS" value="一般氷上スポーツ"/>
-       <lanstr id="STR_ICE_SKATING" value="スケート"/>
-       <lanstr id="STR_ICE_HOCKEY" value="アイスホッケー"/>
-       <lanstr id="STR_ICE_CURLING" value="アイスストーン/カーリング"/>
-       <lanstr id="STR_ICE_SNOWMOBILING" value="スノーモービル"/>
-       <lanstr id="STR_ICE_SLED" value="そり"/>
-       <lanstr id="STR_ICE_BIATHLON" value="冬の2つ"/>
-       <lanstr id="STR_ICE_CROSSCOUNTRYSKING" value="クロスカントリースキー"/>
-       <lanstr id="STR_ICE_SKIING" value="スキー"/>
-       <lanstr id="STR_ICE_SNOWBOARDING" value="スノーボード/スノーボード"/>
-       <lanstr id="STR_ICE_SNOWSHOEING" value="スノーシュー健行"/>
-       <lanstr id="STR_ICE_SNOWSPORTS" value="スノースポーツ"/>
-       <lanstr id="STR_EXTREME_SPORTS" value="一般エクストリームスポーツ"/>
-       <lanstr id="STR_EXTREME_SKATEBOARDING" value="スケートボード"/>
-       <lanstr id="STR_EXTREME_ROCKCLIMBING" value="ロッククライミング"/>
-       <lanstr id="STR_EXTREME_BUNGEEJUMPING" value="ハイジャンプ/バンジージャンプイベント"/>
-       <lanstr id="STR_EXTREME_PARKOUR" value="パルクール"/>
-       <lanstr id="STR_EXTREME_BMX" value="BMX"/>
-       <lanstr id="STR_EXTREME_ORIENTERING" value="オリエンテーリング"/>
-       <lanstr id="STR_EXTREME_PARACHUTE" value="スカイダイビング"/>
-       <lanstr id="STR_EXTREME_RACING" value="レース"/>
-       <lanstr id="STR_EXTREME_TRIATHLONS" value="トライアスロン"/>
-       <lanstr id="STR_OTHER_ELEVATOR" value="エレベーターに乗る"/>
-       <lanstr id="STR_OTHER_ESCALATOR" value="エスカレーター"/>
-       <lanstr id="STR_OTHER_GARDENING" value="ガーデニングをする"/>
-       <lanstr id="STR_OTHER_HORSEWORK" value="家事をする"/>
-       <lanstr id="STR_OTHER_INVEHICLE" value="車の中で"/>
-       <lanstr id="STR_OTHER_MEDITATION" value="瞑想する"/>
-       <lanstr id="STR_OTHER_STILL" value="静止"/>
-       <lanstr id="STR_OTHER_TILTING" value="傾斜"/>
-       <lanstr id="STR_OTHER_WHEELCHAIR" value="車椅子で移動"/>
-       <lanstr id="STR_EXERCISE_LIST" value="フィットネスクラス"/>
-       <lanstr id="STR_BALL_LIST" value="ボール"/>
-       <lanstr id="STR_WATER_LIST" value="ウォータースポーツ"/>
-       <lanstr id="STR_DANCING_LIST" value="ダンスクラス"/>
-       <lanstr id="STR_EXTREME_LIST" value="エクストリームスポーツ"/>
-       <lanstr id="STR_ICE_LIST" value="アイススポーツ"/>
-       <lanstr id="STR_RECREATIONAL_LIST" value="レジャースポーツ"/>
-       <lanstr id="STR_OTHER_LIST" value="その他"/>
-       <lanstr id="STR_DANCING_TITLE" value="ダンススポーツ"/>
-       <lanstr id="STR_BALL_LIST_TITLE" value="球技"/>
-       <lanstr id="STR_OTHER_TITLE" value="その他のスポーツ"/>
-       <lanstr id="STR_EXERCISE_TITLE" value="フィットネススポーツ"/>
-       <lanstr id="STR_TRAINING" value="トレーニング"/>
-       <lanstr id="STR_RAPID_TRAINING" value="クイックトレーニング"/>
-       <lanstr id="STR_SET_GOALS" value="目標の設定"/>
-       <lanstr id="STR_DURATION" value="期間"/>
-       <lanstr id="STR_DURATION_SETTING" value="期間設定"/>
-       <lanstr id="STR_MINUTES" value="分"/>
-       <lanstr id="STR_CALORIE" value="カロリー"/>
-       <lanstr id="STR_CALORIE_SETTING" value="カロリー設定"/>
-       <lanstr id="STR_KILOCALORIE" value="kcal"/>
-       <lanstr id="STR_DISTANCE" value="距離"/>
-       <lanstr id="STR_RANGE_SETTING" value="距離設定{{STR_RANGE_SETTING"/>
-       <lanstr id="STR_METER" value="メートル"/>
-       <lanstr id="STR_KILOMETRE" value="キロメートル"/>
-       <lanstr id="STR_STEP_NUMBER" value="ステップ数"/>
-       <lanstr id="STR_STEP_SETTING" value="ステップ設定"/>
-       <lanstr id="STR_STEP" value="ステップ"/>
-       <lanstr id="STR_HEART_RATE" value="心拍数"/>
-       <lanstr id="STR_MEAN_HEART_RATE" value="平均心拍数"/>
-       <lanstr id="STR_TIMES_PER_MIN" value="回/分"/>
-       <lanstr id="STR_MEAN_HEART_RATE_MIN" value="平均心拍数（回/分）"/>
-       <lanstr id="STR_IN_THE" value="で"/>
-       <lanstr id="STR_LOWER_STRENGTH" value="低強度"/>
-       <lanstr id="STR_MEDIUM_STRENGTH" value="中程度の強さ"/>
-       <lanstr id="STR_HIGH_STRENGTH" value="高強度"/>
-       <lanstr id="STR_ULTRA_HIGH_STRENGTH" value="超高強度"/>
-       <lanstr id="STR_TRAINING_INTENSITY" value="トレーニング強度"/>
-       <lanstr id="STR_TRAINING_INTENSITY_DESCRIPTION" value="トレーニング強度は、トレーニング不足かトレーニング過多かを判断するために用いられ、心拍数をどれだけ増加させる運動強度が最適であるかを判断する。"/>
-       <lanstr id="STR_INTENSITY_INTERVAL_DESCRIPTION" value="この強度区間は目標心拍数（個人基本資料から計算）の強弱に対応するリアルタイム状態表示であり、訓練の質を高めるのに役立つ。"/>
-       <lanstr id="STR_TRAINING_STATE_MEANING" value="トレーニング状態代表の意味"/>
-       <lanstr id="STR_WARM_UP_EXERCISE" value="ウォーミングアップ"/>
-       <lanstr id="STR_FAT_BURNING_ZONE" value="脂肪燃焼ゾーン"/>
-       <lanstr id="STR_IMPROVE_CARDIOPULMONARY_FUNCTION" value="心肺機能の向上"/>
-       <lanstr id="STR_PROFESSIONAL_ATHLETE" value="プロスポーツ選手"/>
-       <lanstr id="STR_TRAINING_INTENSITY_NOTE" value="注：このトレーニング強度はプロの運動評価ではなく、データは参考にしてください。"/>
-       <lanstr id="STR_TRAINING_IN_PROGRESS" value="トレーニング中"/>
-       <lanstr id="STR_BREAK_TRAINING" value="トレーニング一時停止"/>
-       <lanstr id="STR_FINISH" value="の終了"/>
-       <lanstr id="STR_PAUSE" value="一時停止"/>
-       <lanstr id="STR_RESUME" value="続行"/>
-       <lanstr id="STR_GOAL_ACHIEVED" value="目標を達成しました"/>
-       <lanstr id="STR_ACCOMPLISH_GOAL" value="完了目標"/>
-       <lanstr id="STR_OK" value="OK"/>
-       <lanstr id="STR_LOOK_OUT" value="注意"/>
-       <lanstr id="STR_INSUFFICENT_EXERCISE_AMOUNT" value="現在の運動量が小さすぎて記録できません。運動を終了するかどうか"/>
-       <lanstr id="STR_END_MOVEMENT" value="モーションの終了"/>
-       <lanstr id="STR_END_THIS_MOVEMENT" value="この運動を終了するかどうか"/>
-       <lanstr id="STR_GOAL_ACCOMPLISHMENT_DEGREE" value="目標達成度"/>
-       <lanstr id="STR_TRAINING_DURATION" value="トレーニング時間"/>
-       <lanstr id="STR_OFF" value="オフ"/>
-       <lanstr id="STR_MORE" value="以上"/>
-</language>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
index 90181b9..0ea317f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
@@ -470,4 +470,8 @@
        <lanstr id="STR_CONNECT_TIMEOUT" value="连接超时"/>
        <lanstr id="STR_PLEASE_RESTART_CHAT" value="请重新开始对话"/>
        <lanstr id="STR_CONTINUE_CHAT" value="继续对话"/>
+       <lanstr id="STR_AIMODELS_DOUBAO" value="豆包"/>
+       <lanstr id="STR_AIMODES_WENXINYIYAN" value="文心一言"/>
+       <lanstr id="STR_AIMODES_KIMI" value="Kimi"/>
+       <lanstr id="STR_AIMODES_CHATGPT" value="ChatGPT"/>
 </language>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/README b/code/sdk/application/wearable/fd230app/nativeui/language/README
index 89d2a55..0dd1a73 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/README
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/README
@@ -1,13 +1,9 @@
 ## 根元素\r
 \r
 XML 必须以 language 为根元素并支持以下属性，\r
-\r
 language 元素中的属性对所有的子元素都生效，并且作为子元素的默认值，\r
-\r
 如果子元素有定义相同的属性，以子元素设置的生效。 \r
 \r
-\r
-\r
 **表3-3 多语言 xml 配置**\r
 \r
 | 属性名       | 描述                                                         | 取值                                            | 必选 |\r

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 8551ced..a242fed 100644 (file)
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
deleted file mode 100644 (file)
index fe08bbc..0000000
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and /dev/null 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 edf3e00..d7d2106 100644 (file)
--- 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
@@ -481,7 +481,11 @@ enum UIResourceTextId : uint16_t {
     STR_CONNECT_TIMEOUT = 468,\r
     STR_PLEASE_RESTART_CHAT = 469,\r
     STR_CONTINUE_CHAT = 470,\r
-    STR_MAX_ID = 471,\r
+    STR_AIMODELS_DOUBAO = 471,\r
+    STR_AIMODES_WENXINYIYAN = 472,\r
+    STR_AIMODES_KIMI = 473,\r
+    STR_AIMODES_CHATGPT = 474,\r
+    STR_MAX_ID = 475,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

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 e2e29a9..053d7e3 100644 (file)
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/language/languagemake.sh b/code/sdk/application/wearable/fd230app/nativeui/language/languagemake.sh
new file mode 100644 (file)
index 0000000..b2140ff
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/languagemake.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+###
+ # @Date: 2024-07-10 21:03:33
+ # @LastEditors: Caisking 3449750381@qq.com
+ # @LastEditTime: 2024-07-10 21:03:37
+ # @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/languagemake.sh
+### 
+
+# 进入目录 Language_xml
+cd ~/XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml
+
+# 运行 languagetool.py
+python languagetool.py
+
+# 回到上级目录
+cd ..
+
+# 进入目录 stringpack_tool
+cd stringpack_tool
+
+# 运行 language_trans.py
+python language_trans.py ../Language_xml/ ../font/ ../font/
+
+# 打印完成信息
+echo "脚本执行完成。"
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/多国语言工具脚本.md b/code/sdk/application/wearable/fd230app/nativeui/language/多国语言工具脚本.md
similarity index 74%
rename from code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/多国语言工具脚本.md
rename to code/sdk/application/wearable/fd230app/nativeui/language/多国语言工具脚本.md
index 7a4c08c..bf8569f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/多国语言工具脚本.md
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/多国语言工具脚本.md
@@ -1,3 +1,9 @@
+<!--\r
+ * @Date: 2024-04-15 10:55:58\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-07-10 21:18:59\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/多国语言工具脚本.md\r
+-->\r
 ## 多国语言工具脚本使用方法\r
 \r
 ### 1.下载打包工具\r
@@ -61,12 +67,19 @@ Output Path: /tools/string_packer/font
 res路径：  \FD230\code\sdk\build\config\target_config\brandy\mk_fs_image\fd230\fs\user\res\font\r
 \r
 \r
-\r
 【完成多国语言文件配置】\r
+### PS：如果需要增加语言语种 需要增加 languagetool.py 里面语种数组项\r
 \r
-#更新 0709\r
+### 更新 0709\r
 \r
 使用多国语言工具直接生成多国语言lang文件 以及 字体头文件\r
 \r
 python language_trans.py ../Language_xml/ ../font/ ../font/\r
-脚本 输入路径 字体文件输出路径 头文件输出路径
\ No newline at end of file
+脚本 输入路径 字体文件输出路径 头文件输出路径\r
+\r
+### 更新 0710\r
+在language路径下 直接使用脚本即可生成语言文件夹 /font\r
+\r
+chmod +x languagemake.sh\r
+./languagemake.sh\r
+\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp
similarity index 98%
rename from code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp
index ce80767..d9e55d8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp
@@ -3,7 +3,7 @@
  * @Date: 2024-03-30 09:14:38
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-13 17:18:54
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp
  */
 #include <fstream>
 #include <string>
@@ -12,11 +12,11 @@
 #include "font/ui_font.h"
 #include "font/font_global_manager.h"
 #include "wearable_log.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 #include "ConfigModel.h"
 #include <NativeAbility.h>
 #include "AppViewIDs.h"
-#include "language/include/LanguageSwitchModel.h"
+#include "languagecode/include/LanguageSwitchModel.h"
 namespace OHOS
 {
     // 初始化 languages 数组

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h
similarity index 98%
rename from code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h
index 02164a7..d5e4721 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h
@@ -3,7 +3,7 @@
  * @Date: 2024-03-30 09:30:03
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-04-30 10:03:25
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.h
  */
 #ifndef LANGUAGE_INIT_H
 #define LANGUAGE_INIT_H

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListAdapter.h
similarity index 92%
rename from code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListAdapter.h
index 544ca45..15f9a0b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListAdapter.h
@@ -3,7 +3,7 @@
  * @Date: 2024-03-28 14:26:55
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-28 09:34:15
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListAdapter.h
  */
 #ifndef LANGUAGE_SWITCH_LIST_ADAPTER_H
 #define LANGUAGE_SWITCH_LIST_ADAPTER_H
@@ -11,10 +11,10 @@
 #include "components/abstract_adapter.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_list.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 #include "UiConfig.h"
 #include <list>
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 namespace OHOS
 {
     class LanguageSwitchListAdapter : public AbstractAdapter

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListitemView.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListitemView.h
similarity index 88%
rename from code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListitemView.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListitemView.h
index 3e7ed87..aee6aab 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListitemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListitemView.h
@@ -3,14 +3,14 @@
  * @Date: 2024-03-28 14:28:25
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-13 15:52:44
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListitemView.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchListitemView.h
  */
 #ifndef LANGUAGE_SWITCH_LIST_ITEM_VIEW
 #define LANGUAGE_SWITCH_LIST_ITEM_VIEW
 
 #include "components/ui_view_group.h"
 #include "components/ui_label_button_ext.h"
-#include "language/include/LanguageSwitchListAdapter.h"
+#include "languagecode/include/LanguageSwitchListAdapter.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchModel.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchModel.h
similarity index 91%
rename from code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchModel.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchModel.h
index 697a60a..9e954e4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchModel.h
@@ -3,7 +3,7 @@
  * @Date: 2024-03-28 16:36:58
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-13 18:05:27
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchModel.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchModel.h
  */
 
 #ifndef LANGUAGE_SWITCH_MODEL_H
@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include "string"
-#include "language/include/LanguageSwitchListAdapter.h"
+#include "languagecode/include/LanguageSwitchListAdapter.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h
similarity index 89%
rename from code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h
index 8569e6b..442e73f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h
@@ -3,16 +3,16 @@
  * @Date: 2024-03-28 14:16:52
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-28 09:33:07
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchPresenter.h
  */
 #ifndef LANGUAGE_SWITCH_PRESENTER_H
 #define LANGUAGE_SWITCH_PRESENTER_H
 
 #include "Presenter.h"
 #include "View.h"
-#include "language/include/LanguageSwitchModel.h"
+#include "languagecode/include/LanguageSwitchModel.h"
 #include "LanguageSwitchView.h"
-#include "language/include/LanguageSwitchListitemView.h"
+#include "languagecode/include/LanguageSwitchListitemView.h"
 #include "language/font/ui_resource_string.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchView.h b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchView.h
similarity index 93%
rename from code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchView.h
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchView.h
index 99eec0a..b35757c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchView.h
@@ -3,7 +3,7 @@
  * @Date: 2024-03-28 11:58:38
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-13 16:11:04
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchView.h
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/include/LanguageSwitchView.h
  */
 #ifndef LANGUAGE_SWITCH_VIEW_H
 #define LANGUAGE_SWITCH_VIEW_H
@@ -13,7 +13,7 @@
 #include "components/ui_scroll_view.h"
 #include "components/ui_label_ext.h"
 #include "components/ui_list.h"
-#include "language/include/LanguageSwitchListAdapter.h"
+#include "languagecode/include/LanguageSwitchListAdapter.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
similarity index 91%
rename from code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
index 5a64704..8021eb9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
@@ -3,14 +3,14 @@
  * @Date: 2024-03-28 14:27:05
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-28 09:33:56
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListAdapter.cpp
  */
-#include "language/include/LanguageSwitchListAdapter.h"
-#include "language/include/LanguageSwitchListitemView.h"
+#include "languagecode/include/LanguageSwitchListAdapter.h"
+#include "languagecode/include/LanguageSwitchListitemView.h"
 #include "wearable_log.h"
-#include "language/include/LanguageSwitchModel.h"
-#include "language/include/LanguageSwitchPresenter.h"
-#include "language/LanguageInit.h"
+#include "languagecode/include/LanguageSwitchModel.h"
+#include "languagecode/include/LanguageSwitchPresenter.h"
+#include "languagecode/LanguageInit.h"
 #include <UiConfig.h>
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
similarity index 94%
rename from code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
index b2686de..c920e63 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
@@ -3,9 +3,9 @@
  * @Date: 2024-03-28 14:28:03
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-28 09:34:06
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
  */
-#include "language/include/LanguageSwitchListitemView.h"
+#include "languagecode/include/LanguageSwitchListitemView.h"
 #include "wearable_log.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
similarity index 91%
rename from code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
index 28c8683..93602c5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
@@ -3,11 +3,11 @@
  * @Date: 2024-03-28 16:36:46
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-13 17:17:45
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp
  */
-#include "language/include/LanguageSwitchModel.h"
+#include "languagecode/include/LanguageSwitchModel.h"
 #include "wearable_log.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 #include "ConfigModel.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
similarity index 95%
rename from code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index d5b8940..c673d3e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -3,16 +3,16 @@
  * @Date: 2024-03-28 14:17:43
  * @LastEditors: luozheng 1732036298@qq.com
  * @LastEditTime: 2024-06-28 09:32:58
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
 #include "NativeAbility.h"
-#include "language/include/LanguageSwitchPresenter.h"
-#include "language/include/LanguageSwitchListitemView.h"
-#include "language/include/LanguageSwitchModel.h"
+#include "languagecode/include/LanguageSwitchPresenter.h"
+#include "languagecode/include/LanguageSwitchListitemView.h"
+#include "languagecode/include/LanguageSwitchModel.h"
 #include "common/key_code.h"
 #include <custom_utils.h>
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
similarity index 98%
rename from code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
index 2f58319..bdb883d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
@@ -1,5 +1,5 @@
-#include "language/include/LanguageSwitchView.h"
-#include "language/include/LanguageSwitchPresenter.h"
+#include "languagecode/include/LanguageSwitchView.h"
+#include "languagecode/include/LanguageSwitchPresenter.h"
 #include "wearable_log.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
index 561fb71..54e1863 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
@@ -7,7 +7,7 @@
 #include "producttest/include/testPresenter.h"\r
 #include "font/font_global_manager.h"\r
 #include "font/ui_font.h"\r
-#include "language/LanguageInit.h"\r
+#include "languagecode/LanguageInit.h"\r
 #include "../../../../../../drivers/peripheral/utils/custom_utils.h"\r
 #include "power_display_service.h"\r
 #include "components/ui_slider.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
index f792657..ad18c14 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -7,11 +7,11 @@
 #include "system/include/SystemPresenter.h"\r
 #include "font/font_global_manager.h"\r
 #include "font/ui_font.h"\r
-#include "language/LanguageInit.h"\r
+#include "languagecode/LanguageInit.h"\r
 #include "../../../../../../drivers/peripheral/utils/custom_utils.h"\r
 #include "common/key_code.h"\r
 #include "custom_utils.h"\r
-#include "language/LanguageInit.h"\r
+#include "languagecode/LanguageInit.h"\r
 #include "language/font/ui_resource_string.h"\r
 #include "ConfigModel.h"\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherListAdapter.h
index e003d3a..771b44a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherListAdapter.h
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-16 10:24:43
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-10 21:13:30
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/include/FutureWeatherListAdapter.h
+ */
 /*
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-15 09:25:05
@@ -9,7 +15,7 @@
 #define FUTURE_WEATHER_LISTADAPTER_H
 
 #include "components/abstract_adapter.h"
-#include "language/LanguageInit.h"
+#include "languagecode/LanguageInit.h"
 #include <list>
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
index 2f92ec0..58e1a42 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
@@ -16,7 +16,7 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/weather/include
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/heart_blood/health_service
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/sleep/include/
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/phone/include
-${ROOT_DIR}/application/wearable/fd230app/nativeui/language/include 
+${ROOT_DIR}/application/wearable/fd230app/nativeui/languagecode/
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/language
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/traing/training_card/include
 ${ROOT_DIR}/application/wearable/fd230app/nativeui/config/include