Skip to content

Commit b72b82b

Browse files
committed
Fix #246 => Optimize AAChartViewDelegate moveover event method
1 parent 46b7eb3 commit b72b82b

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

AAInfographics/AAChartCreator/AAChartView.swift

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,30 @@ extension AAChartView: WKScriptMessageHandler {
570570
}
571571

572572
extension AAChartView {
573-
private func getEventMessageModel(messageBody: [String: Any]) -> AAMoveOverEventMessageModel {
573+
private func getEventMessageModel(messageBody: [String: Any]) -> AAMoveOverEventMessageModel {
574574
let eventMessageModel = AAMoveOverEventMessageModel()
575575
eventMessageModel.name = messageBody["name"] as? String
576-
eventMessageModel.x = messageBody["x"] as? Float
577-
eventMessageModel.y = messageBody["y"] as? Float
576+
let x = messageBody["x"]
577+
if x is String {
578+
eventMessageModel.x = Float(x as! String)
579+
} else if x is Int {
580+
eventMessageModel.x = Float(x as! Int)
581+
} else if x is Float {
582+
eventMessageModel.x = (x as! Float)
583+
} else if x is Double {
584+
eventMessageModel.x = Float(x as! Double)
585+
}
586+
587+
let y = messageBody["y"]
588+
if y is String {
589+
eventMessageModel.y = Float(y as! String)
590+
} else if y is Int {
591+
eventMessageModel.y = Float(y as! Int)
592+
} else if y is Float {
593+
eventMessageModel.y = (y as! Float)
594+
} else if y is Double {
595+
eventMessageModel.y = Float(y as! Double)
596+
}
578597
eventMessageModel.category = messageBody["category"] as? String
579598
eventMessageModel.offset = messageBody["offset"] as? [String: Any]
580599
eventMessageModel.index = messageBody["index"] as? Int

0 commit comments

Comments
 (0)