Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -10,6 +10,7 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
import android.os.SystemClock;
import android.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;
@@ -42,10 +43,12 @@
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
@@ -91,6 +94,7 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;

import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
import okhttp3.ResponseBody;

@@ -178,6 +182,13 @@

                        if (callback != null) {
                            uniSuccessCallback(type, null, callback);
                        }
                    }
                    break;
                    //账号下是否有电站列表
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_LIST: {
                        if (callback != null) {
                            uniSuccessCallback(type, HdlResidenceLogic.getInstance().getHouseIdList().size(), callback);
                        }
                    }
                    break;
@@ -522,6 +533,12 @@

                    }
                    break;
                    //下载成员（子账号）头像
                    case HDLUniMP.UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR: {
                        uniGetHeadPIortrait(type, data, callback);

                    }
                    break;
                    //成员列表
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
                        uniGetMemberList(type, data, callback);
@@ -576,7 +593,7 @@
                    }
                    break;
                    //获取当前账号在公司的身份
                    case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYPe: {
                    case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYP: {
                        uniGetUserRightType(type, data, callback);

                    }
@@ -650,12 +667,6 @@
        HdlLogLogic.print("uni---组装uni发送数据格式---" + json, false);
    }

    public void openUniMPDelay(String path, JSONObject jsonObject) {
        JSONObject json = this.createdJSONObject(jsonObject, true);
        HDLUniMPSDKManager.getInstance().openUniMPDelay(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
        HdlLogLogic.print("uni---组装uni发送数据格式---" + json, false);
    }

    /**
     * 原生【主动】向小程序发送通知事件
     * 注意：需要提前小程序在运行才可成功
@@ -685,10 +696,15 @@
     * 电站删除
     */
    private void uniGetDelResidence(String type, Object data, DCUniMPJSCallback callback) {


        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                if (callback != null) {
                    uniSuccessCallback(type, null, callback);
                }
                List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
                for (int i = 0; i < list.size(); i++) {
                    GatewayBean gatewayBean = list.get(i);
@@ -697,9 +713,33 @@
                list.clear();//清空缓存;
//              HDLLinkLocalGateway.getInstance().getGatewayList().clear();
                HdlResidenceLogic.getInstance().delHouseId(homeId);//删除电站缓存
                //uni收到成功结果响应后,会自动关闭小程序，在HDLUniMPSDKManager类里面有方法()监听到小程序关闭，监听到小程序关闭事件后，会重新获取电站列表进行刷界面；
                uniSuccessCallback(type, obj, callback);
                if (UserConfigManage.getInstance().isBAccount()) {
                    //B端
                    //收到成功结果响应后,会自动关闭小程序，在HDLUniMPSDKManager类里面有方法()监听到小程序关闭，监听到小程序关闭事件后，会重新获取电站列表进行刷界面；
                    if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
                        HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                    }
                } else {
                    //C端
                    List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
                    if (HouseIdList.size() == 0) {
                        String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
                        HdlUniLogic.getInstance().openUniMP(path, null);
                    } else {
                        HouseIdBean houseIdBean = HouseIdList.get(0);//默认拿第一个
                        HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
                        JsonObject jsonObject = new JsonObject();
                        jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                        jsonObject.addProperty("homeName", houseIdBean.getHomeName());
                        jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
                        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                        uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
                        uniCallBackBaseBean.setData(jsonObject);
                        HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
                    }


                }
            }

            @Override
@@ -742,6 +782,10 @@
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
                //收到成功结果响应后,会自动关闭小程序，在HDLUniMPSDKManager类里面有方法()监听到小程序关闭，监听到小程序关闭事件后，会重新获取电站列表进行刷界面；
                if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
                    HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
                }
            }

            @Override
@@ -966,6 +1010,32 @@
        HdlMemberLogic.getInstance().getMemberAdd(memberBean, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniExceptionCallback(type, e, callback);
            }
        });
    }

    /**
     * 下载成员（子账号）头像
     */
    private void uniGetHeadPIortrait(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(memberInfo)) {
            try {
                memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
            } catch (Exception ignored) {
            }
        }

        HdlMemberLogic.getInstance().getHeadPIortrait(memberBean, new CloudCallBeak<byte[]>() {
            @Override
            public void onSuccess(byte[] obj) {
                uniSuccessCallback(type, obj, callback);
            }

@@ -1960,6 +2030,22 @@

                                        @Override
                                        public void onFailure(HDLException e) {
                                            //添加逆变器失败后初始化逆变器
                                            HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true);
                                            for (int i = 0; i < list.size(); i++) {
                                                GatewayBean gatewayBean = list.get(i);
                                                HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                                                    @Override
                                                    public void onSuccess(Boolean obj) {
                                                        HdlLogLogic.print("初始化逆变器成功-->mac:" + gatewayBean.getDevice_mac(), true);
                                                    }

                                                    @Override
                                                    public void onError(HDLLinkException e) {
                                                        HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true);
                                                    }
                                                });
                                            }
                                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                                        }
                                    });
@@ -1999,9 +2085,12 @@
    private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String mac = getKeyValue("mac", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                //初始化逆变器设备
                HdlDeviceLogic.getInstance().initializeInverter(mac, null);
                //移除本地缓存
                HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
                uniSuccessCallback(type, null, callback);
@@ -2009,7 +2098,25 @@

            @Override
            public void onFailure(HDLException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                if (e.getCode() == 121005) {
                    //设备不存在（121005）状态码
                    //初始化逆变器设备
                    HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            //移除本地缓存
                            HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
                            uniSuccessCallback(type, null, callback);
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                        }
                    });
                } else {
                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                }
            }
        });
    }
@@ -2049,19 +2156,14 @@
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> list) {
                if (list == null || list.size() == 0) {
                    if (callback != null) {
                        uniSuccessCallback(type, list, callback);
                    }
                    return;
                }
                if (callback != null) {
                    uniSuccessCallback(type, list, callback);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
                baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                baseEventBus.setData(list);
                baseEventBus.setData(homeId);
                EventBus.getDefault().post(baseEventBus);
                //进来住宅详情都要上传一次oid列表到云端;
                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);