Add AAScrollablePlotArea

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

@@ -28,6 +28,8 @@
 
 package com.aachartmodel.aainfographics.AAInfographicsLib.AAChartConfiger
 
+import com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel.AAScrollablePlotArea
+
 enum class AAChartAnimationType(val value :String){
     Linear         ("Linear"),
     EaseInQuad     ("easeInQuad"),
@@ -207,6 +209,7 @@ class AAChartModel {
     var borderRadius: Float? = null            //柱状图长条图头部圆角半径(可用于设置头部的形状,仅对条形图,柱状图有效)
     var series: Array<AASeriesElement>? = null
     var touchEventEnabled: Boolean? = null     //是否支持用户触摸事件
+    var scrollablePlotArea: AAScrollablePlotArea? = null
 
 
     fun animationType(prop: AAChartAnimationType): AAChartModel {
@@ -465,6 +468,11 @@ class AAChartModel {
         return this
     }
 
+    fun scrollablePlotArea(prop: AAScrollablePlotArea): AAChartModel? {
+        scrollablePlotArea = prop
+        return this
+    }
+
      init {
          title                = ""
          subtitle             = ""

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

@@ -50,6 +50,8 @@ object AAOptionsConstructor {
             .polar(aaChartModel.polar) //是否极化图表(开启极坐标模式)
             .marginLeft(aaChartModel.marginLeft) //图表左边距
             .marginRight(aaChartModel.marginRight) //图表右边距
+            .scrollablePlotArea(aaChartModel.scrollablePlotArea)
+
 
         val aaTitle = AATitle()
             .text(aaChartModel.title) //标题文本内容

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

@@ -62,6 +62,7 @@ class AASeriesElement {
     private var shadow: AAShadow? = null
     private var stack: String? = null
     private var tooltip: AATooltip? = null
+    private var showInLegend: Boolean? = null
 
 
     fun type(prop: AAChartType): AASeriesElement {
@@ -169,6 +170,11 @@ class AASeriesElement {
         return this
     }
 
+    fun showInLegend(prop: Boolean): AASeriesElement? {
+        showInLegend = prop
+        return this
+    }
+
 }
 
 

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

@@ -28,6 +28,8 @@ class AAChart {
     private var marginRight: Float? = null//👉
     private var marginBottom: Float? = null//👇
     private var marginLeft: Float? = null//👈
+    var scrollablePlotArea: AAScrollablePlotArea? = null
+
 
     fun type(prop: AAChartType?): AAChart {
         type = prop?.value
@@ -109,4 +111,9 @@ class AAChart {
         return this
     }
 
+    fun scrollablePlotArea(prop: AAScrollablePlotArea?): AAChart {
+        scrollablePlotArea = prop
+        return this
+    }
+
 }

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

@@ -0,0 +1,35 @@
+package com.aachartmodel.aainfographics.AAInfographicsLib.AAOptionsModel
+
+class AAScrollablePlotArea {
+    var minHeight: Int? = null
+    var minWidth: Int? = null
+    var opacity: Float? = null
+    var scrollPositionX: Float? = null
+    var scrollPositionY: Float? = null
+
+
+    fun minHeight(prop: Int?): AAScrollablePlotArea {
+        minHeight = prop
+        return this
+    }
+
+    fun minWidth(prop: Int?): AAScrollablePlotArea {
+        minWidth = prop
+        return this
+    }
+
+    fun opacity(prop: Float?): AAScrollablePlotArea {
+        opacity = prop
+        return this
+    }
+
+    fun scrollPositionX(prop: Float?): AAScrollablePlotArea {
+        scrollPositionX = prop
+        return this
+    }
+
+    fun scrollPositionY(prop: Float?): AAScrollablePlotArea {
+        scrollPositionY = prop
+        return this
+    }
+}

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

@@ -373,21 +373,21 @@ function () {
                 "<span style=\\\"color:#CC99090;font-weight:bold;font-size:10px\\\">死亡搁浅</span>"
             )
 
-            val aaChartModel = AAChartModel()
-                .chartType(AAChartType.Areaspline)
-                .title("")
-                .subtitle("")
-                .stacking(AAChartStackingType.Normal)
-                .categories(categories)
-                .dataLabelsEnabled(false)
-                .markerRadius(0f)
-                .series(arrayOf(
-                        AASeriesElement()
-                            .name("Berlin Hot")
-                            .color(AAGradientColor.deepSeaColor())
-                            .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
-                    )
-                )
+             val aaChartModel = AAChartModel()
+                 .chartType(AAChartType.Areaspline)
+                 .title("")
+                 .subtitle("")
+                 .stacking(AAChartStackingType.Normal)
+                 .categories(categories)
+                 .dataLabelsEnabled(false)
+                 .markerRadius(0f)
+                 .series(arrayOf(
+                     AASeriesElement()
+                         .name("Berlin Hot")
+                         .color(AAGradientColor.deepSeaColor())
+                         .data(arrayOf(7.0, 6.9, 2.5, 14.5, 18.2, 21.5, 5.2, 26.5, 23.3, 45.3, 13.9, 9.6))
+                 )
+                 )
 
             val aaOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
             aaOptions.xAxis?.labels?.useHTML(true)
@@ -514,7 +514,7 @@ function () {
 
 
             val aaOptions = AAOptionsConstructor.configureChartOptions(aaChartModel)
-            val aaPlotBandsElementArr = arrayOf<AAPlotBandsElement>(
+            val aaPlotBandsElementArr = arrayOf(
                 AAPlotBandsElement()
                     .from(-0.25f)//值域颜色带X轴起始值
                     .to(4.75f)//值域颜色带X轴结束值
@@ -1012,7 +1012,7 @@ function () {
                             .label(
                                 AALabel()
                                     .text("实际价格")
-                                    .style(AAChartLineDashStyleType.ShortDashDotDot) //                                .rotation(90)
+                                    .style(AAChartLineDashStyleType.ShortDashDotDot) //.rotation(90)
                             )
                     )
                 )

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 30 13:51:20 CST 2019
+#Mon Apr 13 10:08:57 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip