1. 규칙 트리거 시간 선택 시 오후 12시 선택하면 오전 00시로 나오던 문제 수정.

onecable/src/main/java/com/ntels/onecable/view/rules/RulesEdit.java

@@ -1355,11 +1355,11 @@ public class RulesEdit extends CustomActivity implements View.OnClickListener,
                         String httpHour = mUtil.null2string(itemSubList.get(row1).get(Constants.KEY_HOUR));
                         String minute = mUtil.null2string(itemSubList.get(row1).get(Constants.KEY_MINUTE));
                         String[] saTime = mUtil.UTCtoLocal6(httpHour + minute);
-                        String ampm = (mUtil.str2int(saTime[0]) >= 12
-                                ? mUtil.getString(mAct, R.string.layout_pm)
+                        int localHour = mUtil.str2int(saTime[0]);
+                        String ampm = (localHour >= 12 ? mUtil.getString(mAct, R.string.layout_pm)
                                 : mUtil.getString(mAct, R.string.layout_am));
-                        String hour = (mUtil.str2int(saTime[0]) >= 12
-                                ? mDecimalFormat.format((mUtil.str2int(saTime[0]) - 12)) : saTime[0]);
+                        String hour = (localHour >= 12 ? mDecimalFormat.format((localHour - (localHour == 12 ? 0 : 12)))
+                                : (localHour == 0 ? mDecimalFormat.format(localHour + 12) : saTime[0]));
                         String dayOfWeek = getAlListConditions(1);
 
                         if (mAppConfig.getLanguage_Id().equals("ko")) {

onecable/src/main/java/com/ntels/onecable/view/rules/RulesTriggersTime.java

@@ -593,7 +593,7 @@ public class RulesTriggersTime extends CustomActivity implements View.OnClickLis
 
           String hour = "";
           hour = decimalFormat.format(currentHour + (ampm.equals(
-              mUtil.getString(mAct, R.string.layout_pm)) ? 12 : 0));
+              mUtil.getString(mAct, R.string.layout_pm)) ? (currentHour == 12 ? 0 : 12) : (currentHour == 12 ? -12 : 0)));
           String minute = "";
           minute = decimalFormat.format(currentMinute);
           String[] saTime = mUtil.LocaltoUTC3(hour + minute);