release version that disable message broadcast.
authorkfl_614 <kfl_614@163.com>
Fri, 11 Dec 2020 08:20:13 +0000 (16:20 +0800)
committerkfl_614 <kfl_614@163.com>
Fri, 11 Dec 2020 08:20:13 +0000 (16:20 +0800)
app/release/ICSer_V519_2012111430_release.apk [moved from app/release/ICSer_V517_2012101455_release.apk with 78% similarity]
app/release/output.json
app/src/main/java/com/enqualcomm/support/ICSmsManager.java
app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
app/version_code.properties

similarity index 78%
rename from app/release/ICSer_V517_2012101455_release.apk
rename to app/release/ICSer_V519_2012111430_release.apk
index f121b3d..d30b70f 100644 (file)
Binary files a/app/release/ICSer_V517_2012101455_release.apk and b/app/release/ICSer_V519_2012111430_release.apk differ
index 26a3d12..d7bf770 100644 (file)
@@ -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
index 19d064c..ff88580 100644 (file)
@@ -1,25 +1,19 @@
 package com.enqualcomm.support;\r
 \r
-import android.app.Activity;\r
 import android.app.PendingIntent;\r
 import android.content.BroadcastReceiver;\r
 import android.content.ComponentName;\r
-import android.content.ContentResolver;\r
 import android.content.Context;\r
-import android.content.ContextWrapper;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
-import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Environment;\r
 import android.os.Handler;\r
 import android.os.Message;\r
 import android.os.SystemClock;\r
-import android.telephony.SmsManager;\r
 import android.telephony.SmsMessage;\r
 import android.text.TextUtils;\r
-import android.widget.Toast;\r
 \r
 import com.enqualcomm.support.bean.Contact;\r
 import com.enqualcomm.support.bean.ICLocation;\r
@@ -28,14 +22,12 @@ import com.enqualcomm.support.service.Deliver;
 import com.enqualcomm.support.service.SmsDatabaseChaneObserver;\r
 import com.enqualcomm.support.utils.APNUtil;\r
 import com.enqualcomm.support.utils.CameraUtil;\r
-import com.enqualcomm.support.utils.CellInfoUtil;\r
 import com.enqualcomm.support.utils.ContextProxy;\r
 import com.enqualcomm.support.utils.DeviceInfoUtil;\r
 import com.enqualcomm.support.utils.ICAudioManager;\r
 import com.enqualcomm.support.utils.ICHttpUtil;\r
 import com.enqualcomm.support.utils.ICLogger;\r
 import com.enqualcomm.support.utils.SendEmail;\r
-import com.enqualcomm.support.utils.ServiceUtil;\r
 import com.enqualcomm.support.utils.SimSignalUtil;\r
 import com.enqualcomm.support.utils.TimeUtil;\r
 import com.enqualcomm.support.utils.Util;\r
@@ -59,13 +51,9 @@ import static com.enqualcomm.support.Constants.ACTION_SMSCMD;
 import static com.enqualcomm.support.Constants.ACTION_SMSCMD_Reply;\r
 import static com.enqualcomm.support.Constants.ACTION_SMS_RECEIVED;\r
 import static com.enqualcomm.support.Constants.ACTION_START_FOTA_UPDATE;\r
-import static com.enqualcomm.support.Constants.DIALOG_ACTION;\r
 import static com.enqualcomm.support.Constants.KeyReplyData;\r
-import static com.enqualcomm.support.Constants.contact;\r
-import static com.enqualcomm.support.utils.DeviceInfoUtil.getDeviceVersion;\r
 import static com.enqualcomm.support.utils.SimSignalUtil.send_at_cmd;\r
 import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei0;\r
-import static com.enqualcomm.support.utils.SimSignalUtil.send_at_setImei1;\r
 \r
 \r
 public class ICSmsManager  extends BroadcastReceiver {\r
@@ -160,9 +148,10 @@ public class ICSmsManager  extends BroadcastReceiver {
                         }\r
                         ICLogger.i("收到" + from + "短信:" + message);\r
 //                         Toast.makeText(context, "收到" + from + "短信:" + message, Toast.LENGTH_LONG).show();\r
-                        if (handleSMS_CMD(from, message) == false) {\r
+                        if (!handleSMS_CMD(from, message)) {\r
                             //说明不是sms命令,提示短信接收。\r
-                            ContextProxy.sendMsgBroadcast(context, message, 1);\r
+                            // L05和L03不需要其他的指令,直接就不发了。\r
+                            //ContextProxy.sendMsgBroadcast(context, message, 1);\r
                         }\r
                     }\r
                 })).start();\r
index 25572df..1349d44 100644 (file)
@@ -10,27 +10,17 @@ import android.hardware.SensorManager;
 import android.location.LocationManager;\r
 import android.net.Uri;\r
 import android.net.wifi.WifiManager;\r
-import android.os.Build;\r
-import android.os.Environment;\r
-import android.os.PowerManager;\r
 import android.telephony.TelephonyManager;\r
-import android.util.Log;\r
-\r
 \r
 import com.enqualcomm.support.Config;\r
-import com.enqualcomm.support.Constants;\r
 import com.enqualcomm.support.ICContentProvider;\r
 import com.enqualcomm.support.bean.Alarm;\r
 import com.enqualcomm.support.bean.NoticeContent;\r
-import com.enqualcomm.support.bean.Silent;\r
 import com.enqualcomm.support.bean.Runtime;\r
-import com.enqualcomm.support.bean.VoiceContent;\r
 import com.enqualcomm.support.service.AudioService;\r
 \r
-import java.lang.reflect.Method;\r
 import java.util.ArrayList;\r
 import java.util.Calendar;\r
-import java.util.Iterator;\r
 import java.util.concurrent.TimeUnit;\r
 \r
 import rx.Observable;\r
@@ -40,279 +30,291 @@ import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;\r
 import static com.enqualcomm.support.Constants.ACTION_ISCONNECTED;\r
 import static com.enqualcomm.support.Constants.ACTION_KEEPSIT_ALARM;\r
-import static com.enqualcomm.support.Constants.ACTION_SIT_ALARM;\r
 import static com.enqualcomm.support.Constants.ActionReceivePushTxt;\r
 import static com.enqualcomm.support.Constants.ActionSrvPushTxt;\r
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;\r
 \r
 public class ContextProxy {\r
-  private static final long ONE_WEEK = 604800000L;\r
-  \r
-  private final AlarmManager alarmManager;\r
-  \r
-  public Context context;\r
-  \r
-  private final LocationManager locationManager;\r
-  \r
-  private final ContentResolver resolver;\r
-  \r
-  private final SensorManager sensorManager;\r
-  \r
-  private final TelephonyManager telephonyManager;\r
-  \r
-  private final WifiManager wifiManager;\r
-  \r
-  public ContextProxy(Context _context) {\r
-    this.context = _context;\r
-    this.resolver = context.getContentResolver();\r
-    this.locationManager = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE);\r
-    this.alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);\r
-    this.telephonyManager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);\r
-    this.wifiManager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);\r
-    this.sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);\r
-  }\r
-\r
-  private PendingIntent getPendingIntent(String paramString1, String paramString2, String paramString3, String name, int paramInt) {\r
-    StringBuilder stringBuilder = new StringBuilder("alarm:");\r
-    stringBuilder.append(paramString1);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(paramString2);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(paramString3);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(name);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(paramInt);\r
-    Intent intent = new Intent("com.enqualcomm.icare.ALARM", Uri.parse(stringBuilder.toString()));\r
-    return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT);\r
-  }\r
-  \r
-  private PendingIntent getPendingIntent(String noticeTime, String noticeName, String noticeNumber, String noticeID, String noticeCategory, String noticeFrequency, String noticeContent) {\r
-    StringBuilder stringBuilder = new StringBuilder("notice:");\r
-    stringBuilder.append(noticeTime);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeName);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeNumber);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeID);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeCategory);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeFrequency);\r
-    stringBuilder.append(",");\r
-    stringBuilder.append(noticeContent);\r
-    Intent intent = new Intent("com.enqualcomm.icare.NOTICE", Uri.parse(stringBuilder.toString()));\r
-\r
-    return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT);\r
-  }\r
-  \r
-  private void initAlarmAndSilent() {\r
-\r
-    Calendar calendar2 = Calendar.getInstance();\r
-    calendar2.set(Calendar.SECOND, 0);\r
-    long l = System.currentTimeMillis();\r
-    Cursor cursor2 = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);\r
-    byte b2 = 3;\r
-    byte b1 = 5;\r
-    char c = '\002';\r
-    if (cursor2 != null) {\r
-      while (cursor2.moveToNext()) {\r
-        if ("ON".equals(cursor2.getString(4))) {\r
-          String str2 = cursor2.getString(1);\r
-          String str1 = cursor2.getString(c);\r
-          String str3 = cursor2.getString(b2);\r
-          String str4 = cursor2.getString(b1);\r
-          calendar2.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str2.substring(c, 4)));\r
-          calendar2.set(Calendar.MINUTE, Integer.parseInt(str2.substring(b1, 7)));\r
-          char[] arrayOfChar = str1.toCharArray();\r
-          int i = arrayOfChar.length;\r
-          byte b = 1;\r
-          while (b < i) {\r
-            c = (char)(arrayOfChar[b] - '/'); //将ascii数字字符转换为对应的数字\r
-            calendar2.set(Calendar.DAY_OF_WEEK, c);\r
-            long l1 = calendar2.getTimeInMillis();\r
-            if (l1 <= l)\r
-              l1 += ONE_WEEK;\r
-            PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);\r
-            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
-            b++;\r
-            c = '\002';\r
-            b1 = 5;\r
-            b2 = 3;\r
-          }\r
-        }\r
-      }\r
-      cursor2.close();\r
+    private static final long ONE_WEEK = 604800000L;\r
+\r
+    private final AlarmManager alarmManager;\r
+\r
+    public Context context;\r
+\r
+    private final LocationManager locationManager;\r
+\r
+    private final ContentResolver resolver;\r
+\r
+    private final SensorManager sensorManager;\r
+\r
+    private final TelephonyManager telephonyManager;\r
+\r
+    private final WifiManager wifiManager;\r
+\r
+    public ContextProxy(Context _context) {\r
+        this.context = _context;\r
+        this.resolver = context.getContentResolver();\r
+        this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\r
+        this.alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);\r
+        this.telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);\r
+        this.wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);\r
+        this.sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);\r
+    }\r
+\r
+    private PendingIntent getPendingIntent(String paramString1, String paramString2, String paramString3, String name, int paramInt) {\r
+        StringBuilder stringBuilder = new StringBuilder("alarm:");\r
+        stringBuilder.append(paramString1);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(paramString2);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(paramString3);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(name);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(paramInt);\r
+        Intent intent = new Intent("com.enqualcomm.icare.ALARM", Uri.parse(stringBuilder.toString()));\r
+        return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT);\r
     }\r
-    Calendar calendar1 = Calendar.getInstance();\r
-    calendar1.set(Calendar.SECOND, 0);\r
-    Cursor cursor1 = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);\r
-    if (cursor1 != null) {\r
-      while (cursor1.moveToNext()) {\r
-        String str1 = cursor1.getString(1);\r
-        String str2 = cursor1.getString(2);\r
-        String str3 = cursor1.getString(3);\r
-        String str4 = cursor1.getString(4);\r
-        String str5 = cursor1.getString(5);\r
-        String str6 = cursor1.getString(6);\r
-        String str7 = cursor1.getString(6);\r
-        if (str1 != null) {\r
-          String year = str1.substring(0, 4);\r
-          String month = str1.substring(4, 6);\r
-          String day = str1.substring(6, 8);\r
-          String hour = str1.substring(8, 10);\r
-          String minute = str1.substring(10, 12);\r
-          calendar1.set(Calendar.YEAR, Integer.parseInt(year));\r
-          calendar1.set(Calendar.MONTH, Integer.parseInt(month));\r
-          calendar1.set(Calendar.DAY_OF_MONTH, Integer.parseInt(day));\r
-          calendar1.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour));\r
-          calendar1.set(Calendar.MINUTE, Integer.parseInt(minute));\r
-          long l1 = calendar1.getTimeInMillis();\r
-          if (l1 > l) {\r
-            PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);\r
-            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
-          }\r
+\r
+    private PendingIntent getPendingIntent(String noticeTime, String noticeName, String noticeNumber, String noticeID, String noticeCategory, String noticeFrequency, String noticeContent) {\r
+        StringBuilder stringBuilder = new StringBuilder("notice:");\r
+        stringBuilder.append(noticeTime);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeName);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeNumber);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeID);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeCategory);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeFrequency);\r
+        stringBuilder.append(",");\r
+        stringBuilder.append(noticeContent);\r
+        Intent intent = new Intent("com.enqualcomm.icare.NOTICE", Uri.parse(stringBuilder.toString()));\r
+\r
+        return PendingIntent.getActivity(this.context, 0, intent, FLAG_UPDATE_CURRENT);\r
+    }\r
+\r
+    private void initAlarmAndSilent() {\r
+\r
+        Calendar calendar2 = Calendar.getInstance();\r
+        calendar2.set(Calendar.SECOND, 0);\r
+        long l = System.currentTimeMillis();\r
+        Cursor cursor2 = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);\r
+        byte b2 = 3;\r
+        byte b1 = 5;\r
+        char c = '\002';\r
+        if (cursor2 != null) {\r
+            while (cursor2.moveToNext()) {\r
+                if ("ON".equals(cursor2.getString(4))) {\r
+                    String str2 = cursor2.getString(1);\r
+                    String str1 = cursor2.getString(c);\r
+                    String str3 = cursor2.getString(b2);\r
+                    String str4 = cursor2.getString(b1);\r
+                    calendar2.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str2.substring(c, 4)));\r
+                    calendar2.set(Calendar.MINUTE, Integer.parseInt(str2.substring(b1, 7)));\r
+                    char[] arrayOfChar = str1.toCharArray();\r
+                    int i = arrayOfChar.length;\r
+                    byte b = 1;\r
+                    while (b < i) {\r
+                        c = (char) (arrayOfChar[b] - '/'); //将ascii数字字符转换为对应的数字\r
+                        calendar2.set(Calendar.DAY_OF_WEEK, c);\r
+                        long l1 = calendar2.getTimeInMillis();\r
+                        if (l1 <= l)\r
+                            l1 += ONE_WEEK;\r
+                        PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);\r
+                        AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
+                        b++;\r
+                        c = '\002';\r
+                        b1 = 5;\r
+                        b2 = 3;\r
+                    }\r
+                }\r
+            }\r
+            cursor2.close();\r
+        }\r
+        Calendar calendar1 = Calendar.getInstance();\r
+        calendar1.set(Calendar.SECOND, 0);\r
+        Cursor cursor1 = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);\r
+        if (cursor1 != null) {\r
+            while (cursor1.moveToNext()) {\r
+                String str1 = cursor1.getString(1);\r
+                String str2 = cursor1.getString(2);\r
+                String str3 = cursor1.getString(3);\r
+                String str4 = cursor1.getString(4);\r
+                String str5 = cursor1.getString(5);\r
+                String str6 = cursor1.getString(6);\r
+                String str7 = cursor1.getString(6);\r
+                if (str1 != null) {\r
+                    String year = str1.substring(0, 4);\r
+                    String month = str1.substring(4, 6);\r
+                    String day = str1.substring(6, 8);\r
+                    String hour = str1.substring(8, 10);\r
+                    String minute = str1.substring(10, 12);\r
+                    calendar1.set(Calendar.YEAR, Integer.parseInt(year));\r
+                    calendar1.set(Calendar.MONTH, Integer.parseInt(month));\r
+                    calendar1.set(Calendar.DAY_OF_MONTH, Integer.parseInt(day));\r
+                    calendar1.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour));\r
+                    calendar1.set(Calendar.MINUTE, Integer.parseInt(minute));\r
+                    long l1 = calendar1.getTimeInMillis();\r
+                    if (l1 > l) {\r
+                        PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);\r
+                        AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
+                    }\r
+                }\r
+            }\r
+            cursor1.close();\r
         }\r
-      }\r
-      cursor1.close();\r
     }\r
-  }\r
-  \r
-  public LocationManager getLocationManager() { return this.locationManager; }\r
-  \r
-  public ContentResolver getResolver() { return this.resolver; }\r
-  \r
-  public SensorManager getSensorManager() { return this.sensorManager; }\r
-  \r
-  public TelephonyManager getTelephonyManager() { return this.telephonyManager; }\r
-  \r
-  public WifiManager getWifiManager() { return this.wifiManager; }\r
-  \r
-\r
-  public void resolverAlarm(ArrayList<Alarm> paramArrayList) {\r
-    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);\r
-    char c = '\001';\r
-    if (cursor != null) {\r
-      while (cursor.moveToNext()) {\r
-        if ("ON".equals(cursor.getString(4))) {\r
-          String str1 = cursor.getString(c);\r
-          String str2 = cursor.getString(2);\r
-          String str3 = cursor.getString(3);\r
-          String str4 = cursor.getString(5);\r
-          char[] arrayOfChar = str2.toCharArray();\r
-          int i = arrayOfChar.length;\r
-          byte b = 1;\r
-          while (b < i) {\r
-            c = arrayOfChar[b];\r
-            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));\r
-            b++;\r
-            c = '\001';\r
-          }\r
+\r
+    public LocationManager getLocationManager() {\r
+        return this.locationManager;\r
+    }\r
+\r
+    public ContentResolver getResolver() {\r
+        return this.resolver;\r
+    }\r
+\r
+    public SensorManager getSensorManager() {\r
+        return this.sensorManager;\r
+    }\r
+\r
+    public TelephonyManager getTelephonyManager() {\r
+        return this.telephonyManager;\r
+    }\r
+\r
+    public WifiManager getWifiManager() {\r
+        return this.wifiManager;\r
+    }\r
+\r
+\r
+    public void resolverAlarm(ArrayList<Alarm> paramArrayList) {\r
+        Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);\r
+        char c = '\001';\r
+        if (cursor != null) {\r
+            while (cursor.moveToNext()) {\r
+                if ("ON".equals(cursor.getString(4))) {\r
+                    String str1 = cursor.getString(c);\r
+                    String str2 = cursor.getString(2);\r
+                    String str3 = cursor.getString(3);\r
+                    String str4 = cursor.getString(5);\r
+                    char[] arrayOfChar = str2.toCharArray();\r
+                    int i = arrayOfChar.length;\r
+                    byte b = 1;\r
+                    while (b < i) {\r
+                        c = arrayOfChar[b];\r
+                        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));\r
+                        b++;\r
+                        c = '\001';\r
+                    }\r
+                }\r
+            }\r
+            cursor.close();\r
+        }\r
+        Calendar calendar = Calendar.getInstance();\r
+        calendar.set(Calendar.SECOND, 0);\r
+        long l = System.currentTimeMillis();\r
+        for (Alarm alarm : paramArrayList) {\r
+            long l1 = l;\r
+            if ("ON".equals(alarm.status)) {\r
+                int i = Integer.parseInt(alarm.time.substring(2, 4));\r
+                int j = Integer.parseInt(alarm.time.substring(5, 7));\r
+                calendar.set(Calendar.HOUR_OF_DAY, i);\r
+                calendar.set(Calendar.MINUTE, j);\r
+                char[] arrayOfChar = alarm.week.toCharArray();\r
+                i = arrayOfChar.length;\r
+                j = 1;\r
+                while (true) {\r
+                    l1 = l;\r
+                    if (j < i) {\r
+                        c = (char) (arrayOfChar[j] - '/');\r
+                        calendar.set(Calendar.DAY_OF_WEEK, c);\r
+                        long l2 = calendar.getTimeInMillis();\r
+                        l1 = l2;\r
+                        if (l2 <= l)\r
+                            l1 = l2 + ONE_WEEK;\r
+                        PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);\r
+                        AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
+                        j++;\r
+                        continue;\r
+                    }\r
+                    break;\r
+                }\r
+            }\r
+            l = l1;\r
         }\r
-      }\r
-      cursor.close();\r
     }\r
-    Calendar calendar = Calendar.getInstance();\r
-    calendar.set(Calendar.SECOND, 0);\r
-    long l = System.currentTimeMillis();\r
-    for (Alarm alarm : paramArrayList) {\r
-      long l1 = l;\r
-      if ("ON".equals(alarm.status)) {\r
-        int i = Integer.parseInt(alarm.time.substring(2, 4));\r
-        int j = Integer.parseInt(alarm.time.substring(5, 7));\r
-        calendar.set(Calendar.HOUR_OF_DAY, i);\r
-        calendar.set(Calendar.MINUTE, j);\r
-        char[] arrayOfChar = alarm.week.toCharArray();\r
-        i = arrayOfChar.length;\r
-        j = 1;\r
-        while (true) {\r
-          l1 = l;\r
-          if (j < i) {\r
-            c = ( char)(arrayOfChar[j] - '/');\r
-            calendar.set(Calendar.DAY_OF_WEEK, c);\r
-            long l2 = calendar.getTimeInMillis();\r
-            l1 = l2;\r
-            if (l2 <= l)\r
-              l1 = l2 + ONE_WEEK;\r
-            PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);\r
-            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
-            j++;\r
-            continue;\r
-          }\r
-          break;\r
+\r
+    public void resolverNotice(ArrayList<NoticeContent> paramArrayList) {\r
+        Cursor cursor = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);\r
+        if (cursor != null) {\r
+            while (cursor.moveToNext()) {\r
+                String str1 = cursor.getString(1);\r
+                String str2 = cursor.getString(2);\r
+                String str3 = cursor.getString(3);\r
+                String str4 = cursor.getString(4);\r
+                String str5 = cursor.getString(5);\r
+                String str6 = cursor.getString(6);\r
+                String str7 = cursor.getString(6);\r
+                this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));\r
+            }\r
+            cursor.close();\r
+        }\r
+        for (NoticeContent noticeContent : paramArrayList) {\r
+            String str1 = noticeContent.noticeTime;\r
+            String str2 = noticeContent.noticeName;\r
+            String str3 = noticeContent.noticeNumber;\r
+            String str4 = noticeContent.noticeID;\r
+            String str5 = noticeContent.noticeCategory;\r
+            String str6 = noticeContent.noticeFrequency;\r
+            String str7 = noticeContent.noticeContent;\r
+            Calendar calendar = Calendar.getInstance();\r
+            long l = System.currentTimeMillis();\r
+            calendar.set(Calendar.SECOND, 0);\r
+            if (str1 != null) {\r
+                String str8 = str1.substring(0, 4);\r
+                String str9 = str1.substring(4, 6);\r
+                String str10 = str1.substring(6, 8);\r
+                String str11 = str1.substring(8, 10);\r
+                String str12 = str1.substring(10, 12);\r
+                calendar.set(Calendar.YEAR, Integer.parseInt(str8));\r
+                calendar.set(Calendar.MONTH, Integer.parseInt(str9) - 1);\r
+                calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(str10));\r
+                calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str11));\r
+                calendar.set(Calendar.MINUTE, Integer.parseInt(str12));\r
+                long l1 = calendar.getTimeInMillis();\r
+                if (l1 >= l) {\r
+                    PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);\r
+                    AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
+                }\r
+            }\r
         }\r
-      }\r
-      l = l1;\r
     }\r
-  }\r
-  \r
-  public void resolverNotice(ArrayList<NoticeContent> paramArrayList) {\r
-    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);\r
-    if (cursor != null) {\r
-      while (cursor.moveToNext()) {\r
-        String str1 = cursor.getString(1);\r
-        String str2 = cursor.getString(2);\r
-        String str3 = cursor.getString(3);\r
-        String str4 = cursor.getString(4);\r
-        String str5 = cursor.getString(5);\r
-        String str6 = cursor.getString(6);\r
-        String str7 = cursor.getString(6);\r
-        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));\r
-      }\r
-      cursor.close();\r
+\r
+    private static final String PED_TOTAL_KEY = "PED_TOTAL";\r
+    private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH";\r
+\r
+    public void brodcastResetStepCount(int StepCount) {\r
+        Intent intent = new Intent();\r
+        intent.putExtra(PED_TOTAL_KEY, StepCount);\r
+        intent.setAction(PED_FINISH_ACTION);\r
+        ICLogger.i("send broadcast  action " + PED_FINISH_ACTION + ", key " + PED_TOTAL_KEY + " value " + StepCount);\r
+        this.context.sendBroadcast(intent);\r
+    }\r
+\r
+    public void sendBrodcast(String action, Intent intent) {\r
+        intent.setAction(action);\r
+        this.context.sendBroadcast(intent);\r
     }\r
-    for (NoticeContent noticeContent : paramArrayList) {\r
-      String str1 = noticeContent.noticeTime;\r
-      String str2 = noticeContent.noticeName;\r
-      String str3 = noticeContent.noticeNumber;\r
-      String str4 = noticeContent.noticeID;\r
-      String str5 = noticeContent.noticeCategory;\r
-      String str6 = noticeContent.noticeFrequency;\r
-      String str7 = noticeContent.noticeContent;\r
-      Calendar calendar = Calendar.getInstance();\r
-      long l = System.currentTimeMillis();\r
-      calendar.set(Calendar.SECOND, 0);\r
-      if (str1 != null) {\r
-        String str8 = str1.substring(0, 4);\r
-        String str9 = str1.substring(4, 6);\r
-        String str10 = str1.substring(6, 8);\r
-        String str11 = str1.substring(8, 10);\r
-        String str12 = str1.substring(10, 12);\r
-        calendar.set(Calendar.YEAR, Integer.parseInt(str8));\r
-        calendar.set(Calendar.MONTH, Integer.parseInt(str9) - 1);\r
-        calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(str10));\r
-        calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str11));\r
-        calendar.set(Calendar.MINUTE, Integer.parseInt(str12));\r
-        long l1 = calendar.getTimeInMillis();\r
-        if (l1 >= l) {\r
-          PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);\r
-          AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);\r
-        }\r
-      }\r
+\r
+    public void sendBroadcast(String cmd, Runtime dev) {\r
+        Intent intent = new Intent();\r
+        intent.putExtra("longitude", dev.getLocationInstance().getLocation().lon);\r
+        intent.putExtra("latitude", dev.getLocationInstance().getLocation().lat);\r
+        intent.setAction(cmd);\r
+        this.context.sendBroadcast(intent);\r
     }\r
-  }\r
-  private static final String PED_TOTAL_KEY = "PED_TOTAL";\r
-  private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH";\r
-  public void brodcastResetStepCount(int StepCount){\r
-    Intent intent = new Intent();\r
-    intent.putExtra(PED_TOTAL_KEY, StepCount);\r
-    intent.setAction(PED_FINISH_ACTION);\r
-    ICLogger.i("send broadcast  action "+PED_FINISH_ACTION+", key "+PED_TOTAL_KEY+" value "+StepCount);\r
-    this.context.sendBroadcast(intent);\r
-  }\r
-  public void sendBrodcast(String action,Intent intent){\r
-    intent.setAction(action);\r
-    this.context.sendBroadcast(intent);\r
-  }\r
-\r
-  public void sendBroadcast(String cmd, Runtime dev) {\r
-    Intent intent = new Intent();\r
-    intent.putExtra("longitude", dev.getLocationInstance().getLocation().lon);\r
-    intent.putExtra("latitude", dev.getLocationInstance().getLocation().lat);\r
-    intent.setAction(cmd);\r
-    this.context.sendBroadcast(intent);\r
-  }\r
 \r
 //  public void sendBroadcastVoiceReceived(String cmd, VoiceContent vcontent) {\r
 //    Intent intent = new Intent();\r
@@ -322,123 +324,124 @@ public class ContextProxy {
 //    this.context.sendBroadcast(intent);\r
 //  }\r
 \r
-  public void sendBroadcastServerConnectionChanged(boolean paramBoolean) {\r
-    Intent intent = new Intent();\r
-    intent.setAction(ACTION_ISCONNECTED);\r
-    intent.putExtra("isConnected", paramBoolean);\r
-    this.context.sendBroadcast(intent);\r
-  }\r
-\r
-  public void saveMstToSMSDB(String msg){\r
-    Intent intent = new Intent();\r
-    intent.setAction(ActionReceivePushTxt);\r
-    intent.putExtra("txtMsg", msg);\r
-    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-    this.context.sendBroadcast(intent);\r
-  }\r
-  public void sendMsgBroadcast(String msg, int msgType) {\r
-    sendMsgBroadcast(this.context,msg,msgType);\r
-  }\r
-  private static void play_waning_notify(Context context){\r
-    AudioService.getInstance().play(context.getAssets(), "warning.mp3");\r
-  }\r
-  public static void sendMsgBroadcast(Context _context,String msg, int msgType) {\r
-\r
-    if (msgType==0) {\r
-      Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
-        public void call(Long param1Long) {\r
-          if (Config.noPushTxtNotifyDialog == false) {\r
-            Intent intent = new Intent();\r
-            intent.setAction(DIALOG_ACTION);\r
-            intent.putExtra("pushtxt", msg);\r
-            _context.sendBroadcast(intent);\r
-          } else {\r
-            WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
-            play_waning_notify(_context);\r
-            VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
-            try {\r
-              Thread.sleep(2000);\r
-            } catch (InterruptedException e) {\r
-              e.printStackTrace();\r
-            }\r
-          }\r
-          Intent intent = new Intent(ActionSrvPushTxt);\r
-          intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息\r
-          intent.putExtra("txtMsg", msg);\r
-          intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-          _context.sendBroadcast(intent);\r
-        }\r
-      });\r
-    }else  if (msgType==2){\r
-      Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
-        public void call(Long param1Long) {\r
-          if (Config.noPushTxtNotifyDialog == false) {\r
-            Intent intent = new Intent();\r
-            intent.setAction(DIALOG_ACTION);\r
-            intent.putExtra("pushtxt", msg);\r
-            _context.sendBroadcast(intent);\r
-          } else {\r
-            WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
-            play_waning_notify(_context);\r
-            VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
-            try {\r
-              Thread.sleep(2000);\r
-            } catch (InterruptedException e) {\r
-              e.printStackTrace();\r
-            }\r
-          }\r
-          Intent intent = new Intent(ActionSrvPushTxt);\r
-          intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息,2代表有提示音的消息\r
-          intent.putExtra("txtMsg", msg);\r
-          intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-          _context.sendBroadcast(intent);\r
-        }\r
-      });\r
-\r
-    }else{\r
-      Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
-        public void call(Long param1Long) {\r
-          if(Config.noSMSNotifyDialog==false) {\r
-            Intent intent = new Intent();\r
-            intent.setAction(DIALOG_ACTION);\r
-            intent.putExtra("sms", msg);\r
-            _context.sendBroadcast(intent);\r
-          }else{\r
-            WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
-            play_waning_notify(_context);\r
-            VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
-            try {\r
-              Thread.sleep(2000);\r
-            } catch (InterruptedException e) {\r
-              e.printStackTrace();\r
-            }\r
-          }\r
+    public void sendBroadcastServerConnectionChanged(boolean paramBoolean) {\r
+        Intent intent = new Intent();\r
+        intent.setAction(ACTION_ISCONNECTED);\r
+        intent.putExtra("isConnected", paramBoolean);\r
+        this.context.sendBroadcast(intent);\r
+    }\r
 \r
-          Intent intent = new Intent(ActionSrvPushTxt);\r
-          intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息,2代表有提示音的消息\r
-          intent.putExtra("txtMsg", msg);\r
-          intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
-          _context.sendBroadcast(intent);\r
-        }\r
-       });\r
+    public void saveMstToSMSDB(String msg) {\r
+        Intent intent = new Intent();\r
+        intent.setAction(ActionReceivePushTxt);\r
+        intent.putExtra("txtMsg", msg);\r
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
+        this.context.sendBroadcast(intent);\r
+    }\r
+\r
+    public void sendMsgBroadcast(String msg, int msgType) {\r
+        sendMsgBroadcast(this.context, msg, msgType);\r
+    }\r
+\r
+    private static void play_waning_notify(Context context) {\r
+        AudioService.getInstance().play(context.getAssets(), "warning.mp3");\r
     }\r
 \r
+    public static void sendMsgBroadcast(Context _context, String msg, int msgType) {\r
 \r
+        if (msgType == 0) {\r
+            Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+                public void call(Long param1Long) {\r
+                    if (Config.noPushTxtNotifyDialog == false) {\r
+                        Intent intent = new Intent();\r
+                        intent.setAction(DIALOG_ACTION);\r
+                        intent.putExtra("pushtxt", msg);\r
+                        _context.sendBroadcast(intent);\r
+                    } else {\r
+                        WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
+                        play_waning_notify(_context);\r
+                        VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
+                        try {\r
+                            Thread.sleep(2000);\r
+                        } catch (InterruptedException e) {\r
+                            e.printStackTrace();\r
+                        }\r
+                    }\r
+                    Intent intent = new Intent(ActionSrvPushTxt);\r
+                    intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息\r
+                    intent.putExtra("txtMsg", msg);\r
+                    _context.sendBroadcast(intent);\r
+                }\r
+            });\r
+        } else if (msgType == 2) {\r
+            Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+                public void call(Long param1Long) {\r
+                    if (Config.noPushTxtNotifyDialog == false) {\r
+                        Intent intent = new Intent();\r
+                        intent.setAction(DIALOG_ACTION);\r
+                        intent.putExtra("pushtxt", msg);\r
+                        _context.sendBroadcast(intent);\r
+                    } else {\r
+                        WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
+                        play_waning_notify(_context);\r
+                        VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
+                        try {\r
+                            Thread.sleep(2000);\r
+                        } catch (InterruptedException e) {\r
+                            e.printStackTrace();\r
+                        }\r
+                    }\r
+                    Intent intent = new Intent(ActionSrvPushTxt);\r
+                    intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息,2代表有提示音的消息\r
+                    intent.putExtra("txtMsg", msg);\r
+                    _context.sendBroadcast(intent);\r
+                }\r
+            });\r
 \r
+        } else {\r
+            Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+                public void call(Long param1Long) {\r
+                    if (Config.noSMSNotifyDialog == false) {\r
+                        Intent intent = new Intent();\r
+                        intent.setAction(DIALOG_ACTION);\r
+                        intent.putExtra("sms", msg);\r
+                        _context.sendBroadcast(intent);\r
+                    } else {\r
+                        WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
+                        play_waning_notify(_context);\r
+                        VibrateUtil.getInstance(_context).VibrateOnOnce(true);\r
+                        try {\r
+                            Thread.sleep(2000);\r
+                        } catch (InterruptedException e) {\r
+                            e.printStackTrace();\r
+                        }\r
+                    }\r
 \r
-  }\r
-  public void sendStheartRateBroadcast(String paramString, int paramInt) {\r
-    Intent intent = new Intent();\r
-    intent.setAction(paramString);\r
-    intent.putExtra("stheartRateType", paramInt);\r
-    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
+                    Intent intent = new Intent(ActionSrvPushTxt);\r
+                    intent.putExtra("msgType", msgType); //0 代表 server下发消息,1代表 SMS消息,2代表有提示音的消息\r
+                    intent.putExtra("txtMsg", msg);\r
+                    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);\r
+                    _context.sendBroadcast(intent);\r
+                }\r
+            });\r
+        }\r
+\r
+\r
+    }\r
+\r
+    public void sendStheartRateBroadcast(String paramString, int paramInt) {\r
+        Intent intent = new Intent();\r
+        intent.setAction(paramString);\r
+        intent.putExtra("stheartRateType", paramInt);\r
+        this.context.sendBroadcast(intent, "com.eqc.broadcast.permission");\r
+    }\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
 \r
 }\r
 \r
index 8d3b4e2..250b4ea 100644 (file)
@@ -361,9 +361,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                         this.initMyDialog(paramContext, null, 5, finddevtxt);\r
                         this.playFindDevVoice(paramContext);\r
                         VibrateUtil.getInstance(paramContext).VibrateOn(true);\r
-\r
                     }\r
-\r
                     this.screenOn(paramContext);\r
                 }\r
             }\r
index 04a726e..59df2c3 100644 (file)
@@ -1,2 +1,2 @@
-#Thu Dec 10 14:55:18 CST 2020\r
-VERSION_CODE=517\r
+#Fri Dec 11 14:30:07 CST 2020\r
+VERSION_CODE=519\r