Browse Source

在退出callLogic界面的时候,调用SIP挂断

vothin 1 năm trước cách đây
mục cha
commit
85946573a6

+ 8 - 0
jni/logic/callLogic.cc

@@ -365,6 +365,14 @@ static void onUI_quit() {
 
 		CallingStatus::instance()->setBusy(false);
 		CallingStatus::instance()->clearTcpModel();
+
+		voip::CallInfo info = GetTelephone()->GetCallInfo();
+		if (info.state == voip::STATE_CALL_CALLING
+				|| info.state == voip::STATE_CALL_CALLING
+				|| info.state == voip::STATE_CALL_CONFIRMED){
+			GetTelephone()->Hangup(info.id, voip::SIP_STATUS_CODE_DECLINE);
+			GetTelephone()->Hangup();
+		}
 	}
 
 	EASYUICONTEXT->showStatusBar();

+ 2 - 2
jni/service/BusinessConfig.h

@@ -62,8 +62,8 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string version = "v1.0.37";
-static int versionNo = 37;
+static std::string version = "v1.0.38";
+static int versionNo = 38;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/DeviceUpdateActivity.o


BIN
obj/activity/callActivity.o


BIN
obj/activity/mainActivity.o


BIN
obj/activity/settingActivity.o


BIN
obj/activity/sipTestActivity.o


BIN
obj/activity/startActivity.o


BIN
obj/activity/statusbar.o


BIN
obj/activity/ui3Activity.o


BIN
obj/activity/warnActivity.o


BIN
obj/core/update_assistant.o


BIN
obj/net/tcp_client.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o