1.4GAI关闭一些高频打印

2.custom_fileoperate_service线程关闭CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_SAVE消息函数调用，此为电池log信息保存函数

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 360b114..0393e1e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -698,7 +698,7 @@ namespace OHOS
         std::string processedText = accumulatedText;
         safe_replace_utf8(processedText, punctuation, replacement);
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "processedText:%s", processedText.c_str());
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "processedText:%s", processedText.c_str());
 
         accumulatedText = processedText;
         size_t commaPos = accumulatedText.find_last_of(',');
@@ -715,7 +715,7 @@ namespace OHOS
             }
         }
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "commaPos:%d", commaPos);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "commaPos:%d", commaPos);
 
         if (commaPos != std::string::npos)
         {
@@ -749,10 +749,11 @@ namespace OHOS
                 else
                 {
                     // 发送失败，等待下次发送
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败，等待下次发送");
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败，等待下次发送，fouce_count：%d",fouce_count);
                     fouce_count++;
                     if (fouce_count >= 3)
                     {
+                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败准备发送:uapi_start_tts");
                         uapi_start_tts();
                         fouce_count = 0;
                     }
@@ -806,10 +807,11 @@ namespace OHOS
         else
         {
             // 发送失败，等待下次发送
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败，等待下次发送");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败，等待下次发送，fouce_count：%d",fouce_count);
             fouce_count++;
             if (fouce_count >= 3)
             {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败准备发送:uapi_start_tts");
                 uapi_start_tts();
                 fouce_count = 0;
             }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
index 9583743..94428b2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
@@ -692,11 +692,19 @@ namespace OHOS
             }
             else if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_LISTENING_VIEWID))
             {
+                if (model->GetSelect4gorbt() == AI_SELECT_4G)
+                {
+                    return true;
+                }
                 /*聆听中界面右滑退回到AI对话界面*/
                 ChangeViewAndLogicOperator(AIVOICE_LISTENING_VIEWID, AIVOICE_STARTCHAT_VIEWID);
             }
             else if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_THINKING_VIEWID))
             {
+                if (model->GetSelect4gorbt() == AI_SELECT_4G)
+                {
+                   return true;
+                }
                 /*思考中界面右滑退到AI对话界面*/
                 ChangeViewAndLogicOperator(AIVOICE_THINKING_VIEWID, AIVOICE_STARTCHAT_VIEWID);
             }

diff --git a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
index f3ab197..4f35c70 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
@@ -188,7 +188,7 @@ static void custom_fileoperate_service_check_task(void const *arg)
             break;
 
         case CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_SAVE:
-            battery_save_data();
+            // battery_save_data();
             break;
 
         case CUSTOM_FILEOPERATE_MSG_TYPE_MESSAGE_DATA_NOTIFY:
@@ -201,7 +201,7 @@ static void custom_fileoperate_service_check_task(void const *arg)
     }
 }
 #define CUSTOM_FILE_OPERATE_APP_BOARD_MSG_COUNT 10
-#define CUSTOM_FILE_OPERATE_APP_BOARD_TASK_SIZE 0x2000
+#define CUSTOM_FILE_OPERATE_APP_BOARD_TASK_SIZE 0x3000
 #define CUSTOM_FILE_OPERATE_BOARD_TASK_PRIO 7
 void create_custom_fileoperate_queue(void)
 {