添加了电话权限

diff --git a/app/release/ICSOS_V6_2110270942_release.apk b/app/release/ICSOS_V7_2110281634_release.apk
similarity index 58%
rename from app/release/ICSOS_V6_2110270942_release.apk
rename to app/release/ICSOS_V7_2110281634_release.apk
index abc3fc1..98e9ad2 100644 (file)
Binary files a/app/release/ICSOS_V6_2110270942_release.apk and b/app/release/ICSOS_V7_2110281634_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 3a88a99..38c2e25 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_V6_2110270942_release.apk"
+      "outputFile": "ICSOS_V7_2110281634_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2fee61..463bccc 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application
         android:name=".App"

diff --git a/app/src/main/java/com/ic/sos/SOSPresenter.java b/app/src/main/java/com/ic/sos/SOSPresenter.java
index fbae97e..fe9b611 100644 (file)
--- a/app/src/main/java/com/ic/sos/SOSPresenter.java
+++ b/app/src/main/java/com/ic/sos/SOSPresenter.java
@@ -77,7 +77,9 @@ public class SOSPresenter {
         @Override
         public void onChange(boolean selfChange) {
             handler.post(() -> {
-                sosTask();
+                if (phoneNumList != null && phoneNumList.size() == 0) {
+                    sosTask();
+                }
             });
         }
     };
@@ -304,7 +306,9 @@ public class SOSPresenter {
                     .getMethod("getService", String.class);
             IBinder binder = (IBinder) method.invoke(null, new Object[]{Context.TELEPHONY_SERVICE});
             ITelephony telephony = ITelephony.Stub.asInterface(binder);
-            telephony.endCall();
+            if (telephony != null) {
+                telephony.endCall();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

diff --git a/app/version_code.properties b/app/version_code.properties
index db72ccb..4948920 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 27 09:42:49 CST 2021
-VERSION_CODE=6
+#Thu Oct 28 16:34:22 CST 2021
+VERSION_CODE=7