1.修改bug

.idea/misc.xml

@@ -558,6 +558,7 @@
         <entry key="..\:/workspace/hcp-pads/login/src/main/res/layout/activity_login.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_listen_record.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_timepiece.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_common_head_layout.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_comprehensive_evaluation.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_diagnosis.xml" value="0.151" />

moca/src/main/java/com/yingyangfly/moca/timepiece/TimepieceFragment.kt

@@ -11,6 +11,7 @@ import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.utils.RxTimer
 
 /**
@@ -90,8 +91,8 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
         val m: Long = 1000
         val time = 59.toLong()
         rxTimer.interval(m) {
+            seconds = it + 1
             if (it < time) {
-                seconds = it + 1
                 val second = it + 1
                 binding.tvSecond.text = if (second < 9) {
                     "0$second"
@@ -99,7 +100,6 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
                     second.toString()
                 }
             } else {
-                seconds = 0
                 binding.tvMinute.text = "01"
                 binding.tvSecond.text = "00"
                 rxTimer.cancel()
@@ -123,21 +123,25 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
      * 下一页
      */
     private fun nextPage(v: View) {
-        if (seconds < 60) {
-            TipsDialog.TipDialogBuilder()
-                .title("提示", R.color.color_FF222222)
-                .content("时间还未满1分钟，确定继续下一页吗？")
-                .leftBtnText("取消")
-                .rightBtnText("确定")
-                .leftClick({
-
-                }, true)
-                .rightClick({
-                    goNextPage(v)
-                }, true)
-                .show(childFragmentManager)
+        if (seconds <= 0) {
+            "请开始计时".toast()
         } else {
-            goNextPage(v)
+            if (seconds < 60) {
+                TipsDialog.TipDialogBuilder()
+                    .title("提示", R.color.color_FF222222)
+                    .content("时间还未满1分钟，确定继续下一页吗？")
+                    .leftBtnText("取消")
+                    .rightBtnText("确定")
+                    .leftClick({
+
+                    }, true)
+                    .rightClick({
+                        goNextPage(v)
+                    }, true)
+                    .show(childFragmentManager)
+            } else {
+                goNextPage(v)
+            }
         }
     }