From 7731f5f1ac3eee0398c0970dd2b1f9dc9ce1e584 Mon Sep 17 00:00:00 2001
From: Terrence <terrence@tenclass.com>
Date: Thu, 16 Jan 2025 05:43:07 +0800
Subject: [PATCH] add upgrade alert message

---
 main/CMakeLists.txt                           |   2 +-
 main/application.cc                           |  18 ++++++++++++------
 main/assets/upgrade.p3                        | Bin 0 -> 3010 bytes
 .../{err_wificonfig.p3 => wificonfig.p3}      | Bin
 main/boards/common/ml307_board.cc             |   4 ++--
 main/boards/common/wifi_board.cc              |   6 +++---
 6 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 main/assets/upgrade.p3
 rename main/assets/{err_wificonfig.p3 => wificonfig.p3} (100%)

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 1f798e24..00b374bc 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -76,7 +76,7 @@ if(CONFIG_IDF_TARGET_ESP32S3)
 endif()
 
 idf_component_register(SRCS ${SOURCES}
-                    EMBED_FILES "assets/err_reg.p3" "assets/err_pin.p3" "assets/err_wificonfig.p3"
+                    EMBED_FILES "assets/err_reg.p3" "assets/err_pin.p3" "assets/wificonfig.p3" "assets/upgrade.p3"
                     INCLUDE_DIRS ${INCLUDE_DIRS}
                     WHOLE_ARCHIVE
                     )
diff --git a/main/application.cc b/main/application.cc
index 8e8cd7fc..ec0498f2 100644
--- a/main/application.cc
+++ b/main/application.cc
@@ -21,8 +21,10 @@ extern const char p3_err_reg_start[] asm("_binary_err_reg_p3_start");
 extern const char p3_err_reg_end[] asm("_binary_err_reg_p3_end");
 extern const char p3_err_pin_start[] asm("_binary_err_pin_p3_start");
 extern const char p3_err_pin_end[] asm("_binary_err_pin_p3_end");
-extern const char p3_err_wificonfig_start[] asm("_binary_err_wificonfig_p3_start");
-extern const char p3_err_wificonfig_end[] asm("_binary_err_wificonfig_p3_end");
+extern const char p3_wificonfig_start[] asm("_binary_wificonfig_p3_start");
+extern const char p3_wificonfig_end[] asm("_binary_wificonfig_p3_end");
+extern const char p3_upgrade_start[] asm("_binary_upgrade_p3_start");
+extern const char p3_upgrade_end[] asm("_binary_upgrade_p3_end");
 
 static const char* const STATE_STRINGS[] = {
     "unknown",
@@ -61,6 +63,7 @@ void Application::CheckNewVersion() {
     while (true) {
         if (ota_.CheckVersion()) {
             if (ota_.HasNewVersion()) {
+                Alert("Info", "正在升级固件");
                 // Wait for the chat state to be idle
                 do {
                     vTaskDelay(pdMS_TO_TICKS(3000));
@@ -73,6 +76,7 @@ void Application::CheckNewVersion() {
                     display->SetIcon(FONT_AWESOME_DOWNLOAD);
                     display->SetStatus("新版本 " + ota_.GetFirmwareVersion());
 
+                    board.SetPowerSaveMode(false);
                     // 预先关闭音频输出，避免升级过程有音频操作
                     board.GetAudioCodec()->EnableOutput(false);
                     {
@@ -113,11 +117,13 @@ void Application::Alert(const std::string& title, const std::string& message) {
     auto display = Board::GetInstance().GetDisplay();
     display->ShowNotification(message);
 
-    if (message == "PIN is not ready") {
+    if (message == "进入配网模式") {
+        PlayLocalFile(p3_wificonfig_start, p3_wificonfig_end - p3_wificonfig_start);
+    } else if (message == "正在升级固件") {
+        PlayLocalFile(p3_upgrade_start, p3_upgrade_end - p3_upgrade_start);
+    } else if (message == "请插入SIM卡") {
         PlayLocalFile(p3_err_pin_start, p3_err_pin_end - p3_err_pin_start);
-    } else if (message == "Configuring WiFi") {
-        PlayLocalFile(p3_err_wificonfig_start, p3_err_wificonfig_end - p3_err_wificonfig_start);
-    } else if (message == "Registration denied") {
+    } else if (message == "无法接入网络，请检查流量卡状态") {
         PlayLocalFile(p3_err_reg_start, p3_err_reg_end - p3_err_reg_start);
     }
 }
diff --git a/main/assets/upgrade.p3 b/main/assets/upgrade.p3
new file mode 100644
index 0000000000000000000000000000000000000000..4447f26a5c0960c6487cc17ed9d5243f2310e192
GIT binary patch
literal 3010
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
I{*Q(K0UmdnTmS$7

literal 0
HcmV?d00001

diff --git a/main/assets/err_wificonfig.p3 b/main/assets/wificonfig.p3
similarity index 100%
rename from main/assets/err_wificonfig.p3
rename to main/assets/wificonfig.p3
diff --git a/main/boards/common/ml307_board.cc b/main/boards/common/ml307_board.cc
index db3665d9..3902512c 100644
--- a/main/boards/common/ml307_board.cc
+++ b/main/boards/common/ml307_board.cc
@@ -60,10 +60,10 @@ void Ml307Board::WaitForNetworkReady() {
     display->SetStatus("等待网络...");
     int result = modem_.WaitForNetworkReady();
     if (result == -1) {
-        application.Alert("Error", "PIN is not ready");
+        application.Alert("Error", "请插入SIM卡");
         return;
     } else if (result == -2) {
-        application.Alert("Error", "Registration denied");
+        application.Alert("Error", "无法接入网络，请检查流量卡状态");
         return;
     }
 
diff --git a/main/boards/common/wifi_board.cc b/main/boards/common/wifi_board.cc
index 9d5105da..bf1ec1a8 100644
--- a/main/boards/common/wifi_board.cc
+++ b/main/boards/common/wifi_board.cc
@@ -53,9 +53,6 @@ void WifiBoard::EnterWifiConfigMode() {
     auto& wifi_ap = WifiConfigurationAp::GetInstance();
     wifi_ap.SetSsidPrefix("Xiaozhi");
     wifi_ap.Start();
-    
-    // 播报配置 WiFi 的提示
-    application.Alert("Info", "Configuring WiFi");
 
     // 显示 WiFi 配置 AP 的 SSID 和 Web 服务器 URL
     std::string hint = "请在手机上连接热点 ";
@@ -65,6 +62,9 @@ void WifiBoard::EnterWifiConfigMode() {
 
     display->SetStatus(hint);
     
+    // 播报配置 WiFi 的提示
+    application.Alert("Info", "进入配网模式");
+    
     // Wait forever until reset after configuration
     while (true) {
         int free_sram = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);