diff --git a/Keystore/coolapeKeyStore.keystore b/Keystore/coolapeKeyStore.keystore new file mode 100644 index 0000000..b32a8c7 Binary files /dev/null and b/Keystore/coolapeKeyStore.keystore differ diff --git a/Keystore/coolapeKeyStore.keystore.meta b/Keystore/coolapeKeyStore.keystore.meta new file mode 100644 index 0000000..7c41e11 --- /dev/null +++ b/Keystore/coolapeKeyStore.keystore.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: d0d568b30e2f74409bc39d572cd4e60d +DefaultImporter: + userData: diff --git a/app/release/视频对讲指挥系统20201116.apk b/app/release/视频对讲指挥系统20210420.apk similarity index 92% rename from app/release/视频对讲指挥系统20201116.apk rename to app/release/视频对讲指挥系统20210420.apk index 03028ad..3ee713f 100644 Binary files a/app/release/视频对讲指挥系统20201116.apk and b/app/release/视频对讲指挥系统20210420.apk differ diff --git a/app/src/main/java/com/tianrun/sipcall/SipEngine.java b/app/src/main/java/com/tianrun/sipcall/SipEngine.java index a25cb0c..1d7cb48 100644 --- a/app/src/main/java/com/tianrun/sipcall/SipEngine.java +++ b/app/src/main/java/com/tianrun/sipcall/SipEngine.java @@ -173,7 +173,7 @@ public class SipEngine implements BluetelInterface { int calltype = isVideo == false ? 0 : 1; String state = isVideo == true ? "视频来电" : "音频来电"; callPagesConfig.add(new InCallUtils(incomingNumber, isHolder, isVideo, rPort, lPort, incomingNumber, state, false, 0, callid)); - GoToInCall(App.getContext(), incomingNumber, "来电", calltype, callid); + GoToInCall(App.getContext(), incomingNumber, "来电", calltype, callid, false); } @Override @@ -247,7 +247,7 @@ public class SipEngine implements BluetelInterface { * @param calltype * @param callid */ - public void GoToInCall(Context context, String callnumber, String callstate, int calltype, int callid) { + public void GoToInCall(Context context, String callnumber, String callstate, int calltype, int callid, boolean selfCall) { Intent intent = null; logmy.e("GoToInCall==============" + isMeetingCall(callnumber) +"==="+ System.currentTimeMillis()); @@ -261,6 +261,7 @@ public class SipEngine implements BluetelInterface { bundle.putString("callnumber", callnumber); bundle.putString("callstate", callstate); bundle.putInt("calltype", calltype); + bundle.putBoolean("selfCall", selfCall); intent.putExtras(bundle); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); @@ -276,7 +277,7 @@ public class SipEngine implements BluetelInterface { public int CallNumber(String number, boolean isVideo) { int calltype = isVideo ? 0 : 1; int callid = myBluetelEngine.CallNumber(number, ip, port, isVideo); - GoToInCall(App.getContext(), number, "呼叫中", calltype, callid); + GoToInCall(App.getContext(), number, "呼叫中", calltype, callid, true); callPagesConfig.add(new InCallUtils(number, false, isVideo, 0, 0, number, "呼叫中", false, 0, callid)); return callid; diff --git a/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java b/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java index 5635da8..40c5a99 100644 --- a/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java +++ b/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java @@ -60,6 +60,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener { private String callnumber = "未知"; private String callstate = "未知"; private int calltype = 0; //0音频1视频 + private boolean selfCall = false; private boolean VIDEOSTATE = false; public static Intent incallIntent; @@ -189,7 +190,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener { incall_answer.setVisibility(View.GONE); } show.setText(callnumber + callstate); - if (incall_answer.getVisibility() == View.VISIBLE) { + if (incall_answer.getVisibility() == View.VISIBLE && selfCall) { incall_answer.setVisibility(View.GONE); SipEngine.getInstance().answer(callid); } @@ -223,6 +224,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener { callnumber = bundle.getString("callnumber"); callstate = bundle.getString("callstate"); calltype = bundle.getInt("calltype"); + selfCall = bundle.getBoolean("selfCall"); } /** diff --git a/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java b/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java index 78318c5..eb5f4f1 100644 --- a/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java +++ b/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java @@ -82,6 +82,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList private String callnumber = "未知"; private String callstate = "未知"; private int calltype = 0; //0音频1视频 + private boolean selfCall = false; private boolean VIDEOSTATE = false; public static Intent incallIntent; @@ -524,7 +525,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList } show.setText(callnumber + callstate); //控件显示号码，来电，去电，通话中... - if (incall_answer.getVisibility() == View.VISIBLE) { + if (incall_answer.getVisibility() == View.VISIBLE && selfCall) { incall_answer.setVisibility(View.GONE); SipEngine.getInstance().answer(callid); } @@ -560,6 +561,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList callnumber = bundle.getString("callnumber"); callstate = bundle.getString("callstate"); calltype = bundle.getInt("calltype"); + selfCall = bundle.getBoolean("selfCall"); } /** diff --git a/app/src/main/res/layout/incallactivity.xml b/app/src/main/res/layout/incallactivity.xml index b7118d6..820a48a 100644 --- a/app/src/main/res/layout/incallactivity.xml +++ b/app/src/main/res/layout/incallactivity.xml @@ -1,7 +1,8 @@ - +