Optimize code

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AATooltip.kt

@@ -35,7 +35,7 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAEasyTool
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger.AAJSStringPurer
 
 
 class AATooltip {
@@ -92,7 +92,7 @@ class AATooltip {
 
     fun formatter(prop: String): AATooltip {
         var pureJSFunctionStr = "($prop)"
-        pureJSFunctionStr = AAEasyTool.pureJavaScriptFunctionString(pureJSFunctionStr)
+        pureJSFunctionStr = AAJSStringPurer.pureJavaScriptFunctionString(pureJSFunctionStr)
         formatter = pureJSFunctionStr
         return this
     }

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAWaterfallChart.kt → app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAWaterfall.kt

@@ -1,6 +1,6 @@
 /**
  * Copyright (C), 2015-2019, 飞牛集达有限公司
- * FileName: AAWaterfallChart
+ * FileName: AAWaterfall
  * Author: ios-fn
  * Date: 2019-06-29 22:47
  * Description:
@@ -35,28 +35,28 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel;
 
-class AAWaterfallChart {
+class AAWaterfall {
     var upColor: String? = null
     var color: String? = null
     var borderWidth: Float? = null
     var data: Array<Any>? = null
 
-    fun upColor(prop: String): AAWaterfallChart {
+    fun upColor(prop: String): AAWaterfall {
         upColor = prop
         return this
     }
 
-    fun color(prop: String): AAWaterfallChart {
+    fun color(prop: String): AAWaterfall {
         color = prop
         return this
     }
 
-    fun borderWidth(prop: Float?): AAWaterfallChart {
+    fun borderWidth(prop: Float?): AAWaterfall {
         borderWidth = prop
         return this
     }
 
-    fun data(prop: Array<Any>): AAWaterfallChart {
+    fun data(prop: Array<Any>): AAWaterfall {
         data = prop
         return this
     }

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAEasyTool.kt → app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAJSStringPurer.kt

@@ -1,6 +1,6 @@
 /**
  * Copyright (C), 2015-2019, 飞牛集达有限公司
- * FileName: AAEasyTool
+ * FileName: AAJSStringPurer
  * Author: ios-fn
  * Date: 2019-06-16 19:05
  * Description:
@@ -38,7 +38,7 @@ package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 import com.example.chartcorekotlin.AAChartConfiger.AAChartType
 
 
-object AAEasyTool {
+object AAJSStringPurer {
 
     fun pureJavaScriptFunctionString(jsFunctionStr: String): String {
         var pureJSFunctionStr = jsFunctionStr

app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/ChartOptionsComposer.kt

@@ -133,7 +133,8 @@ class ChartOptionsComposer {
                                 .color("#1e90ff")
                                 .fontWeight("bold")
                         )
-                ), AAPlotLinesElement()
+                ),
+            AAPlotLinesElement()
                 .color("#ef476f")//颜色值(16进制)
                 .dashStyle(AAChartLineDashStyleType.LongDashDot)//样式：Dash,Dot,Solid等,默认Solid
                 .width(1f) //标示线粗细
@@ -145,7 +146,8 @@ class ChartOptionsComposer {
                                 .color("#ef476f")
                                 .fontWeight("bold")
                         )
-                ), AAPlotLinesElement()
+                ),
+            AAPlotLinesElement()
                 .color("#1e90ff")//颜色值(16进制)
                 .dashStyle(AAChartLineDashStyleType.LongDash)//样式：Dash,Dot,Solid等,默认Solid
                 .width(1f) //标示线粗细
@@ -181,7 +183,8 @@ class ChartOptionsComposer {
                 "11-30", "12-01", "12-02", "12-03", "12-04", "12-05", "12-06", "12-07", "12-08", "12-09",
                 "12-10", "12-11", "12-12", "12-13", "12-14", "12-15", "12-16", "12-17", "12-18", "12-19",
                 "12-20", "12-21", "12-22", "12-23", "12-024", "12-25", "12-26", "12-27", "12-28", "12-29", "12-30"))
-            .series(arrayOf(AASeriesElement()
+            .series(arrayOf(
+                AASeriesElement()
                 .name("2020")
                 .lineWidth(3f)
                 .color("#FFD700"/*纯金色*/)

app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/CustomStyleChartComposer.kt

@@ -507,7 +507,7 @@ class CustomStyleChartComposer  {
                 .markerRadius(0f)
                 .polar(true)//是否极化图形
                 .series(arrayOf(
-                        AASeriesElement()
+                    AASeriesElement()
                             .data(arrayOf(15.0, 15.0, 15.0)),
                     AASeriesElement()
                             .data(arrayOf(9.0, 9.0, 9.0)),