chenbin/SipPhone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'test'

Browse Source 
# Conflicts:
#	app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java
#	app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java
This commit is contained in:
chenbin
2021-05-06 19:20:24 +08:00
parent eb6c7ddab8 7961a6b462
commit f4c6060cbc
2 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java
View File

@@ -51,7 +51,6 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
private SMPercentFrameLayout localRenderLayout; private SMPercentFrameLayout localRenderLayout;
private SMPercentFrameLayout remoteRenderLayout; private SMPercentFrameLayout remoteRenderLayout;
private ImageButton incall_answer, incall_hangup; private ImageButton incall_answer, incall_hangup;
private Ringtone ringtone;
private TextView show; private TextView show;
QMUITabSegment mTabSegment; QMUITabSegment mTabSegment;
ViewPager mContentViewPager; ViewPager mContentViewPager;
@@ -65,6 +64,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
private boolean selfCall = false; private boolean selfCall = false;
private boolean VIDEOSTATE = false; private boolean VIDEOSTATE = false;
public static Intent incallIntent; public static Intent incallIntent;
private Ringtone ringtone;
public String[] screenTyps = {"经典模式", "均分模式", "远程全屏", "本地全屏"}; public String[] screenTyps = {"经典模式", "均分模式", "远程全屏", "本地全屏"};
@@ -188,19 +188,26 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
super.onResume(); super.onResume();
if (callstate.equals("来电")) { if (callstate.equals("来电")) {
incall_answer.setVisibility(View.VISIBLE); incall_answer.setVisibility(View.VISIBLE);
ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
} else { } else {
incall_answer.setVisibility(View.GONE); incall_answer.setVisibility(View.GONE);
} }
show.setText(callnumber + callstate); show.setText(callnumber + callstate);
if (incall_answer.getVisibility() == View.VISIBLE && selfCall) { if (incall_answer.getVisibility() == View.VISIBLE){
answer(); if(selfCall) {
} else { // incall_answer.setVisibility(View.GONE);
ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this); // SipEngine.getInstance().answer(callid);
AutoAnwser(); //5秒后自动接听 // SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
// ringtone = null;
answer();
} else {
AutoAnwser();
}
} }
} }
static void AutoAnwser(){ static void AutoAnwser() {
handler_CallActivity.postDelayed(doAutoAnwser, 5000); handler_CallActivity.postDelayed(doAutoAnwser, 5000);
} }
static Runnable doAutoAnwser = new Runnable() { static Runnable doAutoAnwser = new Runnable() {
@@ -209,6 +216,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
CONS.SENDMESSAGETO(handler_CallActivity, -2, null); CONS.SENDMESSAGETO(handler_CallActivity, -2, null);
} }
}; };
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
@@ -219,6 +227,8 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
protected void onDestroy() { protected void onDestroy() {
stopVideoStream(true); stopVideoStream(true);
super.onDestroy(); super.onDestroy();
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
SipEngine.getInstance().hangup(callid); SipEngine.getInstance().hangup(callid);
handler_CallActivity.removeCallbacks(doAutoAnwser); handler_CallActivity.removeCallbacks(doAutoAnwser);
handler_CallActivity = null; handler_CallActivity = null;
@@ -226,8 +236,6 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
wakeLock.release(); wakeLock.release();
wakeLock = null; wakeLock = null;
} }
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
} }
/** /**
@@ -347,21 +355,26 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
if (SipEngine.callPagesConfig.size() == 0) { if (SipEngine.callPagesConfig.size() == 0) {
finish(); finish();
} }
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
break; break;
case R.id.incall_answer: case R.id.incall_answer:
// incall_answer.setVisibility(View.GONE);
// SipEngine.getInstance().answer(callid);
// SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
// ringtone = null;
answer(); answer();
break; break;
} }
} }
public void answer(){ public void answer() {
incall_answer.setVisibility(View.GONE); incall_answer.setVisibility(View.GONE);
SipEngine.getInstance().answer(callid); SipEngine.getInstance().answer(callid);
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone); SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
handler_CallActivity.removeCallbacks(doAutoAnwser); handler_CallActivity.removeCallbacks(doAutoAnwser);
} }
public void ShowVideoView(boolean show) { public void ShowVideoView(boolean show) {
if (show) { if (show) {
localRenderLayout.setVisibility(View.VISIBLE); localRenderLayout.setVisibility(View.VISIBLE);

32
app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java
View File

@@ -86,9 +86,10 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
private boolean selfCall = false; private boolean selfCall = false;
private boolean VIDEOSTATE = false; private boolean VIDEOSTATE = false;
public static Intent incallIntent; public static Intent incallIntent;
private Ringtone ringtone;
private boolean isinited = false; private boolean isinited = false;
private Ringtone ringtone;
TrAdapter adapterUser; TrAdapter adapterUser;
@@ -514,6 +515,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
incall_answer.setVisibility(View.VISIBLE); incall_answer.setVisibility(View.VISIBLE);
incall_mute.setVisibility(View.GONE); incall_mute.setVisibility(View.GONE);
incall_muteVideo.setVisibility(View.GONE); incall_muteVideo.setVisibility(View.GONE);
ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
} else { } else {
incall_answer.setVisibility(View.GONE); incall_answer.setVisibility(View.GONE);
if (DBUser.mySelf != null && DBUser.mySelf.isManager) { if (DBUser.mySelf != null && DBUser.mySelf.isManager) {
@@ -527,15 +529,20 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
} }
show.setText(callnumber + callstate); show.setText(callnumber + callstate);
//控件显示号码，来电，去电，通话中... //控件显示号码，来电，去电，通话中...
if (incall_answer.getVisibility() == View.VISIBLE && selfCall) { if (incall_answer.getVisibility() == View.VISIBLE ) {
answer(); if(selfCall) {
} else { // incall_answer.setVisibility(View.GONE);
ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this); // SipEngine.getInstance().answer(callid);
AutoAnwser(); //5秒后自动接听 // SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
// ringtone = null;
answer();
} else {
AutoAnwser();
}
} }
}
static void AutoAnwser(){ }
static void AutoAnwser() {
handler_CallActivity.postDelayed(doAutoAnwser, 5000); handler_CallActivity.postDelayed(doAutoAnwser, 5000);
} }
static Runnable doAutoAnwser = new Runnable() { static Runnable doAutoAnwser = new Runnable() {
@@ -555,6 +562,8 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
protected void onDestroy() { protected void onDestroy() {
stopVideoStream(true); stopVideoStream(true);
super.onDestroy(); super.onDestroy();
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
SipEngine.getInstance().hangup(callid); SipEngine.getInstance().hangup(callid);
handler_CallActivity.removeCallbacks(getMemberRunner); handler_CallActivity.removeCallbacks(getMemberRunner);
handler_CallActivity.removeCallbacks(doAutoAnwser); handler_CallActivity.removeCallbacks(doAutoAnwser);
@@ -564,8 +573,6 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
wakeLock = null; wakeLock = null;
} }
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
} }
/** /**
@@ -634,7 +641,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
case -1: case -1:
getMembers(); getMembers();
break; break;
case -2: case -2:
answer(); answer();
break; break;
} }
@@ -699,7 +706,6 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
if (SipEngine.callPagesConfig.size() == 0) { if (SipEngine.callPagesConfig.size() == 0) {
finish(); finish();
} }
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
break; break;
case R.id.incall_answer: case R.id.incall_answer:
answer(); answer();
@@ -712,7 +718,6 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
break; break;
} }
} }
public void answer() { public void answer() {
incall_answer.setVisibility(View.GONE); incall_answer.setVisibility(View.GONE);
if (DBUser.mySelf != null && DBUser.mySelf.isManager) { if (DBUser.mySelf != null && DBUser.mySelf.isManager) {
@@ -720,6 +725,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
} }
SipEngine.getInstance().answer(callid); SipEngine.getInstance().answer(callid);
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone); SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
ringtone = null;
handler_CallActivity.removeCallbacks(doAutoAnwser); handler_CallActivity.removeCallbacks(doAutoAnwser);
} }