Merge branch '1.5.1'

wjc

2025-02-07 e57e1c01a52a326343122d458ad3bd330fc9d347

 app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java

@@ -22,10 +22,10 @@
public class BasicChartComposer {
    public static AAChartModel configureBasicOptions() {
        return new AAChartModel()
                .backgroundColor("#EDEFF2")
                .backgroundColor("#1C1C1E")
//                .backgroundColor("#4b2b7f")
                .dataLabelsEnabled(false)
                .yAxisGridLineWidth(0.5)
//                .yAxisGridLineWidth(0.5)
                .touchEventEnabled(true);
    }

@@ -55,7 +55,7 @@
//                .data(new Object[]{3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8});

        return configureBasicOptions()
                .backgroundColor("#EDEFF2")
                .backgroundColor("#333738")
                .legendEnabled(false)
                .markerRadius(0)
//                .markerSymbol(AAChartSymbolType.Circle)
@@ -97,7 +97,7 @@
//                .name("NewYork")
//                .data(new Object[]{0.45, 0.43, 0.50, 0.55, 0.58, 0.62, 0.83, 0.39, 0.56, 0.67, 0.50, 0.34, 0.50, 0.67, 0.58, 0.29, 0.46, 0.23, 0.47, 0.46, 0.38, 0.56, 0.48, 0.36});
        return configureBasicOptions()
                .backgroundColor("#333738")
                .backgroundColor("#1C1C1E")
                .legendEnabled(false)
                .markerRadius(0)
//                .markerSymbol(AAChartSymbolType.Circle)
@@ -105,6 +105,9 @@
                .chartType(AAChartType.Area)
                .categories(categories)
                .zoomType(AAChartZoomType.None)//手势缩放
                .yAxisGridLineWidth(0.10)
                .yAxisAllowDecimals(true)
                .xAxisVisible(true)
//                .yAxisMax(100)
                .yAxisMin(0)
                .titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色