|
@@ -7,6 +7,7 @@ import android.content.Context;
|
7
|
7
|
import android.content.DialogInterface;
|
8
|
8
|
import android.content.Intent;
|
9
|
9
|
import android.graphics.Color;
|
|
10
|
+import android.media.Ringtone;
|
10
|
11
|
import android.os.Bundle;
|
11
|
12
|
import android.os.Handler;
|
12
|
13
|
import android.os.Message;
|
|
@@ -85,6 +86,8 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
85
|
86
|
private boolean selfCall = false;
|
86
|
87
|
private boolean VIDEOSTATE = false;
|
87
|
88
|
public static Intent incallIntent;
|
|
89
|
+ private Ringtone ringtone;
|
|
90
|
+
|
88
|
91
|
|
89
|
92
|
private boolean isinited = false;
|
90
|
93
|
|
|
@@ -512,6 +515,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
512
|
515
|
incall_answer.setVisibility(View.VISIBLE);
|
513
|
516
|
incall_mute.setVisibility(View.GONE);
|
514
|
517
|
incall_muteVideo.setVisibility(View.GONE);
|
|
518
|
+ ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
|
515
|
519
|
} else {
|
516
|
520
|
incall_answer.setVisibility(View.GONE);
|
517
|
521
|
if (DBUser.mySelf != null && DBUser.mySelf.isManager) {
|
|
@@ -527,10 +531,9 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
527
|
531
|
//控件显示号码,来电,去电,通话中...
|
528
|
532
|
if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
|
529
|
533
|
incall_answer.setVisibility(View.GONE);
|
530
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
|
531
|
534
|
SipEngine.getInstance().answer(callid);
|
532
|
|
- } else {
|
533
|
|
- SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
|
|
535
|
+ SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
536
|
+ ringtone = null;
|
534
|
537
|
}
|
535
|
538
|
|
536
|
539
|
}
|
|
@@ -545,6 +548,8 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
545
|
548
|
protected void onDestroy() {
|
546
|
549
|
stopVideoStream(true);
|
547
|
550
|
super.onDestroy();
|
|
551
|
+ SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
552
|
+ ringtone = null;
|
548
|
553
|
SipEngine.getInstance().hangup(callid);
|
549
|
554
|
handler_CallActivity.removeCallbacks(getMemberRunner);
|
550
|
555
|
handler_CallActivity = null;
|
|
@@ -690,7 +695,8 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
690
|
695
|
incall_mute.setVisibility(View.VISIBLE);
|
691
|
696
|
}
|
692
|
697
|
SipEngine.getInstance().answer(callid);
|
693
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
|
|
698
|
+ SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
699
|
+ ringtone = null;
|
694
|
700
|
break;
|
695
|
701
|
case R.id.incall_mute:
|
696
|
702
|
muteAll(v);
|