|
|
@@ -29,7 +29,7 @@ data class ChartTSData(
|
|
|
val historyHashMap = hashMapOf<String, Double>()
|
|
|
if(historyDatas != null && historyDatas.isNotEmpty()){
|
|
|
historyDatas.forEach {
|
|
|
- historyHashMap[it.getTime().toShowTime2()] = it.c!!.toDouble()
|
|
|
+ historyHashMap[it.getTime().toShowTimeNoT()] = it.c!!.toDouble()
|
|
|
}
|
|
|
}
|
|
|
return timeList.map{
|
|
|
@@ -140,11 +140,11 @@ data class ChartTSData(
|
|
|
// if (TimeUtils.isPm(this,SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))){
|
|
|
// timeString = this
|
|
|
// }else{
|
|
|
- val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss+08:00", Locale.CHINA)
|
|
|
+ val sdf = SimpleDateFormat("yyyy-MM-ddHH:mm:ss", Locale.CHINA)
|
|
|
val sdf1 = SimpleDateFormat(format, Locale.CHINA)
|
|
|
- timeString = sdf1.format(sdf.parse(this.replace("T"," "))!!)
|
|
|
-// }
|
|
|
+ timeString = sdf1.format(sdf.parse(this.replace("T","").replace("+08:00", ""))!!)
|
|
|
|
|
|
+// }
|
|
|
return timeString
|
|
|
}
|
|
|
|