|
@@ -51,7 +51,6 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
51
|
51
|
private SMPercentFrameLayout localRenderLayout;
|
52
|
52
|
private SMPercentFrameLayout remoteRenderLayout;
|
53
|
53
|
private ImageButton incall_answer, incall_hangup;
|
54
|
|
- private Ringtone ringtone;
|
55
|
54
|
private TextView show;
|
56
|
55
|
QMUITabSegment mTabSegment;
|
57
|
56
|
ViewPager mContentViewPager;
|
|
@@ -65,6 +64,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
65
|
64
|
private boolean selfCall = false;
|
66
|
65
|
private boolean VIDEOSTATE = false;
|
67
|
66
|
public static Intent incallIntent;
|
|
67
|
+ private Ringtone ringtone;
|
68
|
68
|
|
69
|
69
|
public String[] screenTyps = {"经典模式", "均分模式", "远程全屏", "本地全屏"};
|
70
|
70
|
|
|
@@ -188,19 +188,26 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
188
|
188
|
super.onResume();
|
189
|
189
|
if (callstate.equals("来电")) {
|
190
|
190
|
incall_answer.setVisibility(View.VISIBLE);
|
|
191
|
+ ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
|
191
|
192
|
} else {
|
192
|
193
|
incall_answer.setVisibility(View.GONE);
|
193
|
194
|
}
|
194
|
195
|
show.setText(callnumber + callstate);
|
195
|
|
- if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
|
196
|
|
- answer();
|
197
|
|
- } else {
|
198
|
|
- ringtone = SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
|
199
|
|
- AutoAnwser(); //5秒后自动接听
|
|
196
|
+ if (incall_answer.getVisibility() == View.VISIBLE){
|
|
197
|
+ if(selfCall) {
|
|
198
|
+// incall_answer.setVisibility(View.GONE);
|
|
199
|
+// SipEngine.getInstance().answer(callid);
|
|
200
|
+// SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
201
|
+// ringtone = null;
|
|
202
|
+ answer();
|
|
203
|
+ } else {
|
|
204
|
+ AutoAnwser();
|
|
205
|
+ }
|
200
|
206
|
}
|
|
207
|
+
|
201
|
208
|
}
|
202
|
209
|
|
203
|
|
- static void AutoAnwser(){
|
|
210
|
+ static void AutoAnwser() {
|
204
|
211
|
handler_CallActivity.postDelayed(doAutoAnwser, 5000);
|
205
|
212
|
}
|
206
|
213
|
static Runnable doAutoAnwser = new Runnable() {
|
|
@@ -209,6 +216,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
209
|
216
|
CONS.SENDMESSAGETO(handler_CallActivity, -2, null);
|
210
|
217
|
}
|
211
|
218
|
};
|
|
219
|
+
|
212
|
220
|
@Override
|
213
|
221
|
protected void onPause() {
|
214
|
222
|
super.onPause();
|
|
@@ -219,6 +227,8 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
219
|
227
|
protected void onDestroy() {
|
220
|
228
|
stopVideoStream(true);
|
221
|
229
|
super.onDestroy();
|
|
230
|
+ SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
231
|
+ ringtone = null;
|
222
|
232
|
SipEngine.getInstance().hangup(callid);
|
223
|
233
|
handler_CallActivity.removeCallbacks(doAutoAnwser);
|
224
|
234
|
handler_CallActivity = null;
|
|
@@ -226,8 +236,6 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
226
|
236
|
wakeLock.release();
|
227
|
237
|
wakeLock = null;
|
228
|
238
|
}
|
229
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
230
|
|
- ringtone = null;
|
231
|
239
|
}
|
232
|
240
|
|
233
|
241
|
/**
|
|
@@ -347,21 +355,26 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
|
347
|
355
|
if (SipEngine.callPagesConfig.size() == 0) {
|
348
|
356
|
finish();
|
349
|
357
|
}
|
350
|
|
- SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
351
|
358
|
break;
|
352
|
359
|
case R.id.incall_answer:
|
|
360
|
+// incall_answer.setVisibility(View.GONE);
|
|
361
|
+// SipEngine.getInstance().answer(callid);
|
|
362
|
+// SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
363
|
+// ringtone = null;
|
353
|
364
|
answer();
|
354
|
365
|
break;
|
355
|
366
|
}
|
356
|
367
|
}
|
357
|
368
|
|
358
|
|
- public void answer(){
|
|
369
|
+ public void answer() {
|
359
|
370
|
incall_answer.setVisibility(View.GONE);
|
360
|
371
|
SipEngine.getInstance().answer(callid);
|
361
|
372
|
SipEngine.getInstance().StopdefaultCallMediaPlayer(ringtone);
|
|
373
|
+ ringtone = null;
|
362
|
374
|
handler_CallActivity.removeCallbacks(doAutoAnwser);
|
363
|
375
|
}
|
364
|
376
|
|
|
377
|
+
|
365
|
378
|
public void ShowVideoView(boolean show) {
|
366
|
379
|
if (show) {
|
367
|
380
|
localRenderLayout.setVisibility(View.VISIBLE);
|