解决部分bug

RMA/app/src/main/java/cn/muchinfo/rma/global/data/AccountData.kt

@@ -239,21 +239,17 @@ open class AccountData(
                     } else {
                         if (it.averageprice == "" || it.averageprice == "0") {
                             Profit = 0.0
-                        } else {
+                        } else {// 买方向 = (最新价)*持仓数量*合约单位-持仓总金额*方向（买【1】：卖【-1】）
                             if (it.buyorsell == "1") { //卖方向
                                 Profit = NumberUtils.roundNum(
-                                    (quoteDayData.getPrice().minus(
-                                        it.averageprice?.toDouble() ?: 0.0
-                                    )).times(it.curpositionqty?.toDouble() ?: 0.0)
-                                        .times(goodsInfo2.agreeunit).times(-1).toString(),
+                                    (quoteDayData.getPrice()).times(it.curpositionqty?.toDouble() ?: 0.0)
+                                        .times(goodsInfo2.agreeunit).minus((it.curholderamount?.toDouble() ?: 0.0).times(-1)).toString(),
                                     2
                                 ).toDouble()
                             } else {
                                 Profit = NumberUtils.roundNum(
-                                    (quoteDayData.getPrice().minus(
-                                        it.averageprice?.toDouble() ?: 0.0
-                                    )).times(it.curpositionqty?.toDouble() ?: 0.0)
-                                        .times(goodsInfo2.agreeunit).toString(),
+                                    (quoteDayData.getPrice()).times(it.curpositionqty?.toDouble() ?: 0.0)
+                                        .times(goodsInfo2.agreeunit).minus(it.curholderamount?.toDouble() ?: 0.0).toString(),
                                     2
                                 ).toDouble()
                             }

RMA/app/src/main/java/cn/muchinfo/rma/global/data/chart/ChartTSData.kt

@@ -140,9 +140,9 @@ data class ChartTSData(
 //        if (TimeUtils.isPm(this,SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))){
 //            timeString = this
 //        }else{
-        val sdf = SimpleDateFormat("yyyy-MM-ddHH:mm:ss", Locale.CHINA)
+        val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
         val sdf1 = SimpleDateFormat(format, Locale.CHINA)
-        timeString = sdf1.format(sdf.parse(this.replace("T","").replace("+08:00", ""))!!)
+        timeString = sdf1.format(sdf.parse(this.replace("T"," ").replace("+08:00", ""))!!)
 
 //        }
         return timeString
@@ -175,7 +175,7 @@ data class ChartTSData(
         if(historyDatas != null && historyDatas.isNotEmpty()){
             // 这里提前处理一下historyData 方便查询
             historyDatas.forEach {
-                historyMap[it.getTime().toShowTime2()] = it
+                historyMap[it.getTime().toShowTimeNoT()] = it
             }
             // 这里不能循环historyData了  需要循环已经生成的 x 轴点数据
             // 这里生成一个history列表  列表里一部分数据来自historyData  另一部分则是默认历史数据