浏览代码

Optimize Float type be Number type

An An 2 年之前
父节点
当前提交
9725220171
共有 1 个文件被更改,包括 12 次插入12 次删除
  1. 12 12
      charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAMarker.kt

+ 12 - 12
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAMarker.kt

@@ -10,10 +10,10 @@ package com.github.aachartmodel.aainfographics.aaoptionsmodel
 
 
 class AAMarker {
 class AAMarker {
     var enabled: Boolean? = null
     var enabled: Boolean? = null
-    var radius: Float? = null
+    var radius: Number? = null
     var symbol: String? = null
     var symbol: String? = null
     var fillColor: String? = null//点的填充色(用来设置折线连接点的填充色)
     var fillColor: String? = null//点的填充色(用来设置折线连接点的填充色)
-    var lineWidth: Float? = null//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
+    var lineWidth: Number? = null//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
     var lineColor: Any? = null//外沿线的颜色(用来设置折线连接点的轮廓描边颜色,当值为空字符串时,默认取数据点或数据列的颜色。)
     var lineColor: Any? = null//外沿线的颜色(用来设置折线连接点的轮廓描边颜色,当值为空字符串时,默认取数据点或数据列的颜色。)
     var states: AAMarkerStates? = null
     var states: AAMarkerStates? = null
 
 
@@ -22,7 +22,7 @@ class AAMarker {
         return this
         return this
     }
     }
 
 
-    fun radius(prop: Float?): AAMarker {
+    fun radius(prop: Number?): AAMarker {
         radius = prop
         radius = prop
         return this
         return this
     }
     }
@@ -37,7 +37,7 @@ class AAMarker {
         return this
         return this
     }
     }
 
 
-    fun lineWidth(prop: Float?): AAMarker {
+    fun lineWidth(prop: Number?): AAMarker {
         lineWidth = prop
         lineWidth = prop
         return this
         return this
     }
     }
@@ -66,10 +66,10 @@ class AAMarkerHover {
     var enabled: Boolean? = null
     var enabled: Boolean? = null
     var fillColor: String? = null
     var fillColor: String? = null
     var lineColor: String? = null
     var lineColor: String? = null
-    var lineWidth: Float? = null
-    var lineWidthPlus: Float? = null
-    var radius: Float? = null
-    var radiusPlus: Float? = null
+    var lineWidth: Number? = null
+    var lineWidthPlus: Number? = null
+    var radius: Number? = null
+    var radiusPlus: Number? = null
 
 
 
 
     fun enabled(prop: Boolean?): AAMarkerHover {
     fun enabled(prop: Boolean?): AAMarkerHover {
@@ -87,22 +87,22 @@ class AAMarkerHover {
         return this
         return this
     }
     }
 
 
-    fun lineWidth(prop: Float?): AAMarkerHover {
+    fun lineWidth(prop: Number?): AAMarkerHover {
         lineWidth = prop
         lineWidth = prop
         return this
         return this
     }
     }
 
 
-    fun lineWidthPlus(prop: Float?): AAMarkerHover {
+    fun lineWidthPlus(prop: Number?): AAMarkerHover {
         lineWidthPlus = prop
         lineWidthPlus = prop
         return this
         return this
     }
     }
 
 
-    fun radius(prop: Float?): AAMarkerHover {
+    fun radius(prop: Number?): AAMarkerHover {
         radius = prop
         radius = prop
         return this
         return this
     }
     }
 
 
-    fun radiusPlus(prop: Float?): AAMarkerHover {
+    fun radiusPlus(prop: Number?): AAMarkerHover {
         radiusPlus = prop
         radiusPlus = prop
         return this
         return this
     }
     }