Browse Source

1.修改MOCA测评计时器bug

王鹏鹏 2 years ago
parent
commit
8424e2c914

+ 9 - 0
moca/src/main/java/com/yingyangfly/moca/timepiece/TimepieceFragment.kt

@@ -67,6 +67,7 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
                         startClock()
                     }
                     R.id.btnResetting -> {
+                        binding.btnStartClock.isEnabled = true
                         rxTimer.cancel()
                         seconds = 0
                         binding.tvMinute.text = "00"
@@ -88,6 +89,7 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
      */
     @SuppressLint("SetTextI18n")
     private fun startClock() {
+        binding.btnStartClock.isEnabled = false
         binding.tvMinute.text = "00"
         val m: Long = 1000
         val time = 59.toLong()
@@ -104,6 +106,7 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
                 binding.tvMinute.text = "01"
                 binding.tvSecond.text = "00"
                 rxTimer.cancel()
+                binding.btnStartClock.isEnabled = true
             }
         }
     }
@@ -112,6 +115,10 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
      * 上一页
      */
     private fun previousPage(v: View) {
+        if (seconds < 60) {
+            rxTimer.cancel()
+        }
+        binding.btnStartClock.isEnabled = true
         val controller = Navigation.findNavController(v)
         val bundle = bundleOf("questionId" to 58)
         controller.navigate(
@@ -137,6 +144,8 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
 
                     }, true)
                     .rightClick({
+                        rxTimer.cancel()
+                        binding.btnStartClock.isEnabled = true
                         goNextPage(v)
                     }, true)
                     .show(childFragmentManager)