2024年12月12日17:25:15

wjc

2024-12-12 0c1949984e4c59d4ae5f2d96c6b7438364642a08

2024年12月12日17:25:15

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

@@ -222,7 +222,7 @@
    public void getUserInfo_B(CloudCallBeak<BUserInfo> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_USERINFO;
        JsonObject json = new JsonObject();
        json.addProperty("userId",UserConfigManage.getInstance().getUserId());
        json.addProperty("userId", UserConfigManage.getInstance().getUserId());
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
@@ -693,7 +693,7 @@
        if (obj != null) {
            boolean isUserId = UserConfigManage.getInstance().getUserId().equals(obj.getUserId());
            UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//与上一个账号是否同一个
            if (!UserConfigManage.getInstance().isTheSameLoginAccount()) {
            if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
                //不同账号,删除之前的旧账号日志信息;
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
            }

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

@@ -2365,8 +2365,9 @@
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> list) {
                List<GatewayBean> newList = sortLogic(list);
                if (callback != null) {
                    uniSuccessCallback(type, list, callback);
                    uniSuccessCallback(type, newList, callback);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
@@ -2375,7 +2376,7 @@
                baseEventBus.setData(homeId);
                EventBus.getDefault().post(baseEventBus);
                //进来住宅详情都要上传一次oid列表到云端;
                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
            }

            @Override
@@ -2389,6 +2390,31 @@
    }

    /**
     * 进行排序（逆变器-负载中心）
     *
     * @param list 源数据
     * @return 返回列表
     */
    private List<GatewayBean> sortLogic(List<GatewayBean> list) {
        if (list == null || list.size() == 0) {
            return new ArrayList<>();
        }
        List<GatewayBean> newList = new ArrayList<>();
        List<GatewayBean> inverterList = 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));
            } else {
                lcList.add(list.get(i));
            }
        }
        newList.addAll(inverterList);
        newList.addAll(lcList);
        return newList;
    }

    /**
     * link spk 属性编辑
     *
     * @param data     uni数据