mac
2024-07-18 52f5a8bd245aeeeb97eb7b3d73939a30fe6f33c2
2024年07月18日11:06:44

备份代码
6个文件已修改
42 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/red_font.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_my_power_station.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_house_list.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_message.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/home_bottom_line.xml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -5,7 +5,11 @@
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -47,10 +51,13 @@
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        Window window = getWindow();
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            window.setGravity(Gravity.BOTTOM);
        }
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        //空白处不能取消动画
//        setCanceledOnTouchOutside(true);
        //初始化界面控件
        initView();
        //初始化界面数据
app/src/main/res/drawable/red_font.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="#FF3030" />
    <corners android:radius="@dimen/dp_8" />
    <corners android:radius="10.5dp" />
</shape>
app/src/main/res/layout/activity_my_power_station.xml
@@ -22,7 +22,7 @@
        android:id="@+id/my_power_station_bottom_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_64"
        android:background="@drawable/module_13_ffffff"
        android:background="@drawable/ffffff_18"
        android:orientation="horizontal"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
app/src/main/res/layout/fragment_house_list.xml
@@ -189,7 +189,6 @@
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold"
                        />
@@ -219,8 +218,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_power_iv"
@@ -248,8 +246,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_day_iv"
@@ -277,8 +274,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/month_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_month_iv"
app/src/main/res/layout/fragment_message.xml
@@ -152,7 +152,7 @@
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:layout_marginStart="@dimen/dp_7"
                            android:background="@drawable/up" />
                            android:background="@drawable/down" />
                    </LinearLayout>
app/src/main/res/layout/home_bottom_line.xml
@@ -11,7 +11,7 @@
        android:layout_height="@dimen/dp_22"
        android:layout_alignParentTop="true"
        android:layout_centerInParent="true"
        android:layout_marginTop="@dimen/dp_8" />
        android:layout_marginTop="13.5dp" />
    <TextView
        android:id="@+id/title_tv"
@@ -24,17 +24,16 @@
    <TextView
        android:id="@+id/red_count_tv"
        android:layout_width="@dimen/dp_16"
        android:layout_height="@dimen/dp_16"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_21"
        android:layout_alignStart="@+id/icon_iv"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="4.5dp"
        android:layout_marginTop="6dp"
        android:background="@drawable/red_font"
        android:gravity="center"
        android:paddingStart="@dimen/dp_7"
        android:paddingEnd="@dimen/dp_7"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="9sp"
        android:visibility="gone"
        tools:ignore="SmallSp" />
        android:visibility="gone" />
    <!--加大点击热区-->
    <TextView
        android:id="@+id/click_tv"