|
@@ -68,6 +68,7 @@ class TimepieceFragment : BaseFragment<FragmentTimepieceBinding>(),
|
|
|
}
|
|
|
R.id.btnResetting -> {
|
|
|
rxTimer.cancel()
|
|
|
+ seconds = 0
|
|
|
binding.tvMinute.text = "00"
|
|
|
binding.tvSecond.text = "00"
|
|
|
}
|
|
@@ -123,21 +124,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)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|