Add AAOptionsModel files

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

@@ -85,12 +85,6 @@ enum class AAChartType(val value: String) {
     Polygon         ("polygon")
 }
 
-enum class AAChartAlignType(val value: String) {
-    Left   ("left"),
-    Center ("center"),
-    Right  ("right"),
-}
-
 enum class AAChartZoomType(val value: String) {
     X  ("x"),
     Y  ("y"),
@@ -117,18 +111,18 @@ enum class AAChartSymbolStyleType(val value: String) {
     BorderBlank  ("borderBlank"),
 }
 
-enum class AAChartLegendlLayoutType(val value: String) {
+enum class AAChartLayoutType(val value: String) {
     Horizontal  ("horizontal"),
     Vertical    ("vertical"),
 }
 
-enum class AAChartLegendAlignType(val value: String) {
+enum class AAChartAlignType(val value: String) {
     Left     ("left"),
     Center   ("center"),
     Right    ("right"),
 }
 
-enum class AAChartLegendVerticalAlignType(val value: String) {
+enum class AAChartVerticalAlignType(val value: String) {
     Top     ("top"),
     Middle  ("middle"),
     Bottom  ("bottom"),
@@ -352,7 +346,7 @@ class AAChartModel {
         return this
     }
 
-    fun legendVerticalAlign(prop: AAChartLegendVerticalAlignType): AAChartModel {
+    fun legendVerticalAlign(prop: AAChartVerticalAlignType): AAChartModel {
         legendVerticalAlign = prop.value
         return this
     }

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

@@ -0,0 +1,24 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAAnimation
+ * Author: AnAn
+ * Date: 2019-08-30 11:14
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAAnimation {
+    private var duration: Int? = null
+    private var easing: String? = null
+
+    fun duration(prop: Int?): AAAnimation {
+        duration = prop
+        return this
+    }
+
+    fun easing(prop: String): AAAnimation {
+        easing = prop
+        return this
+    }
+}

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

@@ -0,0 +1,79 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAChart
+ * Author: AnAn
+ * Date: 2019-08-30 11:49
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAChart {
+    private var type: String? = null
+    private var backgroundColor: Any? = null
+    private var plotBackgroundImage: String? = null
+    private var pinchType: String? = null
+    private var panning: Boolean? = null
+    private var panKey: String? = null
+    private var polar: Boolean? = null
+    private var animation: AAAnimation? = null
+    private var inverted: Boolean? = null
+    private var marginLeft: Float? = null
+    private var marginRight: Float? = null
+
+    fun type(prop: String): AAChart {
+        type = prop
+        return this
+    }
+
+    fun backgroundColor(prop: Any): AAChart {
+        backgroundColor = prop
+        return this
+    }
+
+    fun plotBackgroundImage(prop: String): AAChart {
+        plotBackgroundImage = prop
+        return this
+    }
+
+    fun pinchType(prop: String): AAChart {
+        pinchType = prop
+        return this
+    }
+
+    fun panning(prop: Boolean?): AAChart {
+        panning = prop
+        return this
+    }
+
+    fun panKey(prop: String): AAChart {
+        panKey = prop
+        return this
+    }
+
+    fun polar(prop: Boolean?): AAChart {
+        polar = prop
+        return this
+    }
+
+    fun animation(prop: AAAnimation): AAChart {
+        animation = prop
+        return this
+    }
+
+    fun inverted(prop: Boolean?): AAChart {
+        inverted = prop
+        return this
+    }
+
+    fun marginLeft(prop: Float?): AAChart {
+        marginLeft = prop
+        return this
+    }
+
+    fun marginRight(prop: Float?): AAChart {
+        marginRight = prop
+        return this
+    }
+
+}

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

@@ -0,0 +1,108 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AADataLabels
+ * Author: AnAn
+ * Date: 2019-08-30 11:35
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AADataLabels {
+    private var enabled: Boolean? = null
+    private var style: AAStyle? = null
+    private var format: String? = null
+    private var rotation: Float? = null
+    private var allowOverlap: Boolean? = null
+    private var useHTML: Boolean? = null
+    private var distance: Float? = null
+    private var verticalAlign: String? = null
+    private var x: Float? = null
+    private var y: Float? = null
+    private var color: String? = null
+    private var backgroundColor: String? = null
+    private var borderColor: String? = null
+    private var borderRadius: Float? = null
+    private var borderWidth: Float? = null
+    private var shape: String? = null
+
+    fun enabled(prop: Boolean?): AADataLabels {
+        enabled = prop
+        return this
+    }
+
+    fun style(prop: AAStyle): AADataLabels {
+        style = prop
+        return this
+    }
+
+    fun format(prop: String): AADataLabels {
+        format = prop
+        return this
+    }
+
+    fun rotation(prop: Float?): AADataLabels {
+        rotation = prop
+        return this
+    }
+
+    fun allowOverlap(prop: Boolean?): AADataLabels {
+        allowOverlap = prop
+        return this
+    }
+
+    fun useHTML(prop: Boolean?): AADataLabels {
+        useHTML = prop
+        return this
+    }
+
+    fun distance(prop: Float?): AADataLabels {
+        distance = prop
+        return this
+    }
+
+    fun verticalAlign(prop: String): AADataLabels {
+        verticalAlign = prop
+        return this
+    }
+
+    fun x(prop: Float?): AADataLabels {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Float?): AADataLabels {
+        y = prop
+        return this
+    }
+
+    fun color(prop: String): AADataLabels {
+        color = prop
+        return this
+    }
+
+    fun backgroundColor(prop: String): AADataLabels {
+        backgroundColor = prop
+        return this
+    }
+
+    fun borderColor(prop: String): AADataLabels {
+        borderColor = prop
+        return this
+    }
+
+    fun borderRadius(prop: Float?): AADataLabels {
+        borderRadius = prop
+        return this
+    }
+
+    fun borderWidth(prop: Float?): AADataLabels {
+        borderWidth = prop
+        return this
+    }
+
+    fun shape(prop: String): AADataLabels {
+        shape = prop
+        return this
+    }
+}

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

@@ -0,0 +1,24 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AALabel
+ * Author: AnAn
+ * Date: 2019-08-30 11:19
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AALabel {
+    private var text: String? = null
+    private var style: Any? = null
+
+    fun text(prop: String): AALabel {
+        text = prop
+        return this
+    }
+
+    fun style(prop: Any): AALabel {
+        style = prop
+        return this
+    }
+}

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

@@ -0,0 +1,107 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AALabels
+ * Author: AnAn
+ * Date: 2019-08-30 11:23
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+
+class AALabels {
+    private var align: String? =
+        null//轴标签的对齐方式，可用的值有 "left"、"center" 及 "right"。默认值是根据坐标轴的位置（在图表中的位置）即标签的旋转角度进行智能判断的。 默认是：center.
+    private var autoRotation: Any? =
+        null //只针对水平轴有效，允许在防止轴标签重叠时自动旋转轴标签的角度。当空间足够时，轴标签不会被旋转。当图表变小时（主要是宽度变小） ，轴标签开始旋转对应的角度，然后会依次删除间隔的轴标签并尝试旋转数组中的角度。可以通过将此参数设置为 false 来关闭轴标签旋转（这将导致标签自动换行）。 默认是：[-45].
+    private var autoRotationLimit: Float? =
+        null//当每个分类的宽度比该参数的值大很多（像素）时，轴标签将不会被自动旋转，而是以换行的形式展示轴标签。 当轴标签包含多个短词时换行展示轴标签可以使得轴标签有足够的空间，所以设置合理的自动旋转下限是非常有意义的。 默认是：80.
+    private var distance: Float? = null//只针对极地图有效，定义周标签与绘图区边缘的距离。 默认是：15.
+    private var enabled: Boolean? = null//是否显示坐标轴标签 默认是：true.
+    private var format: String? = null//坐标轴格式化字符串。 默认是：{value}.
+    private var formatter: String? = null//坐标轴格式化字符串。 默认是：{value}.
+    private var padding: Float? = null//轴标签的内间距，作用是保证轴标签之间有空隙。 默认是：5.
+    private var rotation: Float? = null//轴标签的旋转角度 默认是：0.
+    private var staggerLines: Int? = null//只针对水平轴有效，定义轴标签显示行数。
+    private var step: Int? =
+        null//显示 n 的倍数标签，例如设置为 2 则表示标签间隔一个轴标签显示。默认情况下，为了避免轴标签被覆盖，该参数会根据情况自动计算。可以通过设置此参数为 1 来阻止自动计算。
+    private var style: AAStyle? = null//轴标签的 CSS 样式
+    private var x: Float? = null//相对于坐标轴刻度线的水平偏移。 默认是：0.
+    private var y: Float? = null//相对于坐标轴刻度线的垂直平偏移。 默认是：null.
+    private var useHTML: Boolean? = null//HTML渲染
+
+    fun align(prop: String): AALabels {
+        align = prop
+        return this
+    }
+
+    fun autoRotation(prop: Any): AALabels {
+        autoRotation = prop
+        return this
+    }
+
+    fun autoRotationLimit(prop: Float?): AALabels {
+        autoRotationLimit = prop
+        return this
+    }
+
+    fun distance(prop: Float?): AALabels {
+        distance = prop
+        return this
+    }
+
+    fun enabled(prop: Boolean?): AALabels {
+        enabled = prop
+        return this
+    }
+
+    fun Format(prop: String): AALabels {
+        format = prop
+        return this
+    }
+
+    fun formatter(prop: String): AALabels {
+        formatter = prop
+        return this
+    }
+
+    fun padding(prop: Float?): AALabels {
+        padding = prop
+        return this
+    }
+
+    fun rotation(prop: Float?): AALabels {
+        rotation = prop
+        return this
+    }
+
+    fun staggerLines(prop: Int?): AALabels {
+        staggerLines = prop
+        return this
+    }
+
+    fun step(prop: Int?): AALabels {
+        step = prop
+        return this
+    }
+
+    fun style(prop: AAStyle): AALabels {
+        style = prop
+        return this
+    }
+
+    fun x(prop: Float?): AALabels {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Float?): AALabels {
+        y = prop
+        return this
+    }
+
+    fun useHTML(prop: Boolean?): AALabels {
+        useHTML = prop
+        return this
+    }
+}

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

@@ -0,0 +1,114 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AALegend
+ * Author: AnAn
+ * Date: 2019-08-30 11:48
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
+import com.example.chartcorekotlin.AAChartConfiger.AAChartLayoutType
+import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+
+class AALegend {
+    private var layout: AAChartLayoutType? =
+        null //图例数据项的布局。布局类型： "horizontal" 或 "vertical" 即水平布局和垂直布局 默认是：horizontal.
+    private var align: AAChartAlignType? = null //设定图例在图表区中的水平对齐方式，合法值有left，center 和 right。
+    private var verticalAlign: AAChartVerticalAlignType? =
+        null //设定图例在图表区中的垂直对齐方式，合法值有 top，middle 和 bottom。垂直位置可以通过 y 选项做进一步设定。
+    private var enabled: Boolean? = null
+    private var borderColor: String? = null
+    private var borderWidth: Float? = null
+    private var itemMarginTop: Float? = null //图例的每一项的顶部外边距，单位px。 默认是：0.
+    private var itemStyle: AAItemStyle? = null
+    private var x: Float? = null
+    private var y: Float? = null
+
+    fun layout(prop: AAChartLayoutType): AALegend {
+        layout = prop
+        return this
+    }
+
+    fun align(prop: AAChartAlignType): AALegend {
+        align = prop
+        return this
+    }
+
+    fun verticalAlign(prop: AAChartVerticalAlignType): AALegend {
+        verticalAlign = prop
+        return this
+    }
+
+    fun enabled(prop: Boolean?): AALegend {
+        enabled = prop
+        return this
+    }
+
+    fun borderColor(prop: String): AALegend {
+        borderColor = prop
+        return this
+    }
+
+    fun BorderWidth(prop: Float?): AALegend {
+        borderWidth = prop
+        return this
+    }
+
+    fun itemMarginTop(prop: Float?): AALegend {
+        itemMarginTop = prop
+        return this
+    }
+
+    fun itemStyle(prop: AAItemStyle): AALegend {
+        itemStyle = prop
+        return this
+    }
+
+    fun x(prop: Float?): AALegend {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Float?): AALegend {
+        y = prop
+        return this
+    }
+
+}
+
+class AAItemStyle {
+    private var color: String? = null
+    private var cursor: String? = null
+    private var pointer: String? = null
+    private var fontSize: String? = null
+    private var fontWeight: String? = null
+
+
+    fun color(prop: String): AAItemStyle {
+        this.color = prop
+        return this
+    }
+
+    fun cursor(prop: String): AAItemStyle {
+        this.cursor = prop
+        return this
+    }
+
+    fun pointer(prop: String): AAItemStyle {
+        this.pointer = prop
+        return this
+    }
+
+    fun fontSize(prop: Float?): AAItemStyle {
+        this.fontSize = prop!!.toString() + "px"
+        return this
+    }
+
+    fun fontWeight(prop: String): AAItemStyle {
+        this.fontWeight = prop
+        return this
+    }
+}
+

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

@@ -0,0 +1,44 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAMarker
+ * Author: AnAn
+ * Date: 2019-08-30 11:33
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAMarker {
+    private var radius: Float? = null
+    private var symbol: String? = null
+    private var fillColor: String? = null//点的填充色(用来设置折线连接点的填充色)
+    private var lineWidth: Float? = null//外沿线的宽度(用来设置折线连接点的轮廓描边的宽度)
+    private var lineColor: Any? = null//外沿线的颜色(用来设置折线连接点的轮廓描边颜色，当值为空字符串时，默认取数据点或数据列的颜色。)
+
+
+    fun radius(prop: Float?): AAMarker {
+        radius = prop
+        return this
+    }
+
+    fun symbol(prop: String): AAMarker {
+        symbol = prop
+        return this
+    }
+
+    fun fillColor(prop: String): AAMarker {
+        fillColor = prop
+        return this
+    }
+
+    fun lineWidth(prop: Float?): AAMarker {
+        lineWidth = prop
+        return this
+    }
+
+    fun lineColor(prop: Any): AAMarker {
+        lineColor = prop
+        return this
+    }
+
+}

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

@@ -55,6 +55,7 @@ class AAPlotBandsElement {
         return this
     }
 
+
     fun color(prop: Any): AAPlotBandsElement {
         color = prop
         return this
@@ -88,17 +89,4 @@ class AAPlotBandsElement {
 }
 
 
-class AALabel {
-    private var text: String? = null
-    private var style: Any? = null
-
-    fun text(prop: String): AALabel {
-        text = prop
-        return this
-    }
 
-    fun style(prop: Any): AALabel {
-        style = prop
-        return this
-    }
-}

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

@@ -0,0 +1,344 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAPlotOptions
+ * Author: AnAn
+ * Date: 2019-08-30 11:33
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAPlotOptions {
+    var column: AAColumn? = null
+    var bar: AABar? = null
+    var line: AALine? = null
+    var spline: AASpline? = null
+    var area: AAArea? = null
+    var areaspline: AAAreaspline? = null
+    var pie: AAPie? = null
+    var columnrange: Any? = null
+    var arearange: Any? = null
+    var series: AASeries? = null
+
+    fun column(prop: AAColumn): AAPlotOptions {
+        column = prop
+        return this
+    }
+
+    fun line(prop: AALine): AAPlotOptions {
+        line = prop
+        return this
+    }
+
+    fun pie(prop: AAPie): AAPlotOptions {
+        pie = prop
+        return this
+    }
+
+    fun bar(prop: AABar): AAPlotOptions {
+        bar = prop
+        return this
+    }
+
+    fun spline(prop: AASpline): AAPlotOptions {
+        spline = prop
+        return this
+    }
+
+    fun area(prop: AAArea): AAPlotOptions {
+        area = prop
+        return this
+    }
+
+    fun areaspline(prop: AAAreaspline): AAPlotOptions {
+        areaspline = prop
+        return this
+    }
+
+    fun columnrange(prop: Any): AAPlotOptions {
+        columnrange = prop
+        return this
+    }
+
+    fun arearange(prop: Any): AAPlotOptions {
+        arearange = prop
+        return this
+    }
+
+    fun series(prop: AASeries): AAPlotOptions {
+        series = prop
+        return this
+    }
+
+}
+
+class AAColumn {
+    private var name: String? = null
+    private var data: Array<Any>? = null
+    private var color: String? = null
+    private var grouping: Boolean? =
+        null//Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other. 默认是：true.
+    private var pointPadding: Float? =
+        null//Padding between each column or bar, in x axis units. 默认是：0.1.
+    private var pointPlacement: Float? =
+        null//Padding between each column or bar, in x axis units. 默认是：0.1.
+    private var groupPadding: Float? =
+        null//Padding between each value groups, in x axis units. 默认是：0.2.
+    private var borderWidth: Float? = null
+    private var colorByPoint: Boolean? =
+        null//对每个不同的点设置颜色(当图表类型为 AAColumn 时,设置为 AAColumn 对象的属性,当图表类型为 bar 时,应该设置为 bar 对象的属性才有效)
+    private var dataLabels: AADataLabels? = null
+    private var stacking: String? = null
+    private var borderRadius: Float? = null
+    private var yAxis: Float? = null
+
+    fun name(prop: String): AAColumn {
+        name = prop
+        return this
+    }
+
+    fun data(prop: Array<Any>): AAColumn {
+        data = prop
+        return this
+    }
+
+    fun color(prop: String): AAColumn {
+        color = prop
+        return this
+    }
+
+    fun grouping(prop: Boolean?): AAColumn {
+        grouping = prop
+        return this
+    }
+
+    fun pointPadding(prop: Float?): AAColumn {
+        pointPadding = prop
+        return this
+    }
+
+    fun pointPlacement(prop: Float?): AAColumn {
+        pointPlacement = prop
+        return this
+    }
+
+    fun groupPadding(prop: Float?): AAColumn {
+        groupPadding = prop
+        return this
+    }
+
+    fun borderWidth(prop: Float?): AAColumn {
+        borderWidth = prop
+        return this
+    }
+
+    fun colorByPoint(prop: Boolean?): AAColumn {
+        colorByPoint = prop
+        return this
+    }
+
+    fun dataLabels(prop: AADataLabels): AAColumn {
+        dataLabels = prop
+        return this
+    }
+
+    fun stacking(prop: String): AAColumn {
+        stacking = prop
+        return this
+    }
+
+    fun borderRadius(prop: Float?): AAColumn {
+        borderRadius = prop
+        return this
+    }
+
+    fun yAxis(prop: Float?): AAColumn {
+        yAxis = prop
+        return this
+    }
+
+}
+
+class AABar {
+    private var name: String? = null
+    private var data: Array<Any>? = null
+    private var color: String? = null
+    private var grouping: Boolean? =
+        null//Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other. 默认是：true.
+    private var pointPadding: Float? =
+        null//Padding between each column or bar, in x axis units. 默认是：0.1.
+    private var pointPlacement: Float? =
+        null//Padding between each column or bar, in x axis units. 默认是：0.1.
+    private var groupPadding: Float? =
+        null//Padding between each value groups, in x axis units. 默认是：0.2.
+    private var borderWidth: Float? = null
+    private var colorByPoint: Boolean? =
+        null//对每个不同的点设置颜色(当图表类型为 AABar 时,设置为 AABar 对象的属性,当图表类型为 bar 时,应该设置为 bar 对象的属性才有效)
+    private var dataLabels: AADataLabels? = null
+    private var stacking: String? = null
+    private var borderRadius: Float? = null
+    private var yAxis: Float? = null
+
+    fun name(prop: String): AABar {
+        name = prop
+        return this
+    }
+
+    fun data(prop: Array<Any>): AABar {
+        data = prop
+        return this
+    }
+
+    fun color(prop: String): AABar {
+        color = prop
+        return this
+    }
+
+    fun grouping(prop: Boolean?): AABar {
+        grouping = prop
+        return this
+    }
+
+    fun pointPadding(prop: Float?): AABar {
+        pointPadding = prop
+        return this
+    }
+
+    fun pointPlacement(prop: Float?): AABar {
+        pointPlacement = prop
+        return this
+    }
+
+    fun groupPadding(prop: Float?): AABar {
+        groupPadding = prop
+        return this
+    }
+
+    fun borderWidth(prop: Float?): AABar {
+        borderWidth = prop
+        return this
+    }
+
+    fun colorByPoint(prop: Boolean?): AABar {
+        colorByPoint = prop
+        return this
+    }
+
+    fun dataLabels(prop: AADataLabels): AABar {
+        dataLabels = prop
+        return this
+    }
+
+    fun stacking(prop: String): AABar {
+        stacking = prop
+        return this
+    }
+
+    fun borderRadius(prop: Float?): AABar {
+        borderRadius = prop
+        return this
+    }
+
+    fun yAxis(prop: Float?): AABar {
+        yAxis = prop
+        return this
+    }
+}
+
+
+class AALine {
+    var dataLabels: AADataLabels? = null
+    
+    fun dataLabels(prop: AADataLabels): AALine {
+        dataLabels = prop
+        return this
+    }
+}
+
+class AASpline {
+    var dataLabels: AADataLabels? = null
+    
+    fun dataLabels(prop: AADataLabels): AASpline {
+        dataLabels = prop
+        return this
+    }
+}
+
+class AAArea {
+    var dataLabels: AADataLabels? = null
+    
+    fun dataLabels(prop: AADataLabels): AAArea {
+        dataLabels = prop
+        return this
+    }
+}
+
+class AAAreaspline {
+    var dataLabels: AADataLabels? = null
+
+    fun dataLabels(prop: AADataLabels): AAAreaspline {
+        dataLabels = prop
+        return this
+    }
+}
+
+class AAPie {
+    var dataLabels:AADataLabels? = null
+    var size: Float? = null
+    var allowPointSelect: Boolean? = null
+    var cursor: String? = null
+    var showInLegend: Boolean? = null
+    var startAngle: Float? = null
+    var endAngle: Float? = null
+    var depth: Float? = null
+    var center: Float? = null
+
+    fun dataLabels(prop: AADataLabels): AAPie {
+        dataLabels = prop
+        return this
+    }
+
+    fun size(prop: Float?): AAPie {
+        size = prop
+        return this
+    }
+
+    fun allowPointSelect(prop: Boolean?): AAPie {
+        allowPointSelect = prop
+        return this
+    }
+
+    fun cursor(prop: String): AAPie {
+        cursor = prop
+        return this
+    }
+
+    fun showInLegend(prop: Boolean?): AAPie {
+        showInLegend = prop
+        return this
+    }
+
+    fun startAngle(prop: Float?): AAPie {
+        startAngle = prop
+        return this
+    }
+
+    fun endAngle(prop: Float?): AAPie {
+        endAngle = prop
+        return this
+    }
+
+    fun depth(prop: Float?): AAPie {
+        depth = prop
+        return this
+    }
+
+    fun center(prop: Float?): AAPie {
+        center = prop
+        return this
+    }
+
+}
+
+
+

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

@@ -0,0 +1,67 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AASeries
+ * Author: ios-fn
+ * Date: 2019-08-30 11:32
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AASeries {
+    private var borderRadius: Float? = null
+    private var marker: AAMarker? = null
+    private var stacking: String? = null
+    private var animation: AAAnimation? = null
+    private var keys: Array<String>? = null
+    private var colorByPoint: Boolean? = null//决定了图表是否给每个数据列或每个点分配一个颜色，默认值是 false， 即默认是给每个数据类分配颜色，
+    private var connectNulls: Boolean? = null//设置折线是否断点重连
+    private var events: Map<*, *>? = null
+    private var shadow: AAShadow? = null
+
+    fun borderRadius(prop: Float?): AASeries {
+        borderRadius = prop
+        return this
+    }
+
+    fun marker(prop: AAMarker): AASeries {
+        marker = prop
+        return this
+    }
+
+    fun stacking(prop: String): AASeries {
+        stacking = prop
+        return this
+    }
+
+    fun animation(prop: AAAnimation): AASeries {
+        animation = prop
+        return this
+    }
+
+    fun keys(prop: Array<String>): AASeries {
+        keys = prop
+        return this
+    }
+
+    fun colorByPoint(prop: Boolean?): AASeries {
+        colorByPoint = prop
+        return this
+    }
+
+    fun connectNulls(prop: Boolean?): AASeries {
+        connectNulls = prop
+        return this
+    }
+
+    fun events(prop: Map<*, *>): AASeries {
+        events = prop
+        return this
+    }
+
+    fun shadow(prop: AAShadow): AASeries {
+        shadow = prop
+        return this
+    }
+
+}

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

@@ -0,0 +1,43 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAShadow
+ * Author: AnAn
+ * Date: 2019-08-30 11:31
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAShadow {
+    private var color: String? = null
+    private var offsetX: Float? = null
+    private var offsetY: Float? = null
+    private var opacity: Float? = null
+    private var width: Float? = null
+
+    fun color(prop: String): AAShadow {
+        color = prop
+        return this
+    }
+
+    fun offsetX(prop: Float?): AAShadow {
+        offsetX = prop
+        return this
+    }
+
+    fun offsetY(prop: Float?): AAShadow {
+        offsetY = prop
+        return this
+    }
+
+    fun opacity(prop: Float?): AAShadow {
+        opacity = prop
+        return this
+    }
+
+    fun width(prop: Float?): AAShadow {
+        width = prop
+        return this
+    }
+
+}

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

@@ -0,0 +1,38 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAStyle
+ * Author: AnAn
+ * Date: 2019-08-30 11:17
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAStyle {
+
+    private var color: String? = null
+    private var fontSize: String? = null
+    private var fontWeight: String? = null
+    private var textOutLine: String? = null
+
+    fun color(prop: String): AAStyle {
+        color = prop
+        return this
+    }
+
+    fun fontSize(prop: String): AAStyle {
+        fontSize = prop
+        return this
+    }
+
+    fun fontWeight(prop: String): AAStyle {
+        fontWeight = prop
+        return this
+    }
+
+    fun textOutLine(prop: String): AAStyle {
+        textOutLine = prop
+        return this
+    }
+
+}

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

@@ -0,0 +1,56 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AASubtitle
+ * Author: AnAn
+ * Date: 2019-08-30 11:29
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+
+class AASubtitle {
+    private var text: String? = null
+    private var style: AAStyle? = null
+    private var align: String? = null
+    private var verticalAlign: String? = null
+    private var x: Float? = null
+    private var y: Float? = null
+    private var userHTML: Boolean? = null
+
+    fun text(prop: String): AASubtitle {
+        text = prop
+        return this
+    }
+
+    fun style(prop: AAStyle): AASubtitle {
+        style = prop
+        return this
+    }
+
+    fun align(prop: String): AASubtitle {
+        align = prop
+        return this
+    }
+
+    fun verticalAlign(prop: AAChartVerticalAlignType): AASubtitle {
+        verticalAlign = prop.toString()
+        return this
+    }
+
+    fun x(prop: Float?): AASubtitle {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Float?): AASubtitle {
+        y = prop
+        return this
+    }
+
+    fun userHTML(prop: Boolean?): AASubtitle {
+        userHTML = prop
+        return this
+    }
+}

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

@@ -0,0 +1,57 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AATitle
+ * Author: AnAn
+ * Date: 2019-08-30 11:26
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+import com.example.chartcorekotlin.AAChartConfiger.AAChartAlignType
+import com.example.chartcorekotlin.AAChartConfiger.AAChartVerticalAlignType
+
+class AATitle {
+    private var text: String? = null
+    private var style: AAStyle? = null
+    private var align: String? = null
+    private var verticalAlign: String? = null
+    private var x: Float? = null
+    private var y: Float? = null
+    private var userHTML: Boolean? = null
+
+    fun text(prop: String): AATitle {
+        text = prop
+        return this
+    }
+
+    fun style(prop: AAStyle): AATitle {
+        style = prop
+        return this
+    }
+
+    fun align(prop: AAChartAlignType): AATitle {
+        align = prop.toString()
+        return this
+    }
+
+    fun verticalAlign(prop: AAChartVerticalAlignType): AATitle {
+        verticalAlign = prop.toString()
+        return this
+    }
+
+    fun x(prop: Float?): AATitle {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Float?): AATitle {
+        y = prop
+        return this
+    }
+
+    fun userHTML(prop: Boolean?): AATitle {
+        userHTML = prop
+        return this
+    }
+}

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

@@ -141,32 +141,4 @@ class AATooltip {
 }
 
 
-class AAStyle {
-
-    private var color: String? = null
-    private var fontSize: String? = null
-    private var fontWeight: String? = null
-    private var textOutLine: String? = null
-
-    fun color(prop: String): AAStyle {
-        color = prop
-        return this
-    }
-
-    fun fontSize(prop: String): AAStyle {
-        fontSize = prop
-        return this
-    }
-
-    fun fontWeight(prop: String): AAStyle {
-        fontWeight = prop
-        return this
-    }
-
-    fun textOutLine(prop: String): AAStyle {
-        textOutLine = prop
-        return this
-    }
-
-}
 

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

@@ -0,0 +1,146 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAXAxis
+ * Author: AnAn
+ * Date: 2019-08-30 11:20
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAXAxis {
+    var plotBands: Array<AAPlotBandsElement>? = null
+    var plotLines: Array<AAPlotLinesElement>? = null
+    var categories: Array<String>? = null
+    var reversed: Boolean? = null
+    var lineWidth: Float? = null //x轴轴线宽度
+    var lineColor: String? = null //x轴轴线线颜色
+    var max: Float? = null //x轴最大值
+    var min: Float? = null//x轴最小值（设置为0就不会有负数）
+    var tickColor: String? = null //x轴轴线下方刻度线颜色
+    var gridLineWidth: Float? = null //x轴网格线宽度
+    var gridLineColor: String? = null //x轴网格线颜色
+    var gridLineDashStyle: String? = null //x轴网格线样式
+    var off: Float? = null//x轴垂直偏移
+    var labels: AALabels? = null //用于设置 x 轴文字相关的
+    var visible: Boolean? = null //用于设置 x 轴以及 x 轴文字是否显示
+    var startOnTick: Boolean? =
+        null //Whether to force the axis to start on a tick. Use this option with the minPadding option to control the axis start. 默认是：false.
+    var tickInterval: Int? = null//x轴刻度点间隔数(设置每隔几个点显示一个 X轴的内容:
+    var crosshair: AACrosshair? = null //准星线样式设置
+    var tickmarkPlacement: String? = null //本参数只对分类轴有效。 当值为 on 时刻度线将在分类上方显示；当值为 between 时，刻度线将在两个分类中间显示。当 tickInterval 为 1 时，默认是 between，其他情况默认是 on。 默认是：null.
+    var tickWidth: Float? = null//坐标轴刻度线的宽度，设置为 0 时则不显示刻度线
+    var tickLength: Float? = null//坐标轴刻度线的长度。 默认是：10.
+    var tickPosition: String? = null //刻度线相对于轴线的位置，可用的值有 inside 和 outside，分别表示在轴线的内部和外部。 默认是：outside.
+
+
+    fun plotBands(prop: Array<AAPlotBandsElement>): AAXAxis {
+        plotBands = prop
+        return this
+    }
+
+    fun plotLines(prop: Array<AAPlotLinesElement>): AAXAxis {
+        plotLines = prop
+        return this
+    }
+
+    fun categories(prop: Array<String>): AAXAxis {
+        categories = prop
+        return this
+    }
+
+    fun reversed(prop: Boolean?): AAXAxis {
+        reversed = prop
+        return this
+    }
+
+    fun lineWidth(prop: Float?): AAXAxis {
+        lineWidth = prop
+        return this
+    }
+
+    fun lineColor(prop: String): AAXAxis {
+        lineColor = prop
+        return this
+    }
+
+    fun max(prop: Float?): AAXAxis {
+        max = prop
+        return this
+    }
+
+    fun min(prop: Float?): AAXAxis {
+        min = prop
+        return this
+    }
+
+    fun tickColor(prop: String): AAXAxis {
+        tickColor = prop
+        return this
+    }
+
+    fun gridLineWidth(prop: Float?): AAXAxis {
+        gridLineWidth = prop
+        return this
+    }
+
+    fun gridLineColor(prop: String): AAXAxis {
+        gridLineColor = prop
+        return this
+    }
+
+    fun gridLineDashStyle(prop: String): AAXAxis {
+        gridLineDashStyle = prop
+        return this
+    }
+
+    fun off(prop: Float?): AAXAxis {
+        off = prop
+        return this
+    }
+
+    fun labels(prop: AALabels): AAXAxis {
+        labels = prop
+        return this
+    }
+
+    fun visible(prop: Boolean?): AAXAxis {
+        visible = prop
+        return this
+    }
+
+    fun startOnTick(prop: Boolean?): AAXAxis {
+        startOnTick = prop
+        return this
+    }
+
+    fun tickInterval(prop: Int?): AAXAxis {
+        tickInterval = prop
+        return this
+    }
+
+    fun crosshair(prop: AACrosshair): AAXAxis {
+        crosshair = prop
+        return this
+    }
+
+    fun tickmarkPlacement(prop: String): AAXAxis {
+        tickmarkPlacement = prop
+        return this
+    }
+
+    fun tickWidth(prop: Float?): AAXAxis {
+        tickWidth = prop
+        return this
+    }
+
+    fun tickLength(prop: Float?): AAXAxis {
+        tickLength = prop
+        return this
+    }
+
+    fun tickPosition(prop: String): AAXAxis {
+        tickPosition = prop
+        return this
+    }
+}

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

@@ -0,0 +1,174 @@
+/**
+ * Copyright (C), 2015-2019
+ * FileName: AAYAxis
+ * Author: AnAn
+ * Date: 2019-08-30 11:25
+ * Description:
+ * History:
+ */
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAYAxis {
+    private var title: AATitle? = null
+    private var plotBands: Array<AAPlotBandsElement>? = null
+    private var plotLines: Array<AAPlotLinesElement>? = null
+    private var categories: Array<String>? = null
+    private var reversed: Boolean? = null
+    private var gridLineWidth: Float? = null// y 轴网格线宽度
+    private var gridLineColor: String? = null  // y 轴网格线颜色
+    private var gridLineDashStyle: String? = null //网格线线条样式，所有可用的线条样式参考：Highcharts线条样式
+    private var alternateGridColor: String? = null  //backcolor of every other grid line area
+    private var gridLineInterpolation: String? =
+        null //Polar charts only. Whether the grid lines should draw as a polygon with straight lines between categories, or as circles. Can be either circle or polygon. 默认是：null.
+    private var labels: AALabels? = null//用于设置 y 轴文字相关的
+    private var lineWidth: Float? = null // y 轴线宽度
+    private var lineColor: String? = null // y 轴线颜色
+    private var off: Float? = null // y 轴线水平偏移
+    private var allowDecimals: Boolean? = null //y轴是否允许显示小数
+    private var max: Float? = null //y轴最大值
+    private var min: Float? = null //y轴最小值（设置为0就不会有负数）
+    //private var minPadding:   //Padding of the min value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the lowest data value to appear on the edge of the plot area. 默认是：0.05.
+    private var tickPositions: Array<Any>? = null //自定义Y轴坐标（如：[0, 25, 50, 75 , 100]）
+    private var visible: Boolean? = null //y轴是否允许显示
+    private var opposite: Boolean? =
+        null//是否将坐标轴显示在对立面，默认情况下 x 轴是在图表的下方显示，y 轴是在左方，坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。 默认是：false.
+    private var tickInterval: Int? = null
+    private var crosshair: AACrosshair? = null  //准星线样式设置
+    private var stackLabels: String? = null
+    private var tickWidth: Float? = null//坐标轴刻度线的宽度，设置为 0 时则不显示刻度线
+    private var tickLength: Float? = null//坐标轴刻度线的长度。 默认是：10.
+    private var tickPosition: String? =
+        null //刻度线相对于轴线的位置，可用的值有 inside 和 outside，分别表示在轴线的内部和外部。 默认是：outside.
+
+
+    fun title(prop: AATitle): AAYAxis {
+        title = prop
+        return this
+    }
+
+    fun plotBands(prop: Array<AAPlotBandsElement>): AAYAxis {
+        plotBands = prop
+        return this
+    }
+
+    fun plotLines(prop: Array<AAPlotLinesElement>): AAYAxis {
+        plotLines = prop
+        return this
+    }
+
+    fun categories(prop: Array<String>): AAYAxis {
+        categories = prop
+        return this
+    }
+
+    fun reversed(prop: Boolean?): AAYAxis {
+        reversed = prop
+        return this
+    }
+
+    fun gridLineWidth(prop: Float?): AAYAxis {
+        gridLineWidth = prop
+        return this
+    }
+
+    fun gridLineColor(prop: String): AAYAxis {
+        gridLineColor = prop
+        return this
+    }
+
+    fun gridLineDashStyle(prop: String): AAYAxis {
+        gridLineDashStyle = prop
+        return this
+    }
+
+    fun alternateGridColor(prop: String): AAYAxis {
+        alternateGridColor = prop
+        return this
+    }
+
+    fun gridLineInterpolation(prop: String): AAYAxis {
+        gridLineInterpolation = prop
+        return this
+    }
+
+    fun labels(prop: AALabels): AAYAxis {
+        labels = prop
+        return this
+    }
+
+    fun lineWidth(prop: Float?): AAYAxis {
+        lineWidth = prop
+        return this
+    }
+
+    fun lineColor(prop: String): AAYAxis {
+        lineColor = prop
+        return this
+    }
+
+    fun off(prop: Float?): AAYAxis {
+        off = prop
+        return this
+    }
+
+    fun allowDecimals(prop: Boolean?): AAYAxis {
+        allowDecimals = prop
+        return this
+    }
+
+    fun max(prop: Float?): AAYAxis {
+        max = max
+        return this
+    }
+
+    fun min(prop: Float?): AAYAxis {
+        min = min
+        return this
+    }
+
+    fun tickPositions(prop: Array<Any>): AAYAxis {
+        tickPositions = prop
+        return this
+    }
+
+    fun visible(prop: Boolean?): AAYAxis {
+        visible = prop
+        return this
+    }
+
+    fun opposite(prop: Boolean?): AAYAxis {
+        opposite = prop
+        return this
+    }
+
+    fun tickInterval(prop: Int?): AAYAxis {
+        tickInterval = prop
+        return this
+    }
+
+    fun crosshair(prop: AACrosshair): AAYAxis {
+        crosshair = prop
+        return this
+    }
+
+    fun stackLabels(prop: String): AAYAxis {
+        stackLabels = prop
+        return this
+    }
+
+    fun tickWidth(prop: Float?): AAYAxis {
+        tickWidth = prop
+        return this
+    }
+
+    fun tickLength(prop: Float?): AAYAxis {
+        tickLength = prop
+        return this
+    }
+
+    fun tickPosition(prop: String): AAYAxis {
+        tickPosition = prop
+        return this
+    }
+
+}

app/src/main/java/com/aachartmodel/aainfographics/AAInfographicsLib/AATools/AAGradientColor.kt

@@ -28,6 +28,7 @@
 package com.example.chartcorekotlin.AAChartConfiger
 
 import java.util.HashMap
+
 enum class AALinearGradientDirection {
     ToTop,           //⇧⇧⇧⇧⇧⇧
     ToBottom,        //⇩⇩⇩⇩⇩⇩
@@ -39,10 +40,7 @@ enum class AALinearGradientDirection {
     ToBottomRight,   //⇘⇘⇘⇘⇘⇘
 }
 
-
 object AAGradientColor {
-
-
     fun oceanBlueColor(): Map<String, Any> {
         return oceanBlueColor(AALinearGradientDirection.ToTop)
     }
@@ -269,8 +267,6 @@ object AAGradientColor {
         return gradientColorMap
     }
 
-
-
     /**
     (0,0) ----------- (1,0)
     |                   |

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

@@ -74,7 +74,7 @@ class CommonChartActivity : AppCompatActivity(), RadioGroup.OnCheckedChangeListe
             .backgroundColor("#4b2b7f")
             .dataLabelsEnabled(false)
             .yAxisGridLineWidth(0)
-            .legendVerticalAlign(AAChartLegendVerticalAlignType.Bottom)
+            .legendVerticalAlign(AAChartVerticalAlignType.Bottom)
             .series(arrayOf(
                     AASeriesElement()
                         .name("Tokyo")