From ae1df55835cdc50f4a2045dc4ceaa78a9300d34d Mon Sep 17 00:00:00 2001 From: TrillGates Date: Thu, 23 Sep 2021 17:18:37 +0800 Subject: [PATCH] add an error api for temperature test and format codes. --- .../aidl/com/ic/work/ITempSensorCallback.aidl | 9 +- .../com/enqualcomm/support/CoreService.java | 6 +- .../com/enqualcomm/support/ICSmsManager.java | 4 +- .../support/service/AntiMonitorService.java | 6 +- .../support/service/SilentManager.java | 50 +--- .../enqualcomm/support/utils/AlarmHelper.java | 40 --- .../support/utils/ContextProxy.java | 268 +----------------- .../enqualcomm/support/utils/ICLogger.java | 9 +- .../support/utils/ProcessReceiver.java | 1 - .../support/utils/TemperatureUtil.java | 7 +- .../support/utils/WakeLockUtil.java | 24 +- .../java/com/ic/protocols/protocol_ic.java | 10 +- .../java/com/ic/protocols/protocol_s123.java | 40 +-- .../com/ic/view/battery/ChargeTipsView.java | 2 + 14 files changed, 60 insertions(+), 416 deletions(-) diff --git a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl index d8cdca8a..543a0047 100644 --- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl +++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl @@ -4,8 +4,9 @@ package com.ic.work; import com.ic.work.domain.Temperature; interface ITempSensorCallback { - void onTemperatureGet(in Temperature temperature); - void onTemperatureUpdating(in Temperature temperature); - void onGettingData(); - void onWaiting(); + void onTemperatureTestError(in String message,in int code); + void onTemperatureGet(in Temperature temperature); + void onTemperatureUpdating(in Temperature temperature); + void onGettingData(); + void onWaiting(); } \ 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 b84c5783..b9541627 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -158,7 +158,7 @@ public class CoreService extends Service { return DeviceInfoUtil.getDeviceInfo(runtime); } - private BroadcastReceiver AtCallbackBroadcastReceiver = new BroadcastReceiver() { + private final BroadcastReceiver AtCallbackBroadcastReceiver = new BroadcastReceiver() { public void onReceive(Context param1Context, Intent param1Intent) { if (param1Intent.getAction().equals("com.eqc.intent.action.callback.at")) { String str = param1Intent.getStringExtra("AtResult"); @@ -1160,7 +1160,7 @@ public class CoreService extends Service { if (runtime.Fence_Warning_flag > 0 && Config.needAllwaysAlarmFenceOut) { runtime.Fence_Warning_flag++; - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall), 2); } if (runtime.Cut_off_flag > 0 && Config.needAllwaysAlarmCutOff) { @@ -1195,7 +1195,7 @@ public class CoreService extends Service { if ((runtime.getTotalStepCount() - Runtime.lastSitCheckStepCount) / minutes < Config.KeepSitJudgementRefValue) { //平均 每分钟活动数 小于参考久坐计步值，表示久坐 ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐"); - WakeLockUtil.ScreenOnWakeLockTemperary(this); + WakeLockUtil.ScreenOnWakeLockTemporary(this); VibrateUtil.getInstance(this).vibrateOn(true); Util.mSleep(1000); runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息 diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 4d17ffee..ab25f265 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -152,7 +152,7 @@ public class ICSmsManager extends BroadcastReceiver { list.add(message); instance.addData(list); } - WakeLockUtil.ScreenOnWakeLockTemperary(context); + WakeLockUtil.ScreenOnWakeLockTemporary(context); ContextProxy.play_waning_notify(context); VibrateUtil.getInstance(context).VibrateOnOnce(true); } else { @@ -264,7 +264,7 @@ public class ICSmsManager extends BroadcastReceiver { if (!handleSMS_CMD(from, smsmessage)) { //说明不是sms命令，提示短信接收。 if (!TextUtils.isEmpty(forceReadMsg)) { - WakeLockUtil.ScreenOnWakeLockTemperary(mContext); + WakeLockUtil.ScreenOnWakeLockTemporary(mContext); ContextProxy.play_waning_notify(mContext); VibrateUtil.getInstance(mContext).VibrateOnOnce(true); Util.mSleep(2000); 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 7eb90299..49fa204b 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java +++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java @@ -272,9 +272,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService //current_anti_status == 0 表示佩戴 ==10 表示脱腕 switch (current_cut_status) { - case STATUS_LOCK_ON: - //锁定 - { + case STATUS_LOCK_ON: { Util.setSystemProperties("persist.sys.ic_cutoff", "false"); mRuntime.Cut_off_flag = 0; if (Config.needBroadcastCutoffAlarm) { @@ -286,8 +284,6 @@ public class AntiMonitorService extends AbstractInvokeHandlerService ICLogger.i("triggerSOSLocationProcess "); LocationClient.getInstance().triggerSOSLocationProcess(); } - - } break; case STATUS_CUT_OFF: { diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index 51404d12..284c36b3 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -29,12 +29,10 @@ import com.enqualcomm.support.provider.ICDatabaseHelper; import com.enqualcomm.support.provider.ICForbiddenProvider; import com.enqualcomm.support.provider.ICGlobalSettingsProvider; import com.enqualcomm.support.service.base.AbstractInvokeHandlerService; -import com.enqualcomm.support.utils.AlarmHelper; import com.enqualcomm.support.utils.Connection; import com.enqualcomm.support.utils.DBHelper; import com.enqualcomm.support.utils.ICAudioManager; import com.enqualcomm.support.utils.ICLogger; -import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; import com.enqualcomm.support.utils.VibrateUtil; import com.ic.view.battery.ChargeTipsView; @@ -116,7 +114,7 @@ public class SilentManager extends AbstractInvokeHandlerService { mContext.sendBroadcast(var3); ICLogger.i("========Ring!"); - if (ICAudioManager.needMute == true) { + if (ICAudioManager.needMute) { ICAudioManager.setVolumnMute(mContext); mHandler.postDelayed(new Runnable() { @Override @@ -129,7 +127,7 @@ public class SilentManager extends AbstractInvokeHandlerService { break; case PRECISE_CALL_STATE_ACTIVE://接电话 { - if (ICAudioManager.needMute == false) { + if (!ICAudioManager.needMute) { if (Config.custom_name.equals("AK")) ICAudioManager.setVoiceCallMaxVolume(mContext); //设置最大音量 } @@ -137,7 +135,7 @@ public class SilentManager extends AbstractInvokeHandlerService { case PRECISE_CALL_STATE_HOLDING://接电话 case PRECISE_CALL_STATE_WAITING: ICLogger.i("========Answer Call !"); - if (ICAudioManager.needMute == true) { + if (ICAudioManager.needMute) { ICAudioManager.setVolumnMute(mContext); mHandler.postDelayed(new Runnable() { @Override @@ -372,48 +370,6 @@ public class SilentManager extends AbstractInvokeHandlerService { @Override public boolean onUserRequest(Intent intent, Connection var2, Runtime runtime) { - String action = intent.getAction(); - ICLogger.d("action == > " + action); - //如果是循环的，那么再设置下一次 - if (ACTION_IC_ALARM.equals(action)) { - String alarmTime = intent.getDataString(); //alarm:ST00.43,W,CON,闹铃,2 - ICLogger.d("alarmTime == > " + alarmTime); - String currentTime = TimeUtil.getSystemTime(); - alarmTime.substring(6).split("\\.");//ST00.43,W,CON,闹铃,2 - int alarmTime_minutes = Integer.parseInt(alarmTime.substring(6).split("\\.")[1].substring(0, 2)); - int alarmTime_hour = Integer.parseInt(alarmTime.substring(6).split("\\.")[0].substring(2)); - String[] currentTimeArray = currentTime.split(";")[1].split(":"); - int currentTime_hour = Integer.parseInt(currentTimeArray[0]); - int currentTime_minutes = Integer.parseInt(currentTimeArray[1]); - ICLogger.i("alarm time[" + alarmTime_hour + ":" + alarmTime_minutes + "], current time[" + currentTime_hour + ":" + currentTime_minutes + "]"); - boolean isRepeat = intent.getBooleanExtra("IS_REPEAT", false); - ICLogger.d("isRepeat == > " + isRepeat); - //设置下一周期的时间 - if (isRepeat) { - long timeStamp = intent.getLongExtra("TIME_STAMP", 0L); - PendingIntent pendingIntent = this.getPendingIntent(alarmTime, true); - AlarmHelper.setNextWeekAlarm(this.mAlarmManager, timeStamp, pendingIntent); - } - if (alarmTime_hour != currentTime_hour || alarmTime_minutes != currentTime_minutes) { - return false; - } - - if (this.isIdle(this.mContext)) { - try { - Intent targetIntent = new Intent("com.ic.alarm.action.ALARM_RING", - Uri.parse(alarmTime)); - targetIntent.putExtra("closeAlarm", 0); - targetIntent.addCategory(Intent.CATEGORY_DEFAULT); - targetIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.mContext.startActivity(targetIntent); - } catch (Exception e) { - e.printStackTrace(); - ICLogger.e(e.getMessage(), e); - } - } - } else { - ICLogger.i("静默闹钟来了"); - } return false; } diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java index 48cd31f9..2ab2230e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java @@ -32,19 +32,6 @@ public class AlarmHelper { } } - //设置闹铃 - public static void setAlarm(AlarmManager paramAlarmManager, long triggerAtMillis, - PendingIntent paramPendingIntent) { - //循环闹钟 - paramAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerAtMillis, paramPendingIntent); - //paramAlarmManager.setInexactRepeating(AlarmManager.RTC_WAKEUP, triggerAtMillis, intervalMillis, paramPendingIntent); - } - - public static void setAlarmOnce(AlarmManager paramAlarmManager, long triggerAtMillis, PendingIntent paramPendingIntent) { - ICLogger.i("setAlarmOnce triggerAtMillis " + triggerAtMillis); - paramAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerAtMillis, paramPendingIntent); - // setAlarm(paramAlarmManager, triggerAtMillis, 0, paramPendingIntent); - } public static void setCleanStepCountAlarm(Context context, int hour, int minutes, String paramString) { AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); @@ -109,26 +96,6 @@ public class AlarmHelper { alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (seconds * 1000), pendingIntent); } - public static void setTimeAlarm(Context context, int hour, int minutes, String action) { - AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); - Intent intent = new Intent(context, CoreService.class); - intent.setAction(action); - PendingIntent pendingIntent = PendingIntent.getService(context, - 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT); - long l3 = System.currentTimeMillis(); - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, hour); - calendar.set(Calendar.MINUTE, minutes); - calendar.set(Calendar.SECOND, 0); - long l2 = calendar.getTimeInMillis(); - long l1 = l2; - if (l2 < l3) - l1 = l2 + ONE_DAY; - alarmManager.cancel(pendingIntent); - alarmManager.set(AlarmManager.RTC_WAKEUP, l1, pendingIntent); - } - public static void setPowerOffAlarm(Context context, PendingIntent pendingIntent, int hour, int min) { AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); @@ -146,12 +113,5 @@ public class AlarmHelper { ICLogger.d("target time == > " + l1); alarmManager.set(AlarmManager.RTC_WAKEUP, l1, pendingIntent); } - - - public static void setNextWeekAlarm(AlarmManager mAlarmManager, long timeStamp, PendingIntent pendingIntent) { - //周期为下一周 - timeStamp += ONE_WEEK; - setAlarm(mAlarmManager, timeStamp, pendingIntent); - } } 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 8eb1861f..443896b6 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -1,31 +1,21 @@ package com.enqualcomm.support.utils; import android.app.AlarmManager; -import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.database.Cursor; import android.hardware.SensorManager; import android.location.LocationManager; -import android.net.Uri; import android.net.wifi.WifiManager; import android.os.Handler; import android.os.HandlerThread; import android.telephony.TelephonyManager; import com.enqualcomm.support.Config; -import com.enqualcomm.support.provider.ICContentProvider; import com.enqualcomm.support.R; -import com.enqualcomm.support.bean.Alarm; -import com.enqualcomm.support.bean.NoticeContent; import com.enqualcomm.support.bean.Runtime; import com.enqualcomm.support.service.AudioService; -import java.util.ArrayList; -import java.util.Calendar; - -import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static com.enqualcomm.support.Constants.ACTION_ISCONNECTED; import static com.enqualcomm.support.Constants.ACTION_KEEPSIT_ALARM; @@ -68,128 +58,6 @@ public class ContextProxy { } - private PendingIntent getPendingIntent(String paramString1, String paramString2, - String paramString3, String name, int paramInt, boolean isRepeat) { - StringBuilder stringBuilder = new StringBuilder("alarm:"); - stringBuilder.append(paramString1); - stringBuilder.append(","); - stringBuilder.append(paramString2); - stringBuilder.append(","); - stringBuilder.append(paramString3); - stringBuilder.append(","); - stringBuilder.append(name); - stringBuilder.append(","); - stringBuilder.append(paramInt); - Intent intent = new Intent("com.enqualcomm.icare.ALARM", Uri.parse(stringBuilder.toString())); - intent.putExtra("IS_REPEAT", isRepeat); - return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT); - } - - private PendingIntent getPendingIntent(String noticeTime, String noticeName, - String noticeNumber, String noticeID, String noticeCategory, - String noticeFrequency, String noticeContent, boolean isRepeat) { - StringBuilder stringBuilder = new StringBuilder("notice:"); - stringBuilder.append(noticeTime); - stringBuilder.append(","); - stringBuilder.append(noticeName); - stringBuilder.append(","); - stringBuilder.append(noticeNumber); - stringBuilder.append(","); - stringBuilder.append(noticeID); - stringBuilder.append(","); - stringBuilder.append(noticeCategory); - stringBuilder.append(","); - stringBuilder.append(noticeFrequency); - stringBuilder.append(","); - stringBuilder.append(noticeContent); - Intent intent = new Intent("com.enqualcomm.icare.NOTICE", Uri.parse(stringBuilder.toString())); - intent.putExtra("IS_REPEAT", isRepeat); - return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT); - } - - private void initAlarmAndSilent() { - - Calendar calendar2 = Calendar.getInstance(); - calendar2.set(Calendar.SECOND, 0); - long l = System.currentTimeMillis(); - Cursor cursor2 = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null); - byte b2 = 3; - byte b1 = 5; - char c = '\002'; - if (cursor2 != null) { - while (cursor2.moveToNext()) { - try { - if ("ON".equals(cursor2.getString(4))) { - String str2 = cursor2.getString(1); - String str1 = cursor2.getString(c); - String str3 = cursor2.getString(b2); - String str4 = cursor2.getString(b1); - calendar2.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str2.substring(c, 4))); - calendar2.set(Calendar.MINUTE, Integer.parseInt(str2.substring(b1, 7))); - char[] arrayOfChar = str1.toCharArray(); - int i = arrayOfChar.length; - byte b = 1; - while (b < i) { - c = (char) (arrayOfChar[b] - '/'); //将ascii数字字符转换为对应的数字 - calendar2.set(Calendar.DAY_OF_WEEK, c); - long l1 = calendar2.getTimeInMillis(); - if (l1 <= l) - l1 += ONE_WEEK; - PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c, true); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - b++; - c = '\002'; - b1 = 5; - b2 = 3; - } - } - } catch (Exception e) { - e.printStackTrace(); - ICLogger.e(e.getMessage(), e); - } - } - cursor2.close(); - } - Calendar calendar1 = Calendar.getInstance(); - calendar1.set(Calendar.SECOND, 0); - Cursor cursor1 = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null); - if (cursor1 != null) { - while (cursor1.moveToNext()) { - try { - String str1 = cursor1.getString(1); - String str2 = cursor1.getString(2); - String str3 = cursor1.getString(3); - String str4 = cursor1.getString(4); - String str5 = cursor1.getString(5); - String str6 = cursor1.getString(6); - String str7 = cursor1.getString(6); - if (str1 != null) { - String year = str1.substring(0, 4); - String month = str1.substring(4, 6); - String day = str1.substring(6, 8); - String hour = str1.substring(8, 10); - String minute = str1.substring(10, 12); - calendar1.set(Calendar.YEAR, Integer.parseInt(year)); - calendar1.set(Calendar.MONTH, Integer.parseInt(month)); - calendar1.set(Calendar.DAY_OF_MONTH, Integer.parseInt(day)); - calendar1.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour)); - calendar1.set(Calendar.MINUTE, Integer.parseInt(minute)); - long l1 = calendar1.getTimeInMillis(); - if (l1 > l) { - PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, - str5, str6, str7, true); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - } - } - } catch (Exception e) { - e.printStackTrace(); - ICLogger.e(e.getMessage(), e); - } - } - cursor1.close(); - } - } - public LocationManager getLocationManager() { return this.locationManager; } @@ -198,10 +66,6 @@ public class ContextProxy { return this.resolver; } - public SensorManager getSensorManager() { - return this.sensorManager; - } - public TelephonyManager getTelephonyManager() { return this.telephonyManager; } @@ -210,121 +74,6 @@ public class ContextProxy { return this.wifiManager; } - - public void resolverAlarm(ArrayList paramArrayList) { - Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null); - char c = '\001'; - if (cursor != null) { - while (cursor.moveToNext()) { - if ("ON".equals(cursor.getString(4))) { - String str1 = cursor.getString(c); - String str2 = cursor.getString(2); - String str3 = cursor.getString(3); - String str4 = cursor.getString(5); - char[] arrayOfChar = str2.toCharArray(); - int i = arrayOfChar.length; - byte b = 1; - while (b < i) { - c = arrayOfChar[b]; - this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/', false)); - b++; - c = '\001'; - } - } - } - cursor.close(); - } - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.SECOND, 0); - long l = System.currentTimeMillis(); - for (Alarm alarm : paramArrayList) { - long l1 = l; - - if ("ON".equals(alarm.status)) { - try { - int i = Integer.parseInt(alarm.time.substring(2, 4)); - int j = Integer.parseInt(alarm.time.substring(5, 7)); - calendar.set(Calendar.HOUR_OF_DAY, i); - calendar.set(Calendar.MINUTE, j); - char[] arrayOfChar = alarm.week.toCharArray(); - i = arrayOfChar.length; - j = 1; - while (true) { - l1 = l; - if (j < i) { - c = (char) (arrayOfChar[j] - '/'); - calendar.set(Calendar.DAY_OF_WEEK, c); - long l2 = calendar.getTimeInMillis(); - l1 = l2; - if (l2 <= l) - l1 = l2 + ONE_WEEK; - PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c, true); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - j++; - continue; - } - break; - } - } catch (Exception e) { - e.printStackTrace(); - ICLogger.e(e.getMessage(), e); - } - } - l = l1; - } - } - - public void resolverNotice(ArrayList paramArrayList) { - Cursor cursor = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null); - if (cursor != null) { - while (cursor.moveToNext()) { - String str1 = cursor.getString(1); - String str2 = cursor.getString(2); - String str3 = cursor.getString(3); - String str4 = cursor.getString(4); - String str5 = cursor.getString(5); - String str6 = cursor.getString(6); - String str7 = cursor.getString(6); - this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7, false)); - } - cursor.close(); - } - for (NoticeContent noticeContent : paramArrayList) { - String str1 = noticeContent.noticeTime; - String str2 = noticeContent.noticeName; - String str3 = noticeContent.noticeNumber; - String str4 = noticeContent.noticeID; - String str5 = noticeContent.noticeCategory; - String str6 = noticeContent.noticeFrequency; - String str7 = noticeContent.noticeContent; - Calendar calendar = Calendar.getInstance(); - long l = System.currentTimeMillis(); - calendar.set(Calendar.SECOND, 0); - if (str1 != null) { - try { - String str8 = str1.substring(0, 4); - String str9 = str1.substring(4, 6); - String str10 = str1.substring(6, 8); - String str11 = str1.substring(8, 10); - String str12 = str1.substring(10, 12); - calendar.set(Calendar.YEAR, Integer.parseInt(str8)); - calendar.set(Calendar.MONTH, Integer.parseInt(str9) - 1); - calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(str10)); - calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str11)); - calendar.set(Calendar.MINUTE, Integer.parseInt(str12)); - long l1 = calendar.getTimeInMillis(); - if (l1 >= l) { - PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7, true); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - } - } catch (Exception e) { - e.printStackTrace(); - ICLogger.e(e.getMessage(), e); - } - } - } - } - private static final String PED_TOTAL_KEY = "PED_TOTAL"; private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH"; @@ -392,7 +141,7 @@ public class ContextProxy { intent.putExtra("pushtxt", msg); _context.sendBroadcast(intent); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); + WakeLockUtil.ScreenOnWakeLockTemporary(_context); play_waning_notify(_context); VibrateUtil.getInstance(_context).VibrateOnOnce(true); Util.mSleep(2000); @@ -416,7 +165,7 @@ public class ContextProxy { intent.putExtra("pushtxt", msg); _context.sendBroadcast(intent); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); + WakeLockUtil.ScreenOnWakeLockTemporary(_context); play_waning_notify(_context); VibrateUtil.getInstance(_context).VibrateOnOnce(true); Util.mSleep(2000); @@ -441,7 +190,7 @@ public class ContextProxy { intent.putExtra("needreply", true); _context.sendBroadcast(intent); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); + WakeLockUtil.ScreenOnWakeLockTemporary(_context); play_waning_notify(_context); VibrateUtil.getInstance(_context).VibrateOnOnce(true); Util.mSleep(2000); @@ -456,7 +205,7 @@ public class ContextProxy { intent.putExtra("needReply", true); _context.sendBroadcast(intent); ICLogger.d("s123 send broadcast..."); - WakeLockUtil.ScreenOnWakeLockTemperary(_context); + WakeLockUtil.ScreenOnWakeLockTemporary(_context); play_waning_notify(_context); VibrateUtil.getInstance(_context).VibrateOnOnce(true); }, 50); @@ -469,7 +218,7 @@ public class ContextProxy { intent.putExtra("sms", msg); _context.sendBroadcast(intent); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); + WakeLockUtil.ScreenOnWakeLockTemporary(_context); play_waning_notify(_context); VibrateUtil.getInstance(_context).VibrateOnOnce(true); Util.mSleep(2000); @@ -488,13 +237,6 @@ public class ContextProxy { } - public void sendStheartRateBroadcast(String paramString, int paramInt) { - Intent intent = new Intent(); - intent.setAction(paramString); - intent.putExtra("stheartRateType", paramInt); - this.context.sendBroadcast(intent, "com.eqc.broadcast.permission"); - } - public void sendBroadcastSitLongAlarm() { if (Util.installed(context, "com.ic.ak.launcher")) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java index c8652286..7a7de213 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java @@ -54,7 +54,6 @@ public class ICLogger { return sb.toString(); } } - return null; } @@ -93,12 +92,11 @@ public class ICLogger { isInitConfig = true; LogConfigurator logConfigurator = new LogConfigurator(); String filename = StorageUtils.getExternalStorageLogDir() + File.separator + "log.txt"; - logConfigurator.setFileName(filename); // 日志存储路径，如果该路径没有会自动创建文件 + logConfigurator.setFileName(filename);// 日志存储路径，如果该路径没有会自动创建文件 logConfigurator.setRootLevel(Level.ALL); logConfigurator.setLevel("log", Level.ALL); -// logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式 + //logConfigurator.setFilePattern("%d %-5p [%c{2}]-[%L] %m%n");// 设置文件输出模式 logConfigurator.setFilePattern("%d %m%n ");// 设置文件输出模式 -// 02-29 16:28:38.195 4629-4658/com.enqualcomm.support E/com.enqualcomm.support.utils.ICLogger: logConfigurator.setMaxBackupSize(2); // 设置最大备份数量 logConfigurator.setMaxFileSize(1024 * 1024 * 20);// 设置最大文件大小 20MB logConfigurator.setImmediateFlush(true);// 设置是否立即刷新 @@ -108,12 +106,9 @@ public class ICLogger { logConfigurator.setLogCatPattern("%m%n"); logConfigurator.configure();// 设置提交 android.util.Log.d("CATCH", android.util.Log.getStackTraceString(new ThreadDeath())); -// String logfilelist[]={"Log","GPS","Nmea","APILog","alarmCycle","Battery","LBS"}; //Log 和log目前是同一个配置 Log = Logger.getLogger("log"); Log.info("init Logger " + Log.getName()); -// Log.addAppender( getRollingFileAppender("log","%d %m%n ")); -// Log.info("init Logger "+Log.getName()+" "+((RollingFileAppender)Log.getAppender("log")).getFile()); GPS = Logger.getLogger("GPS"); GPS.addAppender(getRollingFileAppender("GPS", "%d %m%n ")); 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 06614b23..c0af1bfd 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -470,7 +470,6 @@ public class ProcessReceiver extends BroadcastReceiver { this.initMyDialog(context, null, 6, takephoto, false); this.playNotificationVoice(context); VibrateUtil.getInstance(context).vibrateOn(true); - this.screenOn(context); } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java index f84e17bf..748fb16f 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java @@ -76,6 +76,11 @@ public class TemperatureUtil { private final ITempSensorCallback.Stub mRemoteCallback = new ITempSensorCallback.Stub() { + @Override + public void onTemperatureTestError(String message, int code) { + ICLogger.d("message==> " + message + " code==> " + code); + } + @Override public void onTemperatureGet(Temperature temperature) { ICLogger.d("on temperature test end..." + temperature); @@ -149,7 +154,7 @@ public class TemperatureUtil { + temperature.getBodyTemp() + "℃)", "body_temperature", Constants.WARNING_MSG_TYPE_BODY_TEMP); } - + int workEnvResultCode = runtime.tempInfo.checkWorkTemp(); if (workEnvResultCode == 3) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java index 908996ef..6de4c7cd 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java @@ -2,32 +2,20 @@ package com.enqualcomm.support.utils; import android.content.Context; import android.os.Handler; -import android.os.Message; import android.os.PowerManager; - import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP; import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK; public class WakeLockUtil { - public static PowerManager.WakeLock getScreenOnWakeLock(Context context, String tag) { - PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, tag); -// wakeLock.acquire(900000L); - wakeLock.acquire(); - return wakeLock; - } - public static void ScreenOnWakeLockTemperary(Context context) { - final PowerManager.WakeLock wakelock = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, WakeLockUtil.class.getSimpleName()); - wakelock.acquire(); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - wakelock.release(); - } - },5000); - } + public static void ScreenOnWakeLockTemporary(Context context) { + final PowerManager.WakeLock wakelock = ((PowerManager) context.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP | SCREEN_DIM_WAKE_LOCK, WakeLockUtil.class.getSimpleName()); + wakelock.setReferenceCounted(false); + wakelock.acquire(5000); + new Handler().postDelayed(() -> wakelock.release(), 5000); + } } 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 06e55123..203231ec 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -1698,7 +1698,7 @@ public class protocol_ic { ICLogger.i("收到服务器消息：" + (type.equals("1") ? "绑定成功 " : "未激活或者解绑")); if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {//AK-YQ if (type.equals("1")) { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); // runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2); Util.ShowToast(runtime, runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success)); Config.setNeedAntiOff(runtime.getContextProxy().context, true); @@ -1706,7 +1706,7 @@ public class protocol_ic { runtime.setNeedAntioff(true); runtime.setNeddReportCutoff(true); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2); Config.setNeedAntiOff(runtime.getContextProxy().context, false); Config.setNeedCutOff(runtime.getContextProxy().context, false); @@ -2165,7 +2165,7 @@ public class protocol_ic { if (Integer.parseInt(msg) == 0) { ICLogger.i("Handle BPDE index " + index + ", 进入禁止区域 "); runtime.Fence_Warning_flag = 1; - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall), 2); } else { ICLogger.i("Handle BPDE index " + index + ", 离开禁止区域 "); @@ -2660,7 +2660,7 @@ public class protocol_ic { String cmdid = cmdlist[3]; connection.send(APAT(id, cmdid)); if (cmdid.trim().equals("1")) { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); // runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2); Util.ShowToast(runtime, runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success)); Config.setNeedAntiOff(runtime.getContextProxy().context, true); @@ -2668,7 +2668,7 @@ public class protocol_ic { runtime.setNeedAntioff(true); runtime.setNeddReportCutoff(true); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2); Config.setNeedAntiOff(runtime.getContextProxy().context, false); Config.setNeedCutOff(runtime.getContextProxy().context, false); diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java index d4e94af4..36d7f384 100644 --- a/app/src/main/java/com/ic/protocols/protocol_s123.java +++ b/app/src/main/java/com/ic/protocols/protocol_s123.java @@ -2034,7 +2034,7 @@ public class protocol_s123 { ICLogger.i("收到服务器消息：" + (type.equals("1") ? "绑定成功 " : "未激活或者解绑")); if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {//AK-YQ if (type.equals("1")) { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); // runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2); Util.ShowToast(runtime, runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success)); Config.setNeedAntiOff(runtime.getContextProxy().context, true); @@ -2042,7 +2042,7 @@ public class protocol_s123 { runtime.setNeedAntioff(true); runtime.setNeddReportCutoff(true); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2); Config.setNeedAntiOff(runtime.getContextProxy().context, false); Config.setNeedCutOff(runtime.getContextProxy().context, false); @@ -2532,7 +2532,7 @@ public class protocol_s123 { if (Integer.parseInt(msg) == 0) { ICLogger.i("Handle BPDE index " + index + ", 进入禁止区域 "); runtime.Fence_Warning_flag = 1; - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_out_wall), 2); } else { ICLogger.i("Handle BPDE index " + index + ", 离开禁止区域 "); @@ -2747,21 +2747,21 @@ public class protocol_s123 { } public void handleBP46(String cmd, Connection connection, Runtime runtime) { -/*** - * IWBP46,353456789012345,080835,1,[参数]# - * 说明： - * IW：标识符 - * BP46 : 命令字符 - * 353456789012345:IMEI号，设备唯一ID - * 080835 :指令流水号 - * 1: 表示立即拍照 - * [参数]: 此为可选项。根据不同类型设备扩展 - * #:结尾标识符 - * 设备响应： IWAP46,080835,1# - * 080835:指令流水号 - * 1 成功 0失败 - * # 结尾标识符 - */ + /*** + * IWBP46,353456789012345,080835,1,[参数]# + * 说明： + * IW：标识符 + * BP46 : 命令字符 + * 353456789012345:IMEI号，设备唯一ID + * 080835 :指令流水号 + * 1: 表示立即拍照 + * [参数]: 此为可选项。根据不同类型设备扩展 + * #:结尾标识符 + * 设备响应： IWAP46,080835,1# + * 080835:指令流水号 + * 1 成功 0失败 + * # 结尾标识符 + */ String[] cmdlist = cmd.split(CMDSPLIT); if (cmdlist.length >= 4) { @@ -3065,7 +3065,7 @@ public class protocol_s123 { String cmdid = cmdlist[3]; connection.send(APAT(id, cmdid)); if (cmdid.trim().equals("1")) { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); // runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success), 2); Util.ShowToast(runtime, runtime.getContextProxy().context.getResources().getString(R.string.alarm_lock_success)); Config.setNeedAntiOff(runtime.getContextProxy().context, true); @@ -3073,7 +3073,7 @@ public class protocol_s123 { runtime.setNeedAntioff(true); runtime.setNeddReportCutoff(true); } else { - WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context); + WakeLockUtil.ScreenOnWakeLockTemporary(runtime.getContextProxy().context); runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_unbind_success), 2); Config.setNeedAntiOff(runtime.getContextProxy().context, false); Config.setNeedCutOff(runtime.getContextProxy().context, false); diff --git a/app/src/main/java/com/ic/view/battery/ChargeTipsView.java b/app/src/main/java/com/ic/view/battery/ChargeTipsView.java index c4920883..7af0054e 100644 --- a/app/src/main/java/com/ic/view/battery/ChargeTipsView.java +++ b/app/src/main/java/com/ic/view/battery/ChargeTipsView.java @@ -89,6 +89,8 @@ public class ChargeTipsView { btnView.setOnClickListener(v -> { //打开拨号界面 Context context = v.getContext(); + //这里有个bug，即时打开了界面，也无法进行拨号，被顶级的dialog盖住了 + //TODO:要解决这个问题 Intent targetIntent = context.getPackageManager().getLaunchIntentForPackage("com.ic.dial"); if (targetIntent != null) { targetIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -- 2.17.1