From: snickersun Date: Tue, 3 Nov 2020 11:49:52 +0000 (+0800) Subject: release V686 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5b62dadbdfd153ef6ab890cce96c4e21e7ba9d41;p=protocol_srv.git 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 ca40bffd..c0c5ef1a 100644 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 0ca8a0c7..bd3c4a47 100644 --- 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 e78b3cf9..9883c2cd 100644 --- 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); Util.mSleep(1000); runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息 + + //提醒后 重置 lastCheckSitTime 以及 lastSitCheckStepCount ， 重新计时 Runtime.lastSitCheckStepCount=runtime.getTotalStepCount(); Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3(); 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 f58c39e9..f19e757e 100644 --- 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()); //显示提示窗口 intent.setAction(DIALOG_ACTION); - intent.putExtra("takephoto", "Take photo !"); + intent.putExtra("takephoto", "Take Photo !"); context.sendBroadcast(intent); } },500); 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 3cf6b5d1..f4328943 100644 --- 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; import com.enqualcomm.support.bean.VoiceContent; import com.enqualcomm.support.service.AudioService; +import com.enqualcomm.support.service.Deliver; import java.lang.reflect.Method; import java.util.ArrayList; @@ -449,10 +450,19 @@ public class ContextProxy { this.context.sendBroadcast(intent, "com.eqc.broadcast.permission"); } public void sendBroadcastSitLongAlarm() { - Intent intent = new Intent(); - intent.setAction(ACTION_KEEPSIT_ALARM); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - this.context.sendBroadcast(intent); + + if (Util.installed(context,"com.ic.ak.launcher")) { + Intent intent = new Intent(); + intent.setAction(ACTION_KEEPSIT_ALARM); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); + this.context.sendBroadcast(intent); + }else { + Intent intent = new Intent(); + //显示提示窗口 + intent.setAction(DIALOG_ACTION); + intent.putExtra("takephoto", "Sedentary reminder !"); + context.sendBroadcast(intent); + } } } 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 9e607201..5de3340b 100644 --- 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); stopmediaplayer(); - String packagename="com.eqc.camera"; - String activityName="com.eqc.camera.TakePictureActivity"; - if (Util.installed(context,"com.ic.camera")){ - packagename="com.ic.camera"; - activityName="com.ic.camera.MainActivity"; - } - ComponentName var3 = new ComponentName(packagename, activityName); - Intent var5 = new Intent("android.intent.action.MAIN"); - var5.addCategory("android.intent.category.DEFAULT"); - var5.addFlags(FLAG_ACTIVITY_NEW_TASK); - var5.setComponent(var3); - try { - context.startActivity(var5); - } catch (Exception var4) { - var4.printStackTrace(); + if(msg.contains("Take Photo")) { + String packagename = "com.eqc.camera"; + String activityName = "com.eqc.camera.TakePictureActivity"; + if (Util.installed(context, "com.ic.camera")) { + packagename = "com.ic.camera"; + activityName = "com.ic.camera.MainActivity"; + } + ComponentName var3 = new ComponentName(packagename, activityName); + Intent var5 = new Intent("android.intent.action.MAIN"); + var5.addCategory("android.intent.category.DEFAULT"); + var5.addFlags(FLAG_ACTIVITY_NEW_TASK); + var5.setComponent(var3); + try { + context.startActivity(var5); + } catch (Exception var4) { + var4.printStackTrace(); + } } } }).create(); 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 4d88c3c0..b2c50831 100644 --- 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) { sb.append("\\u").append(unicodestr.substring(i, i + 4)); } - return decodeUnicode2Utf8Common(sb.toString()); + try { + return decodeUnicode2Utf8Common(sb.toString()); + }catch (Exception e){ + return ""; + } }else{ - return null; + return ""; } } diff --git a/app/version_code.properties b/app/version_code.properties index 08a6d957..5b97e18f 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Nov 03 09:07:01 CST 2020 -VERSION_CODE=685 +#Tue Nov 03 19:47:51 CST 2020 +VERSION_CODE=686