mac
2024-04-29 cb133dc1c986326be6f402bd10f6b5260e6fd5e5
2024年04月29日17:37:00

备份代码
3个文件已修改
123 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_house_list.xml 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/strings.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -2,7 +2,6 @@
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
@@ -29,9 +28,7 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.MyPowerStationActivity;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -75,7 +72,7 @@
        //添加电站
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
        viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
@@ -188,7 +185,7 @@
        });
        //编辑电站按钮
        viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setOnClickListener(new View.OnClickListener() {
        viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(HouseListEditActivity.class);
@@ -197,11 +194,6 @@
    }
    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station);
        viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setImageResource(R.drawable.editor_house);
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
        LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
        houseInfoAdapter = new HouseInfoAdapter(_mActivity);
        viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
app/src/main/res/layout/fragment_house_list.xml
@@ -10,11 +10,13 @@
        android:id="@+id/power_station_label_top_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_200"
        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"
@@ -283,86 +285,109 @@
            app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll">
            <RelativeLayout
                android:id="@+id/fragment_house_list_content_title1_rl"
                android:id="@+id/station_name_rl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="3"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/fragment_house_list_content_title1_tv"
                    android:id="@+id/station_name_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/power_station_generated_power"
                    android:layout_height="@dimen/dp_17"
                    android:text="@string/station_name"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />
                    android:textSize="@dimen/text_12"
                    android:textStyle="bold" />
                <ImageView
                    android:id="@+id/fragment_house_list_content_title1_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_6"
                    android:layout_alignTop="@+id/fragment_house_list_content_title1_tv"
                    android:layout_alignBottom="@+id/fragment_house_list_content_title1_tv"
                    android:layout_marginStart="@dimen/dp_7"
                    android:layout_toEndOf="@+id/fragment_house_list_content_title1_tv"
                    android:src="@drawable/down" />
                    android:id="@+id/station_name_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_name_tv"
                    android:src="@drawable/ascending_sort" />
            </RelativeLayout>
            <RelativeLayout
                android:id="@+id/fragment_house_list_content_title2_rl"
                android:id="@+id/station_power_rl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="3"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/fragment_house_list_content_title2_tv"
                    android:id="@+id/station_power_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/power_station_Power_generation_today"
                    android:layout_height="@dimen/dp_17"
                    android:text="@string/generated_power"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />
                    android:textSize="@dimen/text_12"
                    android:textStyle="bold" />
                <ImageView
                    android:id="@+id/my_power_station_content_title2_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_6"
                    android:layout_alignTop="@+id/fragment_house_list_content_title2_tv"
                    android:layout_alignBottom="@+id/fragment_house_list_content_title2_tv"
                    android:layout_marginStart="@dimen/dp_7"
                    android:layout_toEndOf="@+id/fragment_house_list_content_title2_tv"
                    android:src="@drawable/down" />
                    android:id="@+id/station_power_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_power_tv"
                    android:src="@drawable/ascending_sort" />
            </RelativeLayout>
            <RelativeLayout
                android:id="@+id/fragment_house_list_content_title3_rl"
                android:id="@+id/station_day_rl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="3"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/fragment_house_list_content_title3_tv"
                    android:id="@+id/station_day_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/power_station_creation_time"
                    android:layout_height="@dimen/dp_17"
                    android:text="@string/day_power_generation"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_14" />
                    android:textSize="@dimen/text_12"
                    android:textStyle="bold" />
                <ImageView
                    android:id="@+id/fragment_house_list_content_title3_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_6"
                    android:layout_alignTop="@+id/fragment_house_list_content_title3_tv"
                    android:layout_alignBottom="@+id/fragment_house_list_content_title3_tv"
                    android:layout_marginStart="@dimen/dp_7"
                    android:layout_toEndOf="@+id/fragment_house_list_content_title3_tv"
                    android:src="@drawable/down" />
                    android:id="@+id/station_day_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_day_tv"
                    android:src="@drawable/ascending_sort" />
            </RelativeLayout>
            <RelativeLayout
                android:id="@+id/station_month_rl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="horizontal">
                <TextView
                    android:id="@+id/station_month_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:text="@string/month_power_generation"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_12"
                    android:textStyle="bold" />
                <ImageView
                    android:id="@+id/station_month_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_toEndOf="@+id/station_month_tv"
                    android:src="@drawable/ascending_sort" />
            </RelativeLayout>
        </LinearLayout>
app/src/main/res/values/strings.xml
@@ -276,5 +276,7 @@
    <string name="generated_power">发电功率</string>
    <string name="installed_capacity">装机容量</string>
    <string name="generation">发电量</string>
    <string name="station_name">电站名称</string>
</resources>