更新

README.md

@@ -2,3 +2,5 @@
 AIUI demo code
 
 国内用户可从 https://gitee.com/xiaosumay/DemoCode 镜像处下载
+
+相关文档可查阅 https://democode.readthedocs.io/zh_CN/latest/

aiui/c-sharp/aiui_csharp_demo/IAIUIEvent.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace aiui
 {
@@ -32,8 +33,15 @@ public int GetArg2()
         public string GetInfo()
         {
             IntPtr temp = aiui_event_info(mEvent);
-            string info = Marshal.PtrToStringAnsi(temp).ToString();
+            int len = aiui_strlen(temp);
+
+            byte[] managedArray = new byte[len];
+            Marshal.Copy(temp, managedArray, 0, len);
+
+            string info = Encoding.UTF8.GetString(managedArray);
+
             temp = IntPtr.Zero;
+            managedArray = null;
 
             return info;
         }
@@ -63,5 +71,8 @@ public IDataBundle GetData()
 
         [DllImport("aiui", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
         private static extern IntPtr aiui_event_databundle(IntPtr ev);
+
+        [DllImport("aiui", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+        private static extern int aiui_strlen(IntPtr str);
     }
 }

aiui/c-sharp/aiui_csharp_demo/IDataBundle.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace aiui
 {
@@ -19,9 +20,36 @@ public int GetInt(string key, int defVal)
 
         public string GetString(string key, string defVal)
         {
-            IntPtr tmp = aiui_db_string(mDataBundle, Marshal.StringToHGlobalAnsi(key), Marshal.StringToHGlobalAnsi(defVal));
+            IntPtr temp = aiui_db_string(mDataBundle, Marshal.StringToHGlobalAnsi(key), Marshal.StringToHGlobalAnsi(defVal));
 
-            return Marshal.PtrToStringAnsi(tmp);
+            int len = aiui_strlen(temp);
+
+            byte[] managedArray = new byte[len];
+            Marshal.Copy(temp, managedArray, 0, len);
+
+            string info = Encoding.UTF8.GetString(managedArray);
+
+            temp = IntPtr.Zero;
+
+            return info;
+        }
+
+        public string GetBinaryStr(string key)
+        {
+            int len = 0;
+            IntPtr tmp = aiui_db_binary(mDataBundle, Marshal.StringToHGlobalAnsi(key), ref len);
+
+            if (len == 0) return null;
+
+            byte[] managedArray = new byte[len - 1];
+            Marshal.Copy(tmp, managedArray, 0, len - 1);
+
+            string info = Encoding.UTF8.GetString(managedArray);
+
+            tmp = IntPtr.Zero;
+            managedArray = null;
+
+            return info;
         }
 
         public byte[] GetBinary(string key, ref int len)
@@ -47,5 +75,8 @@ public byte[] GetBinary(string key, ref int len)
 
         [DllImport("aiui", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
         private static extern IntPtr aiui_db_binary(IntPtr db, IntPtr key, ref int len);
+
+        [DllImport("aiui", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+        private static extern int aiui_strlen(IntPtr str);
     }
 }

aiui/c-sharp/aiui_csharp_demo/Program.cs

@@ -74,8 +74,9 @@ private static void onEvent(IAIUIEvent ev)
 
                 case AIUIConstant.EVENT_RESULT:
                     {
+
                         var info = JsonConvert.DeserializeObject<Dictionary<object, object>>(ev.GetInfo());
-
+    
                         var datas = info["data"] as JArray;
                         var data = datas[0] as JObject;
                         var param = data["params"] as JObject;
@@ -84,25 +85,21 @@ private static void onEvent(IAIUIEvent ev)
 
                         string sub = param["sub"].ToString();
 
-                        if (sub == "nlp" || sub == "iat" || sub == "tts" || sub == "asr")
+                        if (sub == "nlp" || sub == "iat" || sub== "tts" || sub == "asr")
                         {
                             Console.WriteLine("info: {0}", ev.GetInfo());
 
                             string cnt_id = content["cnt_id"].ToString();
-                            int dataLen = 0;
-                            byte[] buffer = ev.GetData().GetBinary(cnt_id, ref dataLen);
 
                             if (sub != "tts")
                             {
-                                if (dataLen != 0)
+                                string resultStr = ev.GetData().GetBinaryStr(cnt_id);
+
+                                if (resultStr != null)
                                 {
-                                    string resultStr = Encoding.UTF8.GetString(buffer);
                                     Console.WriteLine("resultStr: {0}", resultStr);
-                                    resultStr = null;
                                 }
                             }
-
-                            buffer = null;
                         }
 
                         datas = null;
@@ -151,6 +148,8 @@ public static string GetMac()
 
         static void Main(string[] args)
         {
+            Console.OutputEncoding = System.Text.Encoding.GetEncoding("GBK");
+
             string version = IAIUIAgent.Version();
             Console.WriteLine("aiui version is {0}", version);
 
@@ -225,11 +224,14 @@ static void Main(string[] args)
                 msg_write_audio = null;
                 buf_1 = null;
 
-                pcm.Position += count;
-
                 Thread.Sleep(40);
             }
 
+            IAIUIMessage msg_stop_write_audio = IAIUIMessage.Create(AIUIConstant.CMD_STOP_WRITE, 0, 0, "data_type=audio", IBuffer.Zero);
+            agent.SendMessage(msg_stop_write_audio);
+            msg_stop_write_audio.Destroy();
+            msg_stop_write_audio = null;
+
             Console.WriteLine("finished!");
             pcm.Position = 0;
 

aiui/c-sharp/aiui_csharp_demo/aiui_csharp_demo.csproj

@@ -13,6 +13,7 @@
     <Deterministic>true</Deterministic>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,7 +28,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -39,7 +39,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,7 +50,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -62,7 +62,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -73,7 +73,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>aiui_csharp_demo.Program</StartupObject>
@@ -88,7 +88,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -100,13 +100,13 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
-	<StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
+    <StartWorkingDirectory>..\..\..\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-	<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net20\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />

aiui/c/AIUI/cfg/aiui.cfg

@@ -36,7 +36,7 @@
 	"log": {
 		"debug_log": "1",
 		"save_datalog": "0",
-		"datalog_path": ".",
+		"datalog_path": "",
 		"datalog_size": 1024,
 		"raw_audio_path": ""
 	}

docs/conf.py

@@ -140,7 +140,7 @@
 html_static_path = ['_static']
 
 def setup(app):
-   app.add_css_file("aiui.css")
+    app.add_css_file("aiui.css")
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -192,7 +192,7 @@ def setup(app):
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
+html_search_language = 'zh_CN'
 
 # A dictionary with options for the search language support, empty by default.
 # Now only 'ja' uses this config value
@@ -209,7 +209,7 @@ def setup(app):
 
 latex_elements = {
 # The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+ 'papersize': 'a4paper',
 
 # The font size ('10pt', '11pt' or '12pt').
 #'pointsize': '10pt',

docs/index.rst

@@ -8,6 +8,7 @@ AIUI语音SDK集成文档
 
 .. toctree::
    :maxdepth: 2
-   :glob:
 
-   src/*
+   src/index.rst
+   src/error_code.rst
+   src/engines.rst

docs/src/engines.rst

@@ -0,0 +1,8 @@
+其他功能启用说明
+#############################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   engines/*

docs/src/engines/multi_vtn.rst

@@ -0,0 +1,40 @@
+AIUI接VTN多麦降噪引擎
+#############################
+
+1.	登录 https://aiui.xfyun.cn/ 平台，下载相应平台的sdk，此功能在 5.6.1069.1001 版本以上，之前版本的需重新下载sdk版本，以Windows为例
+
+.. image:: ../../_static/download_sdk.png
+
+2.	文件结构如下
+
+.. code-block:: bash
+
+    ├── include
+    ├── libs
+    │   ├── x64
+    │   └── x86
+    ├── README.md
+    └── samples
+    ├── AIUI
+        ├── aiui_sample
+    ├── samples.sln
+
+
+3.	修改 AIUI内配置参数 路径为：samples\AIUI\cfg\aiui.cfg	（以线性4麦为参考）
+1.	修改mic_type为mic4
+
+.. image:: ../../_static/change_mic_type.png
+
+2.	修改wakeup_mode为 vtn，audio_captor为portaudio
+
+.. image:: ../../_static/change_record.png
+
+3.	修改channel_count和channel_filter （鱼亮科技提供的usb录音板为参考）
+
+.. image:: ../../_static/change_filter_old.png
+
+改为以下
+
+.. image:: ../../_static/change_filter_new.png
+
+4.	将提供的库 vtn_mic4.dll （以线性4麦为参考）放置与aiui.dll同级

docs/src/engines/open_vad.rst

@@ -0,0 +1,25 @@
+开启语义VAD
+#############################
+
+1. 平台设置
+=============================
+
+ 1.1. 在 aiui.xfyun.cn 平台 **我的应用** → **应用配置** → **语义理解** → **开启语义VAD**
+
+.. image:: ../../_static/open_sad_vad.png
+
+1.2	点击保存。(语义VAD 开启需要一定的时间，接下端上的操作请等候一两分钟)。
+
+2. 端侧设置
+=============================
+
+2.1 在端上的SDK配置文件 aiui.cfg 中的vad 配置段添加一下内容
+
+ - vad_eos 这是本地的VAD后端点时长， 默认云端是 1.8s，所以本地可以设置为2s
+ - cloud_vad_info 接收云端VAD尾端点的配置
+
+2.2	最终如下图所示：
+
+.. image:: ../../_static/sad_vad_setting.png
+
+2.3	不用做其他处理，正常交互即可。