wjc
2024-12-02 f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc
2024年12月02日10:29:05
7个文件已修改
30 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/dialog_flashing_box.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/tip_fail.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/tip_succeed.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_home_page.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -59,8 +59,6 @@
    @Override
    public Object getContentView() {
        setNotificationBarBackgroundColor(CustomColor.blue);
        viewBinding = ActivityHomeLoginBinding.inflate(getLayoutInflater());
        return viewBinding.getRoot();
    }
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -9,7 +9,9 @@
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartSymbolType;
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.AAStyle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATitle;
import com.github.AAChartModel.AAChartCore.AAOptionsModel.AATooltip;
import com.github.AAChartModel.AAChartCore.AATools.AAColor;
import com.github.AAChartModel.AAChartCore.AATools.AAGradientColor;
@@ -23,7 +25,7 @@
                .backgroundColor("#EDEFF2")
//                .backgroundColor("#4b2b7f")
                .dataLabelsEnabled(false)
                .yAxisGridLineWidth(1)
                .yAxisGridLineWidth(0.5)
                .touchEventEnabled(true);
    }
@@ -68,10 +70,17 @@
                AALinearGradientDirection.ToBottom,
                "rgba(56,196,148,0.5)",//深粉色, alpha 透明度1
                "rgba(255,255,255,0)"//热情的粉红, alpha 透明度 0.1
        );//颜色字符串设置支持十六进制类型和 rgba 类型
        );
        //颜色字符串设置支持十六进制类型和 rgba 类型
//        AAStyle aaStyle = new AAStyle();
//        aaStyle.color("#FFFFFFFF");
//        aaStyle.background("#FF555859");
        AATooltip aaTooltip = new AATooltip()
                .enabled(true)
                .valueDecimals(2);
        AASeriesElement element1 = new AASeriesElement()
                .name(tipSuspendName)
//                .colorByPoint(true)
@@ -87,7 +96,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("#EDEFF2")
                .backgroundColor("#333738")
                .legendEnabled(false)
                .markerRadius(0)
//                .markerSymbol(AAChartSymbolType.Circle)
@@ -97,6 +106,8 @@
                .zoomType(AAChartZoomType.None)//手势缩放
//                .yAxisMax(100)
                .yAxisMin(0)
                .titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色
//                .axesTextColor("#FFFFFF")//背景颜色
                .series(new AASeriesElement[]{element1});
    }
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/CustomStyleChartComposer.java
@@ -197,7 +197,8 @@
                .valueDecimals(2);
        return new AAChartModel()
                .chartType(AAChartType.Column)
                .backgroundColor("#EDEFF2")
                .backgroundColor("#333738")
                .titleStyle(AAStyle.style("#66FFFFFF", 12))//坐标轴字体颜色
                .colorsTheme(new String[]{"#38C494",})
                .categories(categories)
                .xAxisLabelsEnabled(true)
app/src/main/res/drawable/dialog_flashing_box.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_4"/>
    <solid android:color="#000000"/>
<corners android:radius="@dimen/dp_13"/>
    <solid android:color="#80000000"/>
</shape>
app/src/main/res/drawable/tip_fail.png

app/src/main/res/drawable/tip_succeed.png

app/src/main/res/layout/fragment_home_page.xml
@@ -525,8 +525,8 @@
                    android:layout_marginStart="@dimen/dp_16"
                    android:layout_marginTop="@dimen/dp_10"
                    android:layout_marginEnd="@dimen/dp_16"
                    android:paddingBottom="@dimen/dp_16"
                    android:background="@drawable/bj_ff333738"
                    android:paddingBottom="@dimen/dp_16"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
@@ -730,7 +730,9 @@
                    <FrameLayout
                        android:layout_width="0dp"
                        android:layout_height="284dp"
                        android:layout_marginStart="@dimen/dp_4"
                        android:layout_marginTop="@dimen/dp_18"
                        android:layout_marginEnd="@dimen/dp_4"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toBottomOf="@+id/chart_title_rl">