wjc
2024-12-30 81a95bb98f3c2d22d40cc22158883b63c79a4ed6
2024年12月30日16:50:58
1个文件已添加
5个文件已修改
39 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/circular_progress_bar.xml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/progress_small.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_default_filtering.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -8,7 +8,7 @@
public class AppConfigManage {
    /*********是否正式服务器*********/
    private static final boolean isOnlineServer = false;
    private static final boolean isOnlineServer = true;
    /*********正式环境*********/
    private static final String APP_KEY_ONLINE = "CSZEMDJL";
    private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -86,7 +86,7 @@
                .name(tipSuspendName)
//                .colorByPoint(true)
                .color(AARgba(56, 196, 148, 1.0f))//猩红色, alpha 透明度 1
//                .lineWidth(1.5)
                .lineWidth(1.5)
//                .borderColor(AARgba(255,255,255,1.0f))
                .fillColor(linearGradientColor)
//                .fillOpacity(0.5)//区域背景透明度,设置0的话看不到区域背景
app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
@@ -46,7 +46,7 @@
            layoutParams.gravity = Gravity.START | Gravity.TOP;
            layoutParams.width = (int) UnitConversionUtils.dpToPx(mContext, 375 - 32);
            layoutParams.x = (int) UnitConversionUtils.dpToPx(mContext, 16);
            layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 200-5);
            layoutParams.y = (int) UnitConversionUtils.dpToPx(mContext, 137+44);
            window.setAttributes(layoutParams);
        }
        viewBinding = DialogTypeTitleListBBinding.inflate(getLayoutInflater());
app/src/main/res/drawable/circular_progress_bar.xml
New file
@@ -0,0 +1,25 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFF"
        android:pathData="M12,3.5c-5.3,0 -9.5,4.2 -9.5,9.5 0,5.3 4.2,9.5 9.5,9.5 5.3,0 9.5,-4.2 9.5,-9.5 0,-5.3 -4.2,-9.5 -9.5,-9.5z"
        android:strokeWidth="2"
        android:strokeColor="#000000"
        android:trimPathStart="0"
        android:trimPathEnd="0" />
    <rotate
        android:fromDegrees="270"
        android:toDegrees="270"
        android:pivotX="12"
        android:pivotY="12">
        <shape android:shape="ring" android:innerRadiusRatio="3" android:thicknessRatio="10" android:useLevel="false">
            <solid android:color="#000000"/>
        </shape>
    </rotate>
</vector>
app/src/main/res/drawable/progress_small.xml
@@ -3,9 +3,7 @@
    android:fromDegrees="0"
    android:pivotX="50%"
    android:pivotY="50%"
    android:toDegrees="1440"
    >
    android:toDegrees="1440">
    <shape
        android:innerRadiusRatio="3"
        android:shape="ring"
app/src/main/res/layout/dialog_default_filtering.xml
@@ -83,7 +83,7 @@
        android:layout_marginTop="@dimen/dp_18"
        android:text="@string/string_capacity"
        android:textColor="@color/text_FF8E8E8E"
        android:textSize="@dimen/text_16"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -262,7 +262,7 @@
        android:layout_marginTop="167dp"
        android:text="@string/grid_connected_state"
        android:textColor="@color/text_FF8E8E8E"
        android:textSize="@dimen/text_16"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
    <!--全部-->