wjc
2 小时以前 4db3692de0001eea35f938c1224181746e72933a
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -31,6 +31,7 @@
import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.DebugType;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.PowerStationStatus;
import com.hdl.photovoltaic.enums.ProjectOperation;
@@ -220,34 +221,49 @@
        });
        //电站添加
        //点击进入新配置入网界面
        viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
                addPowerStationDialog.show();
                addPowerStationDialog.setCanceledOnTouchOutside(true);
                addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
                    @Override
                    public void onClick(int position, String str) {
                        addPowerStationDialog.dismiss();
                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
                        if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
                        } else {
                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
                        }
//                        requestPermissions(new OnCallBeak() {
//                            @Override
//                            public void onClickCallBeak() {
////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
////                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
//                            }
//                        });
                    }
                });
                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
            }
        });
        //长按进入旧配置入网界面
        viewBinding.addIv.setOnLongClickListener(new View.OnLongClickListener() {
            @Override
            public boolean onLongClick(View v) {
                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
//                AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
//                addPowerStationDialog.show();
//                addPowerStationDialog.setCanceledOnTouchOutside(true);
//                addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
//                    @Override
//                    public void onClick(int position, String str) {
////                        debugging_str = str;
//                        addPowerStationDialog.dismiss();
////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
////                        if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
////                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
////                        } else {
////                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
////                        }
////                        requestPermissions(new OnCallBeak() {
////                            @Override
////                            public void onClickCallBeak() {
//////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
//////                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
////                            }
////                        });
//                    }
//                });
                return true;
            }
        });
        //电站搜索
        viewBinding.powerStationSearchClickCl.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -324,12 +340,13 @@
                delayedConfirmationCancelDialog.show();
                delayedConfirmationCancelDialog.isHideTitle(true);
                String homeName = "\"" + houseIdBean.getHomeName() + "\"";
                String placeholder = UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.ar) ? "s%" : "%s";
                if (isWaitDelivered) {
                    //"是否将电站的调试状态回退到调试中"
                    delayedConfirmationCancelDialog.setContent(getString(R.string.debug_status_rollback).replace("%s", homeName));
                    delayedConfirmationCancelDialog.setContent(getString(R.string.debug_status_rollback).replace(placeholder, homeName));
                } else {
                    delayedConfirmationCancelDialog.startCountdown(4);
                    delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName));
                    delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace(placeholder, homeName));
                }
                delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() {
                    @Override
@@ -337,8 +354,7 @@
                        delayedConfirmationCancelDialog.dismiss();
                        if (isWaitDelivered) {
                            showLoading();
                            String flowRecordContent = UserConfigManage.getInstance().isZh() ? "新特锐能app发起电站重新调试" : "The Xenterra app initiates the re-commissioning of the power station";
                            HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), flowRecordContent, ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
                            HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), getString(R.string.re_commissioning_power_station), ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean list) {
                                    hideLoading();
@@ -1013,9 +1029,10 @@
            @Override
            public void onSuccess(Boolean obj) {
                hideLoading();
                if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                    initializeInverter(list); //发起初始化指令给逆变器;(注意:前面已先解绑云端逆变器,mqtt通道已断开,初始化只能是本地发送(先搜索局域网逆变器列表,建立本地通讯通道))
                }
                //硬件那边叫新固件也发初始化 2025年10月14日10:55:18
//                if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
                initializeInverter(list); //发起初始化指令给逆变器;(注意:前面已先解绑云端逆变器,mqtt通道已断开,初始化只能是本地发送(先搜索局域网逆变器列表,建立本地通讯通道))
//                }
                HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//删除电站缓存
                initData();//初始化缓存数据
                if (houseInfoAdapter != null) {