Browse Source

优化闹钟、上课禁用循环选项显示策略

carlos 1 year ago
parent
commit
1baa2603d0

+ 1 - 1
app/src/main/java/com/sikey/veryfit/k2/ui/settings/AlarmTimeRepeatActivity.kt

@@ -147,7 +147,7 @@ class AlarmTimeRepeatActivity : BaseNoActionBarActivity(), View.OnClickListener
         var isWeekday = true
         weekdayString.toCharArray().forEachIndexed { index, c ->
             if (c == '1') num++
-            if ((index in 0..4) && c == '0') isWeekday = false
+            if (((index in 0..4) && c == '0') || ((index > 4) && c == '1')) isWeekday = false
         }
         if (isWeekday) {
             mWeekDay!!.isChecked = true

+ 2 - 0
app/src/main/java/com/sikey/veryfit/k2/ui/settings/SchoolTimeRepeatActivity.kt

@@ -161,6 +161,8 @@ class SchoolTimeRepeatActivity : BaseNoActionBarActivity(), View.OnClickListener
         for (j in 1..5) {
             isWeekday = isWeekday && mWeekDayMap!![j] == 1
         }
+        if(num == 6) isWeekday = true
+
         if (isWeekday) {
             mWeekDay!!.isChecked = true
         } else {