Browse Source

update

master
chenbin 3 years ago
parent
commit
de8bf0b61c

+ 0
- 4
Keystore/coolapeKeyStore.keystore.meta View File

1
-fileFormatVersion: 2
2
-guid: d0d568b30e2f74409bc39d572cd4e60d
3
-DefaultImporter:
4
-  userData: 

+ 21
- 1
app/src/main/java/com/tianrun/sipcall/SipEngine.java View File

3
 
3
 
4
 import android.content.Context;
4
 import android.content.Context;
5
 import android.content.Intent;
5
 import android.content.Intent;
6
+import android.database.Cursor;
7
+import android.media.Ringtone;
8
+import android.media.RingtoneManager;
9
+import android.net.Uri;
6
 import android.os.Bundle;
10
 import android.os.Bundle;
7
 import android.os.Handler;
11
 import android.os.Handler;
8
 
12
 
325
         return myBluetelEngine.Holder(isHolder, callid);
329
         return myBluetelEngine.Holder(isHolder, callid);
326
     }
330
     }
327
 
331
 
328
-
332
+    /**
333
+     * 播放系统默认来电铃声
334
+     *
335
+     * @return MediaPlayer对象
336
+     *
337
+     * @throws Exception
338
+     */
339
+    public void PlaydefaultCallMediaPlayer(Context context) {
340
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
341
+        Ringtone r = RingtoneManager.getRingtone(context, notification);
342
+        r.play();
343
+    }
344
+    public void StopdefaultCallMediaPlayer(Context context)  {
345
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
346
+        Ringtone r = RingtoneManager.getRingtone(context, notification);
347
+        r.stop();
348
+    }
329
 }
349
 }

+ 4
- 0
app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java View File

193
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
193
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
194
             incall_answer.setVisibility(View.GONE);
194
             incall_answer.setVisibility(View.GONE);
195
             SipEngine.getInstance().answer(callid);
195
             SipEngine.getInstance().answer(callid);
196
+            SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
197
+        } else {
198
+            SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
196
         }
199
         }
197
 
200
 
198
     }
201
     }
333
             case R.id.incall_answer:
336
             case R.id.incall_answer:
334
                 incall_answer.setVisibility(View.GONE);
337
                 incall_answer.setVisibility(View.GONE);
335
                 SipEngine.getInstance().answer(callid);
338
                 SipEngine.getInstance().answer(callid);
339
+                SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
336
                 break;
340
                 break;
337
         }
341
         }
338
     }
342
     }

+ 4
- 0
app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java View File

527
         //控件显示号码,来电,去电,通话中...
527
         //控件显示号码,来电,去电,通话中...
528
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
528
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
529
             incall_answer.setVisibility(View.GONE);
529
             incall_answer.setVisibility(View.GONE);
530
+            SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
530
             SipEngine.getInstance().answer(callid);
531
             SipEngine.getInstance().answer(callid);
532
+        } else {
533
+            SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
531
         }
534
         }
532
 
535
 
533
     }
536
     }
687
                     incall_mute.setVisibility(View.VISIBLE);
690
                     incall_mute.setVisibility(View.VISIBLE);
688
                 }
691
                 }
689
                 SipEngine.getInstance().answer(callid);
692
                 SipEngine.getInstance().answer(callid);
693
+                SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
690
                 break;
694
                 break;
691
             case R.id.incall_mute:
695
             case R.id.incall_mute:
692
                 muteAll(v);
696
                 muteAll(v);

Loading…
Cancel
Save