From de8bf0b61cf86372944c9ba866b2e8313f019032 Mon Sep 17 00:00:00 2001
From: chenbin <>
Date: Thu, 29 Apr 2021 09:19:35 +0800
Subject: [PATCH] update

---
 Keystore/coolapeKeyStore.keystore.meta        |  4 ----
 .../java/com/tianrun/sipcall/SipEngine.java   | 22 ++++++++++++++++++-
 .../tianrun/sipcall/call/InCallActivity.java  |  4 ++++
 .../sipcall/call/InCallMeetingActivity.java   |  4 ++++
 4 files changed, 29 insertions(+), 5 deletions(-)
 delete mode 100644 Keystore/coolapeKeyStore.keystore.meta

diff --git a/Keystore/coolapeKeyStore.keystore.meta b/Keystore/coolapeKeyStore.keystore.meta
deleted file mode 100644
index 7c41e11..0000000
--- a/Keystore/coolapeKeyStore.keystore.meta
+++ /dev/null
@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: d0d568b30e2f74409bc39d572cd4e60d
-DefaultImporter:
-  userData: 
diff --git a/app/src/main/java/com/tianrun/sipcall/SipEngine.java b/app/src/main/java/com/tianrun/sipcall/SipEngine.java
index 1d7cb48..1dfdb81 100644
--- a/app/src/main/java/com/tianrun/sipcall/SipEngine.java
+++ b/app/src/main/java/com/tianrun/sipcall/SipEngine.java
@@ -3,6 +3,10 @@ package com.tianrun.sipcall;
 
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 
@@ -325,5 +329,21 @@ public class SipEngine implements BluetelInterface {
         return myBluetelEngine.Holder(isHolder, callid);
     }
 
-
+    /**
+     * 播放系统默认来电铃声
+     *
+     * @return MediaPlayer对象
+     *
+     * @throws Exception
+     */
+    public void PlaydefaultCallMediaPlayer(Context context) {
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
+        Ringtone r = RingtoneManager.getRingtone(context, notification);
+        r.play();
+    }
+    public void StopdefaultCallMediaPlayer(Context context)  {
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
+        Ringtone r = RingtoneManager.getRingtone(context, notification);
+        r.stop();
+    }
 }
diff --git a/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java b/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java
index 40c5a99..4a9f095 100644
--- a/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java
+++ b/app/src/main/java/com/tianrun/sipcall/call/InCallActivity.java
@@ -193,6 +193,9 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
             incall_answer.setVisibility(View.GONE);
             SipEngine.getInstance().answer(callid);
+            SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
+        } else {
+            SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
         }
 
     }
@@ -333,6 +336,7 @@ public class InCallActivity extends TrBaseActivity implements OnClickListener {
             case R.id.incall_answer:
                 incall_answer.setVisibility(View.GONE);
                 SipEngine.getInstance().answer(callid);
+                SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
                 break;
         }
     }
diff --git a/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java b/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java
index eb5f4f1..a46038e 100644
--- a/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java
+++ b/app/src/main/java/com/tianrun/sipcall/call/InCallMeetingActivity.java
@@ -527,7 +527,10 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
         //控件显示号码，来电，去电，通话中...
         if (incall_answer.getVisibility() == View.VISIBLE && selfCall) {
             incall_answer.setVisibility(View.GONE);
+            SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
             SipEngine.getInstance().answer(callid);
+        } else {
+            SipEngine.getInstance().PlaydefaultCallMediaPlayer(this);
         }
 
     }
@@ -687,6 +690,7 @@ public class InCallMeetingActivity extends TrBaseActivity implements OnClickList
                     incall_mute.setVisibility(View.VISIBLE);
                 }
                 SipEngine.getInstance().answer(callid);
+                SipEngine.getInstance().StopdefaultCallMediaPlayer(this);
                 break;
             case R.id.incall_mute:
                 muteAll(v);