release V605

修正A9 剪断消息提示问题。把表带【剪断（解锁）、链接（锁定）】 和 【佩戴、脱落 】两种事件区分开来。

diff --git a/app/app.iml b/app/app.iml
index 2b17049..e442beb 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<?xml version="1.0" encoding="UTF-8"?><module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="icsupport" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="android-gradle" name="Android-Gradle">\r
       <configuration>\r
@@ -18,8 +18,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false"/>\r
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>\r
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>\r
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>\r
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value=""/>\r
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>\r
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug"/>\r
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>\r
       </configuration>\r
     </facet>\r
@@ -101,15 +101,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>\r
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\mail.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\activation.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\additionnal.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>\r
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>\r
+    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>\r
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>\r

diff --git a/app/release/ICSer_V605_2009072103_release.apk b/app/release/ICSer_V605_2009072103_release.apk
new file mode 100644 (file)
index 0000000..12ead55
Binary files /dev/null and b/app/release/ICSer_V605_2009072103_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index cc039bd..9fec9a4 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -346,7 +346,7 @@ public class Config {
   public static boolean do_broadCast_message_no_indication=false;\r
 \r
   public static boolean needAllwaysAlarmFenceOut=false;\r
-  public static boolean needAllwaysAlarmAntiOff=false;\r
+  public static boolean needAllwaysAlarmCutOff=false;\r
   public static boolean needTemperature_abnormal_alarm=false;\r
   public static boolean A9_noBroadCastActionStrip=false;\r
   public static boolean L004_BroadCastActionStrip=false;\r
@@ -393,7 +393,7 @@ public class Config {
       noSMSNotifyDialog=true;\r
       noVoiceNotifyDialog=true;\r
       needBroadcastAntiAlarm=true;\r
-      needAllwaysAlarmAntiOff=false;\r
+      needAllwaysAlarmCutOff=false;\r
       needAllwaysAlarmFenceOut=false;\r
       needTemperature_abnormal_alarm=false;\r
       noPPGSensor=false;\r
@@ -404,7 +404,7 @@ public class Config {
       noSMSNotifyDialog=true;\r
       noVoiceNotifyDialog=true;\r
       needBroadcastAntiAlarm=true;\r
-      needAllwaysAlarmAntiOff=true;\r
+      needAllwaysAlarmCutOff=true;\r
       needAllwaysAlarmFenceOut=true;\r
       needTemperature_abnormal_alarm=true;\r
       noPPGSensor=false;\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 680803a..5178136 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -741,13 +741,15 @@ public class CoreService extends Service {
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
             runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall),2);\r
         }\r
-        if(runtime.Anti_off_flag>0 && Config.needAllwaysAlarmAntiOff){\r
-            runtime.Anti_off_flag++;\r
-            WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
-            if (runtime.getAntioffStatus()) {\r
-                runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_Illegal_unlock), 2);\r
-            }else{\r
-                runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_wristband_off), 2);\r
+        if(runtime.Cut_off_flag>0 && Config.needAllwaysAlarmCutOff){\r
+            runtime.Cut_off_flag++;\r
+//            WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
+\r
+            if (Config.A9_noBroadCastActionStrip) {\r
+                if(Config.needBroadcastAntiAlarm) {\r
+                    antiservice.send_cutoff_event_broadcast(1);\r
+                }\r
+\r
             }\r
         }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/GPSActivity.java b/app/src/main/java/com/enqualcomm/support/GPSActivity.java
index dc49c21..7eec8db 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/GPSActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/GPSActivity.java
@@ -9,6 +9,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;\r
 import android.support.v7.widget.RecyclerView;\r
 import android.view.View;\r
+import android.view.WindowManager;\r
 import android.widget.TextView;\r
 \r
 import com.enqualcomm.support.NMEAListener.location_callback;\r
@@ -51,6 +52,7 @@ public class GPSActivity extends Activity implements location_callback {
         mStar.setText("0 in 0/ inMap 0");\r
         mHoop.setText("0.0米");\r
         mSearchCount.setText("0秒");\r
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);\r
     }\r
 \r
     @Override\r
@@ -104,25 +106,18 @@ public class GPSActivity extends Activity implements location_callback {
         }\r
         return entity;\r
     }\r
-    PowerManager.WakeLock screenOnWakelock=null;\r
+\r
     @Override\r
     protected  void onResume() {\r
         super.onResume();\r
         NMEAListener.set_callback(this);\r
-        if (screenOnWakelock==null)\r
-            screenOnWakelock = WakeLockUtil.getScreenOnWakeLock(this,GPSActivity.class.getSimpleName());\r
+\r
     }\r
 \r
     @Override\r
     protected void onPause() {\r
         super.onPause();\r
         showmessage=false;\r
-        if(screenOnWakelock!=null) {\r
-            if (screenOnWakelock.isHeld()) {\r
-                screenOnWakelock.release();\r
-            }\r
-            screenOnWakelock=null;\r
-        }\r
 \r
     }\r
 }\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 20b7ac6..8addf48 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -89,8 +89,7 @@ public class Runtime {
   \r
   public boolean isAirMode=false;\r
   \r
-  private boolean isNeedAntioff;\r
-  \r
+\r
   private String key = "867155030001063";\r
   \r
   public String lacByAt;\r
@@ -159,7 +158,8 @@ public class Runtime {
   public int Fence_Warning_flag=0;\r
 \r
     //0 代表佩戴，如果脱腕则置1，每次报警再加1\r
-  public int Anti_off_flag=0;\r
+    public int Anti_off_flag=0;\r
+    public int Cut_off_flag=0;\r
 \r
   public enum AlarmType{\r
       ALARM_SOS,\r
@@ -342,8 +342,19 @@ public class Runtime {
   public boolean isNoTurnOffWifiOnScreenOff(){\r
       return noTurnOffWifiOnScreenOff;\r
   }\r
+\r
+  private boolean isNeedAntioff;\r
   public boolean getAntioffStatus() { return this.isNeedAntioff; }\r
-  \r
+  public void setAntioffStatus(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }\r
+\r
+  private boolean isNeedReportcutoff=false;\r
+  public boolean needReportCutoff(){\r
+      return this.isNeedReportcutoff;\r
+  }\r
+\r
+  public void setNeddReportCutoff(boolean needreport){\r
+      this.isNeedReportcutoff=needreport;\r
+  }\r
   public String getBattery() { return this.battery; }\r
 \r
   public int getBatteryVotage(){ return this.batteryVoltage;}\r
@@ -414,8 +425,7 @@ public class Runtime {
   \r
   public boolean isShutdown() { return this.shutdown; }\r
   \r
-  public void setAntioffStatus(boolean paramBoolean) { this.isNeedAntioff = paramBoolean; }\r
-  \r
+\r
   public void setBattery(String paramString) { this.battery = paramString; }\r
   \r
   public void setBatteryLow(boolean paramBoolean) { this.batteryLow = paramBoolean; }\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index e13f78e..17ce616 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -86,46 +86,87 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
                 ICLogger.i("佩戴状态未变，skip！");\r
                 return;\r
         }\r
-         if (current_anti_status==0){\r
-            //佩戴\r
-             if(Config.needBroadcastAntiAlarm) {\r
-               //  play_notify();\r
-                 send_anti_event_broadcast(0);\r
-             }\r
-             mRuntime.Anti_off_flag=0;\r
-            mRuntime.setAlarmType(Runtime.AlarmType.ALARM_WEARED);\r
-            StringMessage msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
-            Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
+\r
+        //current_anti_status == 0 表示表带 锁定 ， ==10 表示表带非法解锁\r
+        //current_anti_status == 2 表示佩戴       ==12 表示脱腕\r
+\r
+        switch(current_anti_status){\r
+            case 0:\r
+                //锁定\r
+            {\r
+                if (Config.needBroadcastAntiAlarm) {\r
+                    //  play_notify();\r
+                    send_cutoff_event_broadcast(0);\r
+                }\r
+                mRuntime.Cut_off_flag = 0;\r
+                mRuntime.setAlarmType(Runtime.AlarmType.ALARM_LOCK_WATCH);\r
+                StringMessage msg = protocolAPIHelper.getWarningMSG(mRuntime);\r
+                Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
 \r
 //            try {\r
 //                sleep(1000);\r
 //            } catch (InterruptedException e) {\r
 //                e.printStackTrace();\r
 //            }\r
+            }\r
+                break;\r
+            case 10:\r
+            {\r
+                //非法解锁\r
+                if(Config.needBroadcastAntiAlarm) {\r
 \r
-        }else{\r
-             //脱腕\r
-             if(Config.needBroadcastAntiAlarm) {\r
-                 play_notify();\r
-                 VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
-                 screen_on();\r
-                try {\r
-                    sleep(1000);\r
-                } catch (InterruptedException e) {\r
-                    e.printStackTrace();\r
-                }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
-                 send_anti_event_broadcast(1);\r
-             }\r
-             mRuntime.Anti_off_flag=1;\r
-             mRuntime.setAlarmType(Runtime.AlarmType.ALARM_ANTIOFF);\r
-            StringMessage msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
-            Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
+                    send_cutoff_event_broadcast(1);\r
+                }\r
+                mRuntime.Cut_off_flag=1;\r
+                mRuntime.setAlarmType(Runtime.AlarmType.ALARM_CUTOFF);\r
+                StringMessage msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
+                Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
 //            try {\r
 //                sleep(1000);\r
 //            } catch (InterruptedException e) {\r
 //                e.printStackTrace();\r
 //            }\r
+            }\r
+                break;\r
+            case 2:\r
+                //佩戴\r
+            {\r
+                if (Config.needBroadcastAntiAlarm) {\r
+                    //  play_notify();\r
+                    send_anti_event_broadcast(0);\r
+                }\r
+                mRuntime.Anti_off_flag = 0;\r
+                mRuntime.setAlarmType(Runtime.AlarmType.ALARM_WEARED);\r
+                StringMessage msg = protocolAPIHelper.getWarningMSG(mRuntime);\r
+                Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
 \r
+//            try {\r
+//                sleep(1000);\r
+//            } catch (InterruptedException e) {\r
+//                e.printStackTrace();\r
+//            }\r
+            }\r
+                break;\r
+            case 12:\r
+            {\r
+                //脱腕\r
+                if(Config.needBroadcastAntiAlarm) {\r
+\r
+                    send_anti_event_broadcast(1);\r
+                }\r
+                mRuntime.Anti_off_flag=1;\r
+                mRuntime.setAlarmType(Runtime.AlarmType.ALARM_ANTIOFF);\r
+                StringMessage msg=protocolAPIHelper.getWarningMSG(mRuntime);\r
+                Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
+//            try {\r
+//                sleep(1000);\r
+//            } catch (InterruptedException e) {\r
+//                e.printStackTrace();\r
+//            }\r
+            }\r
+                break;\r
+            default:\r
+                break;\r
         }\r
 \r
         last_send_antoff_event=current_anti_status;\r
@@ -179,6 +220,73 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     }\r
 \r
 \r
+\r
+    public void send_cutoff_event_broadcast(int antioff){\r
+\r
+        Intent intent=new Intent();\r
+        intent.setAction(ACTION_ANTI_OFF);\r
+        intent.putExtra(KEY_ANTI_EVENT,antioff);\r
+        if (antioff==0) {\r
+\r
+            if (Config.A9_noBroadCastActionStrip) {\r
+                if (mRuntime.needReportCutoff() == true) {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_lock_success));\r
+                }\r
+            }else if (Config.L004_BroadCastActionStrip){\r
+                Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_on));\r
+                //下面消息是为了把锁定窗口关掉\r
+                intent.putExtra(KEY_ANTI_TXT, "");\r
+                mContext.sendBroadcast(intent);\r
+            }else{\r
+                intent.putExtra(KEY_ANTI_TXT, "");\r
+                mContext.sendBroadcast(intent);\r
+            }\r
+\r
+        }else{\r
+\r
+            if (Config.A9_noBroadCastActionStrip) {\r
+\r
+                if (mRuntime.needReportCutoff() == true) {\r
+                    play_notify();\r
+                    VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                    screen_on();\r
+                    try {\r
+                        sleep(1000);\r
+                    } catch (InterruptedException e) {\r
+                        e.printStackTrace();\r
+                    }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+                }\r
+            }else if (Config.L004_BroadCastActionStrip) {\r
+\r
+                play_notify();\r
+                VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                screen_on();\r
+                try {\r
+                    sleep(1000);\r
+                } catch (InterruptedException e) {\r
+                    e.printStackTrace();\r
+                }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
+                intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                mContext.sendBroadcast(intent);\r
+            }else{\r
+                play_notify();\r
+                VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                screen_on();\r
+                try {\r
+                    sleep(1000);\r
+                } catch (InterruptedException e) {\r
+                    e.printStackTrace();\r
+                }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
+                if (mRuntime.getAntioffStatus()){\r
+                    intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                }\r
+                mContext.sendBroadcast(intent);\r
+            }\r
+\r
+        }\r
+\r
+    }\r
     public void send_anti_event_broadcast(int antioff){\r
 \r
         Intent intent=new Intent();\r
@@ -186,11 +294,13 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         intent.putExtra(KEY_ANTI_EVENT,antioff);\r
         if (antioff==0) {\r
 \r
-            if(Config.A9_noBroadCastActionStrip) {\r
-                Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on));\r
-                //                mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴\r
+            if (Config.A9_noBroadCastActionStrip) {\r
+                if (mRuntime.needReportCutoff() == true) {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_lock_success));\r
+                }\r
             }else if (Config.L004_BroadCastActionStrip){\r
                 Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_on));\r
+                //下面消息是为了把锁定窗口关掉\r
                 intent.putExtra(KEY_ANTI_TXT, "");\r
                 mContext.sendBroadcast(intent);\r
             }else{\r
@@ -202,15 +312,38 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
 \r
             if (Config.A9_noBroadCastActionStrip) {\r
 \r
-                if (mRuntime.getAntioffStatus() == true) {\r
+                if (mRuntime.needReportCutoff() == true) {\r
+                    play_notify();\r
+                    VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                    screen_on();\r
+                    try {\r
+                        sleep(1000);\r
+                    } catch (InterruptedException e) {\r
+                        e.printStackTrace();\r
+                    }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
                     Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
-                } else {\r
-                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_off));\r
                 }\r
-            }else {\r
-                if (mRuntime.getAntioffStatus() == true) {\r
-                    intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
-                } else {\r
+            }else if (Config.L004_BroadCastActionStrip) {\r
+                play_notify();\r
+                VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                screen_on();\r
+                try {\r
+                    sleep(1000);\r
+                } catch (InterruptedException e) {\r
+                    e.printStackTrace();\r
+                }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
+                intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                mContext.sendBroadcast(intent);\r
+            }else{\r
+                play_notify();\r
+                VibrateUtil.getInstance(mContext).VibrateOnOnce(true);\r
+                screen_on();\r
+                try {\r
+                    sleep(1000);\r
+                } catch (InterruptedException e) {\r
+                    e.printStackTrace();\r
+                }//delay一会儿再发消息，以屏没有来得急亮起，免界面不响应。\r
+                if (mRuntime.getAntioffStatus()){\r
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off));\r
                 }\r
                 mContext.sendBroadcast(intent);\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 2220ae6..2166cab 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -2215,7 +2215,7 @@ public class protocol_ic {
 \r
             if (cdd.equals("1")) {\r
                 //delay 启动\r
-                Context context = mRuntime.getContextProxy().context.getApplicationContext();\r
+//                Context context = mRuntime.getContextProxy().context.getApplicationContext();\r
                 CoreService.getInstance().DevliverStringMessage("StartMonitor",tmp);\r
             }\r
         }else{\r

diff --git a/app/version_code.properties b/app/version_code.properties
index ed990bc..de527b2 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Sep 05 01:13:16 CST 2020\r
-VERSION_CODE=604\r
+#Mon Sep 07 21:03:09 CST 2020\r
+VERSION_CODE=605\r