release V686

添加久坐提醒

diff --git a/app/release/ICSer_V685_2011030907_release.apk b/app/release/ICSer_V686_2011031947_release.apk
similarity index 78%
rename from app/release/ICSer_V685_2011030907_release.apk
rename to app/release/ICSer_V686_2011031947_release.apk
index ca40bff..c0c5ef1 100644 (file)
Binary files a/app/release/ICSer_V685_2011030907_release.apk and b/app/release/ICSer_V686_2011031947_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 0ca8a0c..bd3c4a4 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":685,"versionName":"2011030907","enabled":true,"outputFile":"ICSer_V685_2011030907_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V685_2011030907_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":686,"versionName":"2011031947","enabled":true,"outputFile":"ICSer_V686_2011031947_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V686_2011031947_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index e78b3cf..9883c2c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -998,6 +998,8 @@ public class CoreService extends Service {
                     VibrateUtil.getInstance(this).VibrateOn(true);\r
                     Util.mSleep(1000);\r
                     runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息\r
+\r
+\r
                     //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时\r
                     Runtime.lastSitCheckStepCount=runtime.getTotalStepCount();\r
                     Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3();\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index f58c39e..f19e757 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -539,7 +539,7 @@ public class Deliver extends AbstractConnectionService {
           ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED+" "+paramStringMessage.isFromCache());\r
           //显示提示窗口\r
           intent.setAction(DIALOG_ACTION);\r
-          intent.putExtra("takephoto", "Take photo !");\r
+          intent.putExtra("takephoto", "Take Photo !");\r
           context.sendBroadcast(intent);\r
         }\r
       },500);\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 3cf6b5d..f432894 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -27,6 +27,7 @@ import com.enqualcomm.support.bean.Silent;
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.VoiceContent;\r
 import com.enqualcomm.support.service.AudioService;\r
+import com.enqualcomm.support.service.Deliver;\r
 \r
 import java.lang.reflect.Method;\r
 import java.util.ArrayList;\r
@@ -449,10 +450,19 @@ public class ContextProxy {
     this.context.sendBroadcast(intent, "com.eqc.broadcast.permission");\r
   }\r
   public void sendBroadcastSitLongAlarm() {\r
-    Intent intent = new Intent();\r
-    intent.setAction(ACTION_KEEPSIT_ALARM);\r
-    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-    this.context.sendBroadcast(intent);\r
+\r
+    if (Util.installed(context,"com.ic.ak.launcher")) {\r
+      Intent intent = new Intent();\r
+      intent.setAction(ACTION_KEEPSIT_ALARM);\r
+      intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
+      this.context.sendBroadcast(intent);\r
+    }else {\r
+      Intent intent = new Intent();\r
+      //显示提示窗口\r
+      intent.setAction(DIALOG_ACTION);\r
+      intent.putExtra("takephoto", "Sedentary reminder !");\r
+      context.sendBroadcast(intent);\r
+    }\r
   }\r
 \r
 }\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index 9e60720..5de3340 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -222,21 +222,23 @@ public class ProcessReceiver extends BroadcastReceiver {
           VibrateUtil.getInstance(context).VibrateOn(false);\r
           stopmediaplayer();\r
 \r
-          String packagename="com.eqc.camera";\r
-          String activityName="com.eqc.camera.TakePictureActivity";\r
-          if (Util.installed(context,"com.ic.camera")){\r
-            packagename="com.ic.camera";\r
-            activityName="com.ic.camera.MainActivity";\r
-          }\r
-          ComponentName var3 = new ComponentName(packagename, activityName);\r
-          Intent var5 = new Intent("android.intent.action.MAIN");\r
-          var5.addCategory("android.intent.category.DEFAULT");\r
-          var5.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-          var5.setComponent(var3);\r
-          try {\r
-            context.startActivity(var5);\r
-          } catch (Exception var4) {\r
-            var4.printStackTrace();\r
+          if(msg.contains("Take Photo")) {\r
+            String packagename = "com.eqc.camera";\r
+            String activityName = "com.eqc.camera.TakePictureActivity";\r
+            if (Util.installed(context, "com.ic.camera")) {\r
+              packagename = "com.ic.camera";\r
+              activityName = "com.ic.camera.MainActivity";\r
+            }\r
+            ComponentName var3 = new ComponentName(packagename, activityName);\r
+            Intent var5 = new Intent("android.intent.action.MAIN");\r
+            var5.addCategory("android.intent.category.DEFAULT");\r
+            var5.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
+            var5.setComponent(var3);\r
+            try {\r
+              context.startActivity(var5);\r
+            } catch (Exception var4) {\r
+              var4.printStackTrace();\r
+            }\r
           }\r
         }\r
       }).create();\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index 4d88c3c..b2c5083 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -170,9 +170,13 @@ public class Util {
       for (int i = 0; i < len; i += 4) {\r
         sb.append("\\u").append(unicodestr.substring(i, i + 4));\r
       }\r
-      return decodeUnicode2Utf8Common(sb.toString());\r
+      try {\r
+        return decodeUnicode2Utf8Common(sb.toString());\r
+      }catch (Exception e){\r
+        return "";\r
+      }\r
     }else{\r
-      return null;\r
+      return "";\r
     }\r
 \r
   }\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 08a6d95..5b97e18 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 03 09:07:01 CST 2020\r
-VERSION_CODE=685\r
+#Tue Nov 03 19:47:51 CST 2020\r
+VERSION_CODE=686\r