2026年01月13日15:47:59 升级gradle版本

wjc

1 天以前 e7e48e1a65fdaa361e14e7e77e24043a63126bd6

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java

@@ -32,6 +32,7 @@
import com.hdl.photovoltaic.enums.DebugType;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.PowerStationStatus;
import com.hdl.photovoltaic.enums.ProjectOperation;
@@ -41,6 +42,7 @@
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.listener.OnCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlDialogLogic;
@@ -139,7 +141,12 @@
    }

    private void initEvent() {

        viewBinding.exitTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
            }
        });
        //电站标签
        viewBinding.powerStationLabel.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -377,26 +384,27 @@
                            });
                        } else {
                            showLoading(getString(R.string.deleting_please_wait));
                            if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                                //【常规方式】发起删除电站指令
                                HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                    @Override
                                    public void onSuccess(List<GatewayBean> list) {
                                        //发起删除电站指令
                                        deleteResidence(position, houseIdBean, list);
//                            if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                            //【常规方式】发起删除电站指令（搜索网关是考到网关没有连接到云端，使用本地发送初始化指令）
                            // 硬件那边叫新固件也发初始化 2025年10月14日10:55:18
                            HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                                @Override
                                public void onSuccess(List<GatewayBean> list) {
                                    //发起删除电站指令
                                    deleteResidence(position, houseIdBean, list);

                                    }
                                }

                                    @Override
                                    public void onFailure(HDLException e) {
                                        //发起删除电站指令
                                        deleteResidence(position, houseIdBean, null);
                                    }
                                });
                            } else {
                                //【简易方式】发起删除电站指令
                                deleteResidence(position, houseIdBean, null);
                            }
                                @Override
                                public void onFailure(HDLException e) {
                                    //发起删除电站指令
                                    deleteResidence(position, houseIdBean, null);
                                }
                            });
//                            } else {
//                                //【简易方式】发起删除电站指令
//                                deleteResidence(position, houseIdBean, null);
//                            }
                        }
                    }
                });
@@ -573,6 +581,13 @@


    private void initView() {
        if (UserConfigManage.getInstance().isTourist_mode()) {
            viewBinding.addIv.setVisibility(View.GONE);
            viewBinding.exitTv.setVisibility(View.VISIBLE);
        } else {
            viewBinding.addIv.setVisibility(View.VISIBLE);
            viewBinding.exitTv.setVisibility(View.GONE);
        }
        viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
        viewBinding.deviceLabelParent.setVisibility(View.GONE);

@@ -603,7 +618,11 @@
            viewBinding.powerStationLabel.setTextAppearance(R.style.Text18Style);
            viewBinding.deviceLabel.setTextAppearance(R.style.Text14Style);
//            viewBinding.editIv.setVisibility(View.VISIBLE);//编辑图标隐藏
            viewBinding.addIv.setVisibility(View.VISIBLE);//添加图标隐藏
            if (UserConfigManage.getInstance().isTourist_mode()) {
                viewBinding.addIv.setVisibility(View.GONE);//添加图标隐藏
            } else {
                viewBinding.addIv.setVisibility(View.VISIBLE);//添加图标隐藏
            }
            viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//电站标签【父容器】显示
            viewBinding.deviceLabelParent.setVisibility(View.GONE);//设备标签【父容器】隐藏
            if (viewBinding.deviceNullDataIc.getRoot().getVisibility() == View.VISIBLE) {
@@ -613,7 +632,11 @@
            viewBinding.deviceLabel.setTextAppearance(R.style.Text18Style);
            viewBinding.powerStationLabel.setTextAppearance(R.style.Text14Style);
//            viewBinding.editIv.setVisibility(View.GONE);//编辑图标隐藏
            viewBinding.addIv.setVisibility(View.GONE);//添加图标隐藏
            if (UserConfigManage.getInstance().isTourist_mode()) {
                viewBinding.addIv.setVisibility(View.GONE);//添加图标隐藏
            } else {
                viewBinding.addIv.setVisibility(View.GONE);//添加图标隐藏
            }
            viewBinding.powerStationLabelParent.setVisibility(View.GONE);//电站标签【父容器】隐藏
            viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);//设备标签【父容器】显示
            if (viewBinding.homeNullDataIc.getRoot().getVisibility() == View.VISIBLE) {