From d124bd2b2d559e59f260d2839731dc913c306b66 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 26 Jan 2022 17:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9D=A5=E7=94=B5?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E6=96=87=E6=9C=AC=E6=A0=87=E6=98=8E=E9=80=9A?=
 =?UTF-8?q?=E8=AF=9D=E7=B1=BB=E5=9E=8B=EF=BC=9A1.=E5=91=BC=E5=85=A5=202.?=
 =?UTF-8?q?=E5=91=BC=E5=87=BA=203.=E6=9C=AA=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/receiver/PhoneStateReceiver.java   | 12 ++++++++++--
 app/src/main/res/values-en/strings.xml               |  1 +
 app/src/main/res/values/strings.xml                  |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
index 4d115057..e24f04bf 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
@@ -110,13 +110,21 @@ public class PhoneStateReceiver extends BroadcastReceiver {
         }
         SettingUtil.setPrevNoticeHash(phoneNumber, currHash);
 
-        SmsVo smsVo = new SmsVo(phoneNumber, name + context.getString(R.string.calling), new Date(), simInfo);
+        SmsVo smsVo = new SmsVo(phoneNumber, getTypeText(context, callInfo.getType(), name), new Date(), simInfo);
         Log.d(TAG, "send_msg" + smsVo.toString());
         SendUtil.send_msg(context, smsVo, simId, "call");
 
         //SmsHubApi
         if (SettingUtil.getSwitchEnableSmsHubApi()) {
-            SmsHubActionHandler.putData(new SmsHubVo(SmsHubVo.Type.phone, simId, name + context.getString(R.string.calling), phoneNumber));
+            SmsHubActionHandler.putData(new SmsHubVo(SmsHubVo.Type.phone, simId, getTypeText(context, callInfo.getType(), name), phoneNumber));
         }
     }
+
+    //获取通话类型：1.呼入 2.呼出 3.未接
+    private String getTypeText(Context context, int type, String name) {
+        String str = context.getString(R.string.linkman) + name + "\n" + context.getString(R.string.mandatory_type);
+        if (type == 3) return str + context.getString(R.string.received_call);
+        if (type == 2) return str + context.getString(R.string.local_outgoing_call);
+        return str + context.getString(R.string.missed_call);
+    }
 }
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 87d3cee4..40f28828 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -390,4 +390,5 @@
     <string name="tips_clone_failed">One-click clone failed:</string>
     <string name="tips_versions_inconsistent">The APP versions of the sender and the receiver are inconsistent, and cannot be cloned with one click!</string>
     <string name="tips_get_info_failed">Failed to get one-click clone information from sender</string>
+    <string name="linkman">Linkman:</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19b37ac8..b6d232dc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -312,7 +312,7 @@
     <string name="todo">TODO</string>
     <string name="forwarding_function">转发功能</string>
     <string name="forwarding_function_tips">总开关，请根据实际需要，启用对应的转发功能</string>
-    <string name="mandatory_type">通话类型:</string>
+    <string name="mandatory_type">通话类型：</string>
     <string name="missed_call">未接来电</string>
     <string name="received_call">已接来电</string>
     <string name="local_outgoing_call">本机去电</string>
@@ -389,4 +389,5 @@
     <string name="tips_clone_failed">一键克隆失败：</string>
     <string name="tips_versions_inconsistent">发送端与接收端的APP版本不一致，无法一键克隆！</string>
     <string name="tips_get_info_failed">从发送端获取一键克隆信息失败</string>
+    <string name="linkman">联 系 人：</string>
 </resources>