mac
2024-05-08 157065e7a5fc1946fa1827c89499562ec2d32196
2024年05月08日18:05:11
4个文件已添加
3个文件已修改
432 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/clear.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/reset.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/selected_38c494.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/dialog_default_filtering.xml 338 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -610,7 +610,6 @@
                        if (isRefreshing) {
                            hideLoading();
                        }
                    }
                }, _mActivity, ShowErrorMode.YES);
            }
@@ -645,12 +644,15 @@
     */
    private void nullDataUpdateUi() {
        boolean is_data;
        String tipText = "";
        if (isClickPowerStationLabel) {
            is_data = houseListBeanIDList != null && houseListBeanIDList.size() > 0;
            tipText = getString(R.string.my_power_station_data_null);
        } else {
            is_data = deviceInfoList != null && deviceInfoList.size() > 0;
            tipText = getString(R.string.no_equipment);
        }
        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), is_data);
        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, tipText, is_data);
    }
    /**
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
New file
@@ -0,0 +1,76 @@
package com.hdl.photovoltaic.widget;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
public class DefaultFilteringDialog extends BaseDialog {
    private final Context mContext;
    DialogDefaultFilteringBinding viewBinding;
    OnClickListener mOnClickListener;
    public DefaultFilteringDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        this.mContext = context;
    }
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
        setContentView(viewBinding.getRoot());
        //空白处不能取消动画
        setCanceledOnTouchOutside(false);
        //初始化界面控件
        initView();
        //初始化界面数据
        initData();
        //初始化界面控件的事件
        initEvent();
    }
    private void initEvent() {
        viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                if (mOnClickListener != null) {
                    mOnClickListener.confirm();
                }
                dismiss();
            }
        });
        viewBinding.cancelLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                dismiss();
            }
        });
    }
    private void initData() {
    }
    private void initView() {
    }
    public void setOnClickListener(OnClickListener onClickListener) {
        if (onClickListener != null) {
            mOnClickListener = onClickListener;
        }
    }
    public interface OnClickListener {
        void confirm();
    }
}
app/src/main/res/drawable/clear.png

app/src/main/res/drawable/reset.png
app/src/main/res/drawable/selected_38c494.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_17" />
    <solid android:color="@color/text_38C494" />
</shape>
app/src/main/res/layout/dialog_default_filtering.xml
New file
@@ -0,0 +1,338 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/default_filtering_cl"
        android:layout_width="match_parent"
        android:layout_height="405dp"
        android:background="@color/ffffff"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">
        <RelativeLayout
            android:id="@+id/cancel_affirm_cl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_52"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent">
            <LinearLayout
                android:id="@+id/cancel_ll"
                android:layout_width="@dimen/dp_51"
                android:layout_height="match_parent"
                android:layout_alignParentStart="true"
                android:orientation="horizontal">
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:gravity="center_vertical|end"
                    android:text="@string/loading_cancel"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_18" />
            </LinearLayout>
            <TextView
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_marginStart="@dimen/dp_10"
                android:layout_marginEnd="@dimen/dp_10"
                android:layout_toStartOf="@+id/affirm_ll"
                android:layout_toEndOf="@+id/cancel_ll"
                android:gravity="center"
                android:text="@string/filtering"
                android:textColor="@color/text_90000000"
                android:textSize="@dimen/dp_18" />
            <LinearLayout
                android:id="@+id/affirm_ll"
                android:layout_width="@dimen/dp_51"
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:orientation="horizontal">
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:gravity="center_vertical|start"
                    android:text="@string/loading_affirm"
                    android:textColor="@color/text_38C494"
                    android:textSize="@dimen/text_18" />
            </LinearLayout>
            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_1"
                android:layout_alignParentBottom="true"
                android:background="@color/text_E1E1E1" />
        </RelativeLayout>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_18"
            android:text="@string/string_capacity"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
        <ImageView
            android:layout_width="@dimen/dp_19"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_21"
            android:layout_marginEnd="@dimen/dp_5"
            android:src="@drawable/reset"
            app:layout_constraintEnd_toStartOf="@+id/reset_tv"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
        <TextView
            android:id="@+id/reset_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginTop="@dimen/dp_18"
            android:layout_marginEnd="@dimen/dp_20"
            android:text="@string/reset"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
        <RelativeLayout
            android:id="@+id/min_max_rl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_35"
            android:layout_marginTop="@dimen/dp_54"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl">
            <EditText
                android:id="@+id/min_et"
                android:layout_width="@dimen/dp_135"
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_20"
                android:background="@drawable/search_bj_ff05000000"
                android:gravity="center"
                android:hint="min"
                android:textColor="@color/text_90000000"
                android:textColorHint="@color/text_40000000"
                android:textSize="@dimen/text_14" />
            <View
                android:layout_width="match_parent"
                android:layout_height="1dp"
                android:layout_marginStart="@dimen/dp_5"
                android:layout_marginTop="@dimen/dp_17"
                android:layout_marginEnd="@dimen/dp_5"
                android:layout_toStartOf="@+id/max_et"
                android:layout_toEndOf="@+id/min_et"
                android:background="@color/text_E1E1E1"
                />
            <EditText
                android:id="@+id/max_et"
                android:layout_width="@dimen/dp_135"
                android:layout_height="@dimen/dp_35"
                android:layout_alignParentEnd="true"
                android:layout_marginStart="@dimen/dp_20"
                android:layout_marginEnd="@dimen/dp_20"
                android:background="@drawable/search_bj_ff05000000"
                android:gravity="center"
                android:hint="max"
                android:textColor="@color/text_90000000"
                android:textColorHint="@color/text_40000000"
                android:textSize="@dimen/text_14" />
        </RelativeLayout>
        <TextView
            android:id="@+id/text1_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_18"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="0-5"
            android:text="0 ~ 5"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text2_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_15"
            android:layout_marginTop="@dimen/dp_18"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="5-10"
            android:text="5 ~ 10"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text1_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text3_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_15"
            android:layout_marginTop="@dimen/dp_18"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="10-15"
            android:text="10 ~ 15"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text2_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text4_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_66"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="15-30"
            android:text="15 ~ 30"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text5_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_66"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="30-100"
            android:text="30 ~ 100"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text4_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text6_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_66"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="100-300"
            android:text="100 ~ 300"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text5_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text7_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="114dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="300-500"
            android:text="300 ~ 500"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/text8_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="114dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="500-1000000"
            android:text="500+"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/text7_tv"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <TextView
            android:id="@+id/grid_connected_state_title_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="167dp"
            android:text="@string/grid_connected_state"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/min_max_rl" />
        <!--全部-->
        <TextView
            android:id="@+id/all_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="all"
            android:text="@string/message_all"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toStartOf="@+id/min_max_rl"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
        <!--并网-->
        <TextView
            android:id="@+id/grid_connected_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="grid_connected"
            android:text="@string/grid_connected"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/all_tv"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
        <!--离网-->
        <TextView
            android:id="@+id/off_network_tv"
            android:layout_width="102dp"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="13dp"
            android:background="@drawable/search_bj_ff05000000"
            android:gravity="center"
            android:tag="off_network"
            android:text="@string/off_network"
            android:textColor="@color/text_90000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintStart_toEndOf="@+id/grid_connected_tv"
            app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" />
    </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values/strings.xml
@@ -279,6 +279,13 @@
    <string name="search">搜索</string>
    <string name="history_search">历史搜索</string>
    <string name="search_content_null">搜索内容不能为空.</string>
    <string name="no_equipment">暂无设备.</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
    <string name="string_capacity">组串容量(kWp)</string>
    <string name="grid_connected_state">并网状态</string>
    <string name="grid_connected">并网</string>
    <string name="off_network">离网</string>
</resources>