|
@@ -5,6 +5,7 @@ import cn.muchinfo.rma.global.data.GoodsInfoAndQuotes
|
|
|
import cn.muchinfo.rma.global.data.chart.HistoryDatas
|
|
import cn.muchinfo.rma.global.data.chart.HistoryDatas
|
|
|
import cn.muchinfo.rma.global.toShowTime
|
|
import cn.muchinfo.rma.global.toShowTime
|
|
|
import cn.muchinfo.rma.global.toTimeData
|
|
import cn.muchinfo.rma.global.toTimeData
|
|
|
|
|
+import cn.muchinfo.rma.global.toTimeNormalData
|
|
|
import cn.muchinfo.rma.view.base.chart.old.controls.MTPChartControl
|
|
import cn.muchinfo.rma.view.base.chart.old.controls.MTPChartControl
|
|
|
import com.blankj.utilcode.util.TimeUtils
|
|
import com.blankj.utilcode.util.TimeUtils
|
|
|
import com.desfate.chart.data.ChartData
|
|
import com.desfate.chart.data.ChartData
|
|
@@ -54,9 +55,9 @@ class ChartDataAdapter {
|
|
|
|
|
|
|
|
fun checkSameMin(time1: String, time2: String): Boolean{
|
|
fun checkSameMin(time1: String, time2: String): Boolean{
|
|
|
val cal1 = Calendar.getInstance()
|
|
val cal1 = Calendar.getInstance()
|
|
|
- cal1.time = time1.toTimeData()
|
|
|
|
|
|
|
+ cal1.time = time1.toTimeNormalData()
|
|
|
val cal2 = Calendar.getInstance()
|
|
val cal2 = Calendar.getInstance()
|
|
|
- cal2.time = time2.toTimeData()
|
|
|
|
|
|
|
+ cal2.time = time2.toTimeNormalData()
|
|
|
return cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) &&
|
|
return cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) &&
|
|
|
cal1.get(Calendar.HOUR) == cal2.get(Calendar.HOUR) &&
|
|
cal1.get(Calendar.HOUR) == cal2.get(Calendar.HOUR) &&
|
|
|
cal1.get(Calendar.MINUTE) == cal2.get(Calendar.MINUTE)
|
|
cal1.get(Calendar.MINUTE) == cal2.get(Calendar.MINUTE)
|