2025年07月31日16:54:21

wjc

2 天以前 80aa637dacf955c5cb19e735a461b45515945c84

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -38,6 +38,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
@@ -715,7 +716,7 @@
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
                        HdlLogLogic.print("uni通知原生退出登录---", true);
//                        HDLLinkPMUser.getInstance().logout(0);
                        HdlAccountLogic.getInstance().logout();
                        HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
                    }
                    break;
                    //本地密钥获取
@@ -823,6 +824,7 @@
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
                        //退出无网模式标识
                        UserConfigManage.getInstance().setNoNetworkFlag(false);
                        UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
                        UserConfigManage.getInstance().Save();
                        uniSuccessCallback(mode_type, true, callback);
                        if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -831,6 +833,12 @@
                        Intent intent = new Intent(HDLApp.getInstance(), LoginActivity.class);
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                        HDLApp.getInstance().startActivity(intent);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
                        //设备离网时有入口进入无网模式
                        uniSuccessCallback(mode_type, true, callback);
                        HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
@@ -2510,14 +2518,25 @@
        }
        List<GatewayBean> newList = new ArrayList<>();
        List<GatewayBean> inverterList = new ArrayList<>();
        List<GatewayBean> inverterUnactivatedList = new ArrayList<>();
        List<GatewayBean> lcList = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
                inverterList.add(list.get(i));
            GatewayBean gatewayBean = list.get(i);
            if (gatewayBean == null) {
                continue;
            }
            if (gatewayBean.isActivate()) {
                if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
                        || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
                    inverterList.add(gatewayBean);
                } else {
                    lcList.add(gatewayBean);
                }
            } else {
                lcList.add(list.get(i));
                inverterUnactivatedList.add(gatewayBean);
            }
        }
        newList.addAll(inverterUnactivatedList);
        newList.addAll(inverterList);
        newList.addAll(lcList);
        return newList;
@@ -2723,6 +2742,7 @@
                    inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
                    inverterDeviceBean.setSpk(gatewayBean.getSpk());
                    inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
                    inverterDeviceBean.setActivate(gatewayBean.isActivate());
                    newList.add(inverterDeviceBean);
                }
            }