comleted silent delete.

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 c8322eb..a5d7621 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -541,20 +541,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
                         }
                         //AlarmManagerUtil.setAlarm();
                     } else {
-                        char[] chars = weekValue.toCharArray();
-                        //关闭时间的Alarm
-                        for (char aChar : chars) {
-                            ICLogger.d("aChar==> " + aChar);
-                            String targetStartAlarm = SILENT_ALARM_REQUEST_CODE_START_PREFIX + idValue + aChar;
-                            int alarmStartId = Integer.parseInt(targetStartAlarm);
-                            ICLogger.d("alarmStartId ==> " + alarmStartId);
-                            AlarmManagerUtil.cancelAlarm(mContext, AlarmManagerUtil.ALARM_SILENT_START_ACTION, alarmStartId);
-                            //
-                            String targetEndAlarm = SILENT_ALARM_REQUEST_CODE_END_PREFIX + idValue + aChar;
-                            int alarmEndId = Integer.parseInt(targetEndAlarm);
-                            ICLogger.d("alarmEndId ==> " + alarmEndId);
-                            AlarmManagerUtil.cancelAlarm(mContext, AlarmManagerUtil.ALARM_SILENT_END_ACTION, alarmEndId);
-                        }
+                        this.cancelSilentAlarmById(idValue, weekValue);
                     }
                     //判断当前是否需要开启，设置config里的比状态即可
                     if (hour >= startHour && hour <= endHour && minute >= startMinute && minute <= endMinute) {
@@ -597,9 +584,23 @@ public class SilentManager extends AbstractInvokeHandlerService {
     /**
      * 取消静音时间段的Alarm
      *
-     * @param id
+     * @param idValue
+     * @param weekValue
      */
-    public void cancelSilentAlarmById(String id) {
-
+    public void cancelSilentAlarmById(String idValue, String weekValue) {
+        char[] chars = weekValue.toCharArray();
+        //关闭时间的Alarm
+        for (char aChar : chars) {
+            ICLogger.d("aChar==> " + aChar);
+            String targetStartAlarm = SILENT_ALARM_REQUEST_CODE_START_PREFIX + idValue + aChar;
+            int alarmStartId = Integer.parseInt(targetStartAlarm);
+            ICLogger.d("alarmStartId ==> " + alarmStartId);
+            AlarmManagerUtil.cancelAlarm(mContext, AlarmManagerUtil.ALARM_SILENT_START_ACTION, alarmStartId);
+            //
+            String targetEndAlarm = SILENT_ALARM_REQUEST_CODE_END_PREFIX + idValue + aChar;
+            int alarmEndId = Integer.parseInt(targetEndAlarm);
+            ICLogger.d("alarmEndId ==> " + alarmEndId);
+            AlarmManagerUtil.cancelAlarm(mContext, AlarmManagerUtil.ALARM_SILENT_END_ACTION, alarmEndId);
+        }
     }
 }
\ No newline at end of file

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 04f90c1..06614b2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -346,30 +346,16 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
             }
         } else if (ACTION_SHUTDOWN.equals(str)) {
-
             playshutdownsound(context);
-
             Util.shutdown();
-            return;
         } else if (ACTION_PLAYTIME.equals(str)) {
             LedUtil.setBlueLedOn(true);
-            mHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    LedUtil.setBlueLedOn(false);
-                }
-            }, 2000L);
-            return;
+            mHandler.postDelayed(() -> LedUtil.setBlueLedOn(false), 2000L);
         } else if (ACTION_REMOTE_CAMERA.equals(str)) {
             if (paramIntent.hasExtra("remote_number")) {
                 //接收拍照命令，执行拍照
                 String str1 = paramIntent.getStringExtra("remote_number");
-                mHandler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        (new CameraUtil(context)).getPicture(str1);
-                    }
-                });
+                mHandler.post(() -> (new CameraUtil(context)).getPicture(str1));
             } else {
                 //接收到拍照完毕命令，发送照片
                 String msgFrom = paramIntent.getStringExtra("number");
@@ -398,7 +384,6 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
 
             }
-            return;
         } else if (DIALOG_ACTION.equals(str)) {
             //by TrillGates
             //如果是上课禁用模式，那么就不会弹窗了
@@ -517,19 +502,4 @@ public class ProcessReceiver extends BroadcastReceiver {
             }
         }
     }
-
-    public void sendStheartRateBroadcast(Context paramContext, String actionStr, int paramInt) {
-        Intent intent = new Intent();
-        intent.setAction(actionStr);
-        intent.putExtra("stheartRateType", paramInt);
-        paramContext.sendBroadcast(intent);
-    }
-
-    public void sendSOSBroadcast(Context paramContext, String actionStr) {
-        Intent intent = new Intent();
-        intent.setAction(actionStr);
-        paramContext.sendBroadcast(intent);
-    }
-
-
 }

diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 279bf05..1412dfd 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1105,13 +1105,15 @@ public class protocol_fzd {
         if (silent_items.length > 0) {
             //先删除数据库中的数据
             Uri uri = Uri.parse(ICForbiddenProvider.FORBIDDEN);
-            Cursor query = runtime.getContextProxy().getResolver().query(uri, new String[]{ICDatabaseHelper.forbidden_id},
+            Cursor query = runtime.getContextProxy().getResolver().query(uri,
+                    new String[]{ICDatabaseHelper.forbidden_id, ICDatabaseHelper.forbidden_week},
                     null, null, null);
             if (query != null) {
                 SilentManager silentManager = SilentManager.getInstance();
                 while (query.moveToNext()) {
                     String id = query.getString(0);
-                    silentManager.cancelSilentAlarmById(id);
+                    String week = query.getString(1);
+                    silentManager.cancelSilentAlarmById(id, week);
                 }
                 query.close();
             }