调整uni

hxb

2023-06-28 531ba0d5bdc903c37e98128f04a85e0a146d23b7

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

@@ -6,12 +6,24 @@
import com.google.gson.Gson;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;

import org.json.JSONObject;


import java.util.ArrayList;
import java.util.List;

import io.dcloud.feature.unimp.DCUniMPJSCallback;

@@ -52,12 +64,14 @@
            if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                return;
            }
            String json = data == null ? "{}" : data.toString();
            json = json.equals("") ? "{}" : json;
            org.json.JSONObject jsonObject = new org.json.JSONObject(json);
            org.json.JSONObject jsonObject = getJSONObject(data);
            String type_value = "";
            String oid="";
            if (jsonObject.has("type")) {
                type_value = jsonObject.getString("type");
            }
            if (jsonObject.has("oid")) {
                oid = jsonObject.getString("oid");
            }

            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
@@ -65,7 +79,17 @@
                switch (type_value) {
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
                        //创建
                        HdlResidenceLogic.getInstance().getResidenceList(1, 100, "", "", null);
                        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
                            @Override
                            public void onSuccess(List<HouseIdBean> list) {
                                HdlResidenceLogic.getInstance().setHouseIdList(list);
                            }

                            @Override
                            public void onFailure(Exception exception) {

                            }
                        });

                    }
                    break;
@@ -86,10 +110,29 @@
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
                        //获取设备列表
                        //网关搜索
                        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
                            @Override
                            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                                HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                                callBackBaseBean.setTopic(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL);
                                callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST);
                                callBackBaseBean.setData(gatewayBeanList);
                                sendUni(callBackBaseBean);
                            }


                            @Override
                            public void onError(HDLLinkException e) {
                                //发送失败
                            }
                        });
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND:{
                        //发送modbus协议

                    }
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -140,15 +183,9 @@
    /**
     * 原生【主动】向小程序发送通知事件
     * 注意：需要提前小程序在运行才可成功
     *
     * @param topic 主题
     * @param body  附件数据(没有数据填null)
     */
    public void sendUni(String topic, String body) {
    public void sendUni(HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
        try {
            HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
            callBackBaseBean.setTopic(topic);
            callBackBaseBean.setData(body);
            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, HDLUniMP.UNI_APP_ID, getJSONObject(callBackBaseBean));
        } catch (Exception e) {
            HdlLogLogic.print("uni===原生主动向小程序发送通知事件", e.getMessage());
@@ -204,7 +241,7 @@
            uniCallBackBaseBean.setMes(msg);
            uniCallBackBaseBean.setData(obj);
            if (callback != null) {
                callback.invoke(uniCallBackBaseBean);
                callback.invoke(getJSONObject(uniCallBackBaseBean));
            }
        } catch (Exception e) {
            HdlLogLogic.print("uni===组装uni发送数据格式", e.getMessage());
@@ -236,7 +273,14 @@
     */
    private JSONObject getJSONObject(Object obj) {
        try {
            if (obj == null) {
                return new JSONObject();
            }
            if (TextUtils.isEmpty(obj.toString())) {
                return new JSONObject();
            }
            String json = new Gson().toJson(obj);

            return new JSONObject(json);
        } catch (Exception e) {
            return new JSONObject();