AnAn пре 4 година
родитељ
комит
e4dfb7ee01

+ 10 - 10
sample/src/main/java/com/github/aachartmodel/aainfographics/demo/additionalcontent/JSFormatterFunctionActivity.kt

@@ -33,14 +33,14 @@ import androidx.appcompat.app.AppCompatActivity
 import com.github.aachartmodel.aainfographics.aachartcreator.AAChartView
 import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAOptions
 import com.github.aachartmodel.aainfographics.demo.R
-import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction1
-import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction2
-import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction3
-import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithFormatterFunction4
+import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithColorfulHtmlLabels
+import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithDifferentUnitSuffix
+import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customAreaChartTooltipStyleWithSimpleFormatString
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customArearangeChartTooltip
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customBoxplotTooltipContent
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customDoubleXAxesChart
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customLineChartOriginalPointPositionByConfiguringXAxisFormatterAndTooltipFormatter
+import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customLineChartTooltipStyleWhenValueBeZeroDoNotShow
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customStackedAndGroupedColumnChartTooltip
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customTooltipWhichDataSourceComeFromOutSideRatherThanSeries
 import com.github.aachartmodel.aainfographics.demo.chartcomposer.CustomTooltipComposer.Companion.customYAxisLabels
@@ -63,11 +63,11 @@ class JSFormatterFunctionActivity : AppCompatActivity() {
 
     private fun configureTheChartOptions(chartType: String): AAOptions {
         when (chartType) {
-            "formatterFunction1" -> return customAreaChartTooltipStyleWithFormatterFunction1()
-            "formatterFunction2" -> return customAreaChartTooltipStyleWithFormatterFunction2()
-            "formatterFunction3" -> return customAreaChartTooltipStyleWithFormatterFunction3()
-            "formatterFunction4" -> return customAreaChartTooltipStyleWithFormatterFunction4()
-            "formatterFunction5" -> return customBoxplotTooltipContent()
+            "customAreaChartTooltipStyleWithSimpleFormatString" -> return customAreaChartTooltipStyleWithSimpleFormatString()//简单字符串拼接
+            "customAreaChartTooltipStyleWithDifferentUnitSuffix" -> return customAreaChartTooltipStyleWithDifferentUnitSuffix()//自定义不同单位后缀
+            "customAreaChartTooltipStyleWithColorfulHtmlLabels" -> return customAreaChartTooltipStyleWithColorfulHtmlLabels()//自定义多彩颜色文字
+            "customLineChartTooltipStyleWhenValueBeZeroDoNotShow" -> return customLineChartTooltipStyleWhenValueBeZeroDoNotShow()//值为0时,在tooltip中不显示
+            "customBoxplotTooltipContent" -> return customBoxplotTooltipContent()
             "customYAxisLabels" -> return customYAxisLabels()
             "customYAxisLabels2" -> return customYAxisLabels2()
             "customStackedAndGroupedColumnChartTooltip" -> return customStackedAndGroupedColumnChartTooltip()
@@ -79,6 +79,6 @@ class JSFormatterFunctionActivity : AppCompatActivity() {
                 return customTooltipWhichDataSourceComeFromOutSideRatherThanSeries()
 
         }
-        return customAreaChartTooltipStyleWithFormatterFunction1()
+        return customAreaChartTooltipStyleWithSimpleFormatString()
     }
 }

+ 5 - 5
sample/src/main/java/com/github/aachartmodel/aainfographics/demo/basiccontent/MainActivity.kt

@@ -227,11 +227,11 @@ class MainActivity : AppCompatActivity() {
         AAChartType.Spline.value,
         AAChartType.Scatter.value,
         /*自定义 formatter 函数*/
-        "formatterFunction1",
-        "formatterFunction2",
-        "formatterFunction3",
-        "formatterFunction4",
-        "formatterFunction5",
+        "customAreaChartTooltipStyleWithSimpleFormatString",
+        "customAreaChartTooltipStyleWithDifferentUnitSuffix",
+        "customAreaChartTooltipStyleWithColorfulHtmlLabels",
+        "customLineChartTooltipStyleWhenValueBeZeroDoNotShow",
+        "customBoxplotTooltipContent",
         "customYAxisLabels",
         "customYAxisLabels2",
         "customStackedAndGroupedColumnChartTooltip",

+ 4 - 4
sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/CustomTooltipComposer.kt

@@ -41,7 +41,7 @@ import com.github.aachartmodel.aainfographics.aatools.*
 
 class CustomTooltipComposer {
     companion object {
-        fun customAreaChartTooltipStyleWithFormatterFunction1(): AAOptions {
+        fun customAreaChartTooltipStyleWithSimpleFormatString(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Area)//图形类型
                 .title("近三个月金价起伏周期图")//图表主标题
@@ -100,7 +100,7 @@ function () {
             return aaOptions
         }
 
-        fun customAreaChartTooltipStyleWithFormatterFunction2(): AAOptions {
+        fun customAreaChartTooltipStyleWithDifferentUnitSuffix(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Area)//图形类型
                 .title("2014 ~ 2020 汪星人生存指数")//图表主标题
@@ -142,7 +142,7 @@ function () {
             return aaOptions
         }
 
-        fun customAreaChartTooltipStyleWithFormatterFunction3(): AAOptions {
+        fun customAreaChartTooltipStyleWithColorfulHtmlLabels(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Area)//图形类型
                 .title("2014 ~ 2020 汪星人生存指数")//图表主标题
@@ -192,7 +192,7 @@ function () {
             return aaOptions
         }
 
-        fun customAreaChartTooltipStyleWithFormatterFunction4(): AAOptions {
+        fun customLineChartTooltipStyleWhenValueBeZeroDoNotShow(): AAOptions {
             val aaChartModel = AAChartModel()
                 .chartType(AAChartType.Areaspline)//图形类型
                 .title("")//图表主标题