From: kfl_614 Date: Fri, 11 Dec 2020 08:20:13 +0000 (+0800) Subject: release version that disable message broadcast. X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=4bd2de02eba21767dcea204b2af207b99e347201;p=protocol_srv.git release version that disable message broadcast. --- diff --git a/app/release/ICSer_V517_2012101455_release.apk b/app/release/ICSer_V519_2012111430_release.apk similarity index 78% rename from app/release/ICSer_V517_2012101455_release.apk rename to app/release/ICSer_V519_2012111430_release.apk index f121b3dc..d30b70f2 100644 Binary files a/app/release/ICSer_V517_2012101455_release.apk and b/app/release/ICSer_V519_2012111430_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 26a3d125..d7bf7706 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":517,"versionName":"2012101455","enabled":true,"outputFile":"ICSer_V517_2012101455_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V517_2012101455_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":519,"versionName":"2012111430","enabled":true,"outputFile":"ICSer_V519_2012111430_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V519_2012111430_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 19d064c6..ff885800 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -1,25 +1,19 @@ package com.enqualcomm.support; -import android.app.Activity; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; -import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; -import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import android.telephony.SmsManager; import android.telephony.SmsMessage; import android.text.TextUtils; -import android.widget.Toast; import com.enqualcomm.support.bean.Contact; import com.enqualcomm.support.bean.ICLocation; @@ -28,14 +22,12 @@ import com.enqualcomm.support.service.Deliver; import com.enqualcomm.support.service.SmsDatabaseChaneObserver; import com.enqualcomm.support.utils.APNUtil; import com.enqualcomm.support.utils.CameraUtil; -import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.ContextProxy; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.ICAudioManager; import com.enqualcomm.support.utils.ICHttpUtil; import com.enqualcomm.support.utils.ICLogger; import com.enqualcomm.support.utils.SendEmail; -import com.enqualcomm.support.utils.ServiceUtil; import com.enqualcomm.support.utils.SimSignalUtil; import com.enqualcomm.support.utils.TimeUtil; import com.enqualcomm.support.utils.Util; @@ -59,13 +51,9 @@ import static com.enqualcomm.support.Constants.ACTION_SMSCMD; import static com.enqualcomm.support.Constants.ACTION_SMSCMD_Reply; import static com.enqualcomm.support.Constants.ACTION_SMS_RECEIVED; import static com.enqualcomm.support.Constants.ACTION_START_FOTA_UPDATE; -import static com.enqualcomm.support.Constants.DIALOG_ACTION; import static com.enqualcomm.support.Constants.KeyReplyData; -import static com.enqualcomm.support.Constants.contact; -import static com.enqualcomm.support.utils.DeviceInfoUtil.getDeviceVersion; import static com.enqualcomm.support.utils.SimSignalUtil.send_at_cmd; import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei0; -import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei1; public class ICSmsManager extends BroadcastReceiver { @@ -160,9 +148,10 @@ public class ICSmsManager extends BroadcastReceiver { } ICLogger.i("收到" + from + "短信：" + message); // Toast.makeText(context, "收到" + from + "短信：" + message, Toast.LENGTH_LONG).show(); - if (handleSMS_CMD(from, message) == false) { + if (!handleSMS_CMD(from, message)) { //说明不是sms命令，提示短信接收。 - ContextProxy.sendMsgBroadcast(context, message, 1); + // L05和L03不需要其他的指令，直接就不发了。 + //ContextProxy.sendMsgBroadcast(context, message, 1); } } })).start(); 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 25572dfd..1349d444 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -10,27 +10,17 @@ import android.hardware.SensorManager; import android.location.LocationManager; import android.net.Uri; import android.net.wifi.WifiManager; -import android.os.Build; -import android.os.Environment; -import android.os.PowerManager; import android.telephony.TelephonyManager; -import android.util.Log; - import com.enqualcomm.support.Config; -import com.enqualcomm.support.Constants; import com.enqualcomm.support.ICContentProvider; import com.enqualcomm.support.bean.Alarm; import com.enqualcomm.support.bean.NoticeContent; -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 java.lang.reflect.Method; import java.util.ArrayList; import java.util.Calendar; -import java.util.Iterator; import java.util.concurrent.TimeUnit; import rx.Observable; @@ -40,279 +30,291 @@ 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; -import static com.enqualcomm.support.Constants.ACTION_SIT_ALARM; import static com.enqualcomm.support.Constants.ActionReceivePushTxt; import static com.enqualcomm.support.Constants.ActionSrvPushTxt; import static com.enqualcomm.support.Constants.DIALOG_ACTION; public class ContextProxy { - private static final long ONE_WEEK = 604800000L; - - private final AlarmManager alarmManager; - - public Context context; - - private final LocationManager locationManager; - - private final ContentResolver resolver; - - private final SensorManager sensorManager; - - private final TelephonyManager telephonyManager; - - private final WifiManager wifiManager; - - public ContextProxy(Context _context) { - this.context = _context; - this.resolver = context.getContentResolver(); - this.locationManager = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE); - this.alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE); - this.telephonyManager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); - this.wifiManager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE); - this.sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); - } - - private PendingIntent getPendingIntent(String paramString1, String paramString2, String paramString3, String name, int paramInt) { - 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())); - 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) { - 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())); - - 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()) { - 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); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - b++; - c = '\002'; - b1 = 5; - b2 = 3; - } - } - } - cursor2.close(); + private static final long ONE_WEEK = 604800000L; + + private final AlarmManager alarmManager; + + public Context context; + + private final LocationManager locationManager; + + private final ContentResolver resolver; + + private final SensorManager sensorManager; + + private final TelephonyManager telephonyManager; + + private final WifiManager wifiManager; + + public ContextProxy(Context _context) { + this.context = _context; + this.resolver = context.getContentResolver(); + this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); + this.alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + this.telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + this.wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + this.sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); + } + + private PendingIntent getPendingIntent(String paramString1, String paramString2, String paramString3, String name, int paramInt) { + 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())); + return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT); } - 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()) { - 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); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - } + + private PendingIntent getPendingIntent(String noticeTime, String noticeName, String noticeNumber, String noticeID, String noticeCategory, String noticeFrequency, String noticeContent) { + 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())); + + 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()) { + 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); + AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); + b++; + c = '\002'; + b1 = 5; + b2 = 3; + } + } + } + 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()) { + 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); + AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); + } + } + } + cursor1.close(); } - } - cursor1.close(); } - } - - public LocationManager getLocationManager() { return this.locationManager; } - - public ContentResolver getResolver() { return this.resolver; } - - public SensorManager getSensorManager() { return this.sensorManager; } - - public TelephonyManager getTelephonyManager() { return this.telephonyManager; } - - public WifiManager getWifiManager() { 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 - '/')); - b++; - c = '\001'; - } + + public LocationManager getLocationManager() { + return this.locationManager; + } + + public ContentResolver getResolver() { + return this.resolver; + } + + public SensorManager getSensorManager() { + return this.sensorManager; + } + + public TelephonyManager getTelephonyManager() { + return this.telephonyManager; + } + + public WifiManager getWifiManager() { + 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 - '/')); + 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)) { + 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); + AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); + j++; + continue; + } + break; + } + } + l = l1; } - } - 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)) { - 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); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - j++; - continue; - } - break; + + 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)); + } + 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) { + 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); + AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); + } + } } - } - 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)); - } - cursor.close(); + + private static final String PED_TOTAL_KEY = "PED_TOTAL"; + private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH"; + + public void brodcastResetStepCount(int StepCount) { + Intent intent = new Intent(); + intent.putExtra(PED_TOTAL_KEY, StepCount); + intent.setAction(PED_FINISH_ACTION); + ICLogger.i("send broadcast action " + PED_FINISH_ACTION + ", key " + PED_TOTAL_KEY + " value " + StepCount); + this.context.sendBroadcast(intent); + } + + public void sendBrodcast(String action, Intent intent) { + intent.setAction(action); + this.context.sendBroadcast(intent); } - 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) { - 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); - AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent); - } - } + + public void sendBroadcast(String cmd, Runtime dev) { + Intent intent = new Intent(); + intent.putExtra("longitude", dev.getLocationInstance().getLocation().lon); + intent.putExtra("latitude", dev.getLocationInstance().getLocation().lat); + intent.setAction(cmd); + this.context.sendBroadcast(intent); } - } - private static final String PED_TOTAL_KEY = "PED_TOTAL"; - private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH"; - public void brodcastResetStepCount(int StepCount){ - Intent intent = new Intent(); - intent.putExtra(PED_TOTAL_KEY, StepCount); - intent.setAction(PED_FINISH_ACTION); - ICLogger.i("send broadcast action "+PED_FINISH_ACTION+", key "+PED_TOTAL_KEY+" value "+StepCount); - this.context.sendBroadcast(intent); - } - public void sendBrodcast(String action,Intent intent){ - intent.setAction(action); - this.context.sendBroadcast(intent); - } - - public void sendBroadcast(String cmd, Runtime dev) { - Intent intent = new Intent(); - intent.putExtra("longitude", dev.getLocationInstance().getLocation().lon); - intent.putExtra("latitude", dev.getLocationInstance().getLocation().lat); - intent.setAction(cmd); - this.context.sendBroadcast(intent); - } // public void sendBroadcastVoiceReceived(String cmd, VoiceContent vcontent) { // Intent intent = new Intent(); @@ -322,123 +324,124 @@ public class ContextProxy { // this.context.sendBroadcast(intent); // } - public void sendBroadcastServerConnectionChanged(boolean paramBoolean) { - Intent intent = new Intent(); - intent.setAction(ACTION_ISCONNECTED); - intent.putExtra("isConnected", paramBoolean); - this.context.sendBroadcast(intent); - } - - public void saveMstToSMSDB(String msg){ - Intent intent = new Intent(); - intent.setAction(ActionReceivePushTxt); - intent.putExtra("txtMsg", msg); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - this.context.sendBroadcast(intent); - } - public void sendMsgBroadcast(String msg, int msgType) { - sendMsgBroadcast(this.context,msg,msgType); - } - private static void play_waning_notify(Context context){ - AudioService.getInstance().play(context.getAssets(), "warning.mp3"); - } - public static void sendMsgBroadcast(Context _context,String msg, int msgType) { - - if (msgType==0) { - Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { - public void call(Long param1Long) { - if (Config.noPushTxtNotifyDialog == false) { - Intent intent = new Intent(); - intent.setAction(DIALOG_ACTION); - intent.putExtra("pushtxt", msg); - _context.sendBroadcast(intent); - } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); - play_waning_notify(_context); - VibrateUtil.getInstance(_context).VibrateOnOnce(true); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - Intent intent = new Intent(ActionSrvPushTxt); - intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息 - intent.putExtra("txtMsg", msg); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - _context.sendBroadcast(intent); - } - }); - }else if (msgType==2){ - Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { - public void call(Long param1Long) { - if (Config.noPushTxtNotifyDialog == false) { - Intent intent = new Intent(); - intent.setAction(DIALOG_ACTION); - intent.putExtra("pushtxt", msg); - _context.sendBroadcast(intent); - } else { - WakeLockUtil.ScreenOnWakeLockTemperary(_context); - play_waning_notify(_context); - VibrateUtil.getInstance(_context).VibrateOnOnce(true); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - Intent intent = new Intent(ActionSrvPushTxt); - intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 - intent.putExtra("txtMsg", msg); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - _context.sendBroadcast(intent); - } - }); - - }else{ - Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { - public void call(Long param1Long) { - if(Config.noSMSNotifyDialog==false) { - Intent intent = new Intent(); - intent.setAction(DIALOG_ACTION); - intent.putExtra("sms", msg); - _context.sendBroadcast(intent); - }else{ - WakeLockUtil.ScreenOnWakeLockTemperary(_context); - play_waning_notify(_context); - VibrateUtil.getInstance(_context).VibrateOnOnce(true); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } + public void sendBroadcastServerConnectionChanged(boolean paramBoolean) { + Intent intent = new Intent(); + intent.setAction(ACTION_ISCONNECTED); + intent.putExtra("isConnected", paramBoolean); + this.context.sendBroadcast(intent); + } - Intent intent = new Intent(ActionSrvPushTxt); - intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 - intent.putExtra("txtMsg", msg); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - _context.sendBroadcast(intent); - } - }); + public void saveMstToSMSDB(String msg) { + Intent intent = new Intent(); + intent.setAction(ActionReceivePushTxt); + intent.putExtra("txtMsg", msg); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); + this.context.sendBroadcast(intent); + } + + public void sendMsgBroadcast(String msg, int msgType) { + sendMsgBroadcast(this.context, msg, msgType); + } + + private static void play_waning_notify(Context context) { + AudioService.getInstance().play(context.getAssets(), "warning.mp3"); } + public static void sendMsgBroadcast(Context _context, String msg, int msgType) { + if (msgType == 0) { + Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { + public void call(Long param1Long) { + if (Config.noPushTxtNotifyDialog == false) { + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("pushtxt", msg); + _context.sendBroadcast(intent); + } else { + WakeLockUtil.ScreenOnWakeLockTemperary(_context); + play_waning_notify(_context); + VibrateUtil.getInstance(_context).VibrateOnOnce(true); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + Intent intent = new Intent(ActionSrvPushTxt); + intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息 + intent.putExtra("txtMsg", msg); + _context.sendBroadcast(intent); + } + }); + } else if (msgType == 2) { + Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { + public void call(Long param1Long) { + if (Config.noPushTxtNotifyDialog == false) { + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("pushtxt", msg); + _context.sendBroadcast(intent); + } else { + WakeLockUtil.ScreenOnWakeLockTemperary(_context); + play_waning_notify(_context); + VibrateUtil.getInstance(_context).VibrateOnOnce(true); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + Intent intent = new Intent(ActionSrvPushTxt); + intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 + intent.putExtra("txtMsg", msg); + _context.sendBroadcast(intent); + } + }); + } else { + Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1() { + public void call(Long param1Long) { + if (Config.noSMSNotifyDialog == false) { + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("sms", msg); + _context.sendBroadcast(intent); + } else { + WakeLockUtil.ScreenOnWakeLockTemperary(_context); + play_waning_notify(_context); + VibrateUtil.getInstance(_context).VibrateOnOnce(true); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } - } - 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() { - Intent intent = new Intent(); - intent.setAction(ACTION_KEEPSIT_ALARM); - intent.addFlags(FLAG_ACTIVITY_NEW_TASK); - this.context.sendBroadcast(intent); - } + Intent intent = new Intent(ActionSrvPushTxt); + intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 + intent.putExtra("txtMsg", msg); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); + _context.sendBroadcast(intent); + } + }); + } + + + } + + 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() { + Intent intent = new Intent(); + intent.setAction(ACTION_KEEPSIT_ALARM); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); + this.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 8d3b4e21..250b4eac 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -361,9 +361,7 @@ public class ProcessReceiver extends BroadcastReceiver { this.initMyDialog(paramContext, null, 5, finddevtxt); this.playFindDevVoice(paramContext); VibrateUtil.getInstance(paramContext).VibrateOn(true); - } - this.screenOn(paramContext); } } diff --git a/app/version_code.properties b/app/version_code.properties index 04a726ec..59df2c31 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Dec 10 14:55:18 CST 2020 -VERSION_CODE=517 +#Fri Dec 11 14:30:07 CST 2020 +VERSION_CODE=519