uart底层优化,opus优化,心跳帧优化，升级模块增加

osal层增加，hal层增加，日志层修改逻辑

@@ -106,7 +106,10 @@
         "jzsdk_semaphore.h": "c",
         "jzsdk_filesystm.h": "c",
         "jzsdk_memoryadapter.h": "c",
-        "jzsdk_errorcodedef.h": "c"
+        "jzsdk_errorcodedef.h": "c",
+        "jzsdk_timer.h": "c",
+        "jzsdk_framecomparsion_6aframe.h": "c",
+        "jzsdk_uart.h": "c"
     },
     "Codegeex.GenerationPreference": "automatic",
     "C_Cpp.dimInactiveRegions": false

 # 编译链的配置
 
 #1、编译链与设备类型的选择
-set(DEVICE_NAME JZ_H10)
+set(DEVICE_NAME JZ_H1T)
 #上一行为禁止修改行
 
 message("**************************JZSDK构建编译开始***************************\n")

@@ -21,7 +21,7 @@ extern "C" {
 
 #include "./JZsdk_typedef/JZsdk_typedef.h"
 #include "./JZsdk_ReturnCode/JZsdk_ReturnCode.h"
-
+#include "./JZsdk_Platform/JZsdk_Platform.h"
 
 #include "./JZsdk_InsCode.h"
 #include "./JZsdk_FLagCode.h"

@@ -23,21 +23,28 @@ extern "C"
 /* Exported types ------------------------------------------------------------*/
 typedef enum JZ_DEVICE_PORT_TYPE
 {
-    DEVICE_PSDK = 0x1000, // psdk功能
-    UART_4G = 0x1001,     // 4G功能
-    UART_DEV_1 = 0x1002,  // 1号设备功能
-    UART_DEV_2 = 0x1003,  // 2号设备功能
-    UART_DEV_3 = 0x1004,  // 3号设备功能
-    UART_DEV_4 = 0x1005,  // 4号设备功能
-    UART_DEV_5 = 0x1006,  // 5号设备功能
-
-    UART_USB_1 = 0x1100, // usb设备
-    UART_USB_2 = 0x1101, // usb设备
-    UART_USB_3 = 0x1102, // usb设备
-    UART_USB_4 = 0x1103, // usb设备
-    UART_USB_5 = 0x1104, // usb设备
-
-    HAL_DATA_TRANSMISSION = 0x1200, // hal定制的特殊数据传播
+    DEVICE_PSDK = 0x0000, // psdk功能
+
+    UART_4G = 0x0010,     // 4G功能
+    UART_DEV_1 = 0x0011,  // 1号设备功能
+    UART_DEV_2 = 0x0012,  // 2号设备功能
+    UART_DEV_3 = 0x0013,  // 3号设备功能
+    UART_DEV_4 = 0x0014,  // 4号设备功能
+    UART_DEV_5 = 0x0015,  // 5号设备功能
+
+    USB_DEV_1 = 0x0020, // usb设备
+    USB_DEV_2 = 0x0021, // usb设备
+    USB_DEV_3 = 0x0022, // usb设备
+    USB_DEV_4 = 0x0023, // usb设备
+    USB_DEV_5 = 0x0024, // usb设备
+
+    NET_DEV_1 = 0x0030, // 网络设备
+    NET_DEV_2 = 0x0031, // 网络设备
+    NET_DEV_3 = 0x0032, // 网络设备
+
+    HAL_DATA_TRANSMISSION = 0x0040, // hal定制的特殊数据传播
+
+    HAL_MAX = 0x0050, // hal最大值
 
     COMBINE_DEVICE = 0x1998, // 组合设备
     NO_SPECIFIED = 0x1999,   // 无制定设备

@@ -72,6 +72,8 @@ typedef enum {
     JZ_INSCODE_5AFRAME_CHECKSTATUS_SOFTWAREVERSION   = 0x10000625,             //查询软件版本号
     JZ_INSCODE_5AFRAME_CHECKSTATUS_LOOPPLAY          = 0x10000626,             //查询是否打开循环
     JZ_INSCODE_5AFRAME_CHECKSTATUS_ADUIO_LOOP_INTERVAL           = 0x10000639,             //查询音频循环间隔
+    JZ_INSCODE_5AFRAME_CHECKSTATUS_CURRENT_PLAYTIME  = 0x10000640,             //查询当前播放时间回调是否打开
+
 
     JZ_INSCODE_5AFRAME_CHECKSTATUS_TTSTONE           = 0x10000627,             //查询音色
     JZ_INSCODE_5AFRAME_CHECKSTATUS_TTSSPEED          = 0x10000628,             //查询语速 
@@ -94,6 +96,9 @@ typedef enum {
     JZ_INSCODE_5AFRAME_DELETE_AUDIO                         = 0x10000700,           //删除音频
     JZ_INSCODE_5AFRAME_DELETE_VOICE_RECORD                  = 0x10000710,           //删除录音
     JZ_INSCODE_5AFRAME_DELETE_VIDEO_RECORD                  = 0x10000720,           //删除视频
+    JZ_INSCODE_5AFRAME_RENAME_AUDIO                         = 0x10000730,           //重命名音频
+    JZ_INSCODE_5AFRAME_RENAME_VOICE_RECORD                  = 0x10000740,           //重命名录音
+    JZ_INSCODE_5AFRAME_RENAME_VIDEO_RECORD                  = 0x10000750,           //重命名视频
 
 
     JZ_INSCODE_5AFRAME_TTS_SET_TONE                    = 0x10000801,           //TTS设置音色
@@ -103,15 +108,22 @@ typedef enum {
     JZ_INSCODE_5AFRAME_TTS_TRANS_STOP                  = 0x10000805,           //TTS发送完毕
     JZ_INSCODE_5AFRAME_TTS_TRANS_LIMIT_TRANSMISSION          = 0x10000806,           //TTS正在定长接收
     
-    JZ_INSCODE_5AFRAME_OPUS_TRANS_START                = 0x10000900,         //opus传输开始
-    JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION         = 0x10000901,    //opus 无限制传输中
+    JZ_INSCODE_5AFRAME_CURRENT_PLAY_TIME             = 0x10004406,             //设置播放回传
+
+
+    JZ_INSCODE_5AFRAME_OPUS_TRANS_START_1                = 0x10000900,         //opus传输开始1型
+    JZ_INSCODE_5AFRAME_OPUS_TRANS_START_2                = 0x10000901,         //opus传输开始2型
+    //JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION         = 0x10000901,    //opus 无限制传输中
     JZ_INSCODE_5AFRAME_OPUS_TRANS_LIMIT_TRANSMISSION         = 0x10000903,    //opus传输中
 
     JZ_INSCODE_5AFRAME_OPUS_TRANS_STOP                 = 0x10000902,         //opus传输结束
     JZ_INSCODE_5AFRAME_OPUS_TRANS_STOP_AND_CHECK         = 0x10000904,         //opus传输结束并校验
 
+
     JZ_INSCODE_5AFRAME_OPUS_PLAY                       = 0x10000910,           //opus播放
 
+    JZ_INSCODE_5AFRAME_OPUS_GETOPUSLIST                  = 0x10000911,          //获取opus列表
+
     JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_START                   = 0x10000A00,         //开启opus实时语音
     JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_UNLIMIT_TRANSMISSION            = 0x10000A01,         //无限制传输opus实时语音
     JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_STOP                    = 0x10000A02,         //结束opus实时语音
@@ -138,6 +150,12 @@ typedef enum {
     JZ_INSCODE_5AFRAME_OUTPUTPOWER_CONTROL            = 0x10001000,          //对外供电开关
     JZ_INSCODE_5AFRAME_CHECKSTATUS_OUTPUTPOWER        = 0x10001001,          //对外供电查询
 
+    JZ_INSCODE_5AFRAME_UPGRADE_PERPARE                = 0x10001100,          //升级准备
+    JZ_INSCODE_5AFRAME_UPGRADE_SEND_CHECKCODE                  = 0x10001101,              //升级发送校验码
+    JZ_INSCODE_5AFRAME_UPGRADE_STRAT                   = 0x10001102,          //升级传输开始
+    JZ_INSCODE_5AFRAME_UPGRADE_TRANS                   = 0x10001103,          //升级传输数据
+    JZ_INSCODE_5AFRAME_UPGRADE_END                    = 0x10001104,          //升级传输结束
+
 //5B类帧
     JZ_INSCODE_5BFRAME_FRAME                         = 0x10004000,         //发送帧
 
@@ -168,7 +186,8 @@ typedef enum {
     JZ_INSCODE_5BFRAME_TTS_SPEED                     = 0x10004403,             //发送tts语速
     JZ_INSCODE_5BFRAME_AUDIO_PLAYFILENAME            = 0x10004404,             //当前播放的音频名字
     JZ_INSCODE_5BFRAME_CHECKSTATUS_AUDIO_DETAIL_MESSAGE      = 0x10004405,                         //查询音频详细信息
-
+    JZ_INSCODE_5BFRAME_CURRENT_PLAY_TIME             = 0x10004406,             //当前播放时间
+    JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME  = 0x10004407,             //查询当前播放时间回调是否打开
 
 
     JZ_INSCODE_5BFRAME_GIMBAL_PITCH                  = 0x10004500,               //云台俯仰角度
@@ -195,8 +214,18 @@ typedef enum {
     JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER       = 0x10004900,          //对外供电查询
 
     JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS                = 0x10005000,         //opus解码状态
-    JZ_INSCODE_5BFRAME_OPUS_TRANS_STOP_AND_CHECK         = 0x10000904,         //opus传输结束并校验
-
+    JZ_INSCODE_5BFRAME_OPUS_TRANS_STOP_AND_CHECK         = 0x10005904,         //opus传输结束并校验
+
+    JZ_INSCODE_5BFRAME_OPUSLIST_START               = 0x10005910,          //开启发送opus列表帧
+    JZ_INSCODE_5BFRAME_OPUSLIST_TRANS               = 0x10005911,          //传输opus列表帧
+    JZ_INSCODE_5BFRAME_OPUSLIST_END                 = 0x10005912,          //传输opus列表帧
+
+    JZ_INSCODE_5BFRAME_UPGRADE_PERPARE                = 0x10001100,          //升级准备
+    JZ_INSCODE_5BFRAME_UPGRADE_SEND_CHECKCODE                  = 0x10001101,              //升级发送校验码
+    JZ_INSCODE_5BFRAME_UPGRADE_STRAT                   = 0x10001102,          //升级传输开始
+    JZ_INSCODE_5BFRAME_UPGRADE_TRANS                   = 0x10001103,          //升级传输数据
+    JZ_INSCODE_5BFRAME_UPGRADE_END                    = 0x10001104,          //升级传输结束
+    JZ_INSCODE_5BFRAME_UPGRADE_CHECKRESULT                  = 0x10001105,          //升级校验结果
 
 //6A类
     JZ_INSCODE_6AFRAME_FRAME                         = 0x10008000,         //发送帧

 /**
  ********************************************************************
- * @file   JZsdk_typedef.h
+ * @file   JZsdk_Platform.h
  *          用于记录各类码的表
  *
  *********************************************************************
  */
 
 /* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
-#ifndef JZSDK_TYPEDEF_H
-#define JZSDK_TYPEDEF_H
+#ifndef JZSDK_PLATFORM_H
+#define JZSDK_PLATFORM_H
 
 /* Includes ------------------------------------------------------------------*/
 #include "../JZsdk_typedef/JZsdk_typedef.h"
@@ -21,6 +21,29 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* 常亮定义*/
 
+#define JZSDK_FILE_NAME_SIZE_MAX (128)   //文件名最大长度128
+#define JZSDK_FILE_PATH_SIZE_MAX (256)   //文件路径最大长度256
+#define JZSDK_CMD_SIZE      (256)   //cmd指令最大长度
+#define JZSDK_DIR_SIZE      (256)   //目录名最大长度
+
+typedef struct {
+    U16_t year;
+    U8_t month;
+    U8_t day;
+    U8_t hour;
+    U8_t minute;
+    U8_t second;
+} T_JZsdkTime;
+
+typedef struct T_JZsdkFileInfo{
+    U32_t size;
+    T_JZsdkTime createTime;
+    T_JZsdkTime modifyTime;
+    char path[JZSDK_FILE_PATH_SIZE_MAX];
+    bool isDir;
+} T_JZsdkFileInfo;
+
+
 /* Exported macro ------------------------------------------------------------*/
 
 

@@ -27,6 +27,8 @@ typedef enum {
     JZ_ERROR_SYSTEM_MODULE_CODE_HARDLY_FAILURE = 0x0003, //严重错误
     JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER = 0x0002, //文件指针错误
     JZ_ERROR_SYSTEM_MODULE_CODE_MEMORY_ALLOC_FAILED = 0x0004, //内存分配失败
+    JZ_ERROR_SYSTEM_MODULE_CODE_IS_BUSY = 0x0005, //忙错误
+    JZ_ERROR_SYSTEM_MODULE_CODE_CHECK_CODE_ERROR = 0x0006, //校验码错误
 } JZ_SYSTEM_Code;
 
 typedef enum {

@@ -54,6 +54,9 @@ typedef void *T_JZTaskHandle;
 typedef void *T_JZsdkMutexHandle;
 //信号量权柄
 typedef void *T_JZsdkSemaHandle;
+//文件权柄
+typedef void *T_JZsdkFileHandle;
+
 
 /* Exported types ------------------------------------------------------------*/
 

@@ -12,6 +12,16 @@ int JZsdk_Get_FrameSequence(char *DealBuf)
     return DealBuf[6];
 }
 
+/*************************
+ * 
+ *  获取帧的长度
+ * 
+ * ***************************/
+int JZsdk_Get_FrameLength(char *DealBuf)
+{
+    return ((int)DealBuf[3]) << 8 + DealBuf[4];
+}
+
 /***************************
  * 、
  * 

@@ -29,6 +29,8 @@ extern "C" {
 
 /* Exported functions --------------------------------------------------------*/
 int JZsdk_Get_FrameSequence(char *DealBuf);
+int JZsdk_Get_FrameLength(char *DealBuf);
+
 int JZsdk_FrameComparsion(char *getdata, int len);
 
 #ifdef __cplusplus

@@ -205,6 +205,11 @@ static int Comparison_5AFRAME_FirstLevelCode_0x53(char *getdata)
 			return JZ_INSCODE_5AFRAME_CHECKSTATUS_TTSSPEED;
 		break;
 
+		//查询是否打开了播放时间回传
+		case 0x08:
+			return JZ_INSCODE_5AFRAME_CHECKSTATUS_CURRENT_PLAYTIME;
+		break;
+
 		//查询软件版本号
 		case 0xf1:
 			return JZ_INSCODE_5AFRAME_CHECKSTATUS_SOFTWAREVERSION;
@@ -304,6 +309,10 @@ static int Comparison_5AFRAME_FirstLevelCode_0x57(char *getdata)
 			return JZ_INSCODE_5AFRAME_TTS_TRANS_LIMIT_TRANSMISSION;
 			break;
 
+		case 0x07: 
+			return JZ_INSCODE_5AFRAME_CURRENT_PLAY_TIME;
+			break;
+
 		default:
 			break;
 	}
@@ -314,7 +323,7 @@ static int Comparison_5AFRAME_FirstLevelCode_0x58(char *getdata)
 	//二级功能位
 	switch (getdata[8])
 	{
-		//设置音色
+		//获取音乐列表
 		case 0x01:
 			return JZ_INSCODE_5AFRAME_AUDIO_GETMUSICLIST;
 			break;
@@ -323,6 +332,11 @@ static int Comparison_5AFRAME_FirstLevelCode_0x58(char *getdata)
 		case 0x03:
 			return JZ_INSCODE_5AFRAME_CHECKSTATUS_AUDIO_DETAIL_MESSAGE;
 		break;
+
+		//获取opus列表
+		case 0x10:
+			return JZ_INSCODE_5AFRAME_OPUS_GETOPUSLIST;
+		break;
 		
 		default:
 			break;
@@ -337,7 +351,12 @@ static int Comparison_5AFRAME_FirstLevelCode_0x59(char *getdata)
 		//opus录音传输
 		//opus传输开始
 		case 0xF1:
-			return JZ_INSCODE_5AFRAME_OPUS_TRANS_START;
+			return JZ_INSCODE_5AFRAME_OPUS_TRANS_START_1;
+		break;
+
+		//opus传输二型
+		case 0xF5:
+			return JZ_INSCODE_5AFRAME_OPUS_TRANS_START_2;
 		break;
 
 		//opus传输结束
@@ -604,6 +623,45 @@ static int Comparison_5AFRAME_FirstLevelCode_0x6F(char *getdata)
 	}
 }
 
+
+//一级功能码 升级帧
+static int Comparison_5AFRAME_FirstLevelCode_0xA1(char *getdata)
+{
+	//二级功能位
+	switch (getdata[8])
+	{
+		//升级准备
+		case 0x01:
+			return JZ_INSCODE_5AFRAME_UPGRADE_PERPARE;
+		break;
+
+		//升级校验码
+		case 0x02:
+			return JZ_INSCODE_5AFRAME_UPGRADE_SEND_CHECKCODE;
+		break;
+
+		//升级数据发送开始
+		case 0x03:
+			return JZ_INSCODE_5AFRAME_UPGRADE_STRAT;
+		break;
+
+		//升级数据发送结束
+		case 0x04:
+			return JZ_INSCODE_5AFRAME_UPGRADE_END;
+		break;
+
+		//升级发送数据 
+		case 0xF1:
+			return JZ_INSCODE_5AFRAME_UPGRADE_TRANS;
+		break;
+
+		default:
+			return JZ_ERROR_SYSTEM_FRAME_ERROR;
+		break;
+	}
+}
+
+
 /******************************************************************
 
 	回复帧对比
@@ -745,7 +803,9 @@ int JZsdk_5AFrameComparsion(char *getdata, int len)
 			return Comparison_5AFRAME_FirstLevelCode_0x6F(getdata);
 		break;
 
-
+		//一级功能码 升级功能
+		case 0xA1:
+			return Comparison_5AFRAME_FirstLevelCode_0xA1(getdata);
 		break;
 
 		//一级功能码 

@@ -310,7 +310,9 @@ static int Comparison_5BFRAME_FirstLevelCode_0x66(char *getdata)
 			return JZ_ERROR_SYSTEM_FRAME_ERROR;
 		break;
 	}
-}//一级功能码是回复警灯颜色
+}
+
+//一级功能码是回复警灯颜色
 static int Comparison_5BFRAME_FirstLevelCode_0x67(char *getdata)
 {
 	//二级功能位
@@ -326,7 +328,9 @@ static int Comparison_5BFRAME_FirstLevelCode_0x67(char *getdata)
 			return JZ_ERROR_SYSTEM_FRAME_ERROR;
 		break;
 	}
-}//一级功能码是回复温度/序列号查询
+}
+
+//一级功能码是回复温度/序列号查询
 static int Comparison_5BFRAME_FirstLevelCode_0x69(char *getdata)
 {
 	//二级功能位
@@ -347,6 +351,50 @@ static int Comparison_5BFRAME_FirstLevelCode_0x69(char *getdata)
 		break;
 	}
 }
+
+
+//一级功能码 升级帧
+static int Comparison_5AFRAME_FirstLevelCode_0xA1(char *getdata)
+{
+	//二级功能位
+	switch (getdata[8])
+	{
+		//升级准备
+		case 0x01:
+			return JZ_INSCODE_5BFRAME_UPGRADE_PERPARE;
+		break;
+
+		//升级校验码
+		case 0x02:
+			return JZ_INSCODE_5BFRAME_UPGRADE_SEND_CHECKCODE;
+		break;
+
+		//升级数据发送开始
+		case 0x03:
+			return JZ_INSCODE_5BFRAME_UPGRADE_STRAT;
+		break;
+
+		//升级数据发送结束
+		case 0x04:
+			return JZ_INSCODE_5BFRAME_UPGRADE_END;
+		break;
+
+		//升级数据校验结果
+		case 0x05:
+			return JZ_INSCODE_5BFRAME_UPGRADE_CHECKRESULT;
+		break;
+
+		//升级发送数据 
+		case 0xF1:
+			return JZ_INSCODE_5BFRAME_UPGRADE_TRANS;
+		break;
+
+		default:
+			return JZ_ERROR_SYSTEM_FRAME_ERROR;
+		break;
+	}
+}
+
 /******************************************************************
 
 	回复帧对比
@@ -428,6 +476,9 @@ int JZsdk_5BFrameComparsion(char *getdata, int len)
             return Comparison_5BFRAME_FirstLevelCode_0x69(getdata);
 		break;
 
+		case 0xA1:
+            return Comparison_5AFRAME_FirstLevelCode_0xA1(getdata);
+		break;
 
 		default:
 			return JZ_ERROR_SYSTEM_FRAME_ERROR;

@@ -375,6 +375,22 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len)
         }   
         break;
 
+        case JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0c,	0x00,	0x00,   0x53,	0x08,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12; 
+        }   
+        break;
+
+
+        case JZ_INSCODE_5BFRAME_CURRENT_PLAY_TIME:
+        {
+            char sendbuf[13] = {  0x5b,   0x5b,   0x77,   0x00,   0x0d,	0x00,	0x00,   0x57,	0x07,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 13;             
+        }
+
         case JZ_INSCODE_5BFRAME_MUSICLIST_START:
         {
             char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0c,	0x00,   0x00,	0x58,   0x00,   0x00,   0x00,   0x23};
@@ -416,6 +432,28 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len)
         }   
         break;
 
+        case JZ_INSCODE_5BFRAME_OPUSLIST_START:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0c,	0x00,   0x00,	0x58,   0x11,   0x00,   0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12;
+        }
+        break;
+
+        case JZ_INSCODE_5BFRAME_OPUSLIST_TRANS:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0c,	0x00,   0x00,	0x58,   0x12,   0x00,   0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12;   
+        }
+        break;
+
+        case JZ_INSCODE_5BFRAME_OPUSLIST_END:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0c,	0x00,   0x00,	0x58,   0x13,   0x00,   0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12;  
+        }
         break;
 
         case JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS:
@@ -514,7 +552,45 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len)
         }
         break;        
 
+        case JZ_INSCODE_5BFRAME_UPGRADE_PERPARE:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0D,	0x00,	0x00,   0xA1,	0x01,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12; 
+        }
+        break;
+
+        case JZ_INSCODE_5BFRAME_UPGRADE_SEND_CHECKCODE:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0D,	0x00,	0x00,   0xA1,	0x02,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12; 
+        }
+        break;
+
+        case JZ_INSCODE_5BFRAME_UPGRADE_STRAT:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0D,	0x00,	0x00,   0xA1,	0x03,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12; 
+        }
+        break;
+
+        case JZ_INSCODE_5BFRAME_UPGRADE_END:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0D,	0x00,	0x00,   0xA1,	0x04,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12; 
+        }
+        break;
 
+        case JZ_INSCODE_5BFRAME_UPGRADE_CHECKRESULT:
+        {
+            char sendbuf[12] = {  0x5b,   0x5b,   0x77,   0x00,   0x0D,	0x00,	0x00,   0xA1,	0x05,    0x00,    0x00,   0x23};
+            memcpy(str, sendbuf, 12);
+            *str_len = 12;             
+        }
+        break;
 
 /********************************************************************************************************************************************************
  * 

@@ -14,16 +14,18 @@
 #include <unistd.h>
 #include <sys/types.h>  
 
+#define JZSDK_LOG_NAME "JZLOG"
+#define JZSDK_LOG_INDEX_FILE_NAME "/root/sdcard/JZLOG/thelast"
+#define JZSDK_LOG_PATH "/root/sdcard/JZLOG/"
+#define JZSDK_LOG_MAX_COUNT 20
+static char logFilePath[128];
 
 #define LOG_GRADE JZSDK_LOGGER_CONSOLE_LOG_LEVEL_INFO 
 
-// 定义全局互斥锁
-static pthread_mutex_t LogWriteMutex = PTHREAD_MUTEX_INITIALIZER;
-
 /* 全局变量 ------------------------------------------------------------------*/
 static struct timeval g_start_time;
 static FILE *logFile = NULL;
-static char LogFileName[JZSDK_FILENAME_SIZE];
+static FILE *logFileCnt = NULL;
 static int Logger_init_flag = JZ_FLAGCODE_OFF;
 
 /* 函数声明 ------------------------------------------------------------------*/
@@ -142,7 +144,7 @@ T_JZsdkReturnCode createJZLOGFolder()
 
 int ReadLogNumFromFile() 
 {
-    const char *path = "/root/sdcard/JZLOG/thelast";
+    const char *path = JZSDK_LOG_INDEX_FILE_NAME;
     int logNum = 0;
 
     FILE *file = fopen(path, "r");
@@ -170,44 +172,102 @@ int ReadLogNumFromFile()
 
 T_JZsdkReturnCode JZsdk_LoggerInit()
 {
-    //1、记录启动时间
-    gettimeofday(&g_start_time, 0);
-
-    //2、检查是否存在log文件,不在则创建
-    createJZLOGFolder();
-
-    //3、获取本地log个数
-    int LogNum = ReadLogNumFromFile();
-
-    //4、获取本地时间，拼接出log文件名
-    time_t current_time;
-    struct tm *info;
-    char timeString[80];
-    time(&current_time);
-    info = localtime(&current_time);
-    strftime(timeString, sizeof(timeString), "%Y%m%d_%H-%M-%S", info);
-    snprintf(LogFileName, sizeof(LogFileName), "/root/sdcard/JZLOG/%d_%s", LogNum, timeString);
-
-    printf("LogFileName:%s\n",LogFileName);
-
-    // 在主函数或初始化阶段初始化互斥锁
-    pthread_mutex_init(&LogWriteMutex, NULL);  
-
-    //5、打开记录文件
-    logFile = fopen(LogFileName, "w");
-    if (logFile == NULL) {
-        // 文件打开失败，输出错误消息
-        printf("Failed to open file: %s", LogFileName);
+    int ret;
+    unsigned int logFileIndex = 0;
+    unsigned int currentLogFileIndex;
+
+    JZsdk_Osal_Mkdir(JZSDK_LOG_PATH);
+
+    char systemCmd[64]; // 用于存储系统命令
+
+    char folderName[JZSDK_FILE_NAME_SIZE_MAX];
+
+    time_t currentTime = time(NULL);
+    struct tm *localTime = localtime(&currentTime);
+
+    if (localTime == NULL) {
+        printf("Get local time error.\r\n");
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
 
-    //6、写入开始时间
-    char logMessage[256];
-    snprintf(logMessage,256,"LOG_FILE:%s\n",LogFileName);
-    fprintf(logFile, "%s", logMessage); 
-    fflush(logFile);
+    if (access(JZSDK_LOG_NAME, F_OK) != 0) {
+        sprintf(folderName, "mkdir %s", JZSDK_LOG_NAME);
+        ret = system(folderName);
+        if (ret != 0) {
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+    }
+
+    logFileCnt = fopen(JZSDK_LOG_INDEX_FILE_NAME, "rb+");
+    if (logFileCnt == NULL) 
+    {
+        logFileCnt = fopen(JZSDK_LOG_INDEX_FILE_NAME, "wb+");
+        if (logFileCnt == NULL) 
+        {
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+    } 
+    else 
+    {
+        ret = fseek(logFileCnt, 0, SEEK_SET);
+        if (ret != 0) 
+        {
+            printf("Seek log count file error, ret: %d\r\n", ret);
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+
+        ret = fread((uint16_t *) &logFileIndex, 1, sizeof(uint16_t), logFileCnt);
+        if (ret != sizeof(uint16_t)) 
+        {
+            printf("Read log file index error.\r\n");
+        }
+    }
+
+    currentLogFileIndex = logFileIndex;
+    logFileIndex++;
+
+    ret = fseek(logFileCnt, 0, SEEK_SET);
+    if (ret != 0) 
+    {
+        printf("Seek log file error, ret: %d\r\n", ret);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    ret = fwrite((unsigned int *) &logFileIndex, 1, sizeof(unsigned int), logFileCnt);
+    if (ret != sizeof(unsigned int)) 
+    {
+        printf("Write log file index error.\r\n");
+        fclose(logFileCnt);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    fclose(logFileCnt);
+
+    //filePath : /root/sdcard/Logs/_%04d_%04d%02d%02d_%02d-%02d-%02d.log
+    sprintf(logFilePath, "%s%04d_%04d%02d%02d_%02d-%02d-%02d.log", JZSDK_LOG_PATH, currentLogFileIndex,
+            localTime->tm_year + 1900, localTime->tm_mon + 1, localTime->tm_mday,
+            localTime->tm_hour, localTime->tm_min, localTime->tm_sec);
+
+    logFile = fopen(logFilePath, "wb+");
+    if (logFile == NULL) 
+    {
+        printf("Open filepath time error.");
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    if (logFileIndex >= JZSDK_LOG_MAX_COUNT) 
+    {
+        sprintf(systemCmd, "rm -rf %s_%04d*.log", JZSDK_LOG_PATH, currentLogFileIndex - JZSDK_LOG_MAX_COUNT);
+        ret = system(systemCmd);
+        if (ret != 0) {
+            printf("Remove file error, ret:%d.\r\n", ret);
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+    }
+
+    sprintf(systemCmd, "ln -sfrv %s " JZSDK_LOG_NAME "/latest.log", logFilePath);
+    system(systemCmd);
 
-    //dfclose(logFile); 
 
     //打开初始化完成的flag
     Logger_init_flag = JZ_FLAGCODE_ON;
@@ -215,7 +275,11 @@ T_JZsdkReturnCode JZsdk_LoggerInit()
     //设立监控
     Log_Monitor();
 
+    JZSDK_LOG_INFO("%s", logFilePath);
+
     JZSDK_LOG_INFO("log初始化完成");
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
 T_JZsdkReturnCode JZsdk_LoggerDeInit()
@@ -228,64 +292,24 @@ T_JZsdkReturnCode JZsdk_LoggerDeInit()
 
 T_JZsdkReturnCode writeToLogFile(const char *data) 
 {
-    // 加锁
-    pthread_mutex_lock(&LogWriteMutex);
-
-    //logFile = fopen(LogFileName, "a"); // 使用"a"模式打开文件，以在末尾追加数据
-
-    // if (logFile == NULL) {
-    //     // 文件打开失败，输出错误消息
-    //     printf("Failed to open file: %s", LogFileName);
-    //     pthread_mutex_unlock(&LogWriteMutex);
-
-    //     return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    // }
-
     if (logFile == NULL)
     {
-        printf("Failed to open file: %s", LogFileName);
-        pthread_mutex_unlock(&LogWriteMutex);
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
 
     fprintf(logFile, "%s", data); // 写入新的数据
     fflush(logFile);
-    //fclose(logFile);
-
-    // 解锁
-    pthread_mutex_unlock(&LogWriteMutex);
-
 }
 
 T_JZsdkReturnCode HexToLogFile(const char *data) 
 {
-    // 加锁
-    pthread_mutex_lock(&LogWriteMutex);
-
-    // logFile = fopen(LogFileName, "a"); // 使用"a"模式打开文件，以在末尾追加数据
-
-    // if (logFile == NULL) {
-    //     // 文件打开失败，输出错误消息
-    //     printf("Failed to open file: %s", LogFileName);
-    //     pthread_mutex_unlock(&LogWriteMutex);
-
-    //     return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    // }
-
     if (logFile == NULL)
     {
-        printf("Failed to open file: %s", LogFileName);
-        pthread_mutex_unlock(&LogWriteMutex);
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
     
     fprintf(logFile, "%x ", data[0]); // 写入新的数据
     fflush(logFile);
-
-    //fclose(logFile);
-
-    // 解锁
-    pthread_mutex_unlock(&LogWriteMutex);
 }
 
 

@@ -55,7 +55,7 @@ static T_JZsdkReturnCode JZsdk_Check_Src32(unsigned char *DIR, unsigned char *ch
     if (SRC_CheckSum != LocalCheckSum)
     {
         JZSDK_LOG_ERROR("checksum error local:%x src:%x", LocalCheckSum, SRC_CheckSum);
-        ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        ret = JZ_ERROR_SYSTEM_MODULE_CODE_CHECK_CODE_ERROR;
     }
     else
     {
@@ -83,7 +83,7 @@ static T_JZsdkReturnCode JZsdk_Check_Md5(unsigned char *DIR, unsigned char *chec
     if (memcmp(md5, checksum, 21) != 0)
     {
         JZSDK_LOG_ERROR("checksum error\n");
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        return JZ_ERROR_SYSTEM_MODULE_CODE_CHECK_CODE_ERROR;
     }
 
     return ret;

-/**
- ********************************************************************
- * @file   JZsdk_FS_Standards.h
- *          用于规范文件名及长度
- *
- *********************************************************************
- */
-
-/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
-#ifndef JZSDK_FS_STANDARDS_H
-#define JZSDK_FS_STANDARDS_H
-
-#define JZSDK_FILENAME_SIZE (128)   //文件名最大长度128
-#define JZSDK_CMD_SIZE      (256)   //cmd指令最大长度
-#define JZSDK_DIR_SIZE      (256)   //目录名最大长度
-
-
-#endif 
\ No newline at end of file

@@ -10,6 +10,7 @@
 #include "JZsdkLib.h"
 #include <dirent.h>
 #include <errno.h>
+#include <time.h>
 
 /*
 *       用于运行指令
@@ -105,6 +106,203 @@ T_JZsdkReturnCode JZsdk_RunSystemCmd_ReturnResult_Str(char *systemCmd, unsigned
 
 /**********************************
  * 
+ *  打开一个文件
+    函数名：JZsdk_Osal_FileOpen
+    参数：文件名，文件打开模式，文件句柄
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示打开成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示打开失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileOpen(const char *fileName, const char *fileMode, T_JZsdkFileHandle *fileObj)
+{
+    if (fileName == NULL || fileMode == NULL || fileObj == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    *fileObj = fopen(fileName, fileMode);
+    if (*fileObj == NULL) 
+    {
+        goto out;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+
+out:
+    free(*fileObj);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+}
+
+
+/**********************************
+ * 
+ *  关闭一个文件
+    函数名：JZsdk_Osal_FileClose
+    参数：文件句柄
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示关闭成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示关闭失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileClose(T_JZsdkFileHandle fileObj)
+{
+    int32_t ret;
+
+    if (fileObj == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = fclose(fileObj);
+    if (ret < 0) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+
+/***********************************
+ * 
+ *  写入一个文件
+    函数名：JZsdk_Osal_FileWrite
+    参数：文件句柄，写入数据，写入长度，实际写入长度
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示写入成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示写入失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileWrite(T_JZsdkFileHandle fileObj, const U8_t *buf, U32_t len, U32_t *realLen)
+{
+    int32_t ret;
+
+    if (fileObj == NULL || buf == NULL || len == 0 || realLen == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = fwrite(buf, 1, len, fileObj);
+    if (ret >= 0) {
+        *realLen = ret;
+    } else {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/***********************************
+ * 
+ *  读取一个文件
+    函数名：JZsdk_Osal_FileRead
+    参数：文件句柄，读取数据，读取长度，实际读取长度
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示读取成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示读取失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileRead(T_JZsdkFileHandle fileObj, U8_t *buf, U32_t len, U32_t *realLen)
+{
+    int32_t ret;
+
+    if (fileObj == NULL || buf == NULL || len == 0 || realLen == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = fread(buf, 1, len, fileObj);
+    if (ret >= 0) {
+        *realLen = ret;
+    } else {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/***********************************
+ * 
+ *  文件定位
+    函数名：JZsdk_Osal_FileSeek
+    参数：文件句柄，偏移量
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示定位成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示定位失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileSeek(T_JZsdkFileHandle fileObj, U32_t offset)
+{
+    int32_t ret;
+
+    if (fileObj == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = fseek(fileObj, offset, SEEK_SET);
+    if (ret < 0) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/***********************************
+ * 
+ *  文件同步
+    函数名：JZsdk_Osal_FileSync
+    参数：文件句柄
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示同步成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示同步失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_FileSync(T_JZsdkFileHandle fileObj)
+{
+    int32_t ret;
+
+    if (fileObj == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = fflush(fileObj);
+    if (ret < 0) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+
+/**********************************
+ * 
+ *  获取文件信息
+    函数名：JZsdk_Osal_FileStat
+    参数：文件路径，文件信息
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示获取成功，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示获取失败
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_Stat(const char *filePath, T_JZsdkFileInfo *fileInfo)
+{
+    struct stat st;
+    int32_t ret;
+    struct tm *fileTm;
+
+    if (filePath == NULL || fileInfo == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = stat(filePath, &st);
+    if (ret < 0) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    fileTm = localtime((const time_t *) &(st.st_mtim));
+    if (fileTm == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    fileInfo->size = st.st_size;
+
+    fileInfo->createTime.year = fileTm->tm_year + 1900 - 1980;
+    fileInfo->createTime.month = fileTm->tm_mon + 1;
+    fileInfo->createTime.day = fileTm->tm_mday;
+    fileInfo->createTime.hour = fileTm->tm_hour;
+    fileInfo->createTime.minute = fileTm->tm_min;
+    fileInfo->createTime.second = fileTm->tm_sec;
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+
+
+/**********************************
+ * 
  *  创建一个文件夹
     函数名：JZsdk_check_file_exists
     参数：文件路径
@@ -208,13 +406,37 @@ T_JZsdkReturnCode JZsdk_create_file(const char* file_path)
 
 /**********************************
  * 
+ *  重命名文件
+    函数名：JZsdk_check_file_exists
+    参数：文件路径
+    返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示文件存在，
+    JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示文件不存在
+ * *******************************/
+T_JZsdkReturnCode JZsdk_Osal_Rename(const char *oldFilePath, const char *newFilePath)
+{
+    int32_t ret;
+
+    if (oldFilePath == NULL || newFilePath == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
+    }
+
+    ret = rename(oldFilePath, newFilePath);
+    if (ret < 0) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/**********************************
+ * 
  *  删除文件
-    函数名：JZsdk_delete_file
+    函数名：JZsdk_Osal_delete
     参数：文件路径
     返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示文件已经不存在
     JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示文件仍然存在
  * *******************************/
-T_JZsdkReturnCode JZsdk_delete_file(const char* file_path) 
+T_JZsdkReturnCode JZsdk_Osal_delete(const char* file_path) 
 {
     int remove_result = remove(file_path);  
     if (remove_result != 0) {  

@@ -12,7 +12,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
-#include "./JZsdk_FS_Standards.h"
+#include "JZsdk_Base/JZsdk_Code/JZsdk_Platform/JZsdk_Platform.h"
+#include "JZsdk_Base/JZsdk_Code/JZsdk_typedef/JZsdk_typedef.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,7 +29,7 @@ extern "C" {
 T_JZsdkReturnCode JZsdk_RunSystemCmd(char *systemCmd);
 T_JZsdkReturnCode JZsdk_check_file_exists(const char* file_path) ;
 T_JZsdkReturnCode JZsdk_create_file(const char* file_path) ;
-T_JZsdkReturnCode JZsdk_delete_file(const char* file_path) ;
+T_JZsdkReturnCode JZsdk_Osal_delete(const char* file_path);
 T_JZsdkReturnCode JZsdk_strings_suffix_comparison_onlyStr(const unsigned char* Strings, const unsigned char *suffix) ;
 T_JZsdkReturnCode JZsdk_strings_suffix_comparison_withLen(const unsigned char* Strings, int Strings_len, const unsigned char *suffix) ;
 T_JZsdkReturnCode JZsdk_Osal_Mkdir(const char *filePath);
@@ -40,6 +41,17 @@ T_JZsdkReturnCode JZsdk_copy_file_byC(const char* source_path, const char* dest_
 T_JZsdkReturnCode JZsdk_RunSystemCmd_ReturnResult(char *systemCmd, unsigned int *result);
 T_JZsdkReturnCode JZsdk_RunSystemCmd_ReturnResult_Str(char *systemCmd, unsigned char *str);
 T_JZsdkReturnCode JZsdk_Sync();
+T_JZsdkReturnCode JZsdk_Osal_Stat(const char *filePath, T_JZsdkFileInfo *fileInfo);
+T_JZsdkReturnCode JZsdk_Osal_Rename(const char *oldFilePath, const char *newFilePath);
+
+
+T_JZsdkReturnCode JZsdk_Osal_FileOpen(const char *fileName, const char *fileMode, T_JZsdkFileHandle *fileObj);
+T_JZsdkReturnCode JZsdk_Osal_FileClose(T_JZsdkFileHandle fileObj);
+T_JZsdkReturnCode JZsdk_Osal_FileWrite(T_JZsdkFileHandle fileObj, const U8_t *buf, U32_t len, U32_t *realLen);
+T_JZsdkReturnCode JZsdk_Osal_FileRead(T_JZsdkFileHandle fileObj, U8_t *buf, U32_t len, U32_t *realLen);
+T_JZsdkReturnCode JZsdk_Osal_FileSeek(T_JZsdkFileHandle fileObj, U32_t offset);
+T_JZsdkReturnCode JZsdk_Osal_FileSync(T_JZsdkFileHandle fileObj);
+
 
 #ifdef __cplusplus
 }

@@ -8,7 +8,12 @@ static T_JZsdkOsalHandler* g_osalHandler = NULL;
 
 static T_JZsdkReturnCode JZsdk_Platform_RegOsalHandler(const T_JZsdkOsalHandler *osalHandler)
 {
-    g_osalHandler = (T_JZsdkOsalHandler*)osalHandler;  // 存储传入的 OSAL 处理器
+    g_osalHandler = malloc(sizeof(T_JZsdkOsalHandler));
+    if (osalHandler == NULL) {
+        return JZ_ERROR_SYSTEM_MODULE_CODE_MEMORY_ALLOC_FAILED; // 处理内存分配失败的情况
+    }
+    
+    memcpy(g_osalHandler, osalHandler, sizeof(T_JZsdkOsalHandler));
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }

@@ -35,6 +35,7 @@ extern "C" {
  * 
  * ******************/
 typedef struct {
+    //任务名 任务函数 任务栈大小 任务参数 任务句柄
     T_JZsdkReturnCode (*TaskCreate)(const char *name, void *(*taskFunc)(void *),
                                   unsigned int stackSize, void *arg, T_JZTaskHandle *task);
 

 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
+#include <string.h> // Include this for strncpy
 
 #include "./JZsdk_Task.h"
 
@@ -12,13 +13,15 @@ T_JZsdkReturnCode JZsdk_Osal_TaskCreate(const char *name, void *(*taskFunc)(void
     
     //为任务句柄分配内存空间，大小为sizeof(pthread_t)。如果内存分配失败，则返回一个错误代码
     *task = malloc(sizeof(pthread_t));
-    if (*task == NULL) {
+    if (*task == NULL) 
+    {
         return JZ_ERROR_SYSTEM_MODULE_CODE_MEMORY_ALLOC_FAILED;
     }
 
     //使用pthread_create函数创建一个新的线程，传递给它任务函数指针taskFunc和参数arg。如果创建线程失败，则返回一个错误代码
     result = pthread_create(*task, NULL, taskFunc, arg);
-    if (result != 0) {
+    if (result != 0) 
+    {
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
 
@@ -28,8 +31,9 @@ T_JZsdkReturnCode JZsdk_Osal_TaskCreate(const char *name, void *(*taskFunc)(void
         strncpy(nameDealed, name, sizeof(nameDealed) - 1);
 
     //使用pthread_setname_np函数将任务线程的名称设置为nameDealed。如果设置线程名称失败，则返回一个错误代码
-    result = pthread_setname_np(*(pthread_t *) *task, nameDealed);
-    if (result != 0) {
+    result = pthread_setname_np( *(pthread_t *) *task, nameDealed);
+    if (result != 0) 
+    {
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
     

 #include <sys/time.h>  // 为了使用 gettimeofday 函数
 #include <time.h>      // 为了使用 time 函数
+#include <unistd.h>
 
 #include "./JZsdk_TimeR.h"
 

@@ -91,6 +91,9 @@ T_JZsdkReturnCode TaskManagement_SubmitTask(void (*task_function)(void*), void*
 static void* TaskManagement_ThreadFunction(void* arg) 
 {
     t_ThreadPool* pool = (t_ThreadPool*)arg;
+
+    JZSDK_LOG_DEBUG("TaskManagement_Thread Have Create");
+
     while (1) 
     {
         pthread_mutex_lock(&pool->lock);

@@ -543,7 +543,7 @@ int Main_APP_Uart()
         delayMs(1000);
 
         //消息订阅初始化
-        HalSend_type1Send_MessageSubcription_Control(UART_DEV_2, JZ_FLAGCODE_ON);
+        HalSend_type1Send_MessageSubcription_Control(UART_DEV_2, JZ_FLAGCODE_OFF);
 
         // //测试需要开启亮度
         // JZsdk_Uart_SearchLight_Control(UART_DEV_1, 1);

@@ -7,7 +7,7 @@
 #define VERSION_CHOOSE_H
 #include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
 //1~10行 除了D可以修改版本选择 禁止动任何东西
-#define DEVICE_VERSION JZ_H1E
+#define DEVICE_VERSION JZ_H1T
 
 //禁止修改行 选择是串口程序 还是 psdk程序
 #define APP_VERSION APP_UART

@@ -37,7 +37,7 @@
  *   帧尾两位 0x00 0x23     | 祖册了实际的帧尾
  * 
  * ********************/
-int HalRecv_type1_PreliminaryScreeningOfData(unsigned char *Data, unsigned int DataLen, int Port)
+int HalRecv_type1_PreliminaryScreeningOfData(unsigned char *Data, int DataLen, int Port)
 {
     int ResidualLength = 0; //  剩余数据长度
 

@@ -23,7 +23,7 @@ extern "C" {
 
 /* Exported functions --------------------------------------------------------*/
 
-int HalRecv_type1_PreliminaryScreeningOfData(unsigned char *Data, unsigned int DataLen, int Port);
+int HalRecv_type1_PreliminaryScreeningOfData(unsigned char *Data, int DataLen, int Port);
 
 
 #ifdef __cplusplus

@@ -14,6 +14,8 @@
 #include "Megaphone/Megaphone.h"
 #include "DeviceInfo/DeviceInfo.h"
 
+#include "CommonMod/CommonMod.h"
+
 #include "Hal_Send/HalSend_type1/HalSend_type1.h"
 #include "Hal_Send/HalSend.h"
 #include "JZsdk_Hal.h"
@@ -21,9 +23,10 @@
 #ifdef MEGAPHONE_CONFIG_STATUS_ON
     #include "Megaphone/Megaphone.h"
     #include "Megaphone/Music/AudioFile/Megaphone_AudioFile.h"
+    #include "Megaphone/Opus/Megaphone_Opus.h"
 #endif
 
-static int HalRecvMode = JZ_FLAGCODE_OFF;
+static int HalRecvMode = JZ_FLAGCODE_OFF; //接收模式，主要是为了限制不同设备同时要求hal层做出 同一个数据接收相关功能 ，目前做法是只限定一个hal设备使用一种数据接收模式
 static int HalRecvDataLen = 0; //用于计算接收数据长度
 
 static int SecondaryDeviceName = 0x00; // 从设备名，用于多设备相连时通知控制端 从机设备名
@@ -74,6 +77,10 @@ static T_JZsdkReturnCode RecvDeal_AskForConnect(int Port, char *getbuf)
         Main_WorkModeSet(JZ_FLAGCODE_ON);
     }
 
+    //5、打开连接状态
+    s_JZsdk_Hal_Info *halInfo = JZsdk_Hal_GetHalInfo();
+    halInfo->HalPort[Port].ConnectStatus = JZ_FLAGCODE_ON;
+
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
@@ -90,10 +97,28 @@ static T_JZsdkReturnCode RecvDeal_HeartBeat(int Port, char *getbuf)
     int  FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
     //1、获取连接情况
-    int status = Main_WorkModeSet(JZ_FLAGCODE_GET);
+    s_JZsdk_Hal_Info *halInfo = JZsdk_Hal_GetHalInfo();
+
+    //分析模式
+    int mode = getbuf[9];
+    if (mode == 0x00)
+    {
+        //2、回复心跳帧
+        HalSend_type1Send_Send_HeartBeatStatus(Port, FrameSequence, halInfo->HalPort[Port].ConnectStatus);
+    }
+    else if (mode == 0x01 || mode == 0x02)
+    {
+        if(mode == 0x01)
+        {
+            halInfo->HalPort[Port].HeartBeatStatusSend = JZ_FLAGCODE_ON;
+        }
+        else if (mode == 0x02)
+        {
+            halInfo->HalPort[Port].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        }
 
-    //2、回复心跳帧
-    HalSend_type1Send_Send_HeartBeatStatus(Port, FrameSequence, status);
+        HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    }
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -449,20 +474,13 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_stop(int Port, char *getbuf)
 **********/
 static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_start(int Port, char *getbuf, int len)
 {    
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
     JZSDK_LOG_INFO("%s,开始传输的音频文件保存",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    T_JZsdkReturnCode ret = HalRecv_tpye1_RecvDeal_UartTransmodeDecide();
-    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("开始传输的音频文件保存失败");
-        return ret;
-    }
-
     //1、处理帧长度，获取文件名长度
     int FileNameLen = ((int)getbuf[3] << 8) + (int)getbuf[4] - 2 - 9;
 
@@ -475,21 +493,16 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_start(int Port, char *getbu
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
 
     ret = Megaphone_SaveAudioFileStart(FileName);
-    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+
+#endif
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    }
+    else
     {
         HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
-    
-    //3、调整接收模式为音频文件传输
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_DATA_TRANS_TYPE_AUDIO_FILE);
-    HalRecvDataLen = 0;
-
-    //4、回复操作成功
-    HalSend_type1Send_Reply_Success(Port, FrameSequence);
-#else
-    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-#endif
 
     return ret;
 }
@@ -502,7 +515,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_start(int Port, char *getbu
 **********/
 static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_LimitTransmission(int Port, char *getbuf, int len)
 {
-    T_JZsdkReturnCode ret;
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
@@ -515,21 +528,21 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_LimitTransmission(int Port,
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_AUDIO_FILE)
-    {
-        JZSDK_LOG_ERROR("%s, 传输mp2文件未开始,无法传输", JZsdk_DefineCode_GetPortName(Port));
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-
-    HalRecvDataLen += DataLen;
-    //JZSDK_LOG_DEBUG("%s,传输定长音频文件中 ,一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port), HalRecvDataLen);
-    
     //传输数据接口
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_SaveAudioFileTrans(getbuf+9, DataLen);
+    ret = Megaphone_SaveAudioFileTrans(getbuf+9, DataLen);
 #endif
 
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //无操作
+    }
+    else
+    {
+        //回复操作失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
+
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
@@ -541,31 +554,28 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_LimitTransmission(int Port,
 **********/
 static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop(int Port, char *getbuf)
 {
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
     JZSDK_LOG_INFO("%s,传输的音频文件保存",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_AUDIO_FILE)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭");
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-
     //1、保存音频数据
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_SaveAudioFileStop(JZ_FLAGCODE_OFF, NULL);
+    ret = Megaphone_SaveAudioFileStop(JZ_FLAGCODE_OFF, NULL);
 #endif
 
-    //3、调整接收模式为音频文件传输
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_FLAGCODE_OFF);
-    JZSDK_LOG_INFO("一共传输了%d字节", HalRecvDataLen);
-    HalRecvDataLen = 0;
-
-    //2、回复操作成功
-    HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //4、回复操作成功
+        HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    }
+    else
+    {
+        //4、回复操作失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -585,14 +595,6 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop_and_check(int Port, ch
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_AUDIO_FILE)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭");
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-
     unsigned char checkCode[128];
     int frameLenth = ((int)getbuf[3]) << 8 | (int)getbuf[4];
     int CodeLenth = frameLenth - 10 - 2;
@@ -649,11 +651,6 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop_and_check(int Port, ch
     }   
 #endif
 
-    //调整接收模式为音频文件传输
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_FLAGCODE_OFF);
-    JZSDK_LOG_INFO("一共传输了%d字节", HalRecvDataLen);
-    HalRecvDataLen = 0;
-
     return ret;
 }
 
@@ -1563,10 +1560,13 @@ static T_JZsdkReturnCode RecvDeal_Delete_Audio(int Port, char *getbuf)
     FileName[FileName_Length] = '\0'; // 确保文件名以null结尾
 
     //3、拼接指令
-    char cmd[512];
-    snprintf(cmd,  512 ,"rm /root/sdcard/audio/%s", FileName);
+    char FilePath[512];
+    snprintf(FilePath,  512 ,"/root/sdcard/audio/%s", FileName);
+
+    //4、删除文件
+    JZsdk_Osal_delete(FilePath);
 
-    JZsdk_RunSystemCmd(cmd);
+    JZsdk_Sync();
 
     //4、刷新歌曲列表
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
@@ -1587,7 +1587,7 @@ static T_JZsdkReturnCode RecvDeal_Delete_Audio(int Port, char *getbuf)
 **********/
 static T_JZsdkReturnCode RecvDeal_Delete_VoiceRecord(int Port, char *getbuf)
 {
-    JZSDK_LOG_INFO("%s,删除录音操作",JZsdk_DefineCode_GetPortName(Port));
+    JZSDK_LOG_INFO("%s,删除opus录音操作",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
@@ -1597,19 +1597,22 @@ static T_JZsdkReturnCode RecvDeal_Delete_VoiceRecord(int Port, char *getbuf)
     FileName_Length = ((int)getbuf[3] << 8) + (int)getbuf[4] - 2 - 9;
 
     //2、获取名字
-    char FileName[256];
+    char FileName[JZSDK_FILE_NAME_SIZE_MAX];
     memcpy(FileName, &getbuf[9], FileName_Length);
     FileName[FileName_Length] = '\0'; // 确保文件名以null结尾
 
     //3、拼接指令
-    char cmd[512];
-    snprintf(cmd,  512 ,"rm /root/sdcard/audio/%s", FileName);
+    char FilePath[512];
+    snprintf(FilePath,  512 ,"/root/sdcard/opus/%s", FileName);
         
-    JZsdk_RunSystemCmd(cmd);
+    //4、删除文件
+    JZsdk_Osal_delete(FilePath);
+
+    JZsdk_Sync();
 
     //4、刷新歌曲列表
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_Flush_MusicList();
+    OpusFile_FlushList();
 #endif
 
     //回复操作成功
@@ -1629,6 +1632,128 @@ static T_JZsdkReturnCode RecvDeal_Delete_VideoRecord()
 
 }
 
+
+
+/*********
+ * 
+ *  音频重命名
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Rename_Audio(int Port, char *getbuf)
+{
+    JZSDK_LOG_INFO("%s,音频重命名",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //获取总帧长度
+    int FrameLength = JZsdk_Get_FrameLength(getbuf);
+
+    //获取原文件长度
+    int OldFileName_Length = getbuf[9];
+
+    //获取新文件长度
+    int NewFileName_Length = getbuf[10 + OldFileName_Length];
+
+    //获取原文件名字
+    unsigned char OldFileName[128];
+    memcpy(OldFileName, &getbuf[9], OldFileName_Length);
+    OldFileName[OldFileName_Length] = '\0'; // 确保文件名以null结尾
+
+    //获取新文件名字
+    unsigned char NewFileName[128];
+    memcpy(NewFileName, &getbuf[10 + OldFileName_Length], NewFileName_Length);
+    NewFileName[NewFileName_Length] = '\0'; // 确保文件名以null结尾
+
+    //3、拼接出地址
+    char OldFilePath[JZSDK_FILE_PATH_SIZE_MAX];
+    snprintf(OldFilePath,  JZSDK_FILE_PATH_SIZE_MAX ,"/root/sdcard/audio/%s", OldFileName);
+
+    char NewFilePath[JZSDK_FILE_PATH_SIZE_MAX];
+    snprintf(NewFilePath,  JZSDK_FILE_PATH_SIZE_MAX ,"/root/sdcard/audio/%s", NewFileName);
+
+    JZsdk_Osal_Rename(OldFilePath, NewFilePath);
+
+    JZsdk_Sync();
+
+    //4、刷新歌曲列表
+#ifdef MEGAPHONE_CONFIG_STATUS_ON    
+    Megaphone_Flush_MusicList();
+#endif
+
+    //回复操作成功
+    HalSend_type1Send_Reply_Success(Port, FrameSequence);   
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/*********
+ * 
+ *  录音重命名
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Rename_VoiceRecord(int Port, char *getbuf)
+{
+    JZSDK_LOG_INFO("%s,音频重命名",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //获取总帧长度
+    int FrameLength = JZsdk_Get_FrameLength(getbuf);
+
+    //获取原文件长度
+    int OldFileName_Length = getbuf[9];
+
+    //获取新文件长度
+    int NewFileName_Length = getbuf[10 + OldFileName_Length];
+
+    //获取原文件名字
+    unsigned char OldFileName[128];
+    memcpy(OldFileName, &getbuf[9], OldFileName_Length);
+    OldFileName[OldFileName_Length] = '\0'; // 确保文件名以null结尾
+
+    //获取新文件名字
+    unsigned char NewFileName[128];
+    memcpy(NewFileName, &getbuf[10 + OldFileName_Length], NewFileName_Length);
+    NewFileName[NewFileName_Length] = '\0'; // 确保文件名以null结尾
+
+    //3、拼接出地址
+    char OldFilePath[JZSDK_FILE_PATH_SIZE_MAX];
+    snprintf(OldFilePath,  JZSDK_FILE_PATH_SIZE_MAX ,"/root/sdcard/opus/%s", OldFileName);
+
+    char NewFilePath[JZSDK_FILE_PATH_SIZE_MAX];
+    snprintf(NewFilePath,  JZSDK_FILE_PATH_SIZE_MAX ,"/root/sdcard/opus/%s", NewFileName);
+
+    JZsdk_Osal_Rename(OldFilePath, NewFilePath);
+
+    JZsdk_Sync();
+
+    //4、刷新歌曲列表
+#ifdef MEGAPHONE_CONFIG_STATUS_ON    
+    OpusFile_FlushList();
+#endif
+
+    //回复操作成功
+    HalSend_type1Send_Reply_Success(Port, FrameSequence);   
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/*********
+ * 
+ *  删除视频
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Rename_VideoRecord()
+{
+
+}
+
+
 /*********
  * 
  *  tts设置音色
@@ -1840,27 +1965,100 @@ static T_JZsdkReturnCode RecvDeal_TTS_Trans_stop(int Port, char *getbuf)
 }
 
 
+
 /*********
  * 
- *  打开opus传输
+ *  播放时间回传
  * 
  * 
 **********/
-static T_JZsdkReturnCode RecvDeal_OpusTrans_start(int Port, char *getbuf)
+static T_JZsdkReturnCode RecvDeal_Current_Play_Time(int Port, char *getbuf)
 {
-    JZSDK_LOG_INFO("%s,打开opus传输",JZsdk_DefineCode_GetPortName(Port));
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+    JZSDK_LOG_INFO("%s,设置播放时间回传",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    T_JZsdkReturnCode ret = HalRecv_tpye1_RecvDeal_UartTransmodeDecide();
-    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    //获取帧操作
+    int Mode = getbuf[9];
+
+    JZSDK_LOG_INFO("设置播放回传模式:%d", Mode);
+
+#ifdef MEGAPHONE_CONFIG_STATUS_ON 
+
+    //如果是0 或者 1 是关闭或打开回传模式
+    if (Mode == JZ_FLAGCODE_OFF || Mode == JZ_FLAGCODE_ON)
     {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("打开opus传输失败, 已开启其他传输模式");
-        return ret;
+        ret = Megaphone_PlayBackSet(Port, Mode);
+        if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+        {
+            //回复操作成功
+            HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+
+            return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+        }
+        else
+        {
+            //回复操作失败
+            HalSend_type1Send_Reply_Failure(Port, FrameSequence); 
+
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+    }
+
+    //如果是2，则主动索取
+    if (Mode == 2)
+    {
+        ret = Megaphone_PlayBackTimeGet(Port);
     }
+    
+#endif
+
+    return ret;
+}
+
+
+/*********
+ * 
+ *  获取播放时间回传模式
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_CheckStatus_CurrentPlayTime(int Port, char *getbuf)
+{
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+    JZSDK_LOG_INFO("%s,获取播放时间回传模式",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+#ifdef MEGAPHONE_CONFIG_STATUS_ON 
+
+    int mode = Megaphone_PlayBackGetMode(Port);
+    HalSend_type1Send_Reply_CurrentPlayTimeStatus(Port, mode);
+
+#endif
+
+    return ret;
+}
+
+/*********
+ * 
+ *  打开opus传输
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_OpusTrans_start(int Port, char *getbuf)
+{
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+    JZSDK_LOG_INFO("%s,打开opus传输1型",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
     //1、获取解码比特率
     int decode_rate = getbuf[9] * 8000;
@@ -1871,19 +2069,140 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_start(int Port, char *getbuf)
 
     //2、创建存储文件
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_SaveOpusStart(decode_rate);
+    ret = Megaphone_SaveOpusStart(NULL, decode_rate, 16000, 1);
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复操作成功
+        HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+    }
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_IS_BUSY)
+    {
+        JZSDK_LOG_ERROR("opus忙碌中");    
+    }
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE)
+    {
+        JZSDK_LOG_ERROR("opus创建失败");
+    }
+    
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+#else
+    JZSDK_LOG_ERROR("非喊话器不支持opus传输");
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
 #endif
+}
 
-    //3、修改接收模式为传输opus
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_DATA_TRANS_TYPE_OPUS_FILE);
-    HalRecvDataLen = 0;
 
-    //回复操作成功
-    HalSend_type1Send_Reply_Success(Port, FrameSequence); 
 
-    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+/*********
+ * 
+ *  打开opus传输Ⅱ型
+ * 
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_OpusTrans_start_2(int Port, char *getbuf)
+{
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+    JZSDK_LOG_INFO("%s,打开opus传输1型",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //获取帧的长度
+    int FrameLen = JZsdk_Get_FrameLength(getbuf);
+
+    //获取存储模式
+    int SaveMode = getbuf[9];
+
+    //获取比特率
+    int BitChoose = getbuf[10];
+    int decode_rate = 16000;
+    // if (BitChoose == 0)
+    // {
+    //     decode_rate = 16000;
+    // }
+
+    //获取采样率
+    int SampleChoose = getbuf[11];
+    int SampleRate = 16000;
+    // if (SampleChoose == 0)
+    // {
+    //     SampleRate = 16000;
+    // }     
+
+    //获取频道数
+    int ChannelChoose = getbuf[12];
+    int ChannelNum = 1;
+    // if (ChannelChoose == 0)
+    // {
+    //     ChannelNum = 1;
+    // }
+
+    //获取文件名长度
+    int FileNameLen = getbuf[13];
+    if(FileNameLen != FrameLen - 14 - 2)
+    {
+        JZSDK_LOG_ERROR("文件名长度错误");
+        FileNameLen = FrameLen - 14 - 2;
+    }
+
+    if (FileNameLen > 128)
+    {
+        JZSDK_LOG_ERROR("文件名长度过长");
+        FileNameLen = 128;
+    }
+    
+    //获取文件名
+    unsigned char FileName[128] = {0};
+    memcpy(FileName, getbuf + 14, FileNameLen);
+
+    //2、创建存储文件
+#ifdef MEGAPHONE_CONFIG_STATUS_ON    
+
+    if (SaveMode == JZ_FLAGCODE_OFF)
+    {
+        ret = Megaphone_SaveOpusStart(NULL, decode_rate, SampleRate, ChannelNum);
+    }
+    else
+    {
+        ret = Megaphone_SaveOpusStart(FileName, decode_rate, SampleRate, ChannelNum);
+    }
+
+
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复操作成功
+        HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+    }
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_IS_BUSY)
+    {
+        JZSDK_LOG_ERROR("opus忙碌中");    
+    }
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE)
+    {
+        JZSDK_LOG_ERROR("opus创建失败");
+    }
+    
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+#else
+    JZSDK_LOG_ERROR("非喊话器不支持opus传输");
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+#endif
 }
 
+
 /*********
  * 
  *  opus定长传输文件
@@ -1897,13 +2216,6 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_LimitTransmission(int Port, char *ge
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_OPUS_FILE)
-    {
-        JZSDK_LOG_ERROR("%s,不处于opus传输模式,无法接收opus定长音频文件",JZsdk_DefineCode_GetPortName(Port));
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-   
     //提取出数据
     int  DataLen = ((int)getbuf[3] << 8 ) + (int)getbuf[4] - 2 - 9;
     if (DataLen > 1024)
@@ -1911,13 +2223,21 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_LimitTransmission(int Port, char *ge
         JZSDK_LOG_ERROR("%s, 传输得到的opus定长音频文件帧长度超出1024上限",JZsdk_DefineCode_GetPortName(Port));
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
-
-    HalRecvDataLen += DataLen;
-    JZSDK_LOG_DEBUG("%s,传输opus定长音频文件中 一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port),HalRecvDataLen);
     
     //传输数据接口
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_SaveOpusTrans(getbuf+9, DataLen);
+    ret = Megaphone_SaveOpusTrans(getbuf+9, DataLen);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+#else
+    JZSDK_LOG_ERROR("非喊话器不支持opus传输");
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
 #endif
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
@@ -1932,30 +2252,35 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_LimitTransmission(int Port, char *ge
 **********/
 static T_JZsdkReturnCode RecvDeal_OpusTrans_stop(int Port, char *getbuf)
 {
+    T_JZsdkReturnCode ret;
+
     JZSDK_LOG_INFO("%s,结束opus传输",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_OPUS_FILE)
+#ifdef MEGAPHONE_CONFIG_STATUS_ON    
+    ret = Megaphone_SaveOpusStop(JZ_FLAGCODE_OFF, NULL);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
     {
-        //回复操作失败
         HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("关闭opus结束传输失败,opus结束传输未开始,无法关闭");
+
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
+    else
+    {
+        //回复操作成功
+        HalSend_type1Send_Reply_Success(Port, FrameSequence); 
 
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+    }
 
-#ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_SaveOpusStop(JZ_FLAGCODE_OFF, NULL);
-#endif
-
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_FLAGCODE_OFF);
-    JZSDK_LOG_INFO("一共传输了 %d字节\n",HalRecvDataLen);
-    HalRecvDataLen = 0;
+#else
+    JZSDK_LOG_ERROR("非喊话器不支持opus传输");
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
 
-    //回复操作成功
-    HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+    return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+#endif
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -1976,13 +2301,6 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop_and_check(int Port, char *getbu
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_OPUS_FILE)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭");
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
 
     unsigned char checkCode[128];
     int frameLenth = ((int)getbuf[3]) << 8 | (int)getbuf[4];
@@ -2035,18 +2353,16 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop_and_check(int Port, char *getbu
         //回复操作失败
         HalSend_type1Send_Reply_Failure(Port, FrameSequence);
     }
-    
-#endif
 
-    //3、调整接收模式为音频文件传输
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_FLAGCODE_OFF);
-    JZSDK_LOG_INFO("一共传输了 %d字节\n",HalRecvDataLen);
-    HalRecvDataLen = 0;
+#else
+    ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    JZSDK_LOG_ERROR("非喊话器不支持opus传输");
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+#endif
 
     return ret;
 }
 
-
 /*********
  * 
  *  opus播放
@@ -2057,27 +2373,150 @@ static T_JZsdkReturnCode RecvDeal_OpusPlay(int Port, char *getbuf)
 {   
     JZSDK_LOG_INFO("%s,opus播放",JZsdk_DefineCode_GetPortName(Port));
 
-    //获取帧的序列号
-    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //获取是否处于opus传输中的模式
+    if (OpusFile_GetSaveFlag() == JZ_FLAGCODE_ON) 
+    {
+        JZSDK_LOG_ERROR("禁止播放opus,当前正处于录入中");
+        //回复操作失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    //获取命令
+    int Mode = getbuf[9];
+    if (Mode == 0)
+    {
+        UIcontrol_Opus_PlayFixedFile(Port);
+
+        //回复操作成功
+        HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+    }
+    else if (Mode == 1)
+    {
+        
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/**********************************
+ * 
+ *  opus列表查询
+ * 
+ * 
+ * **********************************/
+static T_JZsdkReturnCode RecvDeal_Get_OpusList(int Port, char *getbuf)
+{
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,opus列表查询",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+#ifdef MEGAPHONE_CONFIG_STATUS_ON
+
+    //刷新opus列表
+    OpusFile_FlushList();
+
+    //获取opus总数
+    int OpusFileCount = OpusFile_GetListNum();
+
+    //注册一个opus数组
+    unsigned char **MusicName = (unsigned char **)malloc(OpusFileCount * sizeof(unsigned char*));
+    if (MusicName == NULL)
+    {
+        //回复操作失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 
+    }
+
+    //注册一个歌曲名字长度的数组
+    int *MusicNameLength = (int *)malloc(OpusFileCount * sizeof(int));
+    if (MusicNameLength == NULL)
+    {
+        free(MusicName);
+        //回复操作失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 
+    }
+
+    //为每一首opus分配内存
+    for (int i = 0; i < OpusFileCount; i++)
+    {
+        MusicName[i] = (unsigned char*)malloc(128 * sizeof(unsigned char));
+        if (MusicName[i] == NULL) 
+        {
+            // 内存分配失败，需要释放之前分配的内存
+            for (int j = 0; j < i; j++) 
+            {
+                free(MusicName[j]);
+            }
+            free(MusicNameLength);
+            free(MusicName);
+
+            //回复操作失败
+            HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+            return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 
+        }
+
+        memset(MusicName[i], 0, 128 * sizeof(unsigned char));
+
+        //如果成功分配内存，则写入名字
+        Megaphone_OpusFile_GetAudioNameByIndex(i, MusicName[i], &MusicNameLength[i]);
+    }
+
+    JZSDK_LOG_DEBUG("opus列表取出完成");
+
+    //发送开始帧
+    ret = HalSend_type1Send_Send_OpusList_Start(Port, FrameSequence, OpusFileCount);
 
-    T_JZsdkReturnCode ret = HalRecv_tpye1_RecvDeal_UartTransmodeDecide();
-    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    for (int i = 0; i < OpusFileCount; i++)
     {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("opus播放失败,存在传输模式打开中");
-        return ret;
-    }
+        //获取歌曲详细信息
+        struct AudioMange_audio_struct AudioDetailMessage;
+        memset(&AudioDetailMessage, 0, sizeof(struct AudioMange_audio_struct));
+        ret = OpusFile_GetAudioInfo(MusicName[i], MusicNameLength[i],&AudioDetailMessage);
+        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+        {
+            //回复操作失败
+            HalSend_type1Send_Reply_Failure(Port, FrameSequence);
 
-    UIcontrol_Opus_PlayFixedFile(Port);
+            continue;
+        }
 
-    //回复操作成功
-    HalSend_type1Send_Reply_Success(Port, FrameSequence); 
+        //发送opus列表
+        ret = HalSend_type1Send_Send_OpusList_Trans(Port, FrameSequence, AudioDetailMessage.FileName, AudioDetailMessage.FileNameLen, AudioDetailMessage.FileSize, AudioDetailMessage.Time);
+        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+        {
+            //回复操作失败
+            HalSend_type1Send_Reply_Failure(Port, FrameSequence);
 
-    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
-}
+            continue;
+        }
+    }
 
+    //释放存储的数据
+    for (int i = 0; i < OpusFileCount; i++) 
+    {
+        free(MusicName[i]);
+    }
+    
+    free(MusicNameLength);
+    free(MusicName);
+
+    //发送结束帧
+    ret = HalSend_type1Send_Send_OpusList_Stop(Port, FrameSequence);
 
+#else
+    JZSDK_LOG_ERROR("非喊话器不支持opus列表");
+    //回复操作失败
+    HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+#endif
+}
 
 /*********
  * 
@@ -2087,24 +2526,13 @@ static T_JZsdkReturnCode RecvDeal_OpusPlay(int Port, char *getbuf)
 **********/
 static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_start(int Port, char *getbuf)
 {
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
     JZSDK_LOG_INFO("%s,开启opus实时喊话功能",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
     int  FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    T_JZsdkReturnCode ret = HalRecv_tpye1_RecvDeal_UartTransmodeDecide();
-    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("开启opus实时喊话失败");
-        return ret;
-    }
-
-    //1、修改接收模式
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_DATA_TRANS_TYPE_REAL_TIME_OPUS);
-    HalRecvDataLen = 0;
-
     //2、获取码率倍率 默认8k*1倍
     int RateMagnification = (int)getbuf[9];
     int Rate;
@@ -2120,11 +2548,17 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_start(int Port, char *getbu
     
     //3、打开实时语音模式
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
-    Megaphone_RealTimeVoice_Start(Rate);
+    ret = Megaphone_RealTimeVoice_Start(Rate);
 #endif
 
-    //4、通知成功打开语音发送模式
-    HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        HalSend_type1Send_Reply_Success(Port, FrameSequence);
+    }
+    else
+    {
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -2138,7 +2572,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_start(int Port, char *getbu
 static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_LimitTransmission(int Port, char *getbuf, int len)
 {
 
-    T_JZsdkReturnCode ret;
+    T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
 
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
@@ -2152,23 +2586,18 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_LimitTransmission(int Port,
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
     }
 
-    //判断是否是opus实时语音传输模式
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_REAL_TIME_OPUS)
-    {
-        //回复操作失败
-        JZSDK_LOG_ERROR("%s,opus实时语音定长传输失败,未开启实时opus传输模式", JZsdk_DefineCode_GetPortName(Port));
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-
-    HalRecvDataLen += DataLen;
-    JZSDK_LOG_DEBUG("%s,传输opus定长语音传输中 长度:%d,总长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen, HalRecvDataLen);
+    JZSDK_LOG_DEBUG("%s,传输opus定长语音传输中 长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen);
     
     //传输数据接口
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
     ret = Megaphone_RealTimeVoice_Trans(getbuf+9, DataLen);
 #endif
 
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
+
     return ret;
 }
 
@@ -2188,19 +2617,6 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_stop(int Port, char *getbuf
     //获取帧的序列号
     int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
 
-    if (HalRecvMode != JZ_DATA_TRANS_TYPE_REAL_TIME_OPUS)
-    {
-        //回复操作失败
-        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
-        JZSDK_LOG_ERROR("关闭opus实时语音发送功能失败,opus实时语音发送功能未开始,无法关闭");
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
-    }
-
-    //1、修改接收模式
-    HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(Port, JZ_FLAGCODE_OFF);
-    JZSDK_LOG_INFO("一共播放了:%d的内容", HalRecvDataLen);
-    HalRecvDataLen = 0;
-
     //2、关闭实时语音模式
 #ifdef MEGAPHONE_CONFIG_STATUS_ON    
     ret = Megaphone_RealTimeVoice_Close();
@@ -2604,6 +3020,185 @@ static T_JZsdkReturnCode RecvDeal_Checkstatus_OutPutPower(int Port, char *getbuf
     return ret;
 }
 
+
+
+
+
+
+
+
+
+/*******************************************************************************************************************************
+ * 
+ *          升级部分
+ * 
+ * *******************************************************************************************************************************/
+
+/*********
+ * 
+ *  准备升级
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Upgrade_Prepare(int Port, char *getbuf)
+{
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,准备升级",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    int status = 0;
+    Upgrade_GetStatus(&status);
+
+    //回复升级的准备状态
+    HalSend_type1Send_Reply_ReadyForUpdate(Port, FrameSequence);
+
+    return ret;
+}
+
+
+/*********
+ * 
+ *  升级校验码
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Upgrade_SendCheckCode(int Port, char *getbuf)
+{    
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,升级校验码",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //解析出校验码
+    unsigned char CheckCode[32];
+    memcpy(CheckCode, getbuf + 9, 32);
+
+    //将校验码放置到升级模块
+    ret = Upgrade_PackageCheckCodeSave(CheckCode, JZSDK_CHECK_SUM_TYPE_MD5, 32);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复校验码已收到
+        HalSend_type1Send_Reply_UpgradeHaveRecvCheckCode(Port, 1);
+    }
+    else
+    {
+        //回复校验码已收到
+        HalSend_type1Send_Reply_UpgradeHaveRecvCheckCode(Port, 0);
+    }
+
+    return ret;
+}
+
+
+/*********
+ * 
+ *  数据传输开始
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Upgrade_Start(int Port, char *getbuf)
+{    
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,数据传输开始",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    ret = Upgrade_PackageDownload_Start();
+    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复开始文件发送
+        HalSend_type1Send_Reply_UpgradeStart(Port);
+    }
+    else
+    {
+        //回复开始文件发送失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
+
+    return ret;
+}
+
+
+/*********
+ * 
+ *  数据传输中
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Upgrade_Trans(int Port, char *getbuf)
+{    
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,数据传输中",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    //解析数据长度
+    int FrameLength = JZsdk_Get_FrameLength(getbuf);
+    int BufLen = FrameLength - 8 -2;
+
+    ret = Upgrade_PackageDownload_Trans(&getbuf[9], BufLen);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复数据传输失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+    }
+
+    return ret;
+}
+
+
+/*********
+ * 
+ *  数据传输结束
+ * 
+**********/
+static T_JZsdkReturnCode RecvDeal_Upgrade_End(int Port, char *getbuf)
+{    
+    T_JZsdkReturnCode ret;
+
+    JZSDK_LOG_INFO("%s,数据传输结束",JZsdk_DefineCode_GetPortName(Port));
+
+    //获取帧的序列号
+    int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
+
+    ret = Upgrade_PackageDownload_Stop();
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        //回复数据传输失败
+        HalSend_type1Send_Reply_Failure(Port, FrameSequence);
+        return ret;
+    }
+    else
+    {
+        //回复结束文件传输
+        HalSend_type1Send_Reply_UpgradeEnd(Port);
+    }
+
+    //回复完成后，开始校验
+    ret = Upgrade_PackageCheck();
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        HalSend_type1Send_Reply_UpgradeCheckResult(Port, 1);
+        return ret;
+    }
+
+    //回复校验成功
+    HalSend_type1Send_Reply_UpgradeCheckResult(Port, 0);
+
+    //开始升级
+    Upgrade_PackageUpgrade();
+
+    return ret;
+}
+
+
+
+
 /*******************************************************************************************************************************
  * 
  *          警灯部分
@@ -3311,8 +3906,31 @@ static T_JZsdkReturnCode RecvDeal_Checkstatus_GimbalLinkage(int Port, char *getb
     return ret;
 }
 
+
+static T_JZTaskHandle g_UartReinit_task = NULL;
+
+static void *UartReinit_thread(void *arg)
+{
+    int *arg_value = (int *)arg;
+
+    int Port = arg_value[0];
+    
+    int Value[1];
+    Value[0]= arg_value[1];
+    
+
+    JZsdk_HalPort_ReInit(Port, Value);
+
+    JZSDK_LOG_INFO("串口重置完毕");
+
+    free(arg);
+}
+
+
 static T_JZsdkReturnCode RecvDeal_UartBitrateChange(int Port, char *getbuf)
 {
+    T_JZsdkOsalHandler *osalHandler = JZsdk_Platform_GetOsalHandler();
+
     JZSDK_LOG_INFO("%s,收到串口比特率修改",JZsdk_DefineCode_GetPortName(Port));
 
     //获取帧的序列号
@@ -3349,8 +3967,14 @@ static T_JZsdkReturnCode RecvDeal_UartBitrateChange(int Port, char *getbuf)
         break;
     }
 
-    int Value[1] = {BitRate};
-    JZsdk_HalPort_ReInit(Port, Value);
+    int *arg = (int *)malloc(sizeof(int) * 2);
+    arg[0] = Port;
+    arg[1] = BitRate;
+
+    //使用一个线程用于修改比特率
+    osalHandler->TaskCreate("UartReinit_task", UartReinit_thread, 8192, arg, &g_UartReinit_task);
+
+    JZSDK_LOG_INFO("已创建串口重置线程");
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -3832,13 +4456,37 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi
             return 0;
         break;
 
+        //音频重命名
+        case JZ_INSCODE_5AFRAME_RENAME_AUDIO:
+            RecvDeal_Rename_Audio(Port,getbuf);
+            return 0;
+        break;
+
+        //录音重命名
+        case JZ_INSCODE_5AFRAME_RENAME_VOICE_RECORD:
+            RecvDeal_Rename_VoiceRecord(Port,getbuf);
+            return 0;
+        break;
+
+        //视频重命名
+        case JZ_INSCODE_5AFRAME_RENAME_VIDEO_RECORD:
+            RecvDeal_Rename_VideoRecord(Port,getbuf);
+            return 0;
+        break;
 
         //打开opus传输
-        case JZ_INSCODE_5AFRAME_OPUS_TRANS_START:
+        case JZ_INSCODE_5AFRAME_OPUS_TRANS_START_1:
             RecvDeal_OpusTrans_start(Port,getbuf);
             return 0;
         break;
 
+
+        //传输opus文件数据2型
+        case JZ_INSCODE_5AFRAME_OPUS_TRANS_START_2:
+            RecvDeal_OpusTrans_start_2(Port,getbuf);
+            return 0;
+        break;
+
         //传输定长opus文件数据
         case JZ_INSCODE_5AFRAME_OPUS_TRANS_LIMIT_TRANSMISSION:
             RecvDeal_OpusTrans_LimitTransmission(Port,getbuf, len);
@@ -3863,6 +4511,11 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi
             return 0;
         break;
 
+        //获取opus列表
+        case JZ_INSCODE_5AFRAME_OPUS_GETOPUSLIST:
+            RecvDeal_Get_OpusList(Port,getbuf);
+            return 0;
+        break;
         
         //开启opus实时喊话
         case JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_START:
@@ -3922,6 +4575,17 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi
             return 0;
         break;
 
+        //开关播放时间回传
+        case JZ_INSCODE_5AFRAME_CURRENT_PLAY_TIME:
+            RecvDeal_Current_Play_Time(Port,getbuf);
+            return 0;
+        break;
+
+        //检查是否开启播放时间回传
+        case JZ_INSCODE_5AFRAME_CHECKSTATUS_CURRENT_PLAYTIME:
+            RecvDeal_CheckStatus_CurrentPlayTime(Port,getbuf);
+            return 0;
+        break;
 
         //音频列表获取
         case JZ_INSCODE_5AFRAME_AUDIO_GETMUSICLIST:
@@ -3998,6 +4662,34 @@ static T_JZsdkReturnCode RecvDeal_InstructInput(int Port, int Receive_mode, unsi
 
 
 
+        //升级部分
+
+        //准备升级
+        case JZ_INSCODE_5AFRAME_UPGRADE_PERPARE:
+            RecvDeal_Upgrade_Prepare(Port,getbuf);
+        break;
+
+        //升级校验码
+        case JZ_INSCODE_5AFRAME_UPGRADE_SEND_CHECKCODE:
+            RecvDeal_Upgrade_SendCheckCode(Port,getbuf);
+        break;
+
+        //数据传输开始
+        case JZ_INSCODE_5AFRAME_UPGRADE_STRAT:
+            RecvDeal_Upgrade_Start(Port,getbuf);
+        break;
+
+        //数据传输中
+        case JZ_INSCODE_5AFRAME_UPGRADE_TRANS:
+            RecvDeal_Upgrade_Trans(Port,getbuf);
+        break;
+
+        //数据传输结束
+        case JZ_INSCODE_5AFRAME_UPGRADE_END:
+            RecvDeal_Upgrade_End(Port,getbuf);
+        break;
+
+
 /*******************************************************************************************************************************
  * 
  *          5B类部分
@@ -4293,9 +4985,6 @@ static T_JZsdkReturnCode HalRecv_tpye1_RecvDeal_Set_UartReceiveMode(int Port, in
 static T_JZsdkReturnCode HalRecv_tpye1_RecvDeal_UartTransmodeDecide()
 {
     if  ((HalRecvMode == JZ_DATA_TRANS_TYPE_REAL_TIME_MP2 )			//mp2实时语音传输模式
-			|| (HalRecvMode == JZ_DATA_TRANS_TYPE_AUDIO_FILE)	        //音频文件传输模式
-			|| (HalRecvMode == JZ_DATA_TRANS_TYPE_OPUS_FILE)		//opus无限制传输模式
-            || (HalRecvMode == JZ_DATA_TRANS_TYPE_REAL_TIME_OPUS)		//opus实时语音无限制传输模式
             || (HalRecvMode == JZ_DATA_TRANS_TYPE_TTS))		//TTS无限制传输模式)
     {
         return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;

@@ -3,9 +3,8 @@
 
 #include "JZsdk_uart/JZsdk_Uart_UartDeal.h"
 
+#include "Hal_Send/HalSend.h"
 
-#define SINGLE_THREAD_SEND 0
-#define MULTI_THREAD_SEND 1
 
 /*****************************
  * 
@@ -33,11 +32,11 @@ T_JZsdkReturnCode HalSend_SendData(unsigned int Port, unsigned char *Data, unsig
         case UART_DEV_3:
         case UART_DEV_4:
         case UART_DEV_5:
-            if (SendType == SINGLE_THREAD_SEND)
+            if (SendType == MULTI_THREAD_SEND)
             {
                 JZsdk_Uart_UartSend(Port, Data, DataLen);
             }
-            else if (SendType == MULTI_THREAD_SEND)
+            else if (SendType == SINGLE_THREAD_SEND)
             {
                 JZsdk_Uart_UartSend_NotTask(Port, Data, DataLen);
             }

@@ -20,11 +20,13 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 /* 常亮定义*/
-
+#define SINGLE_THREAD_SEND 0
+#define MULTI_THREAD_SEND 1
 
 /* Exported types ------------------------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
+
 T_JZsdkReturnCode HalSend_SendData(unsigned int Port, unsigned char *Data, unsigned int DataLen, unsigned int SendType);
 
 

@@ -41,7 +41,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_Connect(int Uartport , int FrameSequenc
     sendbuf[6] = FrameSequence; //帧序列
     
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -62,7 +62,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_HeartBeatStatus(int Uartport , int Fram
     sendbuf[6] = FrameSequence; //帧序列
     
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -82,7 +82,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_PowerStatus(int Uartport, int FrameSeque
     sendbuf[6] = FrameSequence; //帧序列
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -102,7 +102,7 @@ T_JZsdkReturnCode HalSend_type1Send_Ask_HeartBeatStatus(int Uartport , int Frame
     sendbuf[6] = FrameSequence; //帧序列
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1); 
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND); 
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 
 }
@@ -121,7 +121,7 @@ T_JZsdkReturnCode HalSend_type1Send_Ask_TimeStamp(int Uartport , int FrameSequen
     sendbuf[6] = FrameSequence; //帧序列
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);  
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);  
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -145,7 +145,7 @@ T_JZsdkReturnCode HalSend_type1Send_SendAllVersion(int Uartport, int FrameSequen
     sendbuf[13] = DebugVersion;
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -172,7 +172,7 @@ T_JZsdkReturnCode HalSend_type1Send_SendAllSerialNumber(int Uartport, int FrameS
     sendbuf[4] = (send_buf_len & 0xff);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);  
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);  
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -190,7 +190,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Success(int Uartport ,int FrameSequenc
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -208,7 +208,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Failure(int Uartport ,int FrameSequenc
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送校验失败帧
@@ -224,7 +224,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_CheckError(int Uartport ,int FrameSequ
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送解码失败帧
@@ -240,7 +240,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_DecodeError(int Uartport ,int FrameSeq
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送当前从设备名
@@ -257,7 +257,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SecondaryDeviceName(int Uartport , int
     sendbuf[10] = device_name;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 
@@ -274,7 +274,7 @@ T_JZsdkReturnCode HalSend_type1Send_QuerySecondaryDeviceName(int Uartport ,int F
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送当前设备序列号
@@ -301,7 +301,7 @@ T_JZsdkReturnCode HalSend_type1Send_SerialNumber(int UartPort, int FrameSequence
     sendbuf[4]  = send_buf_len;
 
     //3、发送帧
-    HalSend_SendData(UartPort ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(UartPort ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*********
@@ -326,7 +326,7 @@ T_JZsdkReturnCode HalSend_type1Send_DeviceMessage(int UartPort, int FrameSequenc
     sendbuf[9+messageLen + 1] = 0x23;
 
     //3、发送帧
-    HalSend_SendData(UartPort ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(UartPort ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 
@@ -457,7 +457,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_Start(int Uartport, int Frame
     sendbuf[9] = music_sum;
 
     //发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 0);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -476,7 +476,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_Stop(int Uartport, int FrameS
     //写入数据
     sendbuf[6] = FrameSequence; //帧序列
 
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 0);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
 }
 
 //发送歌曲列表Ⅱ型
@@ -514,7 +514,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioList_2(int Uartport, int FrameSequ
     sendbuf[send_buf_len-1] = 0x23;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 0);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -542,7 +542,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_AudioDetailMessage(int Uartport, int Fr
     sendbuf[send_buf_len-1] = 0x23;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
@@ -560,7 +560,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus_end(int Uartport)
     //2、写入数据
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送播放状态帧
@@ -593,7 +593,7 @@ T_JZsdkReturnCode HalSend_type1Send_Send_PlayStatus(int Uartport ,int num)
     sendbuf[9] = (char)num;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //回复当前播放的歌曲名字
@@ -634,7 +634,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num)
     sendbuf[9] = (char)num;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
 }
 
@@ -657,7 +657,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe
     sendbuf[12] = debugVersion;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送循环状态
@@ -675,7 +675,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int statu
     sendbuf[9] = status;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 
 }
 
@@ -694,7 +694,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone)
     sendbuf[9] = tone;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送语速
@@ -712,7 +712,44 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed)
     sendbuf[9] = speed;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
+}
+
+//发送当前播放时间状态
+T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode)
+{
+    printf("发送当前播放时间状态帧\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_CURRENT_PLAYTIME, sendbuf, &send_buf_len);
+    
+    //2、写入数据
+    sendbuf[9] = mode;
+    
+    //3、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
+}
+
+//发送当前播放时间
+T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTime(int Uartport ,int time)
+{
+    printf("发送当前播放时间\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CURRENT_PLAY_TIME, sendbuf, &send_buf_len);
+    
+    //2、写入数据
+    sendbuf[9] = time >> 8;
+    sendbuf[10] = time & 0xff;
+
+    //3、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -734,7 +771,87 @@ T_JZsdkReturnCode HalSend_type1Send_OpusDecodeStatus(int Uartport,int value)
     sendbuf[9] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
+}
+
+
+//发送opus列表开始帧
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Start(int Uartport, int FrameSequence, int music_sum)
+{
+    printf("发送opus开始列表帧\n");
+
+    unsigned char sendbuf[128];
+    int  send_buf_len;
+
+    //获取帧样板
+    memset(sendbuf,0,sizeof(sendbuf));
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_OPUSLIST_START , sendbuf, &send_buf_len);
+    //写入数据
+    sendbuf[6] = FrameSequence; //帧序列
+    sendbuf[9] = music_sum;
+
+    //发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+
+//发送opus列表
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Trans(int Uartport, int FrameSequence, unsigned char *name, unsigned int namelen, unsigned int Filesize, unsigned int Time)
+{   
+    printf("发送opus列表 %s %d %d %d\n",name, namelen, Filesize, Time);
+    unsigned char sendbuf[400];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_OPUSLIST_TRANS , sendbuf, &send_buf_len);
+    
+    //写入文件名
+    sendbuf[9] = namelen;
+    memcpy(&sendbuf[10], name, namelen);
+
+     //文件大小
+    sendbuf[10+namelen]   = (Filesize >> 24) & 0xFF;
+    sendbuf[10+namelen+1] = (Filesize >> 16) & 0xFF;
+    sendbuf[10+namelen+2] = (Filesize >> 8) & 0xFF;
+    sendbuf[10+namelen+3] = Filesize & 0xFF;
+
+    //播放时间
+    sendbuf[10+namelen+4] = (Time >> 8) & 0xFF;
+    sendbuf[10+namelen+5] = Time & 0xFF;
+
+    //2、写入数据
+    send_buf_len = 9 + 1 + namelen + 4 + 2 + 2;
+
+    sendbuf[3] = (unsigned char)( (send_buf_len >> 8) & 0xFF); //帧长度
+    sendbuf[4] = (unsigned char)(send_buf_len & 0xFF); //帧长度
+    sendbuf[6] = FrameSequence; //帧序列
+
+    sendbuf[send_buf_len-2] = 0x00;
+    sendbuf[send_buf_len-1] = 0x23;
+
+    //3、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+//发送opus列表结束帧
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSequence)
+{
+    printf("发送opus结束列表帧\n");
+
+    unsigned char sendbuf[128];
+    int  send_buf_len;
+
+    //获取帧样板
+    memset(sendbuf,0,sizeof(sendbuf));
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_OPUSLIST_END , sendbuf, &send_buf_len);
+    //写入数据
+    sendbuf[6] = FrameSequence; //帧序列
+
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
 }
 
 /****************************************************************************************************************************************************
@@ -766,7 +883,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int ang
     sendbuf[11] = (char)(angle & 255);
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //设置当前云台角度
@@ -794,7 +911,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_GimbalPitchAngle(int Uartport ,int angle
     sendbuf[11] = (angle & 0xff);
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询云台角度
@@ -811,7 +928,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalAngle(int Uartport ,int Fr
     sendbuf[6] = FrameSequence;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //微调云台pitch
@@ -839,7 +956,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_GimbalFineTuningPitch(int Uartport, int
     sendbuf[11] = (PitchFineTuning & 0xff);
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询云台角度微调值
@@ -856,7 +973,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalFineTuningPitch(int Uartpo
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //回复云台pitch微调值
@@ -884,7 +1001,7 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalFineTuningPitch(int Uartport, in
     sendbuf[11] = (FineTunigPitch & 0xff);
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //设置云台联动
@@ -902,7 +1019,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_GimbalLinkageControl(int Uartport,int Fr
     sendbuf[10] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询云台联动值
@@ -919,7 +1036,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_GimbalLinkage(int Uartport,int F
     sendbuf[6] = FrameSequence; //帧序列
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送云台联动值
@@ -937,7 +1054,7 @@ T_JZsdkReturnCode HalSend_type1Send_GimbalLinkageControl(int Uartport,int FrameS
     sendbuf[10] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送云台最大最小值帧
@@ -955,7 +1072,7 @@ T_JZsdkReturnCode HalSend_type1Send_SetGimbalRange(int Uartport,int FrameSequenc
     sendbuf[10] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /****************************************************************************************************************************************************
@@ -979,7 +1096,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_SearchLightFrequency(int Uartport ,int F
     sendbuf[10] = Frequency;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //设置探照灯控制
@@ -997,7 +1114,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_Control(int Uartport,int mode)
     sendbuf[10] = mode;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //设置探照灯亮度
@@ -1016,7 +1133,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_SetLumen(int Uartport,  int Left
     sendbuf[10] = RightLumen;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //发送
@@ -1033,7 +1150,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_SearchLight_Frequency(int Uartpo
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询探照灯亮度
@@ -1048,7 +1165,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_SearchLight_Lumen(int Uartport)
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_LUMEN, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询探照灯模式
@@ -1063,7 +1180,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_SearchLight_Mode(int Uartport)
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_MODE, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询探照灯属性
@@ -1078,7 +1195,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_SearchLight_Attribute(int Uartpo
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_LIGHTATTRIBUTE, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询探照灯温度
@@ -1093,7 +1210,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_SearchLight_Temperture(int Uartp
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_TEMPERATURE, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //开启消息订阅
@@ -1111,7 +1228,114 @@ T_JZsdkReturnCode HalSend_type1Send_MessageSubcription_Control(int Uartport, int
     sendbuf[10] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
+}
+
+/************************************************************************************************************************************************************
+ * 
+ *  升级部分
+ *  
+ * 
+*******************************************************************************************************************/
+/*************
+ * 
+ *  回复准备升级
+ * 
+ * **************/
+T_JZsdkReturnCode HalSend_type1Send_Reply_ReadyForUpdate(int Uartport, int Mode)
+{
+    printf("发送回复准备升级\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_UPGRADE_PERPARE, sendbuf, &send_buf_len);
+
+    sendbuf[9] = Mode;
+
+    //2、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+}
+
+/*************
+ * 
+ *  回复校验激活码已收到
+ * 
+ * **************/
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeHaveRecvCheckCode(int Uartport, int Mode)
+{
+    printf("回复校验激活码已收到\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_UPGRADE_SEND_CHECKCODE, sendbuf, &send_buf_len);
+
+   sendbuf[9] = Mode;
+
+    //2、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+}
+
+/*************
+ * 
+ *  回复升级传输已开启
+ * 
+ * **************/
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeStart(int Uartport)
+{
+    printf("回复升级传输已开启\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_UPGRADE_STRAT, sendbuf, &send_buf_len);
+
+    //2、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+}
+
+/*************
+ * 
+ *  回复升级传输已结束
+ * 
+ * **************/
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeEnd(int Uartport)
+{
+    printf("回复升级传输已结束\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_UPGRADE_END, sendbuf, &send_buf_len);
+
+    //2、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
+}
+
+/*************
+ * 
+ *  回复升级校验结果
+ * 
+ * **************/
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeCheckResult(int Uartport, int status)
+{
+    printf("回复升级校验结果\n");
+
+    unsigned char sendbuf[256];
+    int  send_buf_len;
+
+    //1、获取帧样板
+    JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_UPGRADE_CHECKRESULT, sendbuf, &send_buf_len);
+
+    sendbuf[9] = status;
+
+    //2、发送帧
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, SINGLE_THREAD_SEND);
 }
 
 /****************************************************************************************************************************************************
@@ -1139,7 +1363,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_WarningLight_Status(int Uartport,int sta
     sendbuf[10] = mode;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -1162,7 +1386,7 @@ T_JZsdkReturnCode HalSend_type1Send_Set_WarningLight_Color(int Uartport,int colo
     sendbuf[10] = color2;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询警灯状态
@@ -1177,7 +1401,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_WarningLightStatus(int Uartport)
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_WARNINGLIGHT_STATUS, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 //查询警灯颜色
@@ -1192,7 +1416,7 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_WarningLightColor(int Uartport)
     JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_WARNINGLIGHT_COLOR, sendbuf, &send_buf_len);
 
     //2、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /****************************************************************************************************************************************************
@@ -1220,7 +1444,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_Frequency(int Uartport, int Freq
     sendbuf[10] = Frequency;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -1242,7 +1466,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_Mode(int Uartport, int mode)
     sendbuf[10] = mode;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -1265,7 +1489,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_Lumen(int Uartport,int LeftLumen
     sendbuf[10] = RightLumen;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -1288,7 +1512,7 @@ T_JZsdkReturnCode HalSend_type1Send_SearchLight_Temperature(int Uartport, int Le
     sendbuf[10] = RightTemperature;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 
@@ -1312,7 +1536,7 @@ T_JZsdkReturnCode HalSend_type1Send_WarningLight_Status(int Uartport, int status
     sendbuf[10] = mode;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);}
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);}
 
 /*************
  * 
@@ -1334,7 +1558,7 @@ T_JZsdkReturnCode HalSend_type1Send_WarningLight_Color(int Uartport, int color1,
     sendbuf[10] = color2;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /*************
@@ -1356,7 +1580,7 @@ T_JZsdkReturnCode HalSend_type1Send_OutputPowerStatus(int Uartport, int FrameSeq
     sendbuf[9] = status;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
 
 /****************************************************************************************************************************************************
@@ -1380,5 +1604,5 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_CheckSpecialParameters(int Uartport,in
     sendbuf[10] = value;
 
     //3、发送帧
-    HalSend_SendData(Uartport ,sendbuf, send_buf_len, 1);
+    HalSend_SendData(Uartport ,sendbuf, send_buf_len, MULTI_THREAD_SEND);
 }
\ No newline at end of file

@@ -60,6 +60,11 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_MusicName(int Uartport ,char *music_na
 T_JZsdkReturnCode HalSend_type1Send_Reply_Volume(int Uartport ,int num);
 T_JZsdkReturnCode HalSend_type1Send_OpusDecodeStatus(int Uartport,int value);
 
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Start(int Uartport, int FrameSequence, int music_sum);
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Trans(int Uartport, int FrameSequence, unsigned char *name, unsigned int namelen, unsigned int Filesize, unsigned int Time);
+T_JZsdkReturnCode HalSend_type1Send_Send_OpusList_Stop(int Uartport, int FrameSequence);
+
+
 T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalPitchAngle(int Uartport ,int angle);
 T_JZsdkReturnCode HalSend_type1Send_Set_GimbalPitchAngle(int Uartport ,int angle);
 T_JZsdkReturnCode HalSend_type1Send_Reply_GimbalFineTuningPitch(int Uartport, int FrameSequence, int FineTunigPitch);
@@ -76,6 +81,9 @@ T_JZsdkReturnCode HalSend_type1Send_Reply_SoftVersion(int Uartport ,char majorVe
 T_JZsdkReturnCode HalSend_type1Send_Reply_LoopPlayStatus(int Uartport ,int status);
 T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_tone(int Uartport ,int tone);
 T_JZsdkReturnCode HalSend_type1Send_Reply_TTS_speed(int Uartport ,int speed);
+T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTime(int Uartport ,int time);
+T_JZsdkReturnCode HalSend_type1Send_Reply_CurrentPlayTimeStatus(int Uartport ,int mode);
+
 
 T_JZsdkReturnCode HalSend_type1Send_Set_SearchLightFrequency(int Uartport ,int Frequency);
 T_JZsdkReturnCode HalSend_type1Send_SearchLight_Control(int Uartport,int mode);
@@ -115,6 +123,15 @@ T_JZsdkReturnCode HalSend_type1Send_CheckStatus_WarningLightColor(int Uartport);
 T_JZsdkReturnCode HalSend_type1Send_OutputPowerStatus(int Uartport, int FrameSequence, int status);
 
 
+T_JZsdkReturnCode HalSend_type1Send_Reply_ReadyForUpdate(int Uartport, int Mode);
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeHaveRecvCheckCode(int Uartport, int Mode);
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeStart(int Uartport);
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeEnd(int Uartport);
+T_JZsdkReturnCode HalSend_type1Send_Reply_UpgradeCheckResult(int Uartport, int status);
+
+
+
+
 /* Exported functions --------------------------------------------------------*/
 
 #ifdef __cplusplus

@@ -8,148 +8,218 @@
 
 #include "JZsdk_uart/JZsdk_Uart.h"
 
-/******************
- * 
- *  用来记录端口使用情况的结构体
- *  JZ_FLAGCODE_OFF 关闭
- *  JZ_FLAGCODE_ON  开启
- * ********************/
-typedef struct s_JZsdk_Hal_PortUseFlag
-{
-    int UartDev_DEV1 ;
-    int UartDev_DEV2 ;  
-    int UartDev_DEV3 ;
-    int UartDev_DEV4 ;
-    int UartDev_4G   ;
-    int Data_Dransmisson;
-}s_JZsdk_Hal_PortUseFlag;
+static s_JZsdk_Hal_Info *g_HalInfo = NULL;
 
-static s_JZsdk_Hal_PortUseFlag g_PortUseFlag = {JZ_FLAGCODE_OFF};
+s_JZsdk_Hal_Info *JZsdk_Hal_GetHalInfo()
+{
+    return g_HalInfo;
+}
 
-/**************
- * 
- *  jzsdk hal的端口使用标志位
- * 
- * 
- * *********************/
-int JZsdk_HalPort_UseFlag(int PortName)
+T_JZsdkReturnCode JZsdk_Hal_Init()
 {
-    if (PortName == UART_DEV_1)
-    {
-        return g_PortUseFlag.UartDev_DEV1;
-    }
-    else if (PortName  == UART_DEV_2)
+    T_JZsdkOsalHandler *pOsalHandler = JZsdk_Platform_GetOsalHandler();
+
+    if (g_HalInfo == NULL)
     {
-        return g_PortUseFlag.UartDev_DEV2;
+        g_HalInfo = pOsalHandler->Malloc(sizeof(s_JZsdk_Hal_Info));
     }
-    else if (PortName  == UART_DEV_3)
+
+    //PSDK系列初始化
+    for (int i = DEVICE_PSDK; i < UART_4G; i++)
     {
-        return g_PortUseFlag.UartDev_DEV3;
+        g_HalInfo->HalPort[i].UseFlag = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].ConnectStatus = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].PortType = PORT_TYPE_PSDK;
     }
-    else if (PortName  == UART_DEV_4)
+
+    //UART系列初始化
+    for (int i = UART_4G; i < USB_DEV_1; i++)
     {
-        return g_PortUseFlag.UartDev_DEV4;
+        g_HalInfo->HalPort[i].UseFlag = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].ConnectStatus = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].PortType = PORT_TYPE_UART;
     }
-    else if (PortName  == UART_4G)
+
+    //USB系列初始化
+    for (int i = USB_DEV_1; i < NET_DEV_1; i++)
     {
-        return g_PortUseFlag.UartDev_4G;
+        g_HalInfo->HalPort[i].UseFlag = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].ConnectStatus = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].PortType = PORT_TYPE_USB;
     }
-    else if (PortName  == HAL_DATA_TRANSMISSION)
+
+    //网口系列初始化
+    for (int i = NET_DEV_1; i < HAL_DATA_TRANSMISSION; i++)
+    {
+        g_HalInfo->HalPort[i].UseFlag = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].ConnectStatus = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].PortType = PORT_TYPE_NET;
+    }   
+
+    //特殊数据层
+    for (int i = HAL_DATA_TRANSMISSION; i < HAL_MAX; i++)
     {
-        return g_PortUseFlag.Data_Dransmisson;
+        g_HalInfo->HalPort[i].UseFlag = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].ConnectStatus = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+        g_HalInfo->HalPort[i].PortType = PORT_TYPE_TRANS_DATA;
     }
+
+    JZSDK_LOG_INFO("JZsdk_Hal_Init Success");
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
+
+/**************
+ * 
+ *  jzsdk 获取hal的端口使用标志位
+ * 
+ * *********************/
+int JZsdk_HalPort_UseFlag(int PortName)
+{
+    return g_HalInfo->HalPort[PortName].UseFlag;
+}
+
+
 T_JZsdkReturnCode JZsdk_HalPort_SetUseFlag(int PortName,int UseFlag)
 {
-    if (PortName == UART_DEV_1)
-    {
-        g_PortUseFlag.UartDev_DEV1 = UseFlag;
-    }
-    else if (PortName  == UART_DEV_2)
-    {
-        g_PortUseFlag.UartDev_DEV2 = UseFlag;
-    }
-    else if (PortName  == UART_DEV_3)
-    {
-        g_PortUseFlag.UartDev_DEV3 = UseFlag;
-    }
-    else if (PortName  == UART_DEV_4)
-    {
-        g_PortUseFlag.UartDev_DEV4 = UseFlag;
-    }
-    else if (PortName  == UART_4G)
-    {
-        g_PortUseFlag.UartDev_4G = UseFlag;
-    }
-    else if (PortName  == HAL_DATA_TRANSMISSION)
-    {
-        g_PortUseFlag.Data_Dransmisson = UseFlag;
+    g_HalInfo->HalPort[PortName].UseFlag = UseFlag;
+
+    //将端口添加到已使用端口列表中 或从端口中移除
+ 
+    //如果是要添加进列表中
+    if (UseFlag == JZ_FLAGCODE_ON)
+    {
+        //先检查列表中是否已经存在
+        for (int i = 0; i < g_HalInfo->HaveUsePortNum; i++)
+        {
+            if (g_HalInfo->HaveUsePort[i] == PortName)
+            {
+                return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+            }
+        }
+
+        //如果不存在，则添加
+        g_HalInfo->HaveUsePort[g_HalInfo->HaveUsePortNum] = PortName;
+        g_HalInfo->HaveUsePortNum++;
+        g_HalInfo->HalPort[PortName].UseFlag = JZ_FLAGCODE_ON;
     }
-    else
-    {
-        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+
+    //如果是要从列表中移除
+    else if (UseFlag == JZ_FLAGCODE_OFF)
+    {
+        //先检查列表中是否已经存在
+        for (int i = 0; i < g_HalInfo->HaveUsePortNum; i++)
+        {
+            if (g_HalInfo->HaveUsePort[i] == PortName)
+            {
+                g_HalInfo->HaveUsePort[i] = g_HalInfo->HaveUsePort[g_HalInfo->HaveUsePortNum - 1];
+                g_HalInfo->HaveUsePortNum--;
+                g_HalInfo->HalPort[PortName].UseFlag = JZ_FLAGCODE_OFF;
+                g_HalInfo->HalPort[PortName].ConnectStatus = JZ_FLAGCODE_OFF;
+                g_HalInfo->HalPort[PortName].HeartBeatStatusSend = JZ_FLAGCODE_OFF;
+                return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+            }
+        }
+
+        //如果本来就不存在，则直接返回
+        JZSDK_LOG_INFO("hal口:%s,本来就未使用，无需移除", JZsdk_DefineCode_GetPortName(PortName));
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
     }
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
-/**********************
- * 
- *    hal端口 重初始化函数
- *  
- * 
- * ******************/
-T_JZsdkReturnCode JZsdk_HalPort_ReInit(int PortName, int Value[])
+//用于给初始化函数调用
+static T_JZsdkReturnCode JZsdK_HalPort_Init_Info(int PortName, int UseFlag
+    , int ConnectStatus, int HeartBeatStatusSend, int PortType)
 {
-    switch (PortName)
-    {
-        case UART_DEV_1:
-            JZsdk_Uart_ReInit(PortName, Value[0]);
-        break;
-
-        case UART_DEV_2:
-            JZsdk_Uart_ReInit(PortName, Value[0]);
-        break;
-
-        case UART_DEV_3:
-            JZsdk_Uart_ReInit(PortName, Value[0]);
-        break;
-
-        case UART_DEV_4:
-            JZsdk_Uart_ReInit(PortName, Value[0]);
-        break;
-
-        case UART_4G:
-            JZsdk_Uart_ReInit(PortName, Value[0]);
-        break;
-        
-        default:
-            break;
-    }
+    g_HalInfo->HalPort[PortName].UseFlag = UseFlag;
+    g_HalInfo->HalPort[PortName].ConnectStatus = ConnectStatus;
+    g_HalInfo->HalPort[PortName].HeartBeatStatusSend = HeartBeatStatusSend;
+    g_HalInfo->HalPort[PortName].PortType = PortType;
+
+    //记录端口
+    JZsdk_HalPort_SetUseFlag(PortName, JZ_FLAGCODE_ON);
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
 /**********************
  * 
- *    hal端口 使用默认参数初始化函数
+ *    hal端口 初始化函数
+ *    psdk初始化 value为NULL
+ *    uart初始化 value[0]为波特率
  * 
  * ******************/
-T_JZsdkReturnCode JZsdk_HalPort_Init_WithDefault(int PortName)
+T_JZsdkReturnCode JZsdk_HalPort_Init(int PortName, int Value[])
 {
-    int value[5] = {0, 0, 0, 0, 0};
+    T_JZsdkReturnCode ret;
 
-    if (PortName == UART_DEV_1)
+    //psdk初始化
+    if (PortName >= DEVICE_PSDK && PortName < UART_4G)
     {
-        value[0] = UART_DEV1_BITRATE;
+        JZsdK_HalPort_Init_Info(PortName, JZ_FLAGCODE_ON, JZ_FLAGCODE_OFF, JZ_FLAGCODE_OFF, PORT_TYPE_PSDK);
+
+        JZSDK_LOG_INFO("hal%s 初始化",JZsdk_DefineCode_GetPortName(PortName));
+
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+    }
+
+    //uart初始化
+    if (PortName >= UART_4G && PortName < USB_DEV_1)
+    {
+        JZSDK_LOG_INFO("hal%s 初始化",JZsdk_DefineCode_GetPortName(PortName));
+                
+        ret = JZsdk_Uart_ReInit(PortName, Value[0]);
+        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+        {
+            JZSDK_LOG_ERROR("hal%s 初始化失败",JZsdk_DefineCode_GetPortName(PortName));
+            return ret;
+        }
+
+        JZsdK_HalPort_Init_Info(PortName, JZ_FLAGCODE_ON, JZ_FLAGCODE_OFF, JZ_FLAGCODE_OFF, PORT_TYPE_UART);
+
+        return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
     }
-    else if (PortName  == UART_DEV_2)
+    
+    //usb初始化
+    if (PortName >= USB_DEV_1 && PortName < NET_DEV_1)
     {
-        value[0] = UART_DEV2_BITRATE;
+        //还没做
     }
-    else if (PortName  == UART_4G)
+
+    //net初始化
+    if (PortName >= NET_DEV_1 && PortName < HAL_DATA_TRANSMISSION)
     {
-        value[0] = COMM_4G_UART_BITRATE;
+        //还没做
     }
 
-    return JZsdk_HalPort_ReInit(PortName, value);
+    //数据传输初始化
+    if (PortName == HAL_DATA_TRANSMISSION)
+    {
+        JZsdK_HalPort_Init_Info(PortName, JZ_FLAGCODE_ON, JZ_FLAGCODE_OFF, JZ_FLAGCODE_OFF, PORT_TYPE_TRANS_DATA);
+
+        JZSDK_LOG_INFO("hal%s 初始化",JZsdk_DefineCode_GetPortName(PortName));
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+
+/************************
+ * 
+ *  HalRort Reinit
+ *  专门用于已经初始化完毕端口
+ *  与init的区别是, Reinit 是要调用多线程来重初始化的
+ * 
+ * ***************************/
+T_JZsdkReturnCode JZsdk_HalPort_ReInit(int PortName, int Value[])
+{
+    return JZsdk_HalPort_Init(PortName, Value);
 }
\ No newline at end of file

@@ -25,14 +25,52 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* 常亮定义*/
 
+typedef enum E_HAL_PORT_TYPE
+{
+    PORT_TYPE_PSDK   = 0,
+    PORT_TYPE_UART = 1,
+    PORT_TYPE_USB  = 2,
+    PORT_TYPE_NET  = 3,
+    
+    PORT_TYPE_TRANS_DATA = 4,
+}E_HAL_PORT_TYPE;
+
+/******************
+ * 
+ *  hal使用状态
+ * 
+ * 
+ * 
+ * ********/
+typedef struct s_JZsdk_HalStatus
+{
+    int UseFlag; //hal使用标志位    //初始化时开关关闭
+    int ConnectStatus; //接收过连接帧后打开
+    int HeartBeatStatusSend; //心跳帧的发送开关
+    int PortType;
+
+}s_JZsdk_HalStatus;
+
+typedef struct s_JZsdk_Hal_Info
+{
+    s_JZsdk_HalStatus HalPort[255]; //记录hal使用的端口状态
+    int HaveUsePort[255]; //记录已经使用的端口
+    int HaveUsePortNum;   //记录已经使用的端口数量
+
+}s_JZsdk_Hal_Info;
+
 /* Exported types ------------------------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
 int JZsdk_HalPort_UseFlag(int PortName);
 T_JZsdkReturnCode JZsdk_HalPort_SetUseFlag(int PortName,int UseFlag);
+
+T_JZsdkReturnCode JZsdk_HalPort_Init(int PortName, int Value[]);
 T_JZsdkReturnCode JZsdk_HalPort_ReInit(int PortName, int Value[]);
-T_JZsdkReturnCode JZsdk_HalPort_Init_WithDefault(int PortName);
 
+T_JZsdkReturnCode JZsdk_Hal_Init();
+
+s_JZsdk_Hal_Info *JZsdk_Hal_GetHalInfo();
 
 #ifdef __cplusplus
 }

@@ -13,6 +13,28 @@
 #include "JZsdk_uart/JZsdk_Uart_UartDeal.h"
 #include "JZsdk_Hal.h"
 
+static unsigned char *Get_UartDevPath(int UartDev)
+{
+    switch (UartDev)
+    {
+        case UART_4G:
+            return COMM_4G_UART_NUM;    
+        break;
+
+        case UART_DEV_1:
+            return UART_DEV1_NUM;
+        break;
+
+        case UART_DEV_2:
+            return UART_DEV2_NUM;
+        break;
+        
+        default:
+            return NULL;
+            break;
+    }
+}
+
 /********************
  * 
  * 
@@ -110,12 +132,8 @@ T_JZsdkReturnCode JZsdk_Uart_UartEnabled(unsigned char *UartDev, unsigned int Bi
 
 /****************
  * 
- * 
- * 
  *  串口重初始化
- * 
- * 
- * 
+ *  该函数仅能被JZsdk_HalPort_Init调用，请勿直接使用
  * 
  * ************************/
 T_JZsdkReturnCode JZsdk_Uart_ReInit(int UART_DEV_NAME, int BitRate)
@@ -123,88 +141,30 @@ T_JZsdkReturnCode JZsdk_Uart_ReInit(int UART_DEV_NAME, int BitRate)
     T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
     int UartFd = 0;
 
-    JZSDK_LOG_INFO("初始化串口 0x%x", UART_DEV_NAME);
+    //JZSDK_LOG_INFO("初始化串口 0x%x", UART_DEV_NAME);
 
-    //初始化的是一号设备
-    if (UART_DEV_NAME == UART_DEV_1)
+    //检查是否已经初始化
+    if(JZsdk_HalPort_UseFlag(UART_DEV_NAME) == JZ_FLAGCODE_ON)
     {
-        //1、检查串口是否已经初始化
-        if(JZsdk_HalPort_UseFlag(UART_DEV_1) == JZ_FLAGCODE_ON)
-        {
-            //先注释掉原来的串口
-            JZsdk_HalPort_SetUseFlag(UART_DEV_1, JZ_FLAGCODE_OFF);
-
-            //然后关闭串口 注：该函数有延时
-            JZsdk_Uart_CloseUartThead(UART_DEV_1);
-        }
-
-        //2、串口初始化
-        ret = JZsdk_Uart_UartEnabled(UART_DEV1_NUM, BitRate, &UartFd);
-        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-        {
-            return ret;
-        }
-
-        //3、串口接收初始化
-        JZsdk_Uart_UartDeal_Receive(UartFd, UART_DEV_1);
-
-        //4、将串口的标志位打开
-        JZsdk_HalPort_SetUseFlag(UART_DEV_1, JZ_FLAGCODE_ON);
-    }
+        //先注释掉原来的串口
+        JZsdk_HalPort_SetUseFlag(UART_DEV_NAME, JZ_FLAGCODE_OFF);
 
-    //初始化的是二号设备
-    if (UART_DEV_NAME == UART_DEV_2)
-    {
-        //1、检查串口是否已经初始化
-        if(JZsdk_HalPort_UseFlag(UART_DEV_2) == JZ_FLAGCODE_ON)
-        {
-            //先注释掉原来的串口
-            JZsdk_HalPort_SetUseFlag(UART_DEV_2, JZ_FLAGCODE_OFF);
-
-            //然后关闭串口 注：该函数有延时
-            JZsdk_Uart_CloseUartThead(UART_DEV_2);
-        }
-
-        //2、串口初始化
-        ret = JZsdk_Uart_UartEnabled(UART_DEV2_NUM, BitRate, &UartFd);
-        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-        {
-            return ret;
-        }
-
-        //3、串口接收初始化
-        JZsdk_Uart_UartDeal_Receive(UartFd, UART_DEV_2);
-
-        //4、将串口的标志位打开
-        JZsdk_HalPort_SetUseFlag(UART_DEV_2, JZ_FLAGCODE_ON);
+        //然后关闭串口 注：该函数有延时
+        JZsdk_Uart_CloseUartThead(UART_DEV_NAME);
     }
-    
-    //初始化的是4g设备
-    if (UART_DEV_NAME == UART_4G)
+
+    //2、串口初始化
+    ret = JZsdk_Uart_UartEnabled(Get_UartDevPath(UART_DEV_NAME), BitRate, &UartFd);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
     {
-        //1、检查串口是否已经初始化
-        if(JZsdk_HalPort_UseFlag(UART_4G) == JZ_FLAGCODE_ON)
-        {
-            //先注释掉原来的串口
-            JZsdk_HalPort_SetUseFlag(UART_4G, JZ_FLAGCODE_OFF);
-
-            //然后关闭串口 注：该函数有延时
-            JZsdk_Uart_CloseUartThead(UART_4G);
-        }
-
-        //2、串口初始化
-        ret = JZsdk_Uart_UartEnabled(COMM_4G_UART_NUM, BitRate, &UartFd);
-        if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-        {
-            return ret;
-        }
-
-        //3、串口接收初始化
-        JZsdk_Uart_UartDeal_Receive(UartFd, UART_4G);
-
-        //4、将串口的标志位打开
-        JZsdk_HalPort_SetUseFlag(UART_4G, JZ_FLAGCODE_ON);
+        return ret;
     }
 
-    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
-}
\ No newline at end of file
+    //3、串口接收初始化
+    JZsdk_Uart_UartDeal_Receive(UartFd, UART_DEV_NAME);
+
+    JZSDK_LOG_INFO("init %s sucess", JZsdk_DefineCode_GetPortName(UART_DEV_NAME));
+
+    return ret;
+}
+

@@ -56,6 +56,7 @@ static int Deal_Thread = JZ_FLAGCODE_OFF;	//用于判断处理线程是否成功
 
 static void *UartDeal_rece(void *arg);
 static void *UartDeal_deal(void *arg);
+static void *Uart_Recv_deal(void *arg);
 
 
 /******************************************************************
@@ -67,11 +68,6 @@ static void *UartDeal_deal(void *arg);
 int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name)
 {
 	int ret = 0;
-	pthread_t Uart_rece_task;
-
-	pthread_attr_t task_attribute;										   // 线程属性
-	pthread_attr_init(&task_attribute);									   // 初始化线程属性
-	pthread_attr_setdetachstate(&task_attribute, PTHREAD_CREATE_DETACHED); // 设置线程属性
 
 	//根据串口名，将串口描述符赋值给对应的串口，并打开对应的线程开关
 	if (Uart_Dev_name == UART_DEV_1)
@@ -130,7 +126,22 @@ int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name)
 		JZSDK_LOG_ERROR("Failed to create receive thread");
 		return 1;
 	}
+
+	// //创建一个串口处理线程
+	// pthread_t RecvThread;
+	// pthread_attr_t task_attribute;	
+	// pthread_attr_setdetachstate(&task_attribute, PTHREAD_CREATE_DETACHED); // 设置线程分离属性
+	// pthread_attr_init(&task_attribute);
+
+	// if (pthread_create(&RecvThread, &task_attribute, Uart_Recv_deal, parameter) != 0)
+	// {
+	// 	JZSDK_LOG_ERROR("Failed to create receive thread");
+	// 	return 1;
+	// }
+
+	return 0;
 }
+
 /***
  *
  * 	串口接收线程
@@ -187,6 +198,7 @@ static void *UartDeal_rece(void *arg)
 			args->MessageLength = 0;
 			args->ResLen = 0;
 			memset(&(args->Message[0]), 0, sizeof(args->Message));
+			delayMs(100);
 			continue;
 		} 
 		// 超时
@@ -252,7 +264,7 @@ static void *UartDeal_rece(void *arg)
 
 	// 通知线程
 	//pthread_cond_signal(&args->cond);
-	pthread_mutex_unlock(&args->WriteMutex); // 解锁
+	pthread_mutex_unlock(&args->ReadMutex); // 解锁
 
 	JZSDK_LOG_WARN("串口接收线程被关闭");
 }
@@ -288,7 +300,6 @@ static void *UartDeal_deal(void *arg)
 
 	while (*TheadSwtch)
 	{
-
 		// 加锁
 		pthread_mutex_lock(&args->ReadMutex);
 
@@ -341,8 +352,155 @@ static void *UartDeal_deal(void *arg)
 
 
 
+/***
+ *
+ * 	串口处理线程
+ *
+ * ***/
+// 串口数据处理线程函数
+static void *Uart_Recv_deal(void *arg)
+{
+	s_SerialArgs *args = (s_SerialArgs *)arg;
+	struct timeval timeout; // 超时时间
+	fd_set fs_read;
+	static int ResidualLength = 0; // 未处理数据长度
 
+	//获取串口描述符
+	int Uart_fd = args->UartFd;
 
+	//清空接收数组与初始化配置
+	memset(args->Message, 0, sizeof(args->Message)); 
+	args->ResLen = 0;
+	args->MessageLength = 0;
+
+	// 根据设备名称设置相应的线程开关
+	int *TheadSwtch = NULL;  //线程开关
+    switch(args->UartDevName) 
+	{
+        case UART_4G:
+            TheadSwtch = &Uart_4G_Switch;
+            break;
+        case UART_DEV_1:
+            TheadSwtch = &Uart_DEV1_Switch;
+            break;
+        case UART_DEV_2:
+            TheadSwtch = &Uart_DEV2_Switch;
+            break;
+        default:
+            return NULL; // 或者处理未知设备的情况
+    }
+
+
+	while (*TheadSwtch)
+	{        		
+		//重置处理时间
+		FD_ZERO(&fs_read);
+		FD_SET(Uart_fd, &fs_read);
+
+		timeout.tv_sec = 0;
+		timeout.tv_usec = 100000; // 设置为可变的超时时间（100毫秒）
+
+		// 检查fs_read套接字是否有数据
+		int ret = select(Uart_fd + 1, &fs_read, NULL, NULL, &timeout);
+
+		// 发生错误
+		if (ret < 0) 
+		{
+			//清空缓冲区
+			JZSDK_LOG_ERROR("uart select error");
+			args->MessageLength = 0;
+			args->ResLen = 0;
+			memset(&(args->Message[0]), 0, sizeof(args->Message));
+			continue;
+		} 
+		// 超时
+		else if (ret == 0) 
+		{
+			continue;
+		}
+
+		// 读取串口内容
+		int bytesRead = read(Uart_fd, &(args->Message[args->ResLen]), (sizeof(args->Message) - args->ResLen));
+
+		//正常读取到数据
+		if (bytesRead > 0) 
+		{
+			//计算当前的数据长度
+			args->MessageLength = args->ResLen + bytesRead;
+
+			// data_len+=bytesRead;
+			// data_len2+=args->MessageLength;
+			// printf("当前接收长度%d  bytesRead%d bmessage%d reslen%d\n",data_len,bytesRead,data_len2,args->ResLen);
+
+			// JZSDK_LOG_INFO("从串口读取到,长度%d",(args->MessageLength-args->ResLen));
+
+			// for (int i = 0; i < (args->MessageLength-args->ResLen); i++)
+			// {
+			// 	JZSDK_LOG_OUTPUTHEX("%s",&args->Message[i+args->ResLen]);
+			// }
+
+			// 更新剩余长度
+			args->ResLen = 0;
+		} 
+		//读取到数据为空
+		else if (bytesRead == 0) 
+		{
+			// 串口关闭或者无数据可读
+			JZSDK_LOG_ERROR("Error reading from serial port is empty");
+			args->MessageLength = 0;
+			args->ResLen = 0;
+			memset(&(args->Message[0]), 0, sizeof(args->Message));
+		} 
+		else 
+		{
+			// 读取错误发生
+			JZSDK_LOG_ERROR("Error reading from serial port");
+			args->MessageLength = 0;
+			args->ResLen = 0;
+			memset(&(args->Message[0]), 0, sizeof(args->Message));
+		}
+
+		//如果当前存在数据
+		if (args->MessageLength > 0)
+		{
+			//处理数据
+			ResidualLength = HalRecv_type1_PreliminaryScreeningOfData(args->Message, args->MessageLength, args->UartDevName);
+			//JZSDK_LOG_DEBUG("回归%d",ResidualLength);
+
+			//如果还有剩余的长度
+			if (ResidualLength != 0) //将其返还到缓冲区
+			{
+				memcpy(args->Message, &(args->Message[args->MessageLength - ResidualLength]), ResidualLength);
+				memset(&(args->Message[ResidualLength]), 0, (sizeof(args->Message) - ResidualLength));
+				args->MessageLength = 0;
+				args->ResLen = ResidualLength;
+			}
+			
+			else //清空一次缓冲区
+			{
+				memset(args->Message, 0, sizeof(args->Message));
+				args->MessageLength = 0;
+				args->ResLen = 0;
+			}
+		}
+
+		//如果不存在数据 或 存在异常 ，则顺便清空一次缓冲区
+		else
+		{
+			memset(args->Message, 0, sizeof(args->Message));
+			args->MessageLength = 0;
+			args->ResLen = 0;
+		}
+
+		// 添加适当延时，确保接收缓冲区有足够的数据
+		delayMs(3); // 加多了可能导致实时播放难恢复,以及声音间隔  3ms32字节 会向上约1个3ms opus一帧80字节
+	}
+
+	//注销相关
+	Recv_Thread = JZ_FLAGCODE_OFF;
+
+	JZSDK_LOG_WARN("串口接收处理线程被关闭");
+}
 
 
 
@@ -498,9 +656,6 @@ static T_JZsdkReturnCode JZsdk_Uart_CloseUartFd(int UartPort)
 
 T_JZsdkReturnCode JZsdk_Uart_CloseUartThead(int UartPort)
 {
-	//将串口描述符关闭
-    JZsdk_Uart_CloseUartFd(UartPort);
-
 	//关闭对应的线程
 	Deal_Thread = JZ_FLAGCODE_ON; //将处理标志位打开
 	Recv_Thread = JZ_FLAGCODE_ON; //将存储标志位打开
@@ -526,13 +681,29 @@ T_JZsdkReturnCode JZsdk_Uart_CloseUartThead(int UartPort)
 	}
 
 	//直到某个串口达成了关闭，这里不能明确到判断哪个串口关闭，但是识别第一个关闭的串口
-	while ( (Recv_Thread != JZ_FLAGCODE_OFF) && (Deal_Thread != JZ_FLAGCODE_OFF))
+	while ( (Deal_Thread == JZ_FLAGCODE_ON) || (Recv_Thread == JZ_FLAGCODE_ON))
 	{
 		delayUs(500);
 	}
+
+	// while (Recv_Thread == JZ_FLAGCODE_ON)
+	// {
+	// 	delayUs(500);
+	// }
+	
+	//将串口描述符关闭
+    JZsdk_Uart_CloseUartFd(UartPort);
+
 	
 	//保证全部注销后
-	JZSDK_LOG_INFO("0x%x 串口注销完毕", UartPort);
+	JZSDK_LOG_INFO("%s 串口注销完毕", JZsdk_DefineCode_GetPortName(UartPort));
 
 	return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
-}
\ No newline at end of file
+}
+
+
+
+
+
+
+

@@ -2,6 +2,8 @@
 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
 #include "JZsdkLib.h"
 
+#include "HeartBeat/HeartBeat.h"
+
 /***************
  * 
  *    * 通用模块初始化
@@ -13,6 +15,7 @@ T_JZsdkReturnCode CommonMod_Init()
     //初始化升级模块
 
     //初始化心跳模块
+    HeartBeat_Init();
 
     //初始化电源模块
 }
\ No newline at end of file

@@ -16,6 +16,8 @@
 
 #include "CommonMod/PowerManger/PowerManger.h"
 
+#include "Upgrade/Upgrade.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,6 +28,7 @@ extern "C" {
 /* Exported types ------------------------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
+T_JZsdkReturnCode CommonMod_Init();
 
 
 #ifdef __cplusplus

@@ -3,13 +3,21 @@
 
 #include "JZsdkLib.h"
 #include "JZsdk_Hal.h"
+#include "Hal_Send/HalSend_type1/HalSend_type1.h"
 
 T_JZsdkReturnCode HeartBeat_HalCheck()
 {
-    //1、获取hal的使用状态
-    int temp = JZsdk_HalPort_UseFlag(UART_DEV_1);
-
+    s_JZsdk_Hal_Info *HalInfo = JZsdk_Hal_GetHalInfo();
 
+    //1、获取心跳帧的开启情况 发送心跳帧
+    for (int i = 0; i < HalInfo->HaveUsePortNum; i++)
+    {
+        if (HalInfo->HalPort[HalInfo->HaveUsePort[i]].HeartBeatStatusSend == JZ_FLAGCODE_ON)
+        {
+            HalSend_type1Send_Ask_HeartBeatStatus(HalInfo->HaveUsePort[i], 0x00, HalInfo->HalPort[HalInfo->HaveUsePort[i]].ConnectStatus);
+        }
+    }
+    
 }
 
 static void *HeartBeatTask(void *arg)

 /**
  ********************************************************************
- * @file   Megaphone_RecordVoice.h
- *         Megaphone_RecordVoice的头文件
+ * @file   HeartBeat.h
+ *         HeartBeat.c的头文件
+ * 
  *
  *********************************************************************
  */
 
 /* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
-#ifndef MEGSPHONE_RECORDVOICE_H
-#define MEGSPHONE_RECORDVOICE_H
+#ifndef HEART_BEAT_H
+#define HEART_BEAT_H
 
 /* Includes ------------------------------------------------------------------*/
 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
@@ -23,10 +24,9 @@ extern "C" {
 /* Exported types ------------------------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
-T_JZsdkReturnCode Opus_RecordVoice_PlayFixedFile();
-T_JZsdkReturnCode Opus_RecordVoice_SaveOpusStart(int decode_rate);
-T_JZsdkReturnCode Opus_RecordVoice_SaveOpusTrans(unsigned char *SaveData, int size);
-T_JZsdkReturnCode Opus_RecordVoice_SaveOpusStop(int checkFlag, unsigned char *CheckCode);
+T_JZsdkReturnCode HeartBeat_Init();
+
+
 
 #ifdef __cplusplus
 }

@@ -11,7 +11,204 @@
 
 #define REMOTE_UPGRADE_FILE_DIR "/root/ugradeFile/remote_ugradeFile.tar"
 
-static int Upgrade_status = JZ_FLAGCODE_OFF;
+static int Upgrade_DownLoadFlag = JZ_FLAGCODE_OFF;
+
+T_JZsdkFileHandle Upgrade_FileHandle = NULL;
+static unsigned char g_CheckCode[128] = {0};
+static int g_CheckCodeFlag =JZ_FLAGCODE_OFF;
+static int g_UpgradeCheckFlag = JZ_FLAGCODE_OFF;
+
+typedef enum T_UpgradeType
+{
+    UPGRADE_ONLY_HOST = 0, //仅本机进行升级
+    UPGRADE_ONLY_SLAVE = 1, //仅从机进行升级
+    UPGRADE_BOTH_HOST_SLAVE = 2, //主机和从机都进行升级
+} T_UpgradeType;
+
+/*****************
+ * 
+ *  获取升级状态
+ * 
+ * 
+ * ***************/
+T_JZsdkReturnCode Upgrade_GetStatus(int *status)
+{
+    *status = Upgrade_DownLoadFlag;
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/************************************
+ * 
+ *   升级包下载
+ * 
+ * 
+ * **********************************/
+T_JZsdkReturnCode Upgrade_PackageDownload_Start()
+{
+    T_JZsdkReturnCode ret;
+
+    if (Upgrade_DownLoadFlag == JZ_FLAGCODE_ON)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Start: upgrade package is downloading");
+        return JZ_ERROR_SYSTEM_MODULE_CODE_IS_BUSY;
+    }
+    
+    ret = JZsdk_Osal_FileOpen(REMOTE_UPGRADE_FILE_DIR, "wb", &Upgrade_FileHandle);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Start: JZsdk_Osal_FileOpen failed");
+        return ret;
+    }
+
+    Upgrade_DownLoadFlag = JZ_FLAGCODE_ON;
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/************************************
+ * 
+ *  升级包下载中
+ * 
+ * 
+ * **********************************/
+T_JZsdkReturnCode Upgrade_PackageDownload_Trans(unsigned char *buf, unsigned int len)
+{
+    T_JZsdkReturnCode ret;
+
+    if (Upgrade_DownLoadFlag == JZ_FLAGCODE_OFF)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Trans: upgrade package is not downloading");
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    //下载升级包
+    int realLen = 0;
+    ret = JZsdk_Osal_FileWrite(Upgrade_FileHandle, buf, len, &realLen);
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Trans: JZsdk_Osal_FileWrite failed");
+        return ret;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/************************************
+ * 
+ *  升级包下载结束
+ * 
+ * 
+ * **********************************/
+T_JZsdkReturnCode Upgrade_PackageDownload_Stop()
+{
+    T_JZsdkReturnCode ret;
+
+    if (Upgrade_DownLoadFlag == JZ_FLAGCODE_OFF)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Stop: upgrade package is not downloading");
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    JZsdk_Osal_FileSync(Upgrade_FileHandle);
+
+    ret = JZsdk_Osal_FileClose(Upgrade_FileHandle);
+
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        JZSDK_LOG_ERROR("Upgrade_PackageDownload_Stop: JZsdk_Osal_FileClose failed");
+        return ret;
+    }
+
+    Upgrade_FileHandle = NULL;
+
+    Upgrade_DownLoadFlag = JZ_FLAGCODE_OFF;
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/*******************
+ * 
+ *  升级包校验码录入
+ * 
+ * 
+ * ********************/
+T_JZsdkReturnCode Upgrade_PackageCheckCodeSave(unsigned char *CheckCode, int CheckFlag, int len)
+{
+    memcpy(g_CheckCode, CheckCode, len);
+    g_CheckCodeFlag = CheckFlag;
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+/************************************
+ * 
+ *  升级包校验
+ * 
+ * 
+ * **********************************/
+T_JZsdkReturnCode Upgrade_PackageCheck()
+{
+    T_JZsdkReturnCode ret;
+
+    switch (g_CheckCodeFlag)
+    {
+        case JZSDK_CHECK_SUM_TYPE_MD5:
+        {
+            JZSDK_LOG_INFO("升级文件使用md5校验码");
+            //1、获取文件的md5校验码
+            ret = JZsdk_CheckSum(JZSDK_CHECK_SUM_TYPE_MD5, REMOTE_UPGRADE_FILE_DIR, g_CheckCode, 32);
+        }
+        break;
+
+        case JZSDK_CHECK_SUM_TYPE_SRC32:
+        {
+            JZSDK_LOG_INFO("升级文件使用src32校验码");
+            //1、获取文件的src32校验码
+            ret = JZsdk_CheckSum(JZSDK_CHECK_SUM_TYPE_SRC32, REMOTE_UPGRADE_FILE_DIR, g_CheckCode, 4);
+        }
+        break;
+        
+        default:
+        {
+            JZSDK_LOG_ERROR("opus保存校验码类型错误");
+            ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+        }
+        break;
+    }
+
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        JZSDK_LOG_ERROR("升级文件校验失败");
+        JZsdk_Osal_delete(REMOTE_UPGRADE_FILE_DIR);  
+        Upgrade_DownLoadFlag = JZ_FLAGCODE_OFF;
+
+        return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
+    }
+
+    return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
+}
+
+static T_JZsdkReturnCode Ugrade_Way1()
+{
+    //往t60s发送升级固件
+
+    //1、发送准备升级指令
+
+    //2、发送校验码
+
+    //3、上传文件
+
+    //4、传输文件
+
+    //5、关闭上传
+
+    //6、等候校验结果
+
+    //开始自身升级
+
+    //调用升级脚本
+
+    //------------重启--------------
+}
 
 /************************************
  * 
@@ -40,15 +237,48 @@ T_JZsdkReturnCode Upgrade_PackageParse()
         JZSDK_LOG_ERROR("Upgrade_PackageParse: RunSystemCmd failed");
         return ret;
     }
+}
+
+
+/****************************
+ * 
+ *  升级
+ * 
+ * 
+ * ******************************/
+T_JZsdkReturnCode Upgrade_PackageUpgrade()
+{
+    T_JZsdkReturnCode ret;
+    
+    //校验成功的情况，则开始解析升级包
+    ret = Upgrade_PackageParse();
+    if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
+    {
+        JZSDK_LOG_ERROR("解析升级包失败");
+        return ret;
+    }
+
+    //退出当前进程，并通知设备升级
+    FILE *logFile = fopen("/root/JZ_UpgradeLog.txt", "w");
+    if (logFile == NULL)
+    {
+        JZSDK_LOG_ERROR("JZ_UpgradeLog error");
+        return 1;
+    }
     
-    //解析升级包
-    //首先分析本机的升级包
-    unsigned char upgrade_file_name[128] = {0};
+    fprintf(logFile, "UPGRADE_NEEDED\n");
+    fflush(logFile);
+    fclose(logFile);
 
+    JZSDK_LOG_INFO("执行升级脚本");
+
+    //退出程序
+    exit(0);
 
     return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 
+
 /********************************
  * 
  *  升级模块初始化
@@ -59,28 +289,4 @@ T_JZsdkReturnCode Upgrade_Init()
 {
     T_JZsdkReturnCode ret;
 
-    //检查是否存在升级失败文件
-    ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_B);
-    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-    {
-        //这种属于是喊话器自身升级失败了
-        JZSDK_LOG_ERROR("Upgrade_Init: upgrade failed file exists STATUS B");
-
-
-        //失败处理
-
-    }
-    
-    //检查是否存在A文件
-    ret = JZsdk_check_file_exists(UPGRADE_FILE_STATUS_A);
-    if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
-    {
-        //正处于升级状态
-
-        //检查是否还存在升级包
-
-        //
-    }
-
-
 }
\ No newline at end of file

+/**
+ ********************************************************************
+ * @file   Upgrade.h
+ *         Upgrade.c的头文件
+ * 
+ *
+ *********************************************************************
+ */
+
+/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
+#ifndef UPGRADE_H
+#define UPGRADE_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+/* 常亮定义*/
+
+/* Exported types ------------------------------------------------------------*/
+
+/* Exported functions --------------------------------------------------------*/
+T_JZsdkReturnCode Upgrade_GetStatus(int *status);
+T_JZsdkReturnCode Upgrade_PackageDownload_Start();
+T_JZsdkReturnCode Upgrade_PackageDownload_Trans(unsigned char *buf, unsigned int len);
+T_JZsdkReturnCode Upgrade_PackageDownload_Stop();
+T_JZsdkReturnCode Upgrade_PackageCheckCodeSave(unsigned char *CheckCode, int CheckFlag, int len);
+T_JZsdkReturnCode Upgrade_PackageCheck();
+T_JZsdkReturnCode Upgrade_PackageParse();
+T_JZsdkReturnCode Upgrade_PackageUpgrade();
+T_JZsdkReturnCode Upgrade_Init();
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif 

@@ -271,7 +271,7 @@ static T_JZsdkReturnCode ActivateMAT_create_SN_LOCK_file()
 // 参数：文件路径
 static T_JZsdkReturnCode ActivateMAT_delete_SN_LOCK_file() 
 {
-    return JZsdk_delete_file(SN_LOCL_FILE_PATH);
+    return JZsdk_Osal_delete(SN_LOCL_FILE_PATH);
 }
 
 /**********************************

@@ -26,7 +26,7 @@ extern "C" {
 //音频信息结构体
 struct AudioMange_audio_struct
 {
-    unsigned char FileName[JZSDK_FILENAME_SIZE+1]; //音频名字  
+    unsigned char FileName[JZSDK_FILE_NAME_SIZE_MAX+1]; //音频名字  
     unsigned int  FileNameLen; //音频名字长度
 
     unsigned int  FileType; //音频的文件类型

@@ -196,7 +196,7 @@ static T_JZsdkReturnCode Megaphone_Play(struct MegaphoneInfo *IndexInfo, enum Me
             JZSDK_LOG_INFO("opus录音喊话");
 
             //opus播放
-            ret = Opus_RecordVoice_PlayFixedFile();
+            ret = OpusFile_PlayFixedFile();
         }
 
         default:
@@ -562,9 +562,9 @@ T_JZsdkReturnCode Megaphone_SaveAudioFileStart(char *FileName)
 *   2、存储音频文件中
 *
 */
-int Megaphone_SaveAudioFileTrans(char *SaveData, int size)
+T_JZsdkReturnCode Megaphone_SaveAudioFileTrans(char *SaveData, int size)
 {
-    AudioFile_SaveAudioFileTrans(SaveData, size);
+    return AudioFile_SaveAudioFileTrans(SaveData, size);
 }
 
 /*
@@ -614,9 +614,9 @@ T_JZsdkReturnCode Megaphone_Opus_PlayFixedFile()
 *   2、存储opus文件开始
 *
 */
-T_JZsdkReturnCode Megaphone_SaveOpusStart(int decode_rate)
+T_JZsdkReturnCode Megaphone_SaveOpusStart(unsigned char *FileName, int decode_rate, int SampleRate, int Channels)
 {
-    return Opus_RecordVoice_SaveOpusStart(decode_rate);
+    return OpusFile_SaveOpusFileStart(FileName , decode_rate, SampleRate, Channels);
 }
 
 /*
@@ -626,7 +626,7 @@ T_JZsdkReturnCode Megaphone_SaveOpusStart(int decode_rate)
 */
 T_JZsdkReturnCode Megaphone_SaveOpusTrans(char *SaveData, int size)
 {
-    return Opus_RecordVoice_SaveOpusTrans(SaveData, size);
+    return OpusFile_SaveOpusFileStream(SaveData, size);
 }
 
 /*
@@ -636,7 +636,7 @@ T_JZsdkReturnCode Megaphone_SaveOpusTrans(char *SaveData, int size)
 */
 T_JZsdkReturnCode Megaphone_SaveOpusStop(int checkFlag, unsigned char *CheckCode)
 {
-    return Opus_RecordVoice_SaveOpusStop(checkFlag, CheckCode);
+    return OpusFile_SaveOpusFileEnd(checkFlag, CheckCode);
 }
 
 
@@ -658,7 +658,7 @@ T_JZsdkReturnCode Megaphone_RealTimeVoice_Start(int decode_rate)
     if ( Megaphone_RealTimeVoice_GetStatusFlag() == JZ_FLAGCODE_ON)
     {
         //是的话，无法进行操作
-        return JZ_ERRORCODE_REALTIMEVOICE_HAS_BEEN_ON;
+        return JZ_ERROR_SYSTEM_MODULE_CODE_IS_BUSY;
     }
 
     //把暂停音乐的标志关了
@@ -670,7 +670,7 @@ T_JZsdkReturnCode Megaphone_RealTimeVoice_Start(int decode_rate)
     T_JZsdkReturnCode ret = Opus_RealTimeVoice_Start(decode_rate);
     if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
     {
-        //广播关闭
+        //广播实时状态
         Megaphone_status_Broadcast(AUDIO_PLAY_STATUS_OPUS_REAL_TIME);
     }
 
@@ -860,6 +860,9 @@ T_JZsdkReturnCode Megaphone_Init()
     //音频文件管理功能初始化
     Megaphone_AudioFile_Init();
 
+    //opus列表初始化
+    Megaphone_OpusFile_Init();
+
     //设置音量
     Megaphone_SetVolume(30, 0);
 
@@ -1415,7 +1418,7 @@ T_JZsdkReturnCode Megaphone_PrintVolume(int Value, int flag)
             HalSend_type1Send_Reply_Volume(UART_DEV_2, g_Megaphone_Volume);
         }
         //如果psdk接口已经使用
-        if ( (JZsdk_Get_Psdk_UIcontrol_UseFlag() == JZ_FLAGCODE_ON))
+        if ( (JZsdk_HalPort_UseFlag(DEVICE_PSDK) == JZ_FLAGCODE_ON))
         {
             JZsdk_Psdk_UI_io_Reply_Volume(g_Megaphone_Volume);
         }

@@ -12,6 +12,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
+#include "Megaphone/PlayBack/Megaphone_PlayBack.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -109,7 +110,7 @@ T_JZsdkReturnCode Megaphone_GetMusicListMessage(unsigned char *message);
  * 
  * ********/
 
-T_JZsdkReturnCode Megaphone_SaveOpusStart(int decode_rate);
+T_JZsdkReturnCode Megaphone_SaveOpusStart(unsigned char *FileName, int decode_rate, int SampleRate, int Channels);
 T_JZsdkReturnCode Megaphone_SaveOpusTrans(char *SaveData, int size);
 T_JZsdkReturnCode Megaphone_SaveOpusStop(int checkFlag, unsigned char *CheckCode);
 
@@ -123,7 +124,7 @@ T_JZsdkReturnCode Megaphone_RealTimeMP2_trans(unsigned char *getdata, int len);
 T_JZsdkReturnCode Megaphone_RealTimeMP2_stop();
 
 T_JZsdkReturnCode Megaphone_SaveAudioFileStart(char *FileName);
-int Megaphone_SaveAudioFileTrans(char *SaveData, int size);
+T_JZsdkReturnCode Megaphone_SaveAudioFileTrans(char *SaveData, int size);
 T_JZsdkReturnCode Megaphone_Broadcast_OpusDecodeStatus(int status);
 T_JZsdkReturnCode Megaphone_SaveAudioFileStop(int checkFlag, unsigned char *CheckCode);
 T_JZsdkReturnCode Megaphone_Opus_PlayFixedFile();

@@ -17,6 +17,8 @@
 #include "./AudioFile_PlayDeal.h"
 #include "AudioDeal/FF_Statement.h"
 
+#include "Megaphone/PlayBack/Megaphone_PlayBack.h"
+
 //音频文件直接播放
 T_JZsdkReturnCode AudioFile_StartPlay_Interface(unsigned char* FilePath)
 {
@@ -165,6 +167,10 @@ T_JZsdkReturnCode AudioFile_StartPlay_Interface(unsigned char* FilePath)
             if (current_second > last_printed_second)  
             {  
                 printf("nb:%d rate:%d duration:%f total_duration:%f\n", frame->nb_samples, codec_ctx->sample_rate, frame_duration, current_second);  
+
+                //回传播放时间
+                Megaphone_PlayBackTime(current_second);
+
                 last_printed_second = current_second; // 更新上次打印的秒数  
             }