2024年12月13日18:04:10

wjc

2024-12-13 9542b72d7f7faab8781e14bc8006f3df3f9a3f10

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

@@ -13,6 +13,7 @@
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;

import androidx.core.app.ActivityCompat;

@@ -141,6 +142,8 @@
            if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                return;
            }
            long startTime = System.currentTimeMillis();
            Log.d("===开始时间===", String.valueOf(startTime));
            String type = getKeyValue("type", data);//小类
            String logTag = getKeyValue("logTag", data);//标记uni指令
            String mode_type = "大类-" + topic + "---" + "小类-" + type;//用来打印的
@@ -764,6 +767,8 @@
                                } catch (Exception e) {
                                    uniSuccessCallback(type, json, callback);
                                }
                                long endTime = System.currentTimeMillis() - startTime;
                                Log.d("====耗时时间====", String.valueOf(endTime));
                            }
                        }
                    }
@@ -2365,8 +2370,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 +2381,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 +2395,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数据