Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -10,6 +10,7 @@
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartZoomType;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAChart;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AADataLabels;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AAStyle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATitle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
@@ -22,10 +23,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 +56,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)
@@ -71,12 +72,24 @@
                "rgba(56,196,148,0.5)",//深粉色, alpha 透明度1
                "rgba(255,255,255,0)"//热情的粉红, alpha 透明度 0.1
        );
//        try {
//            if (data.length > 0) {
//                for (int i = data.length - 1; i >= 0; i--) {
//                    if (!(Double.parseDouble(data[i].toString()) == 0)) {
//                        break;
//                    }
//                    data[i] = null;
//                }
//            }
//        } catch (Exception ignored) {
//
//        }

        //颜色字符串设置支持十六进制类型和 rgba 类型
//        AAStyle aaStyle = new AAStyle();
//        aaStyle.color("#FFFFFFFF");
        AAStyle aaStyle = new AAStyle();
        aaStyle.color("#66FFFFFF");
//        aaStyle.background("#FF555859");


        aaStyle.fontSize(12);
        AATooltip aaTooltip = new AATooltip()
                .enabled(true)
                .backgroundColor(AAColor.rgbaColor(51, 55, 56, 1f))
@@ -93,11 +106,11 @@
//                .tooltip(aaTooltip)
                .data(data);

//        AASeriesElement element2 = new AASeriesElement()
//        AASeriesElement element2 = new AASeriesElement();
//                .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,11 +118,16 @@
                .chartType(AAChartType.Area)
                .categories(categories)
                .zoomType(AAChartZoomType.None)//手势缩放
                .yAxisGridLineWidth(0.10)
                .yAxisAllowDecimals(true)
                .xAxisVisible(true)
                .xAxisLineWidth(0)
//                .yAxisMax(100)
                .yAxisMin(0)
                .titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色
                .titleStyle(aaStyle)//坐标轴字体颜色
//                .axesTextColor("#FFFFFF")//背景颜色
                .series(new AASeriesElement[]{element1});

    }

    public static AAChartModel configureStepAreaChartAndStepLineChart() {