From e800452f4b632e456ac5ebe66c97bd4f4591f726 Mon Sep 17 00:00:00 2001 From: snickersun Date: Mon, 20 Jan 2020 17:45:23 +0800 Subject: [PATCH] =?utf8?q?=E4=B8=AD=E9=97=B4=E7=89=88=E6=9C=AC=EF=BC=8C?= =?utf8?q?=E6=AD=A3=E5=9C=A8=E6=B7=BB=E5=8A=A0HearRateServer?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 +- .../java/com/ic/protocol/LocationClient.java | 26 ++++----- .../com/ic/protocol/MySqlitOpenHelper.java | 5 -- .../java/com/ic/protocol/ParseUpdate.java | 6 +- .../protocol/adapter/protocolAPIHelper.java | 12 ++-- .../java/com/ic/protocol/bean/Content.java | 20 +++---- .../com/ic/protocol/bean/VoiceContent.java | 32 +++++------ .../com/ic/protocol/bean/heartRateStatus.java | 19 ++++++- .../com/ic/protocol/service/Initialize.java | 4 +- .../protocol/service/protocolMainServer.java | 6 +- .../com/ic/protocol/utils/AlarmWakeUp.java | 2 +- .../java/com/ic/protocol/utils/DBHelper.java | 4 -- .../main/java/com/ic/protocol/utils/Util.java | 57 +++---------------- app/version_code.properties | 4 +- 14 files changed, 85 insertions(+), 117 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a5089d0..5072e555 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -139,7 +139,10 @@ - + diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java index e9fb3d4b..0e115fa1 100644 --- a/app/src/main/java/com/ic/protocol/LocationClient.java +++ b/app/src/main/java/com/ic/protocol/LocationClient.java @@ -57,9 +57,9 @@ public class LocationClient { private static final int IS_WIFI = 1; - public static final String LACATION_CYCLE = "lacation_cycle"; + public static final String LOCATION_CYCLE = "location_cycle"; - public static final String LACATION_MODE = "lacation_mode"; + public static final String LOCATION_MODE = "location_mode"; private static final int MAX_SIZE = 50; @@ -553,13 +553,13 @@ public void updateCellInfo() { }catch (Exception e){ e.printStackTrace(); } - SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_MODE, mod); + SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LOCATION_MODE, mod); runtime.getLocationInstance().setWorkingMod(mod); // runtime.getLocationInstance().setLocation_cycle(3); Logger.i("Set WorkMODE "+mod +" and reset Location AlarmCycle"); protocolMainServer.getInstance().setLocationAlarm(mod); -// Logger.i("ResartLACATION_MODE 2"); - runtime.getContextProxy().sendBroadcast(LACATION_MODE,runtime); +// Logger.i("ResartLOCATION_MODE 2"); + runtime.getContextProxy().sendBroadcast(LOCATION_MODE,runtime); forceLocation=1; this.startLocationProcess(mod); WorkingMod=mod; @@ -599,24 +599,24 @@ public void updateCellInfo() { //初始化设定当前工作模式及循环频率 if (SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, "value_setting_ver", 0) == Config.value_setting) { //如果value_setting_ver = Config.value_setting 表示采用已经保存的模式 - runtime.getLocationInstance().setWorkingMod(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_MODE, ICLocation.NORMAL_MOD)); -// runtime.getLocationInstance().setLocation_cycle(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3)); + runtime.getLocationInstance().setWorkingMod(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LOCATION_MODE, ICLocation.NORMAL_MOD)); +// runtime.getLocationInstance().setLocation_cycle(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LOCATION_CYCLE, 3)); // runtime.getLocationInstance().setLocation_cycle(15); } else { //否则设置一个默认值 SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, "value_setting_ver", Config.value_setting); - SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_MODE, ICLocation.NORMAL_MOD); -// SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3); + SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LOCATION_MODE, ICLocation.NORMAL_MOD); +// SharPreferenceUtil.setPrefInt((runtime.getContextProxy()).context, LOCATION_CYCLE, 3); runtime.getLocationInstance().setWorkingMod(ICLocation.NORMAL_MOD); // runtime.getLocationInstance().setLocation_cycle(15); } StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("value_setting="); stringBuilder.append(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, "value_setting_ver", 0)); - stringBuilder.append("LACATION_MODE="); - stringBuilder.append(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_MODE, 1)); - stringBuilder.append("LACATION_CYCLE="); - stringBuilder.append(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3)); + stringBuilder.append("LOCATION_MODE="); + stringBuilder.append(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LOCATION_MODE, 1)); + stringBuilder.append("LOCATION_CYCLE="); + stringBuilder.append(SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LOCATION_CYCLE, 3)); Logger.i(stringBuilder.toString()); diff --git a/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java b/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java index 6b64602d..ed93b17c 100644 --- a/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java +++ b/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java @@ -50,8 +50,3 @@ public class MySqlitOpenHelper extends SQLiteOpenHelper { } } - -/* Location: D:\android\ApkIDE3.3\ApkIDE\Worksrc\com.enqualcomm.support\!\com\enqualcomm\support\MySqlitOpenHelper.class - * Java compiler version: 6 (50.0) - * JD-Core Version: 1.0.7 - */ \ No newline at end of file diff --git a/app/src/main/java/com/ic/protocol/ParseUpdate.java b/app/src/main/java/com/ic/protocol/ParseUpdate.java index c7ace630..3c9053c2 100644 --- a/app/src/main/java/com/ic/protocol/ParseUpdate.java +++ b/app/src/main/java/com/ic/protocol/ParseUpdate.java @@ -211,10 +211,10 @@ public class ParseUpdate extends Object implements Observable.OnSubscribe 0) { + currentStat = HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS; + } else { + currentStat = HEARTRATE_WORKINGSTAT.HEARTRATE_WARED_AND_TESTING; + } + }else{ + currentStat=HEARTRATE_WORKINGSTAT.HEARTRATE_NOTWARED; + } + }else{ + currentStat=HEARTRATE_WORKINGSTAT.HEARTRATE_CLOSED; + } return currentStat; } diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/ic/protocol/service/Initialize.java index 260c9577..adaf6ef4 100644 --- a/app/src/main/java/com/ic/protocol/service/Initialize.java +++ b/app/src/main/java/com/ic/protocol/service/Initialize.java @@ -61,8 +61,8 @@ public class Initialize extends AbstractConnectionService { return false; if (paramRuntime.IMSI() != null && !paramRuntime.IMSI().startsWith("46001")) paramRuntime.IMSI().startsWith("46006"); - int i = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_mode", 2); - int j = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_cycle", 3); + int i = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "location_mode", 2); + int j = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "location_cycle", 3); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(i); stringBuilder.append("@"); diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java index fe8fb1e3..945724e6 100644 --- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java +++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java @@ -345,7 +345,7 @@ public class protocolMainServer extends Service { } private void wakeUpFromSleep() { this.startAlarmCount = 0; - alarmCycle = 3; +// alarmCycle = 1; setAlarm(alarmCycle); this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime); this.connection.open(); @@ -514,7 +514,7 @@ public class protocolMainServer extends Service { if (this.startAlarmCount < 5 && alarmCycle == 1) { this.startAlarmCount++; } else { - alarmCycle = SharPreferenceUtil.getPrefInt((this.runtime.getContextProxy()).context, "lacation_cycle", 3); + alarmCycle = SharPreferenceUtil.getPrefInt((this.runtime.getContextProxy()).context, "location_cycle", 3); } AlarmWakeUp.setAlarmWakeUpTime(); boolean screenon = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn(); @@ -595,7 +595,7 @@ public class protocolMainServer extends Service { } if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) { if (this.startAlarmCount >= 5) { - alarmCycle = paramIntent.getIntExtra("lacation_cycle", 3); + alarmCycle = paramIntent.getIntExtra("location_cycle", 3); setAlarm(alarmCycle); } stringBuilder1 = new StringBuilder(); diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java index 57b20e82..56b8713b 100644 --- a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java +++ b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java @@ -15,7 +15,7 @@ public class AlarmWakeUp { public static void isNeedWakeUpAlarm(Runtime dev) { long l = SystemClock.elapsedRealtime(); - int i = SharPreferenceUtil.getPrefInt((dev.getContextProxy()).context, "lacation_cycle", 3); + int i = SharPreferenceUtil.getPrefInt((dev.getContextProxy()).context, "location_cycle", 3); if (l - lastAlarmTime > ((i + 1) * 60 * 1000)) { ComponentName componentName = new ComponentName("com.ic.protocol", "com.ic.protocol.service.protocolMainServer"); Intent intent = (new Intent(protocolMainServer.ACTION_ALARM)).setComponent(componentName); diff --git a/app/src/main/java/com/ic/protocol/utils/DBHelper.java b/app/src/main/java/com/ic/protocol/utils/DBHelper.java index f4f4e62b..1b04c55c 100644 --- a/app/src/main/java/com/ic/protocol/utils/DBHelper.java +++ b/app/src/main/java/com/ic/protocol/utils/DBHelper.java @@ -1,7 +1,3 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by Fernflower decompiler) -// package com.ic.protocol.utils; diff --git a/app/src/main/java/com/ic/protocol/utils/Util.java b/app/src/main/java/com/ic/protocol/utils/Util.java index d1c8ec0d..bc652294 100644 --- a/app/src/main/java/com/ic/protocol/utils/Util.java +++ b/app/src/main/java/com/ic/protocol/utils/Util.java @@ -29,9 +29,9 @@ import com.ic.protocol.bean.Runtime; import static android.content.Context.CONNECTIVITY_SERVICE; public class Util { - public static Charset UTF_16 = (UTF_8 = Charset.forName("UTF-8")).forName("UTF-16LE"); + public static Charset UTF_16 = Charset.forName("UTF-16LE"); - public static Charset UTF_8; + public static Charset UTF_8 = Charset.forName("UTF-8"); /** @@ -47,7 +47,9 @@ public class Util { String[] ipAddressArr = new String[inetAddressArr.length]; for (int i = 0; i < inetAddressArr.length; i++) { - serverip.append( inetAddressArr[i].getHostAddress());; + String ip=inetAddressArr[i].getHostAddress(); + serverip.append( ip); + ipAddressArr[i]=ip; } } } catch (Exception e) { @@ -70,7 +72,8 @@ public class Util { } return str; } - public static WifiConfiguration GetconfigWifiInfo(Context paramContext, String paramString1, String paramString2, String paramString3) { // Byte code: + public static WifiConfiguration GetconfigWifiInfo(Context paramContext, String paramString1, String paramString2, String paramString3) { + WifiConfiguration wificonfig=new WifiConfiguration(); return wificonfig; } @@ -142,52 +145,6 @@ public class Util { // Logger.i(stringBuilder.toString()); // return null; // } -// } else { -// if (Build.VERSION.SDK_INT == 16) { -// Logger.i("connectWifiByReflectMethod road 2"); -// return null; -// } -// if (Build.VERSION.SDK_INT >= 14 && Build.VERSION.SDK_INT < 16) { -// Logger.i("connectWifiByReflectMethod road 3"); -// Method[] arrayOfMethod = wifiManager.getClass().getDeclaredMethods(); -// int i = arrayOfMethod.length; -// paramContext = null; -// byte b = 0; -// while (b < i) { -// Method method3 = arrayOfMethod[b]; -// Method method2 = paramContext; -// if ("connectNetwork".equalsIgnoreCase(method3.getName())) { -// Class[] arrayOfClass = method3.getParameterTypes(); -// method2 = paramContext; -// if (arrayOfClass != null) { -// method2 = paramContext; -// if (arrayOfClass.length > 0) { -// method2 = paramContext; -// if ("int".equalsIgnoreCase(arrayOfClass[0].getName())) -// method2 = method3; -// } -// } -// } -// b++; -// method1 = method2; -// } -// method = method1; -// if (method1 != null) -// try { -// method1.invoke(wifiManager, new Object[] { Integer.valueOf(paramInt) }); -// return method1; -// } catch (Exception method1) { -// method1.printStackTrace(); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append("connectWifiByReflectMethod Android "); -// stringBuilder.append(Build.VERSION.SDK_INT); -// stringBuilder.append(" error!"); -// Logger.i(stringBuilder.toString()); -// return null; -// } -// return method; -// } -// return null; // } return null; } diff --git a/app/version_code.properties b/app/version_code.properties index 9a7e2953..5cc6ea1a 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Jan 16 18:40:41 CST 2020 -VERSION_CODE=327 +#Sun Jan 19 16:03:14 CST 2020 +VERSION_CODE=328 -- 2.17.1