mac
2024-04-30 4e65f5254a4e74dbbe691e5edba2775d6d66c0b0
2024年04月30日14:41:34

备份代码
1个文件已添加
6个文件已修改
243 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ascending_descending_order_select.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_my_power_station.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_house_list.xml 149 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/styles.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -15,6 +15,7 @@
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.utils.GlideUtils;
@@ -53,7 +54,7 @@
        HouseIdBean houseIdBean = this.mList.get(position);
        holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
        //装机容量
        String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + "kW";
        String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + HdlDeviceLogic.kW;
        holder.capacityTv.setText(capacity);
        String kw = "0";
        try {
@@ -69,7 +70,7 @@
            kw = "0.0";
        }
        //发电功率
        String power = mContext.getString(R.string.power_station_generated_power) + kw + "kW";
        String power = mContext.getString(R.string.power_station_generated_power) + kw + HdlDeviceLogic.kW;
        holder.powerTv.setText(power);
        holder.item_parent_rl.setTag(position);
        setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.bean;
import android.text.TextUtils;
import com.hdl.photovoltaic.R;
import java.io.Serializable;
@@ -76,7 +78,7 @@
    }
    public String getInstalledCapacity() {
        return installedCapacity == null ? "0" : installedCapacity;
        return TextUtils.isEmpty(installedCapacity) ? "0" : installedCapacity;
    }
    public void setInstalledCapacity(String installedCapacity) {
@@ -84,7 +86,7 @@
    }
    public String getPower() {
        return power == null ? "0" : power;
        return TextUtils.isEmpty(power) ? "0" : power;
    }
    public void setPower(String power) {
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -70,6 +70,30 @@
    private void initEvent() {
        //电站标签
        viewBinding.powerStationLabel.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
                viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
                viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
                viewBinding.deviceLabelParent.setVisibility(View.GONE);//设备标签隐藏
            }
        });
        //设备标签
        viewBinding.deviceLabel.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
                viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
                viewBinding.editIv.setVisibility(View.GONE);//编辑图标隐藏
                viewBinding.addIv.setVisibility(View.GONE);//添加图标隐藏
                viewBinding.powerStationLabelParent.setVisibility(View.GONE);//电站标签隐藏
                viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);
            }
        });
        //添加电站
        viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@@ -183,7 +207,6 @@
            }
        });
        //编辑电站按钮
        viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -191,9 +214,53 @@
                startActivity(HouseListEditActivity.class);
            }
        });
        //电站名称筛选
        viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.stationNameRl.setSelected(!v.isSelected());
                viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
            }
        });
        //电站名称筛选
        viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.stationNameRl.setSelected(!v.isSelected());
                viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
            }
        });
        //发电功率筛选
        viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.stationPowerRl.setSelected(!v.isSelected());
                viewBinding.stationPowerIv.setSelected(viewBinding.stationPowerRl.isSelected());
            }
        });
        //当日发电量筛选
        viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.stationDayRl.setSelected(!v.isSelected());
                viewBinding.stationDayIv.setSelected(viewBinding.stationDayRl.isSelected());
            }
        });
        //当月发电量筛选
        viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                viewBinding.stationMonthRl.setSelected(!v.isSelected());
                viewBinding.stationMonthIv.setSelected(viewBinding.stationMonthRl.isSelected());
            }
        });
    }
    private void initView() {
        viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
        viewBinding.deviceLabelParent.setVisibility(View.GONE);
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        houseInfoAdapter = new HouseInfoAdapter(_mActivity);
        viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
app/src/main/res/drawable/ascending_descending_order_select.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@drawable/ascending_sort" android:state_selected="true" />
    <item android:drawable="@drawable/descending_order" android:state_selected="false" />
</selector>
app/src/main/res/layout/activity_my_power_station.xml
@@ -5,6 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
    <!--首页-Fragment-->
app/src/main/res/layout/fragment_house_list.xml
@@ -5,22 +5,13 @@
    android:id="@+id/house_list_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/power_station_label_top_cl"
        android:layout_width="match_parent"
        android:layout_height="205dp"
        android:layout_marginTop="@dimen/dp_44"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
    <!--头部标签-->
        <RelativeLayout
            android:id="@+id/title_cl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_31"
            android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
            android:layout_marginEnd="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -72,28 +63,42 @@
        </RelativeLayout>
        <!--搜索-->
        <RelativeLayout
            android:id="@+id/search_cl"
    <!--电站标签-->
    <LinearLayout
        android:id="@+id/power_station_label_parent"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
        android:layout_height="0dp"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/title_cl">
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/power_station_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="174dp"
            android:layout_marginTop="@dimen/dp_21">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/power_station_search_cl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_16"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent">
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_marginEnd="@dimen/dp_17"
                android:layout_toStartOf="@+id/default_condition_iv"
                    android:layout_toStartOf="@+id/power_station_default_condition_iv"
                android:background="@drawable/search_bj_edeff2">
                <ImageView
                    android:id="@+id/search_iv"
                        android:id="@+id/power_station_search_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_alignParentStart="true"
@@ -102,19 +107,19 @@
                    android:src="@drawable/search_path" />
                <TextView
                    android:id="@+id/search_tv"
                        android:id="@+id/power_station_search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/search_iv"
                        android:layout_toEndOf="@+id/power_station_search_iv"
                    android:text="Search the power station"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>
            <ImageView
                android:id="@+id/default_condition_iv"
                    android:id="@+id/power_station_default_condition_iv"
                android:layout_width="@dimen/dp_31"
                android:layout_height="@dimen/dp_31"
                android:layout_alignParentEnd="true"
@@ -134,7 +139,7 @@
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/search_cl">
                app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
            <LinearLayout
                android:id="@+id/screening_condition_1"
@@ -308,7 +313,7 @@
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_name_tv"
                    android:src="@drawable/ascending_sort" />
                        android:background="@drawable/ascending_descending_order_select" />
            </RelativeLayout>
@@ -331,11 +336,10 @@
                <ImageView
                    android:id="@+id/station_power_iv"
                    android:layout_width="wrap_content"
                    android:layout_height="15dp"
                    android:layout_marginStart="-8dp"
                        android:layout_width="@dimen/dp_18"
                        android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_power_tv"
                    android:src="@drawable/ascending_sort" />
                        android:background="@drawable/ascending_descending_order_select" />
            </RelativeLayout>
@@ -361,7 +365,7 @@
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_day_tv"
                    android:src="@drawable/ascending_sort" />
                        android:background="@drawable/ascending_descending_order_select" />
            </RelativeLayout>
@@ -387,24 +391,21 @@
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_month_tv"
                    android:src="@drawable/ascending_sort" />
                        android:background="@drawable/ascending_descending_order_select" />
            </RelativeLayout>
        </LinearLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>
    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/fragment_house_srl"
        android:layout_width="match_parent"
        android:layout_height="0dp"
            android:layout_height="match_parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
        <androidx.recyclerview.widget.RecyclerView
@@ -415,6 +416,82 @@
            android:paddingBottom="@dimen/dp_16" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
    </LinearLayout>
    <!--设备标签-->
    <LinearLayout
        android:id="@+id/device_label_parent"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:orientation="vertical"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/title_cl">
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/device_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_marginTop="@dimen/dp_21">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/device_search_cl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_13"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@drawable/search_bj_edeff2"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent">
                <ImageView
                    android:id="@+id/device_search_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_alignParentStart="true"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_13"
                    android:src="@drawable/search_path" />
                <TextView
                    android:id="@+id/device_search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/device_search_iv"
                    android:text="Search the power station"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>
        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
            android:id="@+id/fragment_device_srl"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/fragment_device_srl_list_rc"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_16" />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
    </LinearLayout>
    <!--没有数据显示样式-->
    <include
        android:id="@+id/null_data_ic"
app/src/main/res/values/styles.xml
@@ -13,7 +13,7 @@
        <item name="android:textSize">@dimen/text_20</item>
        <item name="android:textStyle">bold</item>
        <item name="android:textColor">@color/text_90000000</item>
        <item name="android:fontFamily"></item>
<!--        <item name="android:fontFamily"></item>-->
    </style>
    <!-- 自定义字体样式 内容一级标题-->
@@ -28,6 +28,11 @@
        <item name="android:textSize">@dimen/text_14</item>
        <item name="android:textColor">@color/text_40000000</item>
    </style>
    <!-- 自定义字体样式 -->
    <style name="Text16Style">
        <item name="android:textSize">@dimen/text_16</item>
        <item name="android:textColor">@color/text_40000000</item>
    </style>
</resources>