Jelajahi Sumber

Correct word spelling error

An An 5 tahun lalu
induk
melakukan
d087a1555c

+ 8 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AAChartModel.kt

@@ -129,7 +129,7 @@ enum class AAChartVerticalAlignType(val value: String) {
     Bottom  ("bottom"),
 }
 
-enum class AAChartLineDashSyleType(val value: String) {
+enum class AAChartLineDashStyleType(val value: String) {
     Solid           ("Solid"),
     ShortDash       ("ShortDash"),
     ShortDot        ("ShortDot"),
@@ -143,6 +143,13 @@ enum class AAChartLineDashSyleType(val value: String) {
     LongDashDotDot  ("LongDashDotDot"),
 }
 
+enum class AAChartFontWeightType(val value: String) {
+    Thin     ("thin"),
+    Regular  ("regular"),
+    Bold     ("bold"),
+}
+
+
 class AAChartModel {
 
     var animationType: String? = null          //动画类型

+ 37 - 1
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAChartConfiger/AASeriesElement.kt

@@ -28,6 +28,8 @@
 package com.example.chartcorekotlin.AAChartConfiger
 
 
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AADataLabels
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAMarker
 import java.util.Dictionary
 
 /**
@@ -100,7 +102,7 @@ class AASeriesElement {
         return this
     }
 
-    fun dashStyle(prop: AAChartLineDashSyleType): AASeriesElement {
+    fun dashStyle(prop: AAChartLineDashStyleType): AASeriesElement {
         dashStyle = prop.toString()
         return this
     }
@@ -143,6 +145,40 @@ class AASeriesElement {
 
 }
 
+class AADataElement {
+    private var name: String? = null
+    private var y: Float? = null
+    private var color: Any? = null
+    private var dataLabels: AADataLabels? = null
+    private var marker: AAMarker? = null
+
+    fun name(prop: String): AADataElement {
+        name = prop
+        return this
+    }
+
+    fun y(prop: Float?): AADataElement {
+        y = prop
+        return this
+    }
+
+    fun color(prop: Any): AADataElement {
+        color = prop
+        return this
+    }
+
+    fun dataLabels(prop: AADataLabels): AADataElement {
+        dataLabels = prop
+        return this
+    }
+
+    fun marker(prop: AAMarker): AADataElement {
+        marker = prop
+        return this
+    }
+}
+
+
 class AAShadow {
     private var color: String? = null
     private var offsetX: Float? = null

+ 3 - 3
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AACrosshair.kt

@@ -35,12 +35,12 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashSyleType
+import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashStyleType
 
 class AACrosshair {
     private var width: Float? = null
     private var color: String? = null
-    private var dashStyle: AAChartLineDashSyleType? = null
+    private var dashStyle: AAChartLineDashStyleType? = null
 
     fun width(prop: Float?): AACrosshair {
         width = prop
@@ -52,7 +52,7 @@ class AACrosshair {
         return this
     }
 
-    fun dashStyle(prop: AAChartLineDashSyleType): AACrosshair {
+    fun dashStyle(prop: AAChartLineDashStyleType): AACrosshair {
         dashStyle = prop
         return this
     }

+ 3 - 3
app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AAOptionsModel/AAPlotLinesElement.kt

@@ -35,12 +35,12 @@
  */
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
 
-import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashSyleType
+import com.example.chartcorekotlin.AAChartConfiger.AAChartLineDashStyleType
 
 class AAPlotLinesElement {
 
     private var color: Any? = null
-    private var dashStyle: AAChartLineDashSyleType? = null
+    private var dashStyle: AAChartLineDashStyleType? = null
     private var width: Float? = null
     private var value: Float? = null
     private var zIndex: Int? = null
@@ -51,7 +51,7 @@ class AAPlotLinesElement {
         return this
     }
 
-    fun dashStyle(prop: AAChartLineDashSyleType): AAPlotLinesElement {
+    fun dashStyle(prop: AAChartLineDashStyleType): AAPlotLinesElement {
         dashStyle = prop
         return this
     }

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

@@ -123,7 +123,7 @@ class ChartOptionsComposer {
         val aaPlotLinesElementsArr = arrayOf<AAPlotLinesElement>(
             AAPlotLinesElement()
                 .color("#1e90ff")//颜色值(16进制)
-                .dashStyle(AAChartLineDashSyleType.LongDashDotDot)//样式:Dash,Dot,Solid等,默认Solid
+                .dashStyle(AAChartLineDashStyleType.LongDashDotDot)//样式:Dash,Dot,Solid等,默认Solid
                 .width(1f) //标示线粗细
                 .value(12f) //所在位置
                 .zIndex(1) //层叠,标示线在图表中显示的层叠级别,值越大,显示越向前
@@ -135,7 +135,7 @@ class ChartOptionsComposer {
                         )
                 ), AAPlotLinesElement()
                 .color("#ef476f")//颜色值(16进制)
-                .dashStyle(AAChartLineDashSyleType.LongDashDot)//样式:Dash,Dot,Solid等,默认Solid
+                .dashStyle(AAChartLineDashStyleType.LongDashDot)//样式:Dash,Dot,Solid等,默认Solid
                 .width(1f) //标示线粗细
                 .value(24f) //所在位置
                 .zIndex(1) //层叠,标示线在图表中显示的层叠级别,值越大,显示越向前
@@ -147,7 +147,7 @@ class ChartOptionsComposer {
                         )
                 ), AAPlotLinesElement()
                 .color("#1e90ff")//颜色值(16进制)
-                .dashStyle(AAChartLineDashSyleType.LongDash)//样式:Dash,Dot,Solid等,默认Solid
+                .dashStyle(AAChartLineDashStyleType.LongDash)//样式:Dash,Dot,Solid等,默认Solid
                 .width(1f) //标示线粗细
                 .value(36f) //所在位置
                 .zIndex(1) //层叠,标示线在图表中显示的层叠级别,值越大,显示越向前
@@ -268,7 +268,7 @@ function () {
         val aaCrosshair = AACrosshair()
             .color(AAColor.redColor())
             .width(1f)
-            .dashStyle(AAChartLineDashSyleType.LongDashDotDot)
+            .dashStyle(AAChartLineDashStyleType.LongDashDotDot)
          aaOptions.xAxis?.crosshair(aaCrosshair)
         return aaOptions
     }

+ 4 - 4
app/src/main/java/com/aachartmodel/aainfographics/ChartsDemo/ChartComposer/MixedChartComposer.kt

@@ -205,22 +205,22 @@ companion object {
                 AASeriesElement()
                     .name("Dash")
                     .lineWidth(3f)
-                    .dashStyle(AAChartLineDashSyleType.Dash)
+                    .dashStyle(AAChartLineDashStyleType.Dash)
                     .data(arrayOf(50, 320, 230, 370, 230, 400, 320)),
                 AASeriesElement()
                     .name("DashDot")
                     .lineWidth(3f)
-                    .dashStyle(AAChartLineDashSyleType.DashDot)
+                    .dashStyle(AAChartLineDashStyleType.DashDot)
                     .data(arrayOf(50, 320, 230, 370, 230, 400, 320)),
                 AASeriesElement()
                     .name("LongDash")
                     .lineWidth(3f)
-                    .dashStyle(AAChartLineDashSyleType.LongDash)
+                    .dashStyle(AAChartLineDashStyleType.LongDash)
                     .data(arrayOf(50, 320, 230, 370, 230, 400, 320)),
                 AASeriesElement()
                     .name("LongDashDot")
                     .lineWidth(3f)
-                    .dashStyle(AAChartLineDashSyleType.LongDashDot)
+                    .dashStyle(AAChartLineDashStyleType.LongDashDot)
                     .data(arrayOf(50, 320, 230, 370, 230, 400, 320))
             )
             )