修改ai模型顺序错误修改

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 a31d56b..8cd0d07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -202,7 +202,7 @@ namespace OHOS
     uint8_t AiVoiceModel::GetCurUsing4GAiModelType(void)
     {
         int value = GetSelectAiModel();
-        //写一个map
+        // 写一个map
         std::map<int, std::pair<int, int>> selectAiModelToAiModelType = {
             {0, {STR_DEEPSEEK, AI_TYPE_DE}},
             {1, {STR_JIUTIAN, AI_TYPE_JIU}},
@@ -1751,7 +1751,7 @@ namespace OHOS
     // 设置选择的ai模型
     void AiVoiceModel::SetSelectAiModel(int index)
     {
-#if defined(AI_VOICE_JIUTIAN) || defined(AI_VOICE_N9)
+#if defined(AI_VOICE_N9)
         ConfigModel::GetInstance()->SetSelectAiModel(0);
 #else
         ConfigModel::GetInstance()->SetSelectAiModel(index);
@@ -1854,9 +1854,14 @@ namespace OHOS
 #ifdef AI_VOICE_JIUTIAN
         int textId = 0;
         selectAiModelToTextId = {
-            {0, {STR_JIUTIAN, 5}},
+            {0, {STR_DEEPSEEK, 4}},
+            {1, {STR_JIUTIAN, 5}},
+            {2, {STR_AIMODELS_DOUBAO, 3}},
+            {3, {STR_AIMODES_WENXINYIYAN, 0}},
+            {4, {STR_AIMODES_KIMI, 2}},
+            {5, {STR_AIMODES_CHATGPT, 1}},
         };
-        textId = STR_JIUTIAN;
+        textId = STR_DEEPSEEK;
 #elif defined(AI_VOICE_N9)
         int textId = 0;
         selectAiModelToTextId = {
@@ -1868,11 +1873,11 @@ namespace OHOS
         int textId = 0;
         selectAiModelToTextId = {
             {0, {STR_DEEPSEEK, 4}},
-            {1, {STR_JIUTIAN, 5}},
+            {1, {STR_AIMODES_CHATGPT, 1}},
             {2, {STR_AIMODELS_DOUBAO, 3}},
             {3, {STR_AIMODES_WENXINYIYAN, 0}},
             {4, {STR_AIMODES_KIMI, 2}},
-            {5, {STR_AIMODES_CHATGPT, 1}},
+            {5, {STR_IFLYTEK_SPARK, 5}},
         };
         textId = STR_DEEPSEEK;
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
index bb97358..af78b84 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistConfigModel.h
@@ -44,8 +44,6 @@ namespace OHOS
             {VIEW_GOAL, PNG_APPLIST_GOAL_IMAGE_BIG, PNG_APPLIST_GOAL_IMAGE, PNG_APPLIST_DEFAULT_IMG, "活动", STR_ACTIVITY, nullptr, "H", "ACTIVITY"},
 #if defined(BOARD_N9)
             {VIEW_AI_VOICE, PNG_APPLIST_AIVOICE_IMAGE_BIG, PNG_APPLIST_AIVOICE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "星辰AI", STR_START_AI, nullptr, "X", "START_AI"},
-#elif defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION)
-            {VIEW_AI_VOICE, "/user/res/AIVoice/aimodels/aimodels_lingxi.bin", "/user/res/AIVoice/aimodels/aimodels_lingxi.bin", PNG_APPLIST_DEFAULT_IMG, "九天大模型", STR_JIUTIAN, nullptr, "J","JIUTIAN"},
 #else
             {VIEW_AI_VOICE, PNG_APPLIST_AIVOICE_IMAGE_BIG, PNG_APPLIST_AIVOICE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "AI全家桶", STR_AI_FAMILY_MEALS, nullptr, "A", "AI_FAMILY_MEALS"},
 // {VIEW_AI_VOICE, "/user/res/AIVoice/aimodels/aimodels_lingxi.bin", "/user/res/AIVoice/aimodels/aimodels_lingxi.bin", PNG_APPLIST_DEFAULT_IMG, "九天大模型", STR_JIUTIAN, nullptr, "J","JIUTIAN"},