From: Caisking <3449750381@qq.com> Date: Wed, 10 Jul 2024 13:31:20 +0000 (+0800) Subject: 增加语言脚本 优化语言Slice位置 X-Git-Tag: release_V1.2.70_20241020_135402~826^2~8 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=367ff1dcca230a7095c5544b610067e8d6426a91;p=mirrors%2FFD230.git 增加语言脚本 优化语言Slice位置 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 6953c7092..4a17e0b5f 100644 --- 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 3b9c2386b..4506adaf3 100644 --- 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 0826b7de8..5bbb8c3df 100644 --- 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 #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 f9f33aef3..38ce1d8c2 100644 --- 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; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish topic=%u!!", topic); - void *publishData = nullptr; if (size > 0) { publishData = malloc(size); - if (publishData == nullptr) { + if (publishData == nullptr) + { return; } ret = memcpy_s(publishData, size, (const void *)data, size); @@ -149,9 +149,9 @@ extern "C" return; } } - - Request request = {.msgId = topic, .len = size, .msgValue = 0,.data = publishData}; - + + Request request = {.msgId = topic, .len = size, .msgValue = 0, .data = publishData}; + /* public request */ api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); if (api == NULL) @@ -182,12 +182,12 @@ extern "C" WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmTimerEventPublish topic=%u!!", topic); - void *publishData = nullptr; if (size > 0) { publishData = malloc(size); - if (publishData == nullptr) { + if (publishData == nullptr) + { return; } ret = memcpy_s(publishData, size, (const void *)&data, size); @@ -198,9 +198,9 @@ extern "C" return; } } - - Request request = {.msgId = topic, .len = size, .msgValue = 0,.data = publishData}; - + + Request request = {.msgId = topic, .len = size, .msgValue = 0, .data = publishData}; + /* public request */ api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME); if (api == nullptr) @@ -299,9 +299,9 @@ extern "C" { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "It's bedtime in 20 minutes"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "20分钟后要睡觉啦!"); - AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); // 设置状态为睡眠提醒 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEEPNOTIFY); + AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); } } // 退出睡眠模式 @@ -311,12 +311,12 @@ extern "C" uapi_dev_runtime_set_nap_status(1); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!"); + // 设置状态为小睡 + OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE); if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0) { // 早安提醒 AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); - // 设置状态为小睡 - OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE); } if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb()) { @@ -333,11 +333,11 @@ extern "C" do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL); // 睡眠弹窗 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!"); + // 设置状态为睡眠 + OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); if (curTime.tm_hour == sleep_time_hour && curTime.tm_min == sleep_time_min && curTime.tm_sec == 0) { AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); - // 设置状态为睡眠 - OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据 } if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb()) 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 index e69de29bb..000000000 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 4bad2f5cd..bd842a677 100644 --- 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 STR_CONNECT_TIMEOUT$Connection Timeout STR_PLEASE_RESTART_CHAT$Please restart the conversation -STR_CONTINUE_CHAT$Continue the conversation \ No newline at end of file +STR_CONTINUE_CHAT$Continue the conversation +STR_AIMODELS_DOUBAO$Cici +STR_AIMODES_WENXINYIYAN$ERNIE Bot +STR_AIMODES_KIMI$Kimi +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 index 3e6867ec7..000000000 --- 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 7b009119f..407425a50 100644 --- 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$取消 STR_CONNECT_TIMEOUT$连接超时 STR_PLEASE_RESTART_CHAT$请重新开始对话 -STR_CONTINUE_CHAT$继续对话 \ No newline at end of file +STR_CONTINUE_CHAT$继续对话 +STR_AIMODELS_DOUBAO$豆包 +STR_AIMODES_WENXINYIYAN$文心一言 +STR_AIMODES_KIMI$Kimi +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 1335d7bcf..be26e19d4 100644 --- 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 @@ + + + + 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 index b539e5fba..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_ja.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 90181b94e..0ea317fce 100644 --- 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 @@ + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/README b/code/sdk/application/wearable/fd230app/nativeui/language/README index 89d2a5587..0dd1a7343 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/README +++ b/code/sdk/application/wearable/fd230app/nativeui/language/README @@ -1,13 +1,9 @@ ## 根元素 XML 必须以 language 为根元素并支持以下属性, - language 元素中的属性对所有的子元素都生效,并且作为子元素的默认值, - 如果子元素有定义相同的属性,以子元素设置的生效。 - - **表3-3 多语言 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 8551ced93..a242fedb9 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 deleted file mode 100644 index fe08bbc2a..000000000 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 edf3e0022..d7d2106ad 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 @@ -481,7 +481,11 @@ enum UIResourceTextId : uint16_t { STR_CONNECT_TIMEOUT = 468, STR_PLEASE_RESTART_CHAT = 469, STR_CONTINUE_CHAT = 470, - STR_MAX_ID = 471, + STR_AIMODELS_DOUBAO = 471, + STR_AIMODES_WENXINYIYAN = 472, + STR_AIMODES_KIMI = 473, + STR_AIMODES_CHATGPT = 474, + STR_MAX_ID = 475, }; // UIResourceTextId 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 e2e29a931..053d7e382 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/language/languagemake.sh b/code/sdk/application/wearable/fd230app/nativeui/language/languagemake.sh new file mode 100644 index 000000000..b2140ff72 --- /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/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" "b/code/sdk/application/wearable/fd230app/nativeui/language/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" similarity index 74% rename from "code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" rename to "code/sdk/application/wearable/fd230app/nativeui/language/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" index 7a4c08cc7..bf8569fc4 100644 --- "a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" +++ "b/code/sdk/application/wearable/fd230app/nativeui/language/\345\244\232\345\233\275\350\257\255\350\250\200\345\267\245\345\205\267\350\204\232\346\234\254.md" @@ -1,3 +1,9 @@ + ## 多国语言工具脚本使用方法 ### 1.下载打包工具 @@ -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 - 【完成多国语言文件配置】 +### PS:如果需要增加语言语种 需要增加 languagetool.py 里面语种数组项 -#更新 0709 +### 更新 0709 使用多国语言工具直接生成多国语言lang文件 以及 字体头文件 python language_trans.py ../Language_xml/ ../font/ ../font/ -脚本 输入路径 字体文件输出路径 头文件输出路径 \ No newline at end of file +脚本 输入路径 字体文件输出路径 头文件输出路径 + +### 更新 0710 +在language路径下 直接使用脚本即可生成语言文件夹 /font + +chmod +x languagemake.sh +./languagemake.sh + 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 ce80767c7..d9e55d8cc 100644 --- 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 #include @@ -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 #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 02164a719..d5e472179 100644 --- 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 544ca45e7..15f9a0bd9 100644 --- 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 -#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 3e7ed8710..aee6aab7a 100644 --- 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 697a60a86..9e954e4c7 100644 --- 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 #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 8569e6b92..442e73f61 100644 --- 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 99eec0a36..b35757c07 100644 --- 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 5a647044b..8021eb95a 100644 --- 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 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 b2686deff..c920e6359 100644 --- 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 28c868381..93602c527 100644 --- 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 d5b894033..c673d3ee3 100644 --- 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 -#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 2f5831961..bdb883de3 100644 --- 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 561fb714d..54e186324 100644 --- 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" #include "font/font_global_manager.h" #include "font/ui_font.h" -#include "language/LanguageInit.h" +#include "languagecode/LanguageInit.h" #include "../../../../../../drivers/peripheral/utils/custom_utils.h" #include "power_display_service.h" #include "components/ui_slider.h" 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 f79265764..ad18c1454 100644 --- 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" #include "font/font_global_manager.h" #include "font/ui_font.h" -#include "language/LanguageInit.h" +#include "languagecode/LanguageInit.h" #include "../../../../../../drivers/peripheral/utils/custom_utils.h" #include "common/key_code.h" #include "custom_utils.h" -#include "language/LanguageInit.h" +#include "languagecode/LanguageInit.h" #include "language/font/ui_resource_string.h" #include "ConfigModel.h" namespace OHOS 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 e003d3a40..771b44a9b 100644 --- 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 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 2f92ec084..58e1a426c 100644 --- 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