|
@@ -147,8 +147,16 @@ extension DealProDataCell {
|
|
@objc func clickChartsAction() {
|
|
@objc func clickChartsAction() {
|
|
if self.VM?.isShowKline == true {
|
|
if self.VM?.isShowKline == true {
|
|
self.VM?.isShowKline = false
|
|
self.VM?.isShowKline = false
|
|
|
|
+
|
|
|
|
+ UIView.animate(withDuration: 0.15) {
|
|
|
|
+ self.img2View.transform = CGAffineTransformIdentity
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
self.VM?.isShowKline = true
|
|
self.VM?.isShowKline = true
|
|
|
|
+
|
|
|
|
+ UIView.animate(withDuration: 0.15) {
|
|
|
|
+ self.img2View.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 2)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
self.refreshBlock?()
|
|
self.refreshBlock?()
|
|
@@ -250,10 +258,30 @@ extension DealProDataCell {
|
|
|
|
|
|
if isSocket {
|
|
if isSocket {
|
|
guard let cModel = list.last else { return }
|
|
guard let cModel = list.last else { return }
|
|
-
|
|
|
|
|
|
+
|
|
let currentModel = KMyLineModel(cModel: cModel)
|
|
let currentModel = KMyLineModel(cModel: cModel)
|
|
- let newDatas = DataUtil.updateLastData(dataList: VM.kLineStateManger.datas, data: currentModel)
|
|
|
|
|
|
+
|
|
|
|
+ if let newPrice = Double(VM.selectSymbolModel.newPrice), newPrice > 0 {
|
|
|
|
+ currentModel.close = newPrice
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var newDatas = VM.kLineStateManger.datas
|
|
|
|
+
|
|
|
|
+ // 检查第一条和第二条数据的 datetime 是否相同
|
|
|
|
+ if newDatas.count >= 2 {
|
|
|
|
+ let firstModel = newDatas[0]
|
|
|
|
+ let secondModel = newDatas[1]
|
|
|
|
+
|
|
|
|
+ if firstModel.datetime == secondModel.datetime {
|
|
|
|
+ // 用第一条数据替换第二条数据
|
|
|
|
+ newDatas[1] = firstModel
|
|
|
|
+ // 删除第二条数据
|
|
|
|
+ newDatas.remove(at: 1)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ newDatas = DataUtil.updateLastData(dataList: newDatas, data: currentModel)
|
|
|
|
+
|
|
VM.kLineStateManger.datas = newDatas
|
|
VM.kLineStateManger.datas = newDatas
|
|
} else {
|
|
} else {
|
|
var kModels: [KMyLineModel] = []
|
|
var kModels: [KMyLineModel] = []
|
|
@@ -264,6 +292,10 @@ extension DealProDataCell {
|
|
kModels.append(KMyLineModel(cModel: kSymbolKlineData))
|
|
kModels.append(KMyLineModel(cModel: kSymbolKlineData))
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if let newPrice = Double(VM.selectSymbolModel.newPrice), newPrice > 0, kModels.count > 0 {
|
|
|
|
+ kModels[kModels.count - 1].close = newPrice
|
|
|
|
+ }
|
|
|
|
+
|
|
DataUtil.calculate(dataList: kModels)
|
|
DataUtil.calculate(dataList: kModels)
|
|
VM.kLineStateManger.datas = kModels
|
|
VM.kLineStateManger.datas = kModels
|
|
}
|
|
}
|