feat: Add locales with OGG sounds (#1057)

* fix jiuchuan build problem

* feat: Add locales with OGG sounds

* fix building echoear

* Support ogg files frame duration <= 60

CMakeLists.txt

@@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "1.8.5")
+set(PROJECT_VER "1.8.6")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

main/CMakeLists.txt

@@ -208,7 +208,7 @@ elseif(CONFIG_BOARD_TYPE_ELECTRON_BOT)
     set(BOARD_TYPE "electron-bot")
 elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI_CAM)
     set(BOARD_TYPE "bread-compact-wifi-s3cam")
-elseif(CONFIG_BOARD_TYPE_JIUCHUAN )
+elseif(CONFIG_BOARD_TYPE_JIUCHUAN)
     set(BOARD_TYPE "jiuchuan-s3")
 elseif(CONFIG_BOARD_TYPE_LABPLUS_MPYTHON_V3)
     set(BOARD_TYPE "labplus-mpython-v3") 
@@ -245,13 +245,49 @@ elseif(CONFIG_LANGUAGE_EN_US)
     set(LANG_DIR "en-US")
 elseif(CONFIG_LANGUAGE_JA_JP)
     set(LANG_DIR "ja-JP")
+elseif(CONFIG_LANGUAGE_KO_KR)
+    set(LANG_DIR "ko-KR")
+elseif(CONFIG_LANGUAGE_VI_VN)
+    set(LANG_DIR "vi-VN")
+elseif(CONFIG_LANGUAGE_TH_TH)
+    set(LANG_DIR "th-TH")
+elseif(CONFIG_LANGUAGE_DE_DE)
+    set(LANG_DIR "de-DE")
+elseif(CONFIG_LANGUAGE_FR_FR)
+    set(LANG_DIR "fr-FR")
+elseif(CONFIG_LANGUAGE_ES_ES)
+    set(LANG_DIR "es-ES")
+elseif(CONFIG_LANGUAGE_IT_IT)
+    set(LANG_DIR "it-IT")
+elseif(CONFIG_LANGUAGE_RU_RU)
+    set(LANG_DIR "ru-RU")
+elseif(CONFIG_LANGUAGE_AR_SA)
+    set(LANG_DIR "ar-SA")
+elseif(CONFIG_LANGUAGE_HI_IN)
+    set(LANG_DIR "hi-IN")
+elseif(CONFIG_LANGUAGE_PT_PT)
+    set(LANG_DIR "pt-PT")
+elseif(CONFIG_LANGUAGE_PL_PL)
+    set(LANG_DIR "pl-PL")
+elseif(CONFIG_LANGUAGE_CS_CZ)
+    set(LANG_DIR "cs-CZ")
+elseif(CONFIG_LANGUAGE_FI_FI)
+    set(LANG_DIR "fi-FI")
+elseif(CONFIG_LANGUAGE_TR_TR)
+    set(LANG_DIR "tr-TR")
+elseif(CONFIG_LANGUAGE_ID_ID)
+    set(LANG_DIR "id-ID")
+elseif(CONFIG_LANGUAGE_UK_UA)
+    set(LANG_DIR "uk-UA")
+elseif(CONFIG_LANGUAGE_RO_RO)
+    set(LANG_DIR "ro-RO")
 endif()
 
 # 定义生成路径
-set(LANG_JSON "${CMAKE_CURRENT_SOURCE_DIR}/assets/${LANG_DIR}/language.json")
+set(LANG_JSON "${CMAKE_CURRENT_SOURCE_DIR}/assets/locales/${LANG_DIR}/language.json")
 set(LANG_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/assets/lang_config.h")
-file(GLOB LANG_SOUNDS ${CMAKE_CURRENT_SOURCE_DIR}/assets/${LANG_DIR}/*.p3)
-file(GLOB COMMON_SOUNDS ${CMAKE_CURRENT_SOURCE_DIR}/assets/common/*.p3)
+file(GLOB LANG_SOUNDS ${CMAKE_CURRENT_SOURCE_DIR}/assets/locales/${LANG_DIR}/*.ogg)
+file(GLOB COMMON_SOUNDS ${CMAKE_CURRENT_SOURCE_DIR}/assets/common/*.ogg)
 
 # 如果目标芯片是 ESP32，则排除特定文件
 if(CONFIG_IDF_TARGET_ESP32)
@@ -281,7 +317,7 @@ target_compile_definitions(${COMPONENT_LIB}
 add_custom_command(
     OUTPUT ${LANG_HEADER}
     COMMAND python ${PROJECT_DIR}/scripts/gen_lang.py
-            --input "${LANG_JSON}"
+            --language "${LANG_DIR}"
             --output "${LANG_HEADER}"
     DEPENDS
         ${LANG_JSON}

main/Kconfig.projbuild

@@ -21,6 +21,42 @@ choice
         bool "English"
     config LANGUAGE_JA_JP
         bool "Japanese"
+    config LANGUAGE_KO_KR
+        bool "Korean"
+    config LANGUAGE_VI_VN
+        bool "Vietnamese"
+    config LANGUAGE_TH_TH
+        bool "Thai"
+    config LANGUAGE_DE_DE
+        bool "German"
+    config LANGUAGE_FR_FR
+        bool "French"
+    config LANGUAGE_ES_ES
+        bool "Spanish"
+    config LANGUAGE_IT_IT
+        bool "Italian"
+    config LANGUAGE_RU_RU
+        bool "Russian"
+    config LANGUAGE_AR_SA
+        bool "Arabic"
+    config LANGUAGE_HI_IN
+        bool "Hindi"
+    config LANGUAGE_PT_PT
+        bool "Portuguese"
+    config LANGUAGE_PL_PL
+        bool "Polish"
+    config LANGUAGE_CS_CZ
+        bool "Czech"
+    config LANGUAGE_FI_FI
+        bool "Finnish"
+    config LANGUAGE_TR_TR
+        bool "Turkish"
+    config LANGUAGE_ID_ID
+        bool "Indonesian"
+    config LANGUAGE_UK_UA
+        bool "Ukrainian"
+    config LANGUAGE_RO_RO
+        bool "Romanian"
 endchoice
 
 choice BOARD_TYPE

main/application.cc

@@ -85,9 +85,9 @@ void Application::CheckNewVersion(Ota& ota) {
                 return;
             }
 
-            char buffer[128];
+            char buffer[256];
             snprintf(buffer, sizeof(buffer), Lang::Strings::CHECK_NEW_VERSION_FAILED, retry_delay, ota.GetCheckVersionUrl().c_str());
-            Alert(Lang::Strings::ERROR, buffer, "sad", Lang::Sounds::P3_EXCLAMATION);
+            Alert(Lang::Strings::ERROR, buffer, "sad", Lang::Sounds::OGG_EXCLAMATION);
 
             ESP_LOGW(TAG, "Check new version failed, retry in %d seconds (%d/%d)", retry_delay, retry_count, MAX_RETRY);
             for (int i = 0; i < retry_delay; i++) {
@@ -103,7 +103,7 @@ void Application::CheckNewVersion(Ota& ota) {
         retry_delay = 10; // 重置重试延迟时间
 
         if (ota.HasNewVersion()) {
-            Alert(Lang::Strings::OTA_UPGRADE, Lang::Strings::UPGRADING, "happy", Lang::Sounds::P3_UPGRADE);
+            Alert(Lang::Strings::OTA_UPGRADE, Lang::Strings::UPGRADING, "happy", Lang::Sounds::OGG_UPGRADE);
 
             vTaskDelay(pdMS_TO_TICKS(3000));
 
@@ -130,7 +130,7 @@ void Application::CheckNewVersion(Ota& ota) {
                 ESP_LOGE(TAG, "Firmware upgrade failed, restarting audio service and continuing operation...");
                 audio_service_.Start(); // Restart audio service
                 board.SetPowerSaveMode(true); // Restore power save mode
-                Alert(Lang::Strings::ERROR, Lang::Strings::UPGRADE_FAILED, "sad", Lang::Sounds::P3_EXCLAMATION);
+                Alert(Lang::Strings::ERROR, Lang::Strings::UPGRADE_FAILED, "sad", Lang::Sounds::OGG_EXCLAMATION);
                 vTaskDelay(pdMS_TO_TICKS(3000));
                 // Continue to normal operation (don't break, just fall through)
             } else {
@@ -182,20 +182,20 @@ void Application::ShowActivationCode(const std::string& code, const std::string&
         const std::string_view& sound;
     };
     static const std::array<digit_sound, 10> digit_sounds{{
-        digit_sound{'0', Lang::Sounds::P3_0},
-        digit_sound{'1', Lang::Sounds::P3_1}, 
-        digit_sound{'2', Lang::Sounds::P3_2},
-        digit_sound{'3', Lang::Sounds::P3_3},
-        digit_sound{'4', Lang::Sounds::P3_4},
-        digit_sound{'5', Lang::Sounds::P3_5},
-        digit_sound{'6', Lang::Sounds::P3_6},
-        digit_sound{'7', Lang::Sounds::P3_7},
-        digit_sound{'8', Lang::Sounds::P3_8},
-        digit_sound{'9', Lang::Sounds::P3_9}
+        digit_sound{'0', Lang::Sounds::OGG_0},
+        digit_sound{'1', Lang::Sounds::OGG_1}, 
+        digit_sound{'2', Lang::Sounds::OGG_2},
+        digit_sound{'3', Lang::Sounds::OGG_3},
+        digit_sound{'4', Lang::Sounds::OGG_4},
+        digit_sound{'5', Lang::Sounds::OGG_5},
+        digit_sound{'6', Lang::Sounds::OGG_6},
+        digit_sound{'7', Lang::Sounds::OGG_7},
+        digit_sound{'8', Lang::Sounds::OGG_8},
+        digit_sound{'9', Lang::Sounds::OGG_9}
     }};
 
     // This sentence uses 9KB of SRAM, so we need to wait for it to finish
-    Alert(Lang::Strings::ACTIVATION, message.c_str(), "happy", Lang::Sounds::P3_ACTIVATION);
+    Alert(Lang::Strings::ACTIVATION, message.c_str(), "happy", Lang::Sounds::OGG_ACTIVATION);
 
     for (const auto& digit : code) {
         auto it = std::find_if(digit_sounds.begin(), digit_sounds.end(),
@@ -471,7 +471,7 @@ void Application::Start() {
             auto message = cJSON_GetObjectItem(root, "message");
             auto emotion = cJSON_GetObjectItem(root, "emotion");
             if (cJSON_IsString(status) && cJSON_IsString(message) && cJSON_IsString(emotion)) {
-                Alert(status->valuestring, message->valuestring, emotion->valuestring, Lang::Sounds::P3_VIBRATION);
+                Alert(status->valuestring, message->valuestring, emotion->valuestring, Lang::Sounds::OGG_VIBRATION);
             } else {
                 ESP_LOGW(TAG, "Alert command requires status, message and emotion");
             }
@@ -501,7 +501,7 @@ void Application::Start() {
         display->ShowNotification(message.c_str());
         display->SetChatMessage("system", "");
         // Play the success sound to indicate the device is ready
-        audio_service_.PlaySound(Lang::Sounds::P3_SUCCESS);
+        audio_service_.PlaySound(Lang::Sounds::OGG_SUCCESS);
     }
 
     // Print heap stats
@@ -546,7 +546,7 @@ void Application::MainEventLoop() {
             MAIN_EVENT_ERROR, pdTRUE, pdFALSE, portMAX_DELAY);
         if (bits & MAIN_EVENT_ERROR) {
             SetDeviceState(kDeviceStateIdle);
-            Alert(Lang::Strings::ERROR, last_error_message_.c_str(), "sad", Lang::Sounds::P3_EXCLAMATION);
+            Alert(Lang::Strings::ERROR, last_error_message_.c_str(), "sad", Lang::Sounds::OGG_EXCLAMATION);
         }
 
         if (bits & MAIN_EVENT_SEND_AUDIO) {
@@ -608,7 +608,7 @@ void Application::OnWakeWordDetected() {
 #else
         SetListeningMode(aec_mode_ == kAecOff ? kListeningModeAutoStop : kListeningModeRealtime);
         // Play the pop up sound to indicate the wake word is detected
-        audio_service_.PlaySound(Lang::Sounds::P3_POPUP);
+        audio_service_.PlaySound(Lang::Sounds::OGG_POPUP);
 #endif
     } else if (device_state_ == kDeviceStateSpeaking) {
         AbortSpeaking(kAbortReasonWakeWordDetected);

main/assets/locales/ar-SA/language.json

@@ -0,0 +1,58 @@
+{
+    "language": {
+        "type" :"ar-SA"
+    },
+    "strings": {
+        "WARNING":"تحذير",
+        "INFO":"معلومات",
+        "ERROR":"خطأ",
+        "VERSION": "الإصدار ",
+        "LOADING_PROTOCOL":"الاتصال بالخادم...",
+        "INITIALIZING":"التهيئة...",
+        "PIN_ERROR":"يرجى إدخال بطاقة SIM",
+        "REG_ERROR":"لا يمكن الوصول إلى الشبكة، يرجى التحقق من حالة بطاقة البيانات",
+        "DETECTING_MODULE":"اكتشاف الوحدة...",
+        "REGISTERING_NETWORK":"انتظار الشبكة...",
+        "CHECKING_NEW_VERSION":"فحص الإصدار الجديد...",
+        "CHECK_NEW_VERSION_FAILED":"فشل فحص الإصدار الجديد، سيتم المحاولة خلال %d ثانية: %s",
+        "SWITCH_TO_WIFI_NETWORK":"التبديل إلى Wi-Fi...",
+        "SWITCH_TO_4G_NETWORK":"التبديل إلى 4G...",
+
+        "STANDBY":"في الانتظار",
+        "CONNECT_TO":"الاتصال بـ ",
+        "CONNECTING":"جاري الاتصال...",
+        "CONNECTED_TO":"متصل بـ ",
+
+        "LISTENING":"الاستماع...",
+        "SPEAKING":"التحدث...",
+
+        "SERVER_NOT_FOUND":"البحث عن خدمة متاحة",
+        "SERVER_NOT_CONNECTED":"لا يمكن الاتصال بالخدمة، يرجى المحاولة لاحقاً",
+        "SERVER_TIMEOUT":"انتهت مهلة الاستجابة",
+        "SERVER_ERROR":"فشل الإرسال، يرجى التحقق من الشبكة",
+
+        "CONNECT_TO_HOTSPOT":"اتصل الهاتف بنقطة الاتصال ",
+        "ACCESS_VIA_BROWSER":"،الوصول عبر المتصفح ",
+        "WIFI_CONFIG_MODE":"وضع تكوين الشبكة",
+        "ENTERING_WIFI_CONFIG_MODE":"الدخول في وضع تكوين الشبكة...",
+        "SCANNING_WIFI":"فحص Wi-Fi...",
+
+        "NEW_VERSION": "إصدار جديد ",
+        "OTA_UPGRADE":"تحديث OTA",
+        "UPGRADING":"تحديث النظام...",
+        "UPGRADE_FAILED":"فشل التحديث",
+        "ACTIVATION":"تفعيل الجهاز",
+
+        "BATTERY_LOW":"البطارية منخفضة",
+        "BATTERY_CHARGING":"جاري الشحن",
+        "BATTERY_FULL":"البطارية ممتلئة",
+        "BATTERY_NEED_CHARGE":"البطارية منخفضة، يرجى الشحن",
+
+        "VOLUME":"الصوت ",
+        "MUTED":"صامت",
+        "MAX_VOLUME":"أقصى صوت",
+
+        "RTC_MODE_OFF":"AEC مُوقف",
+        "RTC_MODE_ON":"AEC مُشغل"
+    }
+} 

main/assets/locales/cs-CZ/language.json

@@ -0,0 +1,58 @@
+{
+    "language": {
+        "type" :"cs-CZ"
+    },
+    "strings": {
+        "WARNING":"Varování",
+        "INFO":"Informace",
+        "ERROR":"Chyba",
+        "VERSION": "Verze ",
+        "LOADING_PROTOCOL":"Připojování k serveru...",
+        "INITIALIZING":"Inicializace...",
+        "PIN_ERROR":"Prosím vložte SIM kartu",
+        "REG_ERROR":"Nelze se připojit k síti, zkontrolujte stav datové karty",
+        "DETECTING_MODULE":"Detekce modulu...",
+        "REGISTERING_NETWORK":"Čekání na síť...",
+        "CHECKING_NEW_VERSION":"Kontrola nové verze...",
+        "CHECK_NEW_VERSION_FAILED":"Kontrola nové verze selhala, opakování za %d sekund: %s",
+        "SWITCH_TO_WIFI_NETWORK":"Přepínání na Wi-Fi...",
+        "SWITCH_TO_4G_NETWORK":"Přepínání na 4G...",
+
+        "STANDBY":"Pohotovost",
+        "CONNECT_TO":"Připojit k ",
+        "CONNECTING":"Připojování...",
+        "CONNECTED_TO":"Připojeno k ",
+
+        "LISTENING":"Naslouchání...",
+        "SPEAKING":"Mluvení...",
+
+        "SERVER_NOT_FOUND":"Hledání dostupné služby",
+        "SERVER_NOT_CONNECTED":"Nelze se připojit ke službě, zkuste to později",
+        "SERVER_TIMEOUT":"Čas odpovědi vypršel",
+        "SERVER_ERROR":"Odeslání selhalo, zkontrolujte síť",
+
+        "CONNECT_TO_HOTSPOT":"Připojte telefon k hotspotu ",
+        "ACCESS_VIA_BROWSER":"，přístup přes prohlížeč ",
+        "WIFI_CONFIG_MODE":"Režim konfigurace sítě",
+        "ENTERING_WIFI_CONFIG_MODE":"Vstup do režimu konfigurace sítě...",
+        "SCANNING_WIFI":"Skenování Wi-Fi...",
+
+        "NEW_VERSION": "Nová verze ",
+        "OTA_UPGRADE":"OTA upgrade",
+        "UPGRADING":"Aktualizace systému...",
+        "UPGRADE_FAILED":"Upgrade selhal",
+        "ACTIVATION":"Aktivace zařízení",
+
+        "BATTERY_LOW":"Slabá baterie",
+        "BATTERY_CHARGING":"Nabíjení",
+        "BATTERY_FULL":"Baterie plná",
+        "BATTERY_NEED_CHARGE":"Slabá baterie, prosím nabijte",
+
+        "VOLUME":"Hlasitost ",
+        "MUTED":"Ztlumeno",
+        "MAX_VOLUME":"Maximální hlasitost",
+
+        "RTC_MODE_OFF":"AEC vypnuto",
+        "RTC_MODE_ON":"AEC zapnuto"
+    }
+} 

main/assets/locales/de-DE/language.json

@@ -0,0 +1,58 @@
+{
+    "language": {
+        "type" :"de-DE"
+    },
+    "strings": {
+        "WARNING":"Warnung",
+        "INFO":"Information",
+        "ERROR":"Fehler",
+        "VERSION": "Version ",
+        "LOADING_PROTOCOL":"Verbindung zum Server...",
+        "INITIALIZING":"Initialisierung...",
+        "PIN_ERROR":"Bitte SIM-Karte einlegen",
+        "REG_ERROR":"Netzwerkverbindung fehlgeschlagen, bitte Datenkartenstatus prüfen",
+        "DETECTING_MODULE":"Modul erkennen...",
+        "REGISTERING_NETWORK":"Auf Netzwerk warten...",
+        "CHECKING_NEW_VERSION":"Neue Version prüfen...",
+        "CHECK_NEW_VERSION_FAILED":"Neue Version prüfen fehlgeschlagen, Wiederholung in %d Sekunden: %s",
+        "SWITCH_TO_WIFI_NETWORK":"Zu Wi-Fi wechseln...",
+        "SWITCH_TO_4G_NETWORK":"Zu 4G wechseln...",
+
+        "STANDBY":"Bereitschaft",
+        "CONNECT_TO":"Verbinden zu ",
+        "CONNECTING":"Verbindung wird hergestellt...",
+        "CONNECTED_TO":"Verbunden mit ",
+
+        "LISTENING":"Zuhören...",
+        "SPEAKING":"Sprechen...",
+
+        "SERVER_NOT_FOUND":"Verfügbaren Service suchen",
+        "SERVER_NOT_CONNECTED":"Service-Verbindung fehlgeschlagen, bitte später versuchen",
+        "SERVER_TIMEOUT":"Antwort-Timeout",
+        "SERVER_ERROR":"Senden fehlgeschlagen, bitte Netzwerk prüfen",
+
+        "CONNECT_TO_HOTSPOT":"Handy mit Hotspot verbinden ",
+        "ACCESS_VIA_BROWSER":"，Browser öffnen ",
+        "WIFI_CONFIG_MODE":"Netzwerkkonfigurationsmodus",
+        "ENTERING_WIFI_CONFIG_MODE":"Netzwerkkonfigurationsmodus eingeben...",
+        "SCANNING_WIFI":"Wi-Fi scannen...",
+
+        "NEW_VERSION": "Neue Version ",
+        "OTA_UPGRADE":"OTA-Upgrade",
+        "UPGRADING":"System wird aktualisiert...",
+        "UPGRADE_FAILED":"Upgrade fehlgeschlagen",
+        "ACTIVATION":"Gerät aktivieren",
+
+        "BATTERY_LOW":"Niedriger Batteriestand",
+        "BATTERY_CHARGING":"Wird geladen",
+        "BATTERY_FULL":"Batterie voll",
+        "BATTERY_NEED_CHARGE":"Niedriger Batteriestand, bitte aufladen",
+
+        "VOLUME":"Lautstärke ",
+        "MUTED":"Stummgeschaltet",
+        "MAX_VOLUME":"Maximale Lautstärke",
+
+        "RTC_MODE_OFF":"AEC aus",
+        "RTC_MODE_ON":"AEC ein"
+    }
+}