优化纯sip通话

jni/logic/callLogic.cc

@@ -376,6 +376,7 @@ static void onUI_quit() {
 	}
 
 	EASYUICONTEXT->showStatusBar();
+	EASYUICONTEXT->showNaviBar();
 
     mediaPlayer.Stop();
 	mActivityPtr->unregisterUserTimer(goBack);

jni/logic/startLogic.cc

@@ -59,11 +59,6 @@ namespace {
 		if (state == voip::STATE_CALL_INCOMING
 				|| state == voip::STATE_CALL_CALLING
 				|| state == voip::STATE_CALL_CONFIRMED) {
-			if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP"){
-				//EASYUICONTEXT->goHome();
-				EASYUICONTEXT->openActivity("callActivity");
-				CloseUi();
-			}
 
 			voip::CallInfo info = GetTelephone()->GetCallInfo();
 			LOGD("info.id == %d", info.id);
@@ -72,13 +67,19 @@ namespace {
 
 			string sipId = info.remote_uri.substr(info.remote_uri.find(":") + 1, info.remote_uri.find("@") - info.remote_uri.find(":") - 1);
 			LOGD("sipId == %s", sipId.c_str());
-			if (sipId != "0000000000") {
-				const char* currentAppName = EASYUICONTEXT->currentAppName();
-				string _currentAppName = currentAppName;
-				if (_currentAppName != "callActivity") {
-					telephone->Hangup();
-					LOGD("=================> 不在通话界面，直接挂断!");
-					return;
+
+			if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP"){
+				EASYUICONTEXT->openActivity("callActivity");
+			}
+			else {
+				if (sipId != "0000000000") {
+					const char* currentAppName = EASYUICONTEXT->currentAppName();
+					string _currentAppName = currentAppName;
+					if (_currentAppName != "callActivity") {
+						telephone->Hangup();
+						LOGD("=================> 不在通话界面，直接挂断!");
+						return;
+					}
 				}
 			}