Merge pull request #257 from AAChartModel/dev

Dev

Author: AAChartModel

build.gradle.kts

@@ -1,5 +1,7 @@
 buildscript {
     repositories {
+        maven { url = uri("https://maven.aliyun.com/repository/google") }
+        maven { url = uri("https://maven.aliyun.com/repository/central") }
         google()
         mavenCentral()
     }
@@ -19,6 +21,8 @@ plugins {
 
 allprojects {
     repositories {
+        maven { url = uri("https://maven.aliyun.com/repository/google") }
+        maven { url = uri("https://maven.aliyun.com/repository/central") }
         google()
         mavenCentral()
         maven(url = "https://jitpack.io")

buildSrc/src/main/java/Constants.kt

@@ -15,7 +15,7 @@ object Versions {
 
     const val bintray_version = "1.8.5"
     const val kotlin_stdlib_version = "1.4.10"
-    const val gson_version = "2.10.1"
+    const val gson_version = "2.11.0"
 }
 
 object Libs {

charts/src/main/assets/AAEasing.js

@@ -12,7 +12,7 @@ enum class AAChartAxisType(val value: String) {
     var allowDecimals: Boolean? = null
     var alternateGridColor: Any? = null
     var crosshair: AACrosshair? = null //准星线样式设置
-    var title: AATitle? = null
+    var title: AAAxisTitle? = null
     var type: String? = null
     var dateTimeLabelFormats: AADateTimeLabelFormats? = null
     var plotBands: Array<AAPlotBandsElement>? = null

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAAxis.kt

@@ -0,0 +1,76 @@
+package com.github.aachartmodel.aainfographics.aaoptionsmodel
+
+import com.github.aachartmodel.aainfographics.aachartcreator.AAChartAlignType
+
+// https://api.highcharts.com/highcharts/xAxis.title.align
+// https://api.highcharts.com/highcharts/yAxis.title.align
+enum class AAChartAxisTitleAlignValueType(val value: String) {
+    High("high"),
+    Low("low"),
+    Middle("middle")
+}
+
+// https://api.highcharts.com/highcharts/xAxis.title
+// https://api.highcharts.com/highcharts/yAxis.title
+class AAAxisTitle {
+    var align: String? = null
+    var margin: String? = null
+    var offset: Number? = null
+    var rotation: Number? = null
+    var style: AAStyle? = null
+    var text: String? = null
+    var textAlign: String? = null
+    var useHTML: Boolean? = null // 是否使用 HTML 渲染标题
+    var x: Number? = null // 标题相对于水平对齐的偏移量，取值范围为：图表左边距到图表右边距，可以是负值，单位px。 默认是：0.
+    var y: Number? = null // 标题相对于垂直对齐的偏移量，取值范围：图表的上边距（chart.spacingTop ）到图表的下边距（chart.spacingBottom），可以是负值，单位是px。默认值和字体大小有关。
+
+    fun align(prop: AAChartAxisTitleAlignValueType?): AAAxisTitle {
+        align = prop?.value
+        return this
+    }
+
+    fun margin(prop: String?): AAAxisTitle {
+        margin = prop
+        return this
+    }
+
+    fun offset(prop: Number?): AAAxisTitle {
+        offset = prop
+        return this
+    }
+
+    fun rotation(prop: Number?): AAAxisTitle {
+        rotation = prop
+        return this
+    }
+
+    fun style(prop: AAStyle?): AAAxisTitle {
+        style = prop
+        return this
+    }
+
+    fun text(prop: String?): AAAxisTitle {
+        text = prop
+        return this
+    }
+
+    fun textAlign(prop: AAChartAlignType?): AAAxisTitle {
+        textAlign = prop?.value
+        return this
+    }
+
+    fun useHTML(prop: Boolean?): AAAxisTitle {
+        useHTML = prop
+        return this
+    }
+
+    fun x(prop: Number?): AAAxisTitle {
+        x = prop
+        return this
+    }
+
+    fun y(prop: Number?): AAAxisTitle {
+        y = prop
+        return this
+    }
+}

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAAxisTitle.kt

@@ -13,13 +13,13 @@ import com.github.aachartmodel.aainfographics.aachartcreator.AAChartVerticalAlig
 
 
 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: Number? = null
-    private var y: Number? = null
-    private var userHTML: Boolean? = null
+    var text: String? = null
+    var style: AAStyle? = null
+    var align: String? = null
+    var verticalAlign: String? = null
+    var x: Number? = null
+    var y: Number? = null
+    var userHTML: Boolean? = null
 
     fun text(prop: String?): AASubtitle {
         text = prop

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AASubtitle.kt

@@ -12,13 +12,13 @@ import com.github.aachartmodel.aainfographics.aachartcreator.AAChartAlignType
 import com.github.aachartmodel.aainfographics.aachartcreator.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: Number? = null
-    private var y: Number? = null
-    private var userHTML: Boolean? = null
+    var text: String? = null
+    var style: AAStyle? = null
+    var align: String? = null
+    var verticalAlign: String? = null
+    var x: Number? = null
+    var y: Number? = null
+    var useHTML: Boolean? = null
 
     fun text(prop: String?): AATitle {
         text = prop
@@ -50,8 +50,8 @@ class AATitle {
         return this
     }
 
-    fun userHTML(prop: Boolean?): AATitle {
-        userHTML = prop
+    fun useHTML(prop: Boolean?): AATitle {
+        useHTML = prop
         return this
     }
 }

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AATitle.kt

@@ -25,11 +25,31 @@ open class AAXAxis: AAAxis() {
         return this
     }
 
-    fun title(prop: AATitle): AAXAxis {
+    fun title(prop: AAAxisTitle): AAXAxis {
         title = prop
         return this
     }
 
+    // 为了保持向后兼容性，添加对 AATitle 的支持
+    // 同时添加方法废弃警告⚠️, 提示用户使用新的 AAAxisTitle 类型
+    @Deprecated("Use `fun title(prop: AAAxisTitle): AAXAxis` instead. AATitle is deprecated for axis titles.")
+    fun title(prop: AATitle?): AAXAxis {
+        if (prop != null) {
+            // 将 AATitle 转换为 AAAxisTitle
+            val axisTitle = AAAxisTitle()
+                .text(prop.text)
+                .style(prop.style)
+                .x(prop.x)
+                .y(prop.y)
+                .useHTML(prop.useHTML)
+
+            title = axisTitle
+        } else {
+            title = null
+        }
+        return this
+    }
+
     fun type(prop: AAChartAxisType): AAXAxis {
         type = prop.value
         return this

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAXAxis.kt

@@ -31,11 +31,31 @@ open class AAYAxis: AAAxis() {
         return this
     }
 
-    fun title(prop: AATitle): AAYAxis {
+    fun title(prop: AAAxisTitle): AAYAxis {
         title = prop
         return this
     }
 
+    // 为了保持向后兼容性，添加对 AATitle 的支持
+    // 同时添加方法废弃警告⚠️, 提示用户使用新的 AAAxisTitle 类型
+    @Deprecated("Use `fun title(prop: AAAxisTitle): AAYAxis` instead. AATitle is deprecated for axis titles.")
+    fun title(prop: AATitle?): AAYAxis {
+        if (prop != null) {
+            // 将 AATitle 转换为 AAAxisTitle
+            val axisTitle = AAAxisTitle()
+                .text(prop.text)
+                .style(prop.style)
+                .x(prop.x)
+                .y(prop.y)
+                .useHTML(prop.useHTML)
+
+            title = axisTitle
+        } else {
+            title = null
+        }
+        return this
+    }
+
     fun type(prop: AAChartAxisType): AAYAxis {
         type = prop.value
         return this

charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAYAxis.kt

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://mirrors.aliyun.com/macports/distfiles/gradle/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists