Merge pull request #19 from yunxinusecase/v1.1.5

V1.1.5

Author: yunxinusecase

build.ps1

@@ -0,0 +1,63 @@
+
+# 获取脚本的参数
+$arguments = $args
+Write-Host "args: $args"
+
+# 初始化变量
+$espIdfPath = ""
+$projectPath = ""
+$otherParams = @()
+
+# 遍历参数
+foreach ($arg in $arguments) {
+    if ($arg -match "^--espIdfPath=") {
+        # 提取 espIdfPath 的值
+        $espIdfPath = $arg -replace "^--espIdfPath=", ""
+    } elseif ($arg -match "^--projectPath=") {
+        # 提取 projectPath 的值
+        $projectPath = $arg -replace "^--projectPath=", ""
+    } else {
+        # 将其他参数添加到数组中
+        $otherParams += $arg
+    }
+}
+
+# 检查 espIdfPath 是否为空，如果为空则使用默认值
+if ([string]::IsNullOrEmpty($espIdfPath)) {
+    $espIdfPath = "C:/Users/hzgaoqi1/esp/v5.4.1/esp-idf"
+}
+if ([string]::IsNullOrEmpty($projectPath)) {
+    $projectPath = (Get-Location).Path
+}
+
+# 打印参数值以调试
+Write-Host "Debug Information:"
+Write-Host "espIdfPath: $espIdfPath"
+Write-Host "projectPath: $projectPath"
+Write-Host "otherParams: $otherParams"
+
+# 设置环境变量
+$env:IDF_PATH = $espIdfPath
+$env:PATH = "$env:PATH;$env:IDF_PATH/tools"
+
+# 激活 ESP-IDF 环境
+. "$env:IDF_PATH/export.ps1"
+
+# 构造 Python 命令
+$pythonCommand = "python $projectPath/build.py"
+foreach ($arg in $args) {
+    $pythonCommand += " $arg"
+}
+
+# 打印构造的 Python 命令以调试
+Write-Host "Executing command: $pythonCommand"
+
+# 运行 Python 编译脚本并捕获输出和退出状态码
+$process = Start-Process -FilePath "python" -ArgumentList "$projectPath/build.py", "$otherParams" -PassThru -NoNewWindow -Wait
+$exitCode = $process.ExitCode
+
+# 打印退出状态码
+Write-Host "Exit code: $exitCode"
+
+# 退出脚本并返回状态码
+exit $exitCode

build.py

@@ -0,0 +1,91 @@
+import os
+import shutil
+import subprocess
+import argparse
+import platform
+
+# 设置 ESP-IDF 路径
+esp_idf_path = {
+    "Windows": "C:/Users/hzgaoqi1/esp/v5.4.1/esp-idf",
+    "Darwin": "/path/to/esp-idf"  # macOS路径，需要根据实际情况修改
+}
+
+def run_command(command, cwd=None):
+    """运行命令并捕获输出"""
+    try:
+        subprocess.run(command, check=True, cwd=cwd, shell=True)
+    except subprocess.CalledProcessError as e:
+        print(f"Error: {e}")
+        exit(1)
+
+def activate_espidf_env(esp_idf_path):
+    """激活ESP-IDF环境"""
+    if platform.system() == "Windows":
+        # # 直接在Python中设置环境变量
+        # os.environ["IDF_PATH"] = esp_idf_path["Windows"]
+        # os.environ["PATH"] = f"{os.environ['PATH']};{os.path.join(esp_idf_path['Windows'], 'tools')}"
+        print(f"Activating ESP-IDF environment for Windows at build.ps1")
+    elif platform.system() == "Darwin":  # macOS
+        # os.environ["IDF_PATH"] = esp_idf_path["Darwin"]
+        # os.environ["PATH"] = f"{os.environ['PATH']}:{os.path.join(esp_idf_path['Darwin'], 'tools')}"
+        print(f"Activating ESP-IDF environment for Mac at build.sh")
+
+def build_project(target, build_dir, project_path, esp_idf_path):
+    """编译项目"""
+    print(f"Compiling {target} project...")
+    # 删除旧的 sdkconfig 文件
+    sdkconfig_path = os.path.join(project_path, "sdkconfig")
+    if os.path.exists(sdkconfig_path):
+        os.remove(sdkconfig_path)
+    
+    # 根据目标芯片复制默认的 sdkconfig 文件
+    sdkconfig_defaults_path = os.path.join(project_path, f"sdkconfig.defaults.{target}")
+    if not os.path.exists(sdkconfig_defaults_path):
+        print(f"Error: sdkconfig.defaults.{target} not found in {project_path}")
+        exit(1)
+    shutil.copy(sdkconfig_defaults_path, sdkconfig_path)
+    
+    # 激活 ESP-IDF 环境
+    activate_espidf_env(esp_idf_path)
+    
+    # 运行编译命令
+    build_command = f"idf.py -B {build_dir} -DIDF_TARGET={target} build"
+    run_command(build_command, cwd=project_path)
+    print(f"{target} compilation completed successfully. Output in {build_dir}")
+
+def main():
+    parser = argparse.ArgumentParser(description="Build ESP-IDF projects for different targets.")
+    parser.add_argument("--esp32s3", action="store_true", help="Build for ESP32-S3")
+    parser.add_argument("--esp32c3", action="store_true", help="Build for ESP32-C3")
+    parser.add_argument("--all", action="store_true", help="Build for both ESP32-S3 and ESP32-C3 (default)")
+    
+    args = parser.parse_args()
+    
+    # 设置默认行为为 --all
+    if not (args.esp32s3 or args.esp32c3 or args.all):
+        args.all = True
+    
+    # 设置路径
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    project_path = script_dir
+
+    # # 删除旧的 out 目录
+    # out_dir = os.path.join(script_dir, "out")
+    # if os.path.exists(out_dir):
+    #     shutil.rmtree(out_dir)
+    #     os.makedirs(out_dir)
+    
+    try:
+        if args.all or args.esp32s3:
+            build_dir = os.path.join(script_dir, "out", "esp32s3")
+            build_project("esp32s3", build_dir, project_path, esp_idf_path)
+        
+        if args.all or args.esp32c3:
+            build_dir = os.path.join(script_dir, "out", "esp32c3")
+            build_project("esp32c3", build_dir, project_path, esp_idf_path)
+    except Exception as e:
+        print(f"Error: {e}")
+        exit(1)
+
+if __name__ == "__main__":
+    main()

build.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# 获取脚本的参数
+arguments=("$@")
+echo "args: ${arguments[@]}"
+
+# 初始化变量
+espIdfPath=""
+projectPath=""
+otherParams=()
+
+# 遍历参数
+for arg in "${arguments[@]}"; do
+    if [[ $arg =~ ^--espIdfPath= ]]; then
+        # 提取 espIdfPath 的值
+        espIdfPath="${arg#*=}"
+    elif [[ $arg =~ ^--projectPath= ]]; then
+        # 提取 projectPath 的值
+        projectPath="${arg#*=}"
+    else
+        # 将其他参数添加到数组中
+        otherParams+=("$arg")
+    fi
+done
+
+# 检查 espIdfPath 是否为空，如果为空则使用默认值
+if [ -z "$espIdfPath" ]; then
+    espIdfPath="/Users/yunxin/project/esp/esp-idf"
+fi
+
+# 检查 projectPath 是否为空，如果为空则使用当前目录
+if [ -z "$projectPath" ]; then
+    projectPath="$(pwd)"
+fi
+
+# 打印参数值以调试
+echo "Debug Information:"
+echo "espIdfPath: $espIdfPath"
+echo "projectPath: $projectPath"
+echo "otherParams: ${otherParams[@]}"
+
+# 设置环境变量
+export IDF_PATH="$espIdfPath"
+export PATH="$PATH:$IDF_PATH/tools"
+
+# 激活 ESP-IDF 环境
+cd $IDF_PATH
+. ./export.sh
+cd -
+
+# 构造 Python 命令
+pythonCommand="python $projectPath/build.py"
+for arg in "${otherParams[@]}"; do
+    pythonCommand+=" $arg"
+done
+
+# 打印构造的 Python 命令以调试
+echo "Executing command: $pythonCommand"
+
+# 运行 Python 编译脚本并捕获输出和退出状态码
+python $projectPath/build.py "${otherParams[@]}"
+exitCode=$?
+
+# 打印退出状态码
+echo "Exit code: $exitCode"
+
+# 退出脚本并返回状态码
+exit $exitCode

components/nertc_sdk/include/nertc_sdk.h

@@ -1,5 +1,5 @@
-#ifndef _NERTC_SDK_H_
-#define _NERTC_SDK_H_
+#ifndef __NERTC_SDK_H__
+#define __NERTC_SDK_H__
 
 #include "nertc_sdk_event.h"
 #include "nertc_sdk_error.h"
@@ -52,9 +52,9 @@ NERTC_SDK_API int nertc_init(nertc_sdk_engine_t engine);
  *         - 非0：失败 <br>
  */
 NERTC_SDK_API int nertc_join(nertc_sdk_engine_t engine,
-                            const char* channel_name, 
-                            const char * token,
-                            uint64_t uid);
+                             const char* channel_name, 
+                             const char * token,
+                             uint64_t uid);
 
 /**
  * @brief 离开房间
@@ -163,6 +163,14 @@ NERTC_SDK_API int nertc_stop_ai(nertc_sdk_engine_t engine);
  */
 NERTC_SDK_API int nertc_ai_manual_interrupt(nertc_sdk_engine_t engine);
 
+/**
+ * @brief 挂断电话
+ * @param engine 通过 nertc_create_engine 创建且通过 nertc_init 初始化之后的引擎实例
+ * @return 方法调用结果：<br>
+ *         -   0：成功 <br>
+ *         - 非0：失败 <br>
+ */
+NERTC_SDK_API int nertc_ai_hang_up(nertc_sdk_engine_t engine);
 
 #ifdef __cplusplus
 }

components/nertc_sdk/include/nertc_sdk_define.h

@@ -10,6 +10,12 @@ extern "C" {
 /** token 最大长度 */
 #define kNERtcMaxTokenLength 256
 
+typedef enum {
+  NERTC_SDK_DEVICE_LEVEL_NORMAL = 0,
+  NERTC_SDK_DEVICE_LEVEL_LOW = 1,
+  NERTC_SDK_DEVICE_LEVEL_HIGH = 2
+} nertc_sdk_device_level_e;
+
 typedef enum {
   NERTC_SDK_LOG_NONE = 0,
   NERTC_SDK_LOG_ERROR = 1,
@@ -34,6 +40,7 @@ typedef enum {
 } nertc_sdk_user_type_e;
 
 typedef enum {
+  NERTC_SDK_MEDIA_UNKNOWN = -1,
   NERTC_SDK_MEDIA_MAIN_AUDIO = 0,
   NERTC_SDK_MEDIA_SUB_AUDIO = 1,
   NERTC_SDK_MEDIA_MAIN_VIDEO = 2,
@@ -57,6 +64,20 @@ typedef enum {
   NERTC_SDK_ASR_CAPTION_STATE_STOPPED = 3
 } nertc_sdk_asr_caption_state_e;
 
+typedef struct nertc_sdk_optional_config {
+  nertc_sdk_device_level_e device_performance_level;
+  bool enable_server_aec;
+  char* custom_config;
+} nertc_sdk_optional_config_t;
+
+typedef struct nertc_sdk_licence_config {
+  const char* license;  // licence
+} nertc_sdk_licence_config_t;
+
+typedef struct nertc_sdk_log_config {
+  nertc_sdk_log_level_e log_level;
+} nertc_sdk_log_config_t;
+
 typedef struct nertc_sdk_user_info {
   /**
    * @if Chinese
@@ -105,7 +126,7 @@ typedef struct nertc_sdk_audio_frame {
   nertc_sdk_audio_config_t config;
   /** 音频帧数据 */
   void* data;
-  /** 音频帧数据的长度 */
+  /** 音频帧数据int16的长度 */
   int length;
 } nertc_sdk_audio_frame_t;
 
@@ -165,4 +186,4 @@ typedef struct nertc_sdk_ai_data_result {
 }
 #endif
 
-#endif // __NERTC_SDK_DEFINE_H__
+#endif  // __NERTC_SDK_DEFINE_H__

components/nertc_sdk/include/nertc_sdk_error.h

@@ -46,6 +46,21 @@ typedef enum {
   /* Invalid state */
   NERTC_SDK_ERR_INVALID_STATE                             = 30005,
 
+  /* 许可证不合法 */
+  NERTC_SDK_ERR_LICENSE_ILLEGAL                           = 30060,
+
+  /* 许可证不存在 */
+  NERTC_SDK_ERR_LICENSE_NOT_EXIST                         = 30061,
+
+  /* 许可证校验失败 */
+  NERTC_SDK_ERR_LICENSE_CHECK_FAILED                      = 30062,
+
+  /* 许可证已过期 */
+  NERTC_SDK_ERR_LICENSE_EXPIRED                           = 30063,
+
+  /* 许可证未激活 */
+  NERTC_SDK_ERR_LICENSE_NOT_ACTIVATED                     = 30064,
+
   /** 用户未找到 */
   NERTC_SDK_ERR_USER_NOT_FOUND                            = 30105,       
 
@@ -59,8 +74,7 @@ typedef enum {
   NERTC_SDK_ERR_KICKED_BY_SERVER                          = 30206,             
 
   /** 房间已被关闭 */
-  NERTC_SDK_ERR_KICKED_BY_CHANNEL_CLOSED                  = 30207,         
-
+  NERTC_SDK_ERR_KICKED_BY_CHANNEL_CLOSED                  = 30207,
 } nertc_sdk_error_code_e;
 
 #ifdef __cplusplus