|
@@ -529,14 +529,28 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
529
|
529
|
}
|
530
|
530
|
show.setText(callnumber + callstate);
|
531
|
531
|
//控件显示号码,来电,去电,通话中...
|
532
|
|
- if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
|
533
|
|
- incall_answer.setVisibility(View.GONE);
|
534
|
|
- SipEngine.getInstance().answer(callid);
|
535
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
536
|
|
- ringtone = null;
|
|
532
|
+ if (incall_answer.getVisibility() == View.VISIBLE ) {
|
|
533
|
+ if(selfCall) {
|
|
534
|
+// incall_answer.setVisibility(View.GONE);
|
|
535
|
+// SipEngine.getInstance().answer(callid);
|
|
536
|
+// SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
537
|
+// ringtone = null;
|
|
538
|
+ answer();
|
|
539
|
+ } else {
|
|
540
|
+ AutoAnwser();
|
|
541
|
+ }
|
537
|
542
|
}
|
538
|
543
|
|
539
|
544
|
}
|
|
545
|
+ static void AutoAnwser() {
|
|
546
|
+ handler_CallActivity.postDelayed(doAutoAnwser, 5000);
|
|
547
|
+ }
|
|
548
|
+ static Runnable doAutoAnwser = new Runnable() {
|
|
549
|
+ @Override
|
|
550
|
+ public void run() {
|
|
551
|
+ CONS.SENDMESSAGETO(handler_CallActivity, -2, null);
|
|
552
|
+ }
|
|
553
|
+ };
|
540
|
554
|
|
541
|
555
|
@Override
|
542
|
556
|
protected void onPause() {
|
|
@@ -552,6 +566,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
552
|
566
|
ringtone = null;
|
553
|
567
|
SipEngine.getInstance().hangup(callid);
|
554
|
568
|
handler_CallActivity.removeCallbacks(getMemberRunner);
|
|
569
|
+ handler_CallActivity.removeCallbacks(doAutoAnwser);
|
555
|
570
|
handler_CallActivity = null;
|
556
|
571
|
if (wakeLock != null) {
|
557
|
572
|
wakeLock.release();
|
|
@@ -626,6 +641,9 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
626
|
641
|
case -1:
|
627
|
642
|
getMembers();
|
628
|
643
|
break;
|
|
644
|
+ case -2:
|
|
645
|
+ answer();
|
|
646
|
+ break;
|
629
|
647
|
}
|
630
|
648
|
return true;
|
631
|
649
|
}
|
|
@@ -690,13 +708,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
690
|
708
|
}
|
691
|
709
|
break;
|
692
|
710
|
case R.id.incall_answer:
|
693
|
|
- incall_answer.setVisibility(View.GONE);
|
694
|
|
- if (DBUser.mySelf != null && DBUser.mySelf.isManager) {
|
695
|
|
- incall_mute.setVisibility(View.VISIBLE);
|
696
|
|
- }
|
697
|
|
- SipEngine.getInstance().answer(callid);
|
698
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
699
|
|
- ringtone = null;
|
|
711
|
+ answer();
|
700
|
712
|
break;
|
701
|
713
|
case R.id.incall_mute:
|
702
|
714
|
muteAll(v);
|
|
@@ -706,6 +718,16 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
|
706
|
718
|
break;
|
707
|
719
|
}
|
708
|
720
|
}
|
|
721
|
+ public void answer() {
|
|
722
|
+ incall_answer.setVisibility(View.GONE);
|
|
723
|
+ if (DBUser.mySelf != null && DBUser.mySelf.isManager) {
|
|
724
|
+ incall_mute.setVisibility(View.VISIBLE);
|
|
725
|
+ }
|
|
726
|
+ SipEngine.getInstance().answer(callid);
|
|
727
|
+ SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
728
|
+ ringtone = null;
|
|
729
|
+ handler_CallActivity.removeCallbacks(doAutoAnwser);
|
|
730
|
+ }
|
709
|
731
|
|
710
|
732
|
public void muteAll(View view) {
|
711
|
733
|
QMUIQuickAction qa = QMUIPopups.quickAction(InCallMeetingActivity.this,
|