更新了tts包的内容

修复了飞机固件下循环录音播放不能被文本打断的问题修复了飞机固件下播放音频按键不能打断录音的问题

更新了tts包的内容
修复了飞机固件下循环录音播放不能被文本打断的问题修复了飞机固件下播放音频按键不能打断录音的问题
ookk303
CmakeConfig/Compiler.cmake
JZsdk_Config/version_choose.h
Module/Megaphone/Megaphone.c
Module/Megaphone/opus/OpusFile/OpusFilePlay.c
Module/UI_control/Psdk_UI_io.c
project_build/DJI_大疆PSDK/samples/sample_c/module_sample/widget/test_widget_speaker.c
project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/CMakeLists.txt
--- a/CmakeConfig/Compiler.cmake
查看文件 @a27d150
+++ b/CmakeConfig/Compiler.cmake
查看文件 @a27d150
 # 编译链的配置
 #1、编译链与设备类型的选择
-set(DEVICE_NAME JZ_U30)
+set(DEVICE_NAME JZ_H1E)
 #上一行为禁止修改行
 message("**************************JZSDK构建编译开始***************************\n")
@@ -40,15 +40,15 @@ if(${MAKE_COMPILER} STREQUAL "ARM_CORTEXA9_LINUX")
 elseif(${MAKE_COMPILER} STREQUAL "ARM_CORTEX_LINUX")
     set(TOOLCHAIN_NAME arm-linux-gnueabihf-gcc)
-    set(CMAKE_C_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc")
-    set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++")
+    set(CMAKE_C_COMPILER "/usr/local/arm/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc")
+    set(CMAKE_CXX_COMPILER "/usr/local/arm/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++")
     message("使用ARM_CORTEX_LINUX编译链")
 elseif(${MAKE_COMPILER} STREQUAL "ARM_X86_64_ARRCH64")
     # 交叉编译链3 
 	set(TOOLCHAIN_NAME aarch64-linux-gnu-gcc)
-    set(CMAKE_C_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc")
-    set(CMAKE_CXX_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++")
+    set(CMAKE_C_COMPILER "/usr/local/arm/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc")
+    set(CMAKE_CXX_COMPILER "/usr/local/arm/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++")
     message("使用ARM_X86_64_ARRCH64编译链")
 elseif(${MAKE_COMPILER} STREQUAL "LOCAL")
--- a/JZsdk_Config/version_choose.h
查看文件 @a27d150
+++ b/JZsdk_Config/version_choose.h
查看文件 @a27d150
@@ -7,7 +7,7 @@
 #define VERSION_CHOOSE_H
 #include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
 //1~10行 除了D可以修改版本选择 禁止动任何东西
-#define DEVICE_VERSION JZ_U30
+#define DEVICE_VERSION JZ_H1E
 //禁止修改行 选择是串口程序 还是 psdk程序
 #define APP_VERSION APP_PSDK
@@ -18,7 +18,7 @@
 //禁止修改行 串口连接程序的软件版本号
 #define MAJOR_VERSION 0x01
 #define MINOR_VERSION 0x03
-#define MODIFY_VERSION 0x10
+#define MODIFY_VERSION 0x11
 #define DEBUG_VERSION 0x00
 //禁止修改行 滤波方式
--- a/Module/Megaphone/Megaphone.c
查看文件 @a27d150
+++ b/Module/Megaphone/Megaphone.c
查看文件 @a27d150
@@ -139,6 +139,8 @@ T_JZsdkReturnCode Megaphone_MegDataGenFinshFlag(int order, int Flag)
     {
         return MegDataGenFinsh_Flag;
     }
+
+    //JZSDK_LOG_DEBUG("设置数据生产完成标志位:0x%d",Flag);
     MegDataGenFinsh_Flag = Flag;
@@ -1114,26 +1116,23 @@ T_JZsdkReturnCode Megaphone_PlayContinue()
     int ami =JZ_FLAGCODE_ON;
     Megaphone_Amplifier_param(JZ_FLAGCODE_SET, &ami);
-    //查看播放状态是否不处于停止
-    if (g_Megaphone_Play_Status == AUDIO_PLAY_STATUS_IDLE)
-    {
-             //播放当前音频
-        unsigned char CurrentName[128];
-        memset(CurrentName,0,sizeof(CurrentName));
-        unsigned int CurrentNameLen = 0;
-        unsigned int CurrentNum = 0;
-        AudioMange_Get_FilePlayName(CurrentName, &CurrentNameLen, &CurrentNum);
-        UIcontrol_PlayAudioFile(NO_SPECIFIED ,CurrentName, CurrentNameLen);
-        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
-      
-    }
-    else if (g_Megaphone_Play_Status == AUDIO_PLAY_STATUS_MUSIC)
+    //如果正处于播放音频，则恢复播放
+    if (g_Megaphone_Play_Status == AUDIO_PLAY_STATUS_MUSIC)
     {
         AudioDeal_PauseAndContinuePlay(JZ_FLAGCODE_OFF);
         return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
     }
+    //如果正处于其他播放状态，则改为播放当前音频
     else
     {
+        //播放当前音频
+        unsigned char CurrentName[128];
+        memset(CurrentName,0,sizeof(CurrentName));
+        unsigned int CurrentNameLen = 0;
+        unsigned int CurrentNum = 0;
+        AudioMange_Get_FilePlayName(CurrentName, &CurrentNameLen, &CurrentNum);
+        UIcontrol_PlayAudioFile(NO_SPECIFIED ,CurrentName, CurrentNameLen);      
+
         return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
     }
 }
--- a/Module/Megaphone/opus/OpusFile/OpusFilePlay.c
查看文件 @a27d150
+++ b/Module/Megaphone/opus/OpusFile/OpusFilePlay.c
查看文件 @a27d150
@@ -182,6 +182,8 @@ static T_JZsdkReturnCode FixedFilePlay()
 */
 static void *PlayFixedFile_task(void *arg)
 {
+    //JZSDK_LOG_DEBUG("opus播放开始\n");
+
     Megaphone_MegDataGenFlag(JZ_FLAGCODE_SET, JZ_FLAGCODE_ON);
     Megaphone_MegDataGenFinshFlag(JZ_FLAGCODE_SET, JZ_FLAGCODE_ON);
@@ -201,6 +203,8 @@ static void *PlayFixedFile_task(void *arg)
     //广播关闭
 	Megaphone_status_Broadcast(JZ_FLAGCODE_OFF);
+
+    //JZSDK_LOG_DEBUG("opus播放结束\n");
 }
 /*******************************
--- a/Module/UI_control/Psdk_UI_io.c
查看文件 @a27d150
+++ b/Module/UI_control/Psdk_UI_io.c
查看文件 @a27d150
@@ -409,6 +409,9 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_Audio_PauseAndPlayContinue(int wheather_contr
     {
         // 将控件界面的播放开关 转化为关闭
         UI_control_WidgetSet(PSDK_UI_WIDGET_PLAYSTATUS, 1);
+     
+        // 将ttsSpeaker的开关关闭
+        UI_control_WidgetSet(PSDK_UI_SECONDARY_WIDGET_PLAYSTATUS, 0);
         // 如果有进行控制，不只是改控件
         if (wheather_control == 1)
@@ -1093,6 +1096,9 @@ T_JZsdkReturnCode JZsdk_Psdk_UI_io_Set_TTS_Play(char *data, int len)
     //关闭音乐控件
     UI_control_WidgetSet(PSDK_UI_WIDGET_PLAYSTATUS, 1);
+    //关闭内ui的三角形
+    UI_control_WidgetSet(PSDK_UI_SECONDARY_WIDGET_PLAYSTATUS, 0);
+
     T_JZsdkReturnCode ret;
     ret = UIcontrol_TTS_Play(DEVICE_PSDK, data, len);
     return ret;
--- a/project_build/DJI_大疆PSDK/samples/sample_c/module_sample/widget/test_widget_speaker.c
查看文件 @a27d150
+++ b/project_build/DJI_大疆PSDK/samples/sample_c/module_sample/widget/test_widget_speaker.c
查看文件 @a27d150
@@ -865,6 +865,7 @@ static void *DjiTest_WidgetSpeakerTask(void *arg)
                     while (s_isDecodeFinished == false) {
                         osalHandler->TaskSleepMs(1);
                     }
+
                     djiReturnCode = DjiTest_PlayAudioData();
                     if (djiReturnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
                         USER_LOG_ERROR("Play audio data failed, error: 0x%08llX.", djiReturnCode);
@@ -887,6 +888,7 @@ static void *DjiTest_WidgetSpeakerTask(void *arg)
                     while (s_isDecodeFinished == false) {
                         osalHandler->TaskSleepMs(1);
                     }
+
                     djiReturnCode = DjiTest_PlayAudioData();
                     if (djiReturnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
                         USER_LOG_ERROR("Play audio data failed, error: 0x%08llX.", djiReturnCode);
--- a/project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/CMakeLists.txt
查看文件 @a27d150
+++ b/project_build/DJI_大疆PSDK/samples/sample_c/platform/linux/all/CMakeLists.txt
查看文件 @a27d150
 # cmake 最低版本要求 第三行名字不能动
 cmake_minimum_required(VERSION 2.8)
-project(JZ_U30) 
+project(JZ_H1E) 
 #set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++")
 #"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。