2024年03月26日15:22:09

mac

2024-03-26 c7c07eaa32ca7b137b1ac028d17beee0ebcf9a0b

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

@@ -18,6 +18,7 @@

import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
@@ -25,6 +26,7 @@
import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
@@ -130,6 +132,15 @@
                    //用户头像（旧平台逻辑是头像单独获取下载地址）
                    case HDLUniMP.UNI_EVENT_REPLY_USER_IMAGE: {
                        uniGetImageKey(mode_type, data, callback);
                    }
                    break;
                    //用户本地缓存信息
                    case HDLUniMP.UNI_EVENT_REPLY_USER_LOCAL_INFO: {
                        JsonObject jsonObject = new JsonObject();
                        jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
                        jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
                        jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
                        uniCallbackData(mode_type, jsonObject, callback);
                    }
                    break;
                }
@@ -1124,6 +1135,7 @@
                UserConfigManage.getInstance().Save();
                //获取用户头像路径
                if (cUserInfo.getMemberHeadIcon().contains("http")) {
                    UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                    //更新用户头像
                    uniCallbackData(type, cUserInfo, callback);
                } else {
@@ -1131,6 +1143,7 @@
                        @Override
                        public void onSuccess(String url) {
                            cUserInfo.setMemberHeadIcon(url);
                            UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                            uniCallbackData(type, cUserInfo, callback);
                        }

@@ -1359,6 +1372,7 @@
//        com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
        try {
            String devices = getKeyValue("devices", getKeyValue("data", data));
            String homeId = UserConfigManage.getInstance().getHomeId(); //getKeyValue("homeId", getKeyValue("data", data));
            Gson gson = new Gson();
            Type typeOfT = new TypeToken<List<GatewayBean>>() {
            }.getType();
@@ -1367,7 +1381,6 @@
                uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
                return;
            }
            String homeId = UserConfigManage.getInstance().getHomeId();
            //记录条数
            AtomicInteger atomicInteger = new AtomicInteger(0);
            final boolean[] is_boolean = {false};
@@ -1483,16 +1496,16 @@
                    }
                    return;
                }
                //进来住宅详情都要上传一次oid列表到云端;
                HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
                if (callback != null) {
                    uniCallbackData(type, list, callback);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                baseEventBus.setData(list);
                EventBus.getDefault().post(baseEventBus);
                if (callback != null) {
                    uniCallbackData(type, list, callback);
                }
                //进来住宅详情都要上传一次oid列表到云端;
                HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
            }

            @Override
@@ -1546,14 +1559,14 @@
            @Override
            public void onSuccess(int[] data) {
                uniCallbackData(type, data, callback);
                HdlLogLogic.print("uni--->接收--->ModBus--->" + Arrays.toString(data), true);
//                HdlLogLogic.print("uni--->接收--->ModBus--->" + Arrays.toString(data), true);

            }

            @Override
            public void onError(HDLLinkException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                HdlLogLogic.print("uni--->接收--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
//                HdlLogLogic.print("uni--->接收--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
            }
        });
    }
@@ -1579,6 +1592,9 @@
                //小程序那里有自己的请求方法,需要这些数据
                data.put("token", UserConfigManage.getInstance().getToken());
                data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
                if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
                    AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
                }
                data.put("serverAddress", AppConfigManage.getUserRegionUrl());
                data.put("appKey", AppConfigManage.getAppKey());
                data.put("appSecret", AppConfigManage.getAppSecret());