Ai全家桶改为 “星辰AI”，暂时使用豆包

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 2e7c956..1ac231f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -710,7 +710,8 @@ enum UIResourceTextId : uint16_t {
     STR_CALIBRATE = 697,\r
     STR_CALIBRATION_SUGGESTION = 698,\r
     STR_CALIBRATION_PATH = 699,\r
-    STR_MAX_ID = 700,\r
+    STR_START_AI = 700,\r
+    STR_MAX_ID = 701,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
index dcb35dc..ef3ac4d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
@@ -22,9 +22,11 @@
 #define CURRENT_AIAUDIO_TYPE AIAUDIO_TYPE_SBC
 
 #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION)
-    #define AI_VOICE_JIUTIAN 1 // 九天版本 
+    #define AI_VOICE_JIUTIAN  // 九天版本
+#elif defined(BOARD_N9)
+    #define AI_VOICE_N9 //N9 星辰Ai
 #else
-    #define AI_VOICE_JIUTIAN 0 // 九天版本 
+    #define AI_VOICE_FD230   
 #endif
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
index 934f9c4..159c49d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -1657,7 +1657,7 @@ namespace OHOS
     // 设置选择的ai模型
     void AiVoiceModel::SetSelectAiModel(int index)
     {
-#if AI_VOICE_JIUTIAN
+#if defined(AI_VOICE_JIUTIAN) || defined(AI_VOICE_N9)
         ConfigModel::GetInstance()->SetSelectAiModel(0);
 #else
         ConfigModel::GetInstance()->SetSelectAiModel(index);
@@ -1757,12 +1757,18 @@ namespace OHOS
             textId = STR_AIMODES_CHATGPT;
         }
 #endif
-#if AI_VOICE_JIUTIAN
+#ifdef AI_VOICE_JIUTIAN
         int textId = 0;
         selectAiModelToTextId = {
             {0, {STR_JIUTIAN, 5}},
         };
         textId = STR_JIUTIAN;
+#elif defined(AI_VOICE_N9)
+        int textId = 0;
+        selectAiModelToTextId = {
+            {0, {STR_AIMODELS_DOUBAO, 3}},
+        };
+        textId = STR_AIMODELS_DOUBAO;
 #else
         // 客户新需求需要改模型顺序：
         int textId = 0;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
index 37fcc1e..7902488 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
@@ -438,7 +438,7 @@ namespace OHOS
             aiModelPicker->SetStyle(STYLE_BORDER_RADIUS, 150);
             aiModelPicker->SetItemHeight(40);
             aiModelPicker->SetLoopState(true);
-#if AI_VOICE_JIUTIAN
+#if defined(AI_VOICE_JIUTIAN) || defined(AI_VOICE_N9)
 #else
             aiModelPicker->SetRotateFactor(1.0);
             aiModelPicker->RequestFocus();
@@ -546,7 +546,7 @@ namespace OHOS
         container_->SetOnClickListener(presenter_);
 
         ChangeView(MAX_AIVOICE_VIEWID, AIVOICE_STARTCHAT_VIEWID);
-#if AI_VOICE_JIUTIAN
+#if defined(AI_VOICE_JIUTIAN) || defined(AI_VOICE_N9)
         CreateAiVoiceVoiceView();
 #endif
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
index ade8086..c7a0e72 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -186,7 +186,7 @@ namespace OHOS
 /* -------------------------------------------------------------------------- */
 // int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY,STR_DIAL_PLATE};
 #if defined(BOARD_N9)
-        int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_LIST_DISPLAY, STR_DIAL_PLATE};
+        int16_t textId[] = {STR_LIST_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY, STR_DIAL_PLATE};
 #else
         int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE};
 #endif
@@ -243,8 +243,8 @@ namespace OHOS
 
 // const char *viewId[] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS, THEME_STYLE_ARC_LIST,THEME_STYLE_CIRCLE_LIST};
 #if defined(BOARD_N9)
-        const char *viewId[] = {THEME_STYLE_ARC_LIST, THEME_STYLE_LIST, THEME_STYLE_CIRCLE_LIST};
-#else
+        const char *viewId[] = {THEME_STYLE_LIST, THEME_STYLE_ARC_LIST, THEME_STYLE_CIRCLE_LIST};
+#else 
         const char *viewId[] = {THEME_STYLE_ARC_LIST, THEME_STYLE_HEXAGONS,THEME_STYLE_CIRCLE_LIST};
 #endif
         for (int i = 0; i < sizeof(viewId) / sizeof(viewId[0]); i++)
@@ -289,7 +289,7 @@ namespace OHOS
         int y = 150;
 // const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH, THEMESTYLE_ARCLIST_IMAGEPATH,THEMESTYLE_CIRCLELIST_IMAGEPATH};
 #if defined(BOARD_N9)
-        const char *src[] = {THEMESTYLE_ARCLIST_IMAGEPATH, THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_CIRCLELIST_IMAGEPATH};
+        const char *src[] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_ARCLIST_IMAGEPATH, THEMESTYLE_CIRCLELIST_IMAGEPATH};
 #else
         const char *src[] = {THEMESTYLE_ARCLIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH,THEMESTYLE_CIRCLELIST_IMAGEPATH};
 #endif

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/en.lang
index 2bfb736..079c3ea 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/ui_resource_string.h
index 7127be4..1ac231f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/ui_resource_string.h
@@ -652,7 +652,66 @@ enum UIResourceTextId : uint16_t {
     STR_RECORD_MAX = 639,\r
     STR_CLEAR_ALL_RECORDS = 640,\r
     STR_DEEPSEEK = 641,\r
-    STR_MAX_ID = 642,\r
+    STR_BP_CHECK = 642,\r
+    STR_BP_CALIBRATE = 643,\r
+    STR_MEARURING = 644,\r
+    STR_MEASURING_KEEP_STILL = 645,\r
+    STR_RECALIBRATE = 646,\r
+    STR_CALIBRATION_DONE = 647,\r
+    STR_CALIBRATION_FAILED = 648,\r
+    STR_MEASUREMENT_DONE = 649,\r
+    STR_CALIBRATION_REMINDER = 650,\r
+    STR_USE_TRAD_SPHYGM = 651,\r
+    STR_CONFIRM = 652,\r
+    STR_CAL_RES_UPLOADED_30D = 653,\r
+    STR_RES_ANALYZING = 654,\r
+    STR_ANALYZING_DONT_EXIT = 655,\r
+    STR_FIRST_CAL_KEEP_STILL = 656,\r
+    STR_SECOND_CAL_KEEP_STILL = 657,\r
+    STR_ENTER_BP_READ = 658,\r
+    STR_SBP = 659,\r
+    STR_DBP = 660,\r
+    STR_NORMAL = 661,\r
+    STR_ELEVATED = 662,\r
+    STR_WARNING = 663,\r
+    STR_SBP_ELEVATED = 664,\r
+    STR_WARN_THRESH = 665,\r
+    STR_BP_WARN_CONSULT_DOC = 666,\r
+    STR_MEAS_FAILED = 667,\r
+    STR_CALIBRATING = 668,\r
+    STR_S = 669,\r
+    STR_PRESSURE = 670,\r
+    STR_WEAR_WATCH_DET = 671,\r
+    STR_RE_MEAS = 672,\r
+    STR_DATA_ANAL_WAIT = 673,\r
+    STR_EMOTION = 674,\r
+    STR_PLEASURE = 675,\r
+    STR_COMPLEX_NEG_EMO = 676,\r
+    STR_MEASURE = 677,\r
+    STR_FINGER_LEAD_PORT = 678,\r
+    STR_START_MEAS = 679,\r
+    STR_WEAR_TIGHT_FINGER_LEAD = 680,\r
+    STR_NO_FINGER_MOVE = 681,\r
+    STR_CONNECT_APP_4G = 682,\r
+    STR_FINGER_LEAD_TILL_VAL = 683,\r
+    STR_SINUS_HR = 684,\r
+    STR_APP_REPORT_NOT_CLIN = 685,\r
+    STR_FATIGUE_LEVEL = 686,\r
+    STR_BP_MODEL_2CAL = 687,\r
+    STR_RECAL_MONTHLY = 688,\r
+    STR_SAME_ARM_CALIB = 689,\r
+    STR_HYPERTENSIVE_PREPOST_CAL = 690,\r
+    STR_CALIB_POSTURE_GUIDE = 691,\r
+    STR_START_CAL = 692,\r
+    STR_CALIB_POSTURE_REQ = 693,\r
+    STR_ECG = 694,\r
+    STR_JIUTIAN = 695,\r
+    STR_LAST_CALIBRATION_TIME = 696,\r
+    STR_CALIBRATE = 697,\r
+    STR_CALIBRATION_SUGGESTION = 698,\r
+    STR_CALIBRATION_PATH = 699,\r
+    STR_START_AI = 700,\r
+    STR_MAX_ID = 701,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/zh.lang
index 056633b..1b28015 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/n9/fs/user/res/font/zh.lang differ

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 307ef7b..d3fa4d4 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -699,4 +699,5 @@ STR_JIUTIAN$jiutian
 STR_LAST_CALIBRATION_TIME$Last Calibration Time\r
 STR_CALIBRATE$Calibrate\r
 STR_CALIBRATION_SUGGESTION$It is recommended to recalibrate every month\r
-STR_CALIBRATION_PATH$Calibration Path: Settings - Blood Pressure Calibration
\ No newline at end of file
+STR_CALIBRATION_PATH$Calibration Path: Settings - Blood Pressure Calibration\r
+STR_START_AI$xingchen AI
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index d39ce29..d49075e 100755 (executable)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -699,4 +699,5 @@ STR_JIUTIAN$九天大模型
 STR_LAST_CALIBRATION_TIME$上次校准时间\r
 STR_CALIBRATE$校准\r
 STR_CALIBRATION_SUGGESTION$建议每个月都重新校准！\r
-STR_CALIBRATION_PATH$校准路径：设置-血压校准
\ No newline at end of file
+STR_CALIBRATION_PATH$校准路径：设置-血压校准\r
+STR_START_AI$星辰AI
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language_custom.xlsx b/tools/language_tool/Language_xml/language_custom.xlsx
index 93b031a..4aee2c7 100755 (executable)
Binary files a/tools/language_tool/Language_xml/language_custom.xlsx and b/tools/language_tool/Language_xml/language_custom.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index 2267310..0c117cd 100755 (executable)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -701,4 +701,5 @@
        <lanstr id="STR_CALIBRATE" value="Calibrate"/>
        <lanstr id="STR_CALIBRATION_SUGGESTION" value="It is recommended to recalibrate every month"/>
        <lanstr id="STR_CALIBRATION_PATH" value="Calibration Path: Settings - Blood Pressure Calibration"/>
+       <lanstr id="STR_START_AI" value="xingchen AI"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index f796b0c..1b63a05 100755 (executable)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -701,4 +701,5 @@
        <lanstr id="STR_CALIBRATE" value="校准"/>
        <lanstr id="STR_CALIBRATION_SUGGESTION" value="建议每个月都重新校准！"/>
        <lanstr id="STR_CALIBRATION_PATH" value="校准路径：设置-血压校准"/>
+       <lanstr id="STR_START_AI" value="星辰AI"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index 441b555..079c3ea 100755 (executable)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 2e7c956..1ac231f 100755 (executable)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -710,7 +710,8 @@ enum UIResourceTextId : uint16_t {
     STR_CALIBRATE = 697,\r
     STR_CALIBRATION_SUGGESTION = 698,\r
     STR_CALIBRATION_PATH = 699,\r
-    STR_MAX_ID = 700,\r
+    STR_START_AI = 700,\r
+    STR_MAX_ID = 701,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index c84385f..1b28015 100755 (executable)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ