release V656

优化 dump alarm message

diff --git a/app/app.iml b/app/app.iml
index e442beb..497b2ac 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -29,15 +29,15 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes"/>\r
     <exclude-output/>\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true"/>\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true"/>\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true"/>\r

diff --git a/app/release/ICSer_V650_2010141931_release.apk b/app/release/ICSer_V656_2010142127_release.apk
similarity index 78%
rename from app/release/ICSer_V650_2010141931_release.apk
rename to app/release/ICSer_V656_2010142127_release.apk
index 140eb82..e38d86a 100644 (file)
Binary files a/app/release/ICSer_V650_2010141931_release.apk and b/app/release/ICSer_V656_2010142127_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index aad1151..d749bf7 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":650,"versionName":"2010141931","enabled":true,"outputFile":"ICSer_V650_2010141931_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V650_2010141931_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":656,"versionName":"2010142127","enabled":true,"outputFile":"ICSer_V656_2010142127_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V656_2010142127_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 736f242..9eb2fb6 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -167,11 +167,15 @@ public class LocationClient {
               //只有上一次在区域内，这次出区域才需要报警\r
               ICLogger.i("BT 不在区域内，且上次在区域内，报警！");\r
               //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
-              startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
-              forceLocation=1;\r
-              startLocationProcess(ICLocation.NORMAL_MOD);\r
-//              StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
-//              DeliverMessage(AL_CMD);\r
+              if (donotScanWiFi){\r
+                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+                DeliverMessage(AL_CMD);\r
+              }else {\r
+                startSOSLocation = true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
+                forceLocation = 1;\r
+                startLocationProcess(ICLocation.NORMAL_MOD);\r
+              }\r
+\r
             }\r
           }else{\r
             ICLogger.i("BT 在区域内！");\r
@@ -184,18 +188,30 @@ public class LocationClient {
             if ( runtime.bleInfo.last_is_in_area==true) {\r
               //只有上一次在区域内，这次出区域才需要报警\r
               ICLogger.i("BT 不在区域内，且上次在区域内，报警！");\r
-//              StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
-//              DeliverMessage(AL_CMD);\r
-              //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
-              startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
-              forceLocation=1;\r
-              startLocationProcess(ICLocation.NORMAL_MOD);\r
-            }else {\r
-              if(startSOSLocation){\r
-                startLocationProcess(ICLocation.NORMAL_MOD);\r
+              if (donotScanWiFi){\r
+                StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+                DeliverMessage(AL_CMD);\r
+                startSOSLocation=false;\r
               }else {\r
-                startLocationProcess(runtime.getLocationInstance().getWorkingMod());\r
+                //如果需要报警定位，则强制进行sos定位，不能通过triggerSOS，因为函数中调用了BLEScan会造成循环调用\r
+                startSOSLocation = true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
+                forceLocation = 1;\r
+                startLocationProcess(ICLocation.NORMAL_MOD);\r
               }\r
+            }else {\r
+\r
+                if (startSOSLocation) {\r
+                  if (donotScanWiFi) {\r
+                    StringMessage AL_CMD = protocolAPIHelper.getWarningMSG(runtime);\r
+                    DeliverMessage(AL_CMD);\r
+                    startSOSLocation=false;\r
+                  } else {\r
+                    startLocationProcess(ICLocation.NORMAL_MOD);\r
+                  }\r
+                } else {\r
+                  startLocationProcess(runtime.getLocationInstance().getWorkingMod());\r
+                }\r
+\r
             }\r
           } else {\r
             ICLogger.i("BT 在区域内，直接发送区域坐标即可！");\r
@@ -292,8 +308,29 @@ public class LocationClient {
     mhandler.sendEmptyMessage(msgWhat_StartBLEProcess);\r
   }\r
 \r
+  private static boolean donotScanWiFi=true;\r
   public void triggerSOSLocationProcess(){\r
-    mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);\r
+\r
+\r
+    if (donotScanWiFi){\r
+      updateCellInfo();\r
+      if (runtime.bleInfo.btMacList.size() > 0) {\r
+        //有蓝牙搜索要求则 先进行蓝牙扫描\r
+        startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
+        forceLocation=1;\r
+        if (needLocationForBT())\r
+          btHelper.scanBLE();\r
+      } else {\r
+        try{\r
+          Thread.sleep(1000);\r
+        }catch (Exception e){}\r
+        StringMessage waningmsg=protocolAPIHelper.getWarningMSG(runtime);\r
+        DeliverMessage(waningmsg);\r
+      }\r
+\r
+    }else {\r
+      mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);\r
+    }\r
   }\r
 \r
   private static int checktimes=0;\r

diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index 9a9717a..554addd 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -443,6 +443,41 @@ public class Runtime {
         ICLogger.i("setFZDDevStatus "+String.format("0x%x",fzdDevStatus)+" "+fzdDevStatus);\r
 \r
     }\r
+\r
+    public void dumpDevStatus(){\r
+        StringBuilder sb=new StringBuilder("get FZDStatus ");\r
+        if( (fzdDevStatus & 0x00800000 ) > 0  ){\r
+            sb.append("ALARM_POWER_OFF ");\r
+        }\r
+        if ((fzdDevStatus & 0x00040000 ) > 0  ){\r
+            sb.append("ALARM_ESCAPE ");\r
+        }\r
+        if ((fzdDevStatus & 0x01000000 ) > 0  ){\r
+            sb.append("ALARM_ABNORMAL_HEART_RATE ");\r
+        }\r
+        if ((fzdDevStatus & 0x00200000 ) > 0  ){\r
+            sb.append("ALARM_FALL ");\r
+        }\r
+        if ((fzdDevStatus & 0x00100000 ) > 0  ){\r
+            sb.append("ALARM_ILLEGAL_CUTOFF ");\r
+        }\r
+        if ((fzdDevStatus & 0x00100000 ) == 0  ){\r
+            sb.append("ALARM_LOCK_WATCH ");\r
+        }\r
+        if ((fzdDevStatus & 0x00020000 ) > 0  ){\r
+            sb.append("ALARM_LOWBATTERY ");\r
+        }\r
+        if ((fzdDevStatus & 0x00010000 ) > 0  ){\r
+            sb.append("ALARM_SOS ");\r
+        }\r
+        if ((fzdDevStatus & 0x00000008 ) > 0  ){\r
+            sb.append("ALARM_ANTIOFF ");\r
+        }\r
+        if ((fzdDevStatus & 0x00000008 ) == 0  ){\r
+            sb.append("ALARM_WEARED ");\r
+        }\r
+        ICLogger.i(sb.toString());\r
+    }\r
   public String preCdmaInfo;\r
   \r
   public String preCellInfo;\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 9e19327..0ec4627 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -196,6 +196,7 @@ public class protocolAPIHelper {
     public static StringMessage getWarningMSG(Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
         StringMessage ret=null;\r
+        runtime.dumpDevStatus();\r
         switch(Config.protocol_no)\r
         {\r
             case Config.PROTOCOL_JIAI:\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 8d1cbe1..1c10b49 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 14 19:31:29 CST 2020\r
-VERSION_CODE=650\r
+#Wed Oct 14 21:27:44 CST 2020\r
+VERSION_CODE=656\r