更新包，修复呼叫可能没有声音的情况，修复取消呼叫报错的问题

jni/logic/callLogic.cc

@@ -10,7 +10,7 @@
 #include "service/BusinessConfig.h"
 #include "net/tcp_client.h"
 #include "manager/ConfigManager.h"
-#include "voip/wav_player.h"
+//#include "voip/wav_player.h"
 #include "voip/media_player.h"
 #include "manager/LanguageManager.h"
 
@@ -18,7 +18,7 @@
 std::string _isOutgoing;
 std::string _toIdStr;
 
-voip::WAVPlayer wavPlayer;	// 播放音频
+//voip::WAVPlayer wavPlayer;	// 播放音频
 
 std::string tid;
 

jni/logic/mainLogic.cc

@@ -11,6 +11,7 @@
 #include "core/sip_config.h"
 #include "manager/LanguageManager.h"
 #include "core/utilities.h"
+#include <string>
 
 #include "base/strings.hpp"
 #include "base/http_client.h"
@@ -67,6 +68,7 @@ Json::Value painterInfoList;
 static bool reinforce = false;	// 判断设备是否处于增援状态
 static bool serverInfo = true;	// 判断是否需要从服务器获取服务器信息，第一次要，后续不要
 static bool isHelpTimerRegistered = false;
+static std::string cencalByDoorTid = "";
 
 
 
@@ -451,6 +453,9 @@ void cancelAutoBtnHelpTimer(){
 	 }
 }
 
+std::string getCencalByDoorTid() {
+	return cencalByDoorTid;
+}
 
 int getNowTime() {
 	struct tm *t = TimeHelper::getDateTime();
@@ -914,6 +919,8 @@ static bool onButtonClick_CallCencelButton(ZKButton *pButton) {
 	std::string req = getTcpModelString(tcpModel);
 	LOGD("TCP VOICE : %s",req.c_str());
 
+	cencalByDoorTid = tcpModel.tid;
+
 	//回调注册
 	TcpCallback callback;
 	callback.tid = tcpModel.tid;
@@ -987,12 +994,13 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     LOGD(" ButtonClick FunctionButton !!!\n");
 	mFunctionWinPtr->hideWnd();
 
+	StoragePreferences::putBool(STORE_NURSING_TYPE, false);
+
 	std::string heartStr = "DOORLED,000F";
 	const char* sendMsg = heartStr.c_str();
 	sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
 
 	if (nursingTcpModel.json.size() != 0) {	// 对比一下，json里面不为空的时候
-		StoragePreferences::putBool(STORE_NURSING_TYPE, false);
 
 		// 发送tcp, tcp_type = SIDE, tcp_action = NURSING_END
 		TcpModel tcpModel;

jni/logic/startLogic.cc

@@ -252,7 +252,10 @@ void handleMsg(byte* inBytes){
 		}
 	} else if (tcpModel.type == TcpType::VOICE){
 		if (tcpModel.action == VoiceAction::FAILED){
-			callActivityFinish(CallFinishType::FAILED);
+			string _cencalByDoorTid = getCencalByDoorTid();
+			if (tcpModel.tid != _cencalByDoorTid) {
+				callActivityFinish(CallFinishType::FAILED);
+			}
 			
 		} else if (tcpModel.action == VoiceAction::SUCCESS){
 			CallingStatus::instance()->setTcpModel(tcpModel);	// 只有呼叫成功才闪红灯
@@ -865,7 +868,7 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 				if (isSleep) {
 					scrrenOn();
 				}
-				heartStr = "DOORLED,100F";
+//				heartStr = "DOORLED,000F";
 			}
 			else if (data.cmd == "KEY>") {	// key>是面板挂断按钮
 				if (!StoragePreferences::getInt(STORE_SCREEN_LIGHT, 0)) {

jni/service/BusinessConfig.h

@@ -52,8 +52,8 @@
 #define STORE_ROOM_CALL_BED "room_call_bed"
 #define SIGNAL_TYPE "TCP" //TCP,SIP
 
-static std::string version = "v1.0.23";
-static int versionNo = 23;
+static std::string version = "v1.0.29";
+static int versionNo = 29;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -143,6 +143,9 @@ void cancelAutoBtnHelpTimer();
 // 设置调试的按键框
 void setCheckbox(std::string check);
 
+// 查询取消呼叫的tid
+std::string getCencalByDoorTid();
+
 
 enum CallFinishType {
 	CANCEL,