Resolve property `stacking` problem

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartModel.kt

@@ -169,7 +169,7 @@ class AAChartModel {
 
 
     fun animationType(prop: AAChartAnimationType): AAChartModel {
-        animationType = prop.toString().toLowerCase()
+        animationType = prop.value
         return this
     }
 
@@ -189,22 +189,22 @@ class AAChartModel {
     }
 
     fun chartType(prop: AAChartType): AAChartModel {
-        chartType = prop.toString().toLowerCase()
+        chartType = prop.value
         return this
     }
 
     fun stacking(prop: AAChartStackingType): AAChartModel {
-        stacking = prop.toString().toLowerCase()
+        stacking = prop.value
         return this
     }
 
     fun symbol(prop: AAChartSymbolType): AAChartModel {
-        symbol = prop.toString().toLowerCase()
+        symbol = prop.value
         return this
     }
 
     fun symbolStyle(prop: AAChartSymbolStyleType): AAChartModel {
-        symbolStyle = prop.toString().toLowerCase()
+        symbolStyle = prop.value
         return this
     }
 
@@ -325,7 +325,7 @@ class AAChartModel {
     }
 
     fun legendVerticalAlign(prop: AAChartLegendVerticalAlignType): AAChartModel {
-        legendVerticalAlign = prop.toString().toLowerCase()
+        legendVerticalAlign = prop.value
         return this
     }
 
@@ -351,11 +351,11 @@ class AAChartModel {
 
     init {
         chartType = AAChartType.Line.toString()
-        animationType = AAChartAnimationType.EaseInBack.toString().toLowerCase()
+        animationType = AAChartAnimationType.EaseInBack.value
         animationDuration = 800//以毫秒为单位
         pointHollow = false
         inverted = false
-        stacking = AAChartStackingType.False.toString().toLowerCase()
+        stacking = AAChartStackingType.False.value
         xAxisReversed = false
         yAxisReversed = false
         zoomType = "x"
@@ -363,6 +363,7 @@ class AAChartModel {
         tooltipCrosshairs = true
         gradientColorEnable = false
         polar = false
+        dataLabelEnabled = false
         xAxisLabelsEnabled = true
         xAxisGridLineWidth = 0
         yAxisLabelsEnabled = true

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartView.kt

@@ -100,7 +100,6 @@ class AAChartView : WebView {
         // Do some initialize work.
         this.contentWidth = 320f
         this.contentHeight = 350f
-        //        //设置WebView支持JavaScript(这一句是十分关键的一句)
         this.settings.javaScriptEnabled = true
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 //            this.setWebContentsDebuggingEnabled(true)

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAOptionsConstructor.kt

@@ -117,20 +117,20 @@ object AAOptionsConstructor {
     ): HashMap<String, Any?> {
         val chartType = aaChartModel.chartType
         //数据点标记相关配置，只有线性图(折线图、曲线图、折线区域填充图、曲线区域填充图,散点图)才有数据点标记
-        if (chartType === AAChartType.Area.toString()
-            || chartType === AAChartType.Areaspline.toString()
-            || chartType === AAChartType.Line.toString()
-            || chartType === AAChartType.Spline.toString()
-            || chartType === AAChartType.Scatter.toString()) {
+        if (chartType === AAChartType.Area.value
+            || chartType === AAChartType.Areaspline.value
+            || chartType === AAChartType.Line.value
+            || chartType === AAChartType.Spline.value
+            || chartType === AAChartType.Scatter.value) {
             val aaMarker = HashMap<String, Any?>()
             aaMarker["radius"] = aaChartModel.markerRadius//曲线连接点半径，默认是4
             aaMarker["symbol"] = aaChartModel.symbol//曲线连接点类型："circle", "square", "diamond", "triangle","triangle-down"，默认是"circle"
             //设置曲线连接点风格样式
-            if (aaChartModel.symbolStyle === AAChartSymbolStyleType.InnerBlank.toString()) {
+            if (aaChartModel.symbolStyle === AAChartSymbolStyleType.InnerBlank.value) {
                 aaMarker["fillColor"] = "#FFFFFF"//点的填充色(用来设置折线连接点的填充色)
                 aaMarker["lineWidth"] = 2//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
                 aaMarker["lineColor"] = ""//外沿线的颜色(用来设置折线连接点的轮廓描边颜色，当值为空字符串时，默认取数据点或数据列的颜色。)
-            } else if (aaChartModel.symbolStyle === AAChartSymbolStyleType.BorderBlank.toString()) {
+            } else if (aaChartModel.symbolStyle === AAChartSymbolStyleType.BorderBlank.value) {
                 aaMarker["lineWidth"] = 2//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
                 aaMarker["lineColor"] = aaChartModel.backgroundColor//外沿线的颜色(用来设置折线连接点的轮廓描边颜色，当值为空字符串时，默认取数据点或数据列的颜色。)
             }
@@ -146,10 +146,10 @@ object AAOptionsConstructor {
 
         val chartType = aaChartModel.chartType
         val aaDataLabels = HashMap<String, Any?>()
-        aaDataLabels["enabled"] = aaChartModel.xAxisLabelsEnabled
+        aaDataLabels["enabled"] = aaChartModel.dataLabelEnabled
         val aaSomeTypeChart = HashMap<String, Any?>()
 
-        if (chartType === AAChartType.Column.toString() || chartType === AAChartType.Bar.toString()) {
+        if (chartType === AAChartType.Column.value || chartType === AAChartType.Bar.value) {
             aaSomeTypeChart["borderWidth"] = 0
             aaSomeTypeChart["borderRadius"] = aaChartModel.borderRadius
             aaSomeTypeChart["dataLabels"] = aaDataLabels
@@ -157,7 +157,7 @@ object AAOptionsConstructor {
                 aaSomeTypeChart["pointPadding"] = 0
                 aaSomeTypeChart["groupPadding"] = 0.005
             }
-        } else if (chartType === AAChartType.Pie.toString()) {
+        } else if (chartType === AAChartType.Pie.value) {
             aaSomeTypeChart["allowPointSelect"] = true
             aaSomeTypeChart["cursor"] = "pointer"
             aaSomeTypeChart["showInLegend"] = aaChartModel.legendEnabled
@@ -176,9 +176,9 @@ object AAOptionsConstructor {
     private fun configureAxisContentAndStyle(aaOptions: HashMap<String, Any?>,
                                              aaChartModel: AAChartModel) {
 
-        if (aaChartModel.chartType !== AAChartType.Pie.toString()
-            && aaChartModel.chartType !== AAChartType.Pyramid.toString()
-            && aaChartModel.chartType !== AAChartType.Funnel.toString()) {
+        if (aaChartModel.chartType !== AAChartType.Pie.value
+            && aaChartModel.chartType !== AAChartType.Pyramid.value
+            && aaChartModel.chartType !== AAChartType.Funnel.value) {
             val aaAxisLabel = HashMap<String, Any?>()
             aaAxisLabel["enabled"] = aaChartModel.xAxisLabelsEnabled
 

app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/BasicContent/CommonChartActivity.kt

@@ -45,7 +45,7 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
             .title("title")
             .subtitle("subtitle")
             .backgroundColor("#4b2b7f")
-            .dataLabelEnabled(true)
+            .dataLabelEnabled(false)
             .yAxisGridLineWidth(0)
             .legendVerticalAlign(AAChartLegendVerticalAlignType.Bottom)
             .series(arrayOf(
@@ -66,27 +66,26 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
 
         if (position == 4 || position == 5) {
             aaChartModel.series(arrayOf(
-                    AASeriesElement()
-                        .name("Tokyo")
-                        .step(true)
-                        .data(arrayOf(149.9, 171.5, 106.4, 129.2, 144.0, 176.0, 135.6, 188.5, 276.4, 214.1, 95.6, 54.4)),
                 AASeriesElement()
-                        .name("NewYork")
-                        .step(true)
-                        .data(arrayOf(83.6, 78.8, 188.5, 93.4, 106.0, 84.5, 105.0, 104.3, 131.2, 153.5, 226.6, 192.3)),
+                    .name("Tokyo")
+                    .step(true)
+                    .data(arrayOf(149.9, 171.5, 106.4, 129.2, 144.0, 176.0, 135.6, 188.5, 276.4, 214.1, 95.6, 54.4)),
                 AASeriesElement()
-                        .name("London")
-                        .step(true)
-                        .data(arrayOf(48.9, 38.8, 19.3, 41.4, 47.0, 28.3, 59.0, 69.6, 52.4, 65.2, 53.3, 72.2))
-                )
+                    .name("NewYork")
+                    .step(true)
+                    .data(arrayOf(83.6, 78.8, 188.5, 93.4, 106.0, 84.5, 105.0, 104.3, 131.2, 153.5, 226.6, 192.3)),
+                AASeriesElement()
+                    .name("London")
+                    .step(true)
+                    .data(arrayOf(48.9, 38.8, 19.3, 41.4, 47.0, 28.3, 59.0, 69.6, 52.4, 65.2, 53.3, 72.2))
+            )
             )
 
         } else {
             aaChartModel.series(arrayOf(
                     AASeriesElement()
                         .name("Tokyo")
-                        .data(arrayOf(7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6)),
-                    AASeriesElement()
+                        .data(arrayOf(7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6)),                    AASeriesElement()
                         .name("NewYork")
                         .data(arrayOf(0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5)),
                     AASeriesElement()
@@ -100,11 +99,11 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
 
         }
 
-        if (chartType == AAChartType.Area.toString()
-            || chartType == AAChartType.Arearange.toString()) {
+        if (chartType == AAChartType.Area.value
+            || chartType == AAChartType.Arearange.value) {
             aaChartModel.symbolStyle(AAChartSymbolStyleType.InnerBlank)
-        } else if (chartType == AAChartType.Line.toString()
-            || chartType == AAChartType.Spline.toString()) {
+        } else if (chartType == AAChartType.Line.value
+            || chartType == AAChartType.Spline.value) {
             aaChartModel.symbolStyle(AAChartSymbolStyleType.BorderBlank)
         }