|
|
@@ -72,14 +72,14 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
|
|
|
dataMonitorAdapter.clearData()
|
|
|
binding.tvTrainingTimeToday.text = "0秒"
|
|
|
calendar[Calendar.MONTH] = calendar[Calendar.MONTH] - 1
|
|
|
- loadData()
|
|
|
+ getMonthRecord()
|
|
|
}
|
|
|
//增大月份
|
|
|
rightImage.setOnSingleClickListener {
|
|
|
dataMonitorAdapter.clearData()
|
|
|
binding.tvTrainingTimeToday.text = "0秒"
|
|
|
calendar[Calendar.MONTH] = calendar[Calendar.MONTH] + 1
|
|
|
- loadData()
|
|
|
+ getMonthRecord()
|
|
|
}
|
|
|
|
|
|
btnTrainingDaily.setOnSingleClickListener {
|
|
|
@@ -109,10 +109,8 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
|
|
|
}
|
|
|
|
|
|
override fun initData() {
|
|
|
- loadData()
|
|
|
- getStatisticRecord()
|
|
|
selectedTime = User.getNowDay()
|
|
|
- getDayRecordDetail()
|
|
|
+ loadData()
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -156,11 +154,17 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ @Subscribe(code = RxBusCodes.GetDataMonitor, threadMode = ThreadMode.MAIN)
|
|
|
+ fun loadData() {
|
|
|
+ getMonthRecord()
|
|
|
+ getStatisticRecord()
|
|
|
+ getDayRecordDetail()
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 加载数据监控
|
|
|
*/
|
|
|
- @Subscribe(code = RxBusCodes.GetDataMonitor, threadMode = ThreadMode.MAIN)
|
|
|
- fun loadData() {
|
|
|
+ private fun getMonthRecord() {
|
|
|
//年
|
|
|
val year = calendar[Calendar.YEAR]
|
|
|
//月
|