修改了翻译

diff --git a/app/release/ICSOS_V8_2110282046_release.apk b/app/release/ICSOS_V10_2110291715_release.apk
similarity index 58%
rename from app/release/ICSOS_V8_2110282046_release.apk
rename to app/release/ICSOS_V10_2110291715_release.apk
index 70f3e5a..7ea98fa 100644 (file)
Binary files a/app/release/ICSOS_V8_2110282046_release.apk and b/app/release/ICSOS_V10_2110291715_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index ab85230..69f6a28 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 1,
       "versionName": "1.0",
-      "outputFile": "ICSOS_V8_2110282046_release.apk"
+      "outputFile": "ICSOS_V10_2110291715_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a56c8a..7b4090c 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ic.sos">
+    package="com.ic.sos"
+    android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />

diff --git a/app/src/main/java/com/ic/sos/SOSPresenter.java b/app/src/main/java/com/ic/sos/SOSPresenter.java
index 85037a9..4cf5feb 100644 (file)
--- a/app/src/main/java/com/ic/sos/SOSPresenter.java
+++ b/app/src/main/java/com/ic/sos/SOSPresenter.java
@@ -113,6 +113,8 @@ public class SOSPresenter {
                     break;
                 case STATE_HAND_UP_ING:
                     ICLogger.d("正在挂断");
+                    //删除闹钟
+                    EndCallAlarmUtil.cancelAlarm(context);
                     break;
                 case STATE_TALKING:
                     ICLogger.d("正在通话中...");
@@ -140,9 +142,9 @@ public class SOSPresenter {
         if ("continue".equals(callWay)) {
             //如果拨通了，就不再往下轮询了
             //播完此轮就好
-            boolean isLastOne = currentCallIndex == phoneNumList.size() - 1;
+            boolean isLastOne = currentCallIndex >= phoneNumList.size() - 1;
             //是否有拨通hasRemoteAnswer
-            boolean isLastLoop = currentLoopGroupTime == loopTime;
+            boolean isLastLoop = currentLoopGroupTime >= loopTime;
             ICLogger.d("isLastOne ==> " + isLastOne);
             ICLogger.d("hasRemoteAnswer ==> " + hasRemoteAnswer);
             //有接听的，拨完这轮，没接听的，一直拨到最后一轮
@@ -358,6 +360,7 @@ public class SOSPresenter {
 
 
     public void cleared() {
+        handler.removeCallbacks(this::doSosCall);
         hasFirstCall = false;
         phoneNumList.clear();
         mContext.unregisterReceiver(stateReceiver);

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index fa21ffb..ddc9fc1 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -2,6 +2,7 @@
     <string name="app_name">ICSOS</string>
     <string name="calling_text">Calling…</string>
     <string name="call_error_text">Call Failed</string>
+    <string name="urgent_text">Urgent call</string>
     <string name="no_sim_text">No sim card</string>
     <string name="set_up_sim_text">Setup now</string>
     <string name="no_urgent_number_text">No sos number</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 784ca95..43e5b73 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2,6 +2,7 @@
     <string name="app_name">ICSOS</string>
     <string name="calling_text">呼んでいます…</string>
     <string name="call_error_text">コール失敗</string>
+    <string name="urgent_text">緊急サービス</string>
     <string name="no_sim_text">今はSIMカードがありません</string>
     <string name="set_up_sim_text">すぐに取り付けてください</string>
     <string name="no_urgent_number_text">緊急連絡先がありません。</string>

diff --git a/app/version_code.properties b/app/version_code.properties
index 0099c1e..6235d29 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Oct 28 20:46:51 CST 2021
-VERSION_CODE=8
+#Fri Oct 29 17:15:35 CST 2021
+VERSION_CODE=10