2024年06月12日17:27:36

mac

2024-06-12 fde174d256d4dced8bef6c439ec87cd888ad140b

2024年06月12日17:27:36

备份代码

 app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java

@@ -8,7 +8,7 @@
public class AppConfigManage {

    /*********是否正式服务器*********/
    private static final boolean isOnlineServer = true;
    private static final boolean isOnlineServer = false;
    /*********正式环境*********/
    private static final String APP_KEY_ONLINE = "CSZEMDJL";
    private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";

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

@@ -46,7 +46,7 @@
     *
     * @param cloudCallBeak -
     */
    public void getUserRightType(CloudCallBeak<PageNumberObject<UserRightTypeBean>> cloudCallBeak) {
    public void getUserRightType(CloudCallBeak<UserRightTypeBean> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_USERRIGHTTYPE;
        JsonObject json = new JsonObject();
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -54,15 +54,14 @@
            public void onSuccess(String jsonStr) {
                if (TextUtils.isEmpty(jsonStr)) {
                    if (cloudCallBeak != null) {
                        cloudCallBeak.onSuccess(new PageNumberObject<>());
                        cloudCallBeak.onSuccess(new UserRightTypeBean());
                    }
                }
                Gson gson = new Gson();
                Type type = new TypeToken<PageNumberObject<UserRightTypeBean>>() {
                }.getType();
                PageNumberObject<UserRightTypeBean> pageNumberObject = gson.fromJson(jsonStr, type);

                UserRightTypeBean userRightTypeBean = gson.fromJson(jsonStr, UserRightTypeBean.class);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(pageNumberObject);
                    cloudCallBeak.onSuccess(userRightTypeBean);
                }
            }


 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.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;

@@ -30,6 +31,7 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -43,8 +45,11 @@
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
@@ -152,7 +157,7 @@
                        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);
                        uniSuccessCallback(mode_type, jsonObject, callback);
                    }
                    break;
                }
@@ -197,7 +202,7 @@

                }
                if (callback != null) {
                    uniCallbackData(type, null, callback);
                    uniSuccessCallback(type, null, callback);
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                //设备模块
@@ -296,14 +301,14 @@
                    //获取手机wifi列表
                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
                        if (callback != null) {
                            uniCallbackData(mode_type, wifiUtils.getScanResult(), callback);
                            uniSuccessCallback(mode_type, wifiUtils.getScanResult(), callback);
                        }
                    }
                    break;
                    //获取手机当前wifi详情
                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_INFO: {
                        if (callback != null) {
                            uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
                            uniSuccessCallback(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
                        }
                    }
                    break;
@@ -471,6 +476,53 @@
                    break;
                    //成员列表
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
                        uniGetMemberList(type, data, callback);
                    }
                    break;
                    //成员添加
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_ADD: {
                        uniGetMemberAdd(type, data, callback);
                    }
                    break;
                    //成员删除
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_DELETE: {
                        uniGetMemberDelete(type, data, callback);
                    }
                    break;
                    //成员编辑
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_EDIT: {
                        uniGetMemberEdit(type, data, callback);

                    }
                    break;
                    //获取员工列表
                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_LIST: {
                        uniGetStaffList(type, data, callback);

                    }
                    break;
                    //员工添加
                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_ADD: {
                        uniGetStaffAdd(type, data, callback);

                    }
                    break;
                    //员工删除
                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_DELETE: {

                        uniGetStaffDelete(type, data, callback);

                    }
                    break;
                    //员工编辑
                    case HDLUniMP.UNI_EVENT_REPLY_STAFF_EDIT: {
                        uniGetStaffEdit(type, data, callback);

                    }
                    break;
                    //获取当前账号在公司的身份
                    case HDLUniMP.UNI_EVENT_REPLY_USERRIGHTTYPe: {
                        uniGetUserRightType(type, data, callback);

                    }
                    break;
@@ -482,12 +534,12 @@
                switch (type) {
                    //获取温度单位
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
                        uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
                        uniSuccessCallback(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
                    }
                    break;
                    //获取当前app语言
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
                        uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
                        uniSuccessCallback(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
                    }
                    break;
                    //获取位置信息
@@ -498,7 +550,7 @@
                    //应用冲突
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
                        if (callback != null) {
                            uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
                            uniSuccessCallback(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
                        }
                    }
                    break;
@@ -574,6 +626,209 @@

    //region ******uni接口方法******

    /**
     * 获取当前账号在公司的身份
     */
    private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
        HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
            @Override
            public void onSuccess(UserRightTypeBean userRightTypeBean) {
                uniSuccessCallback(type, userRightTypeBean, callback);
            }

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

    /**
     * 员工编辑
     */
    private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
            } catch (Exception ignored) {
            }
        }
        HdlMemberLogic.getInstance().getStaffEdit(staffBean, 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 uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
            } catch (Exception ignored) {
            }
        }
        HdlMemberLogic.getInstance().getStaffDelete(staffBean, 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 uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
            } catch (Exception ignored) {
            }
        }
        HdlMemberLogic.getInstance().getStaffAdd(staffBean, 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 uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
        HdlMemberLogic.getInstance().getStaffList(1, 50, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
            @Override
            public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
                uniSuccessCallback(type, obj.getList(), callback);
            }

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

    /**
     * 成员编辑
     */
    private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);
            } catch (Exception ignored) {
            }
        }
        HdlMemberLogic.getInstance().getMemberEdit(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 uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);
            } catch (Exception ignored) {
            }
        }
        HdlMemberLogic.getInstance().getMemberDelete(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 uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);
            } catch (Exception ignored) {
            }
        }
        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 uniGetMemberList(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        MemberBean memberBean = new MemberBean();
        memberBean.setHomeId(homeId);
        HdlMemberLogic.getInstance().getMemberList(memberBean, new CloudCallBeak<List<MemberBean>>() {
            @Override
            public void onSuccess(List<MemberBean> list) {
                uniSuccessCallback(type, list, callback);
            }

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

    /**
     * 获取或者配置逆变器网络（包括逆变器热点，wifi，以太网）信息
@@ -596,7 +851,7 @@
            @Override
            public void onSuccess(String msg) {
                if (callback != null) {
                    uniCallbackData(type, msg, callback);
                    uniSuccessCallback(type, msg, callback);
                }

            }
@@ -625,7 +880,7 @@
            if (ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                geolocation.setResult(-2);
                geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_no_location_information_permission));
                uniCallbackData(type, geolocation, callback);
                uniSuccessCallback(type, geolocation, callback);
                return;
            }
            // 判断设备是否支持定位功能
@@ -633,14 +888,14 @@
                geolocation.setResult(-1);
                geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
                //todo 提示用户打开定位功能或者引导用户去系统设置页面打开定位功能
                uniCallbackData(type, geolocation, callback);
                uniSuccessCallback(type, geolocation, callback);
                return;
            }
            Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
            if (location == null) {
                geolocation.setResult(-3);
                geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_unable_location_move10_meters_later));
                uniCallbackData(type, geolocation, callback);
                uniSuccessCallback(type, geolocation, callback);
                return;
            }
            geolocation.setResult(0);
@@ -651,12 +906,12 @@
            double lon = longitude.setScale(6, RoundingMode.HALF_DOWN).doubleValue();
            geolocation.setLatitude(lat);//经度
            geolocation.setLongitude(lon);//纬度
            uniCallbackData(type, geolocation, callback);
            uniSuccessCallback(type, geolocation, callback);
        } catch (Exception e) {
            Geolocation geolocation = new Geolocation();
            geolocation.setResult(-4);
            geolocation.setDes(e.getMessage());
            uniCallbackData(type, geolocation, callback);
            uniSuccessCallback(type, geolocation, callback);
        }
    }

@@ -670,7 +925,7 @@
        HdlOtaLogic.getInstance().getCloudOidList(new CloudCallBeak<List<DeviceOidInfoBean>>() {
            @Override
            public void onSuccess(List<DeviceOidInfoBean> obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -689,7 +944,7 @@
        HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
            @Override
            public void onSuccess(List<DeviceFirmwareBean> obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -709,7 +964,7 @@
        HdlOtaLogic.getInstance().getNewDeviceFirmwares(hardwareModel, osImageId, new CloudCallBeak<List<CloudDeviceFirmwaresBean>>() {
            @Override
            public void onSuccess(List<CloudDeviceFirmwaresBean> obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -747,7 +1002,7 @@
                }
            }
            if (callback != null) {
                this.uniCallbackData(type, list, callback);
                this.uniSuccessCallback(type, list, callback);
            }
        } catch (Exception ignored) {
        }
@@ -871,7 +1126,7 @@
                            HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniCallbackData(type, obj, callback);
                                    uniSuccessCallback(type, obj, callback);
                                }

                                @Override
@@ -910,7 +1165,7 @@
                        HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(type, obj, callback);
                                uniSuccessCallback(type, obj, callback);
                            }

                            @Override
@@ -940,7 +1195,7 @@
        HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
            @Override
            public void onSuccess(List<GatewayDriverBean> obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -960,7 +1215,7 @@
        HdlOtaLogic.getInstance().getNewGatewayDrivers(driveCode, osImageId, new CloudCallBeak<CloudGatewayDriversBean>() {
            @Override
            public void onSuccess(CloudGatewayDriversBean obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -996,10 +1251,10 @@
                }
            }
            if (callback != null) {
                this.uniCallbackData(type, list, callback);
                this.uniSuccessCallback(type, list, callback);
            }
        } catch (Exception exception) {
            this.uniCallbackData(type, new ArrayList<>(), callback);
            this.uniSuccessCallback(type, new ArrayList<>(), callback);
        }

    }
@@ -1123,7 +1378,7 @@
                            HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniCallbackData(type, obj, callback);
                                    uniSuccessCallback(type, obj, callback);
                                }

                                @Override
@@ -1162,7 +1417,7 @@
                        HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(type, obj, callback);
                                uniSuccessCallback(type, obj, callback);
                            }

                            @Override
@@ -1273,19 +1528,19 @@
                if (cUserInfo.getMemberHeadIcon().contains("http")) {
                    UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                    //更新用户头像
                    uniCallbackData(type, cUserInfo, callback);
                    uniSuccessCallback(type, cUserInfo, callback);
                } else {
                    HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
                        @Override
                        public void onSuccess(String url) {
                            cUserInfo.setMemberHeadIcon(url);
                            UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
                            uniCallbackData(type, cUserInfo, callback);
                            uniSuccessCallback(type, cUserInfo, callback);
                        }

                        @Override
                        public void onFailure(HDLException e) {
                            uniCallbackData(type, cUserInfo, callback);
                            uniSuccessCallback(type, cUserInfo, callback);
                        }
                    });
                }
@@ -1310,7 +1565,7 @@
        HdlAccountLogic.getInstance().getImageKey_C(imageKey, new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String url) {
                uniCallbackData(type, url, callback);
                uniSuccessCallback(type, url, callback);
            }

            @Override
@@ -1332,7 +1587,7 @@
        HdlDeviceLogic.getInstance().clearInverterHomeId(mac, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, null, callback);
                uniSuccessCallback(type, null, callback);
            }

            @Override
@@ -1353,7 +1608,7 @@
        HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
            @Override
            public void onSuccess(UnCountBean data) {
                uniCallbackData(type, data, callback);
                uniSuccessCallback(type, data, callback);
            }

            @Override
@@ -1392,7 +1647,7 @@
        HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, timezone, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, true, callback);
                uniSuccessCallback(type, true, callback);
            }

            @Override
@@ -1414,7 +1669,7 @@
            @Override
            public void onSuccess(DeviceTimeBean deviceTimeBean) {
                if (callback != null) {
                    uniCallbackData(type, deviceTimeBean, callback);
                    uniSuccessCallback(type, deviceTimeBean, callback);
                }
            }

@@ -1437,7 +1692,7 @@
            @Override
            public void onSuccess(List<OidBean> list) {
                if (callback != null) {
                    uniCallbackData(type, list, callback);
                    uniSuccessCallback(type, list, callback);
                }
            }

@@ -1474,7 +1729,7 @@
                        HdlDeviceLogic.getInstance().addInverterDeviceToCloud(homeId, mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(type, null, callback);
                                uniSuccessCallback(type, null, callback);
                            }

                            @Override
@@ -1534,7 +1789,7 @@
                                    HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
                                        @Override
                                        public void onSuccess(Boolean obj) {
                                            uniCallbackData(type, null, callback);
                                            uniSuccessCallback(type, null, callback);
                                        }

                                        @Override
@@ -1584,7 +1839,7 @@
        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, null, callback);
                uniSuccessCallback(type, null, callback);
            }

            @Override
@@ -1606,7 +1861,7 @@
        HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                uniCallbackData(type, gatewayBeanList, callback);
                uniSuccessCallback(type, gatewayBeanList, callback);
            }

            @Override
@@ -1631,12 +1886,12 @@
            public void onSuccess(List<GatewayBean> list) {
                if (list == null || list.size() == 0) {
                    if (callback != null) {
                        uniCallbackData(type, list, callback);
                        uniSuccessCallback(type, list, callback);
                    }
                    return;
                }
                if (callback != null) {
                    uniCallbackData(type, list, callback);
                    uniSuccessCallback(type, list, callback);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
@@ -1679,7 +1934,7 @@
        TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_DOWN, jay, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                uniCallbackData(type, msg, callback);
                uniSuccessCallback(type, msg, callback);
            }

            @Override
@@ -1717,7 +1972,7 @@
                    Type typeOfT = new TypeToken<BaseLocalResponse<List<LinkBean>>>() {
                    }.getType();
                    BaseLocalResponse<List<LinkBean>> baseLocalResponse = gson.fromJson(msg, typeOfT);
                    uniCallbackData(type, baseLocalResponse, callback);
                    uniSuccessCallback(type, baseLocalResponse, callback);
                } catch (Exception e) {
                    uniCallbackData(type, msg, -2, "", callback);
                }
@@ -1775,7 +2030,7 @@
//                            logMessage("tcp回复数据", 0, strings[0] + "\r\n" + json.toString());
                    if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
                        if (callback != null) {
                            uniCallbackData(type, json, callback);
                            uniSuccessCallback(type, json, callback);
                        }
                        if (json.has("mac")) { //回复成功再拿设备mac
//                                    this.device_mac = json.getString("mac");
@@ -1818,7 +2073,7 @@
        HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -1865,7 +2120,7 @@
        HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -1890,7 +2145,7 @@
        HdlDeviceLogic.getInstance().setRename(homeId, deviceType, deviceId, name, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, obj, callback);
                uniSuccessCallback(type, obj, callback);
            }

            @Override
@@ -1940,7 +2195,7 @@
        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
            @Override
            public void onSuccess(int[] data) {
                uniCallbackData(type, data, callback);
                uniSuccessCallback(type, data, callback);
//                HdlLogLogic.print("uni---接收---ModBus---" + Arrays.toString(data), true);

            }
@@ -1989,6 +2244,13 @@
        return new JSONObject();
    }

    private void uniSuccessCallback(String type, Object obj, DCUniMPJSCallback callback) {
        uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
    }

    private void uniExceptionCallback(String type, HDLException hdlException, DCUniMPJSCallback callback) {
        uniCallbackData(type, null, hdlException.getCode(), hdlException.getMsg(), callback);
    }

    /**
     * 组装uni发送数据格式
@@ -2018,9 +2280,6 @@

    }

    private void uniCallbackData(String type, Object obj, DCUniMPJSCallback callback) {
        uniCallbackData(type, obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
    }

    /**
     * 当前对象转 JSONObject

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java

@@ -103,6 +103,7 @@
    public final static String UNI_EVENT_REPLY_STAFF_ADD = "staff_add";//员工添加
    public final static String UNI_EVENT_REPLY_STAFF_DELETE = "staff_delete";//员工删除
    public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//员工编辑
    public final static String UNI_EVENT_REPLY_USERRIGHTTYPe = "user_right_type";//获取当前账号在公司的身份


    /*********Wifi模块*********/