2024年06月12日17:27:36

mac

2024-06-12 fde174d256d4dced8bef6c439ec87cd888ad140b

 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,10 +31,12 @@
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;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
@@ -42,10 +45,13 @@
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.PersonalDataActivity;
import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterList;
import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
@@ -64,6 +70,7 @@
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.huawei.hms.api.Api;

import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -90,6 +97,8 @@
 */
public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
    private static volatile HdlUniLogic sHdlUniLogic;

    public final static String separator = "---";

    /**
     * 获取当前对象
@@ -127,8 +136,8 @@
            }
            String type = getKeyValue("type", data);//小类
            String logTag = getKeyValue("logTag", data);//标记uni指令
            String mode_type = "大类->" + topic + "--->" + "小类->" + type;//用来打印的
            HdlLogLogic.print(logTag + ":" + "uni--->发送--->" + mode_type + "\r\n" + data, true);
            String mode_type = "大类-" + topic + "---" + "小类-" + type;//用来打印的
            HdlLogLogic.print(logTag + ":" + "uni---发送---" + mode_type + "\r\n" + data, true);
            if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
                //用户模块
                switch (type) {
@@ -148,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;
                }
@@ -193,11 +202,16 @@

                }
                if (callback != null) {
                    uniCallbackData(type, null, callback);
                    uniSuccessCallback(type, null, callback);
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                //设备模块
                switch (type) {
                    //modBus协议专用
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
                        sendModBus(mode_type, data, callback);
                    }
                    break;
                    //添加逆变器到云端
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                        this.uniAddInverterDeviceToCloud(mode_type, data, callback);
@@ -223,11 +237,6 @@
                        this.uniGetCurrentHomeLocalAndCloudGatewayList(mode_type, data, callback);
                    }
                    break;
                    //modBus协议专用
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
                        sendModBus(mode_type, data, callback);
                    }
                    break;
                    //获取oid列表
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
                        this.uniGetInverterOidList(mode_type, data, callback);
@@ -237,7 +246,6 @@
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
                        this.uniGetInverterTime(mode_type, data, callback);
                    }

                    break;
                    //逆变器时间编辑
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
@@ -269,43 +277,78 @@
                        this.uniGetMessageNumber(mode_type, data, callback);
                    }
                    break;

                    //初始化逆变器
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER: {
                        this.setInitializeGateway(mode_type, data, callback);
                    }
                    break;
                    //读取设备远程信息
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_REMOTEINFO: {
                        this.setInverterDeviceRemoteInfo(mode_type, data, callback);
                    }
                    break;
                    //设备名称修改(修改是云端oid名称，设备使用modbus协议修改)
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
                        this.uniOidEditName(mode_type, data, callback);
                    }
                    break;
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
                WifiUtils wifiUtils = WifiUtils.getInstance();
                //wifi模块
                switch (type) {
                    //获取wifi列表
                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
                    //获取手机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_WIFI_PHONE_INFO: {
                    //获取手机当前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;
                    //配置WiFi信息给逆变器
                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_SET_DEVICE: {
                        String mac = getKeyValue("mac", getKeyValue("data", data));//
                        String wif_type = getKeyValue("wif_type", getKeyValue("data", data));//1：热点,2：无线wifi,3：以太网
                        String ssid = getKeyValue("ssid", getKeyValue("data", data));//
                        String password = getKeyValue("password", getKeyValue("data", data));//
                        startTcpThreadSendAccountAndPassword(mode_type, ssid, password, callback);

                    }
                    break;
                    //打开手机Wifi设置界面
                    case HDLUniMP.UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS: {
                    case HDLUniMP.UNI_EVENT_REPLY_PHONE_OPEN_WIFI_SETTINGS: {
                        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                        HDLApp.getInstance().startActivity(intent);
                    }
                    //逆变器WiFi信息配置
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_SET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_EDIT, callback);
                    }
                    break;
                    //逆变器WiFi信息获取
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_GET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_GET, callback);
                    }
                    break;
                    //逆变器热点配置
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_SET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_EDIT, callback);
                    }
                    break;
                    //逆变器热点获取
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_GET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_GET, callback);
                    }
                    break;
                    //逆变器以太网配置
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
                    }
                    break;
                    //逆变器以太网获取
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
                        uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
                    }
                    break;

                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
                //OTA升级模块
@@ -394,7 +437,7 @@
                    case HDLUniMP.UNI_EVENT_REPLY_MINE_EDIT_USER_INFO: {
                        Intent intent = new Intent();
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                        intent.setClass(HDLApp.getInstance(), PersonalDataActivity.class);
                        intent.setClass(HDLApp.getInstance(), CPersonalDataActivity.class);
                        HDLApp.getInstance().startActivity(intent);
                    }
                    break;
@@ -428,6 +471,59 @@
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                        intent.setClass(HDLApp.getInstance(), SetActivity.class);
                        HDLApp.getInstance().startActivity(intent);

                    }
                    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;

@@ -438,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;
                    //获取位置信息
@@ -454,24 +550,21 @@
                    //应用冲突
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
                        if (callback != null) {
                            uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
                            uniSuccessCallback(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
                        }
                    }
                    break;
                    //专门收集uni日志
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
                        String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
                        HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
                        HdlLogLogic.print("uni---log---" + customizeContentFormat, true);

                    }
                    break;
                    //uni主页点击返回通知
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
                        //EventBus事件分发
                        BaseEventBus baseEventBus = new BaseEventBus();
                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
                        EventBus.getDefault().post(baseEventBus);
                        HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL, HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);

                    }
                    break;
@@ -484,7 +577,7 @@
            }

        } catch (Exception e) {
            HdlLogLogic.print("uni--->发送--->" + e.getMessage(), true);
            HdlLogLogic.print("uni---发送---" + e.getMessage(), true);
        }

    }
@@ -499,7 +592,13 @@
    public void openUniMP(String path, JSONObject jsonObject) {
        JSONObject json = this.createdJSONObject(jsonObject, true);
        HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
        HdlLogLogic.print("uni--->组装uni发送数据格式--->" + json, false);
        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);
    }

    /**
@@ -513,7 +612,7 @@
        try {
            HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
        } catch (Exception e) {
            HdlLogLogic.print("uni--->原生主动向小程序发送通知事件--->" + e.getMessage(), false);
            HdlLogLogic.print("uni---原生主动向小程序发送通知事件---" + e.getMessage(), false);
        }
    }

@@ -526,6 +625,246 @@
    //endregion

    //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，以太网）信息
     */
    private void uniGetAndSetNetwork(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        JsonArray jsonArray = new JsonArray();
        JsonObject jObject = null;
        String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
        if (!TextUtils.isEmpty(attribute_data)) {
            try {
                jObject = new Gson().fromJson(attribute_data, JsonObject.class);
            } catch (Exception ignored) {
                jObject = new JsonObject();
            }
        }
        jsonArray.add(jObject);
        //解密负载数据(写密钥给网关一定是明文，因为那时网关还没有密钥)
        TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String msg) {
                if (callback != null) {
                    uniSuccessCallback(type, msg, callback);
                }

            }

            @Override
            public void onError(HDLLinkException e) {
                if (callback != null) {
                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                }
            }
        });
    }


    /**
     * 获取位置信息,包括经纬度
@@ -541,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;
            }
            // 判断设备是否支持定位功能
@@ -549,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);
@@ -567,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);
        }
    }

@@ -586,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
@@ -605,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
@@ -625,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
@@ -663,7 +1002,7 @@
                }
            }
            if (callback != null) {
                this.uniCallbackData(type, list, callback);
                this.uniSuccessCallback(type, list, callback);
            }
        } catch (Exception ignored) {
        }
@@ -727,11 +1066,11 @@
        String module = "FW#" + imageId;//模块信息(HW：硬件)

        //升级本地优先->云端升级
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
                    HdlLogLogic.print("本地升级--->", true);
                    HdlLogLogic.print("本地升级---", true);
                    //本地
                    //1,建立本地服务；
                    //2,告诉网关手机ip和端口；
@@ -769,7 +1108,7 @@
                        }
                    });
                } else {
                    HdlLogLogic.print("在线升级--->", true);
                    HdlLogLogic.print("在线升级---", true);
                    //远程升级需要检测在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                        @Override
@@ -787,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
@@ -808,7 +1147,7 @@

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级--->", true);
                HdlLogLogic.print("在线升级---", true);
                //远程升级需要检测在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
@@ -826,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
@@ -856,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
@@ -876,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
@@ -912,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);
        }

    }
@@ -979,11 +1318,11 @@
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String module = driverCode + "#" + imageId;
        //升级本地优先->云端升级
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
                    HdlLogLogic.print("本地升级--->", true);
                    HdlLogLogic.print("本地升级---", true);
                    //本地
                    //1,建立本地服务；
                    // 2，告诉网关手机ip和端口；
@@ -1021,7 +1360,7 @@
                        }
                    });
                } else {
                    HdlLogLogic.print("在线升级--->", true);
                    HdlLogLogic.print("在线升级---", true);
                    //远程升级需要【检测】在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                        @Override
@@ -1039,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
@@ -1060,7 +1399,7 @@

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级--->", true);
                HdlLogLogic.print("在线升级---", true);
                //远程升级需要【检测】在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
@@ -1078,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
@@ -1189,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);
                        }
                    });
                }
@@ -1226,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
@@ -1248,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
@@ -1269,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
@@ -1308,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
@@ -1330,7 +1669,7 @@
            @Override
            public void onSuccess(DeviceTimeBean deviceTimeBean) {
                if (callback != null) {
                    uniCallbackData(type, deviceTimeBean, callback);
                    uniSuccessCallback(type, deviceTimeBean, callback);
                }
            }

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

@@ -1390,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
@@ -1424,7 +1763,7 @@
//        com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
        try {
            String devices = getKeyValue("devices", getKeyValue("data", data));
            String homeId = UserConfigManage.getInstance().getHomeId(); //绑定成功之后通知
            String homeId = getKeyValue("homeId", getKeyValue("data", data));
            Gson gson = new Gson();
            Type typeOfT = new TypeToken<List<GatewayBean>>() {
            }.getType();
@@ -1450,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
@@ -1493,11 +1832,14 @@
     */
    private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        String homeId = UserConfigManage.getInstance().getHomeId();
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        if (TextUtils.isEmpty(homeId)) {
            homeId = UserConfigManage.getInstance().getHomeId();
        }
        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, null, callback);
                uniSuccessCallback(type, null, callback);
            }

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

            @Override
@@ -1544,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();
@@ -1592,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
@@ -1630,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);
                }
@@ -1652,73 +1994,165 @@
     * @param callback uni回调
     */
    public void startTcpThreadSendAccountAndPassword(String type, String ssid, String password, DCUniMPJSCallback callback) {
        new Thread(
                () -> {
                    Socket socket = null;
                    OutputStream outputStreamTcp = null;
                    InputStream inputStreamTcp = null;
                    try {
                        socket = new Socket();
                        socket.setTcpNoDelay(true);
                        socket.setSoTimeout(10 * 1000);//10秒超时
                        socket.connect(new InetSocketAddress("192.168.8.1", 8586));
                        socket.setKeepAlive(true);
        new Thread(() -> {
            Socket socket = null;
            OutputStream outputStreamTcp = null;
            InputStream inputStreamTcp = null;
            try {
                socket = new Socket();
                socket.setTcpNoDelay(true);
                socket.setSoTimeout(10 * 1000);//10秒超时
                socket.connect(new InetSocketAddress("192.168.8.1", 8586));
                socket.setKeepAlive(true);
//                        logMessage("tcp连接状态成功", 0, "");
                        outputStreamTcp = socket.getOutputStream();
                        JsonObject jsonObject = new JsonObject();
                        jsonObject.addProperty("id", "102030");
                        jsonObject.addProperty("ssid", ssid);
                        jsonObject.addProperty("password", password);
                        jsonObject.addProperty("server_addr", HDLLinkPMUser.getInstance().getHomeRegionUrl());
                        jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
                        String sendData = "Topic:/user/id/custom/wifi/set\r\n";
                        sendData += "Length:" + jsonObject.toString().getBytes().length + "\r\n\r\n";
                        sendData += jsonObject.toString();
                        outputStreamTcp.write(sendData.getBytes());
                        outputStreamTcp.flush();
                        Thread.sleep(200);
                        inputStreamTcp = socket.getInputStream();
                        byte[] bytes = new byte[1204 * 2];
                        int len = inputStreamTcp.read(bytes);
                        if (len != -1) {
                            String str = new String(bytes, 0, bytes.length);
                            String[] strings = str.split("\r\n\r\n");
                            String[] topicAndLength = strings[0].split("\r\n");
                            String topic = topicAndLength[0];
                            JSONObject json = new JSONObject(strings[1]);
                outputStreamTcp = socket.getOutputStream();
                JsonObject jsonObject = new JsonObject();
                jsonObject.addProperty("id", "102030");
                jsonObject.addProperty("ssid", ssid);
                jsonObject.addProperty("password", password);
                jsonObject.addProperty("server_addr", HDLLinkPMUser.getInstance().getHomeRegionUrl());
                jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
                String sendData = "Topic:/user/id/custom/wifi/set\r\n";
                sendData += "Length:" + jsonObject.toString().getBytes().length + "\r\n\r\n";
                sendData += jsonObject.toString();
                outputStreamTcp.write(sendData.getBytes());
                outputStreamTcp.flush();
                Thread.sleep(200);
                inputStreamTcp = socket.getInputStream();
                byte[] bytes = new byte[1204 * 2];
                int len = inputStreamTcp.read(bytes);
                if (len != -1) {
                    String str = new String(bytes, 0, bytes.length);
                    String[] strings = str.split("\r\n\r\n");
                    String[] topicAndLength = strings[0].split("\r\n");
                    String topic = topicAndLength[0];
                    JSONObject json = new JSONObject(strings[1]);
//                            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);
                                }
                                if (json.has("mac")) { //回复成功再拿设备mac
                    if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
                        if (callback != null) {
                            uniSuccessCallback(type, json, callback);
                        }
                        if (json.has("mac")) { //回复成功再拿设备mac
//                                    this.device_mac = json.getString("mac");
//                                    this.isSucceedTcp = true;//表示成功
                                }
                            }
                        }

                    } catch (Exception ignored) {
                    } finally {
                        try {
                            if (outputStreamTcp != null) {
                                outputStreamTcp.close();
                                outputStreamTcp = null;
                            }
                            if (inputStreamTcp != null) {
                                inputStreamTcp.close();
                                inputStreamTcp = null;
                            }
                            if (socket != null) {
                                socket.close();
                                socket = null;
                            }

                        } catch (Exception ignored) {
                        }
                    }
                }
        ).start();

            } catch (Exception ignored) {
            } finally {
                try {
                    if (outputStreamTcp != null) {
                        outputStreamTcp.close();
                        outputStreamTcp = null;
                    }
                    if (inputStreamTcp != null) {
                        inputStreamTcp.close();
                        inputStreamTcp = null;
                    }
                    if (socket != null) {
                        socket.close();
                        socket = null;
                    }

                } catch (Exception ignored) {
                }
            }
        }).start();
    }

    /**
     * 初始化逆变器
     *
     * @param type     账号
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void setInitializeGateway(String type, Object data, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onError(HDLLinkException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
            }
        });
    }

    /**
     * 初始化逆变器
     *
     * @param type     账号
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void setInverterDeviceRemoteInfo(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String json = getKeyValue("list", getKeyValue("data", data));
        List<CloudInverterDeviceBean> newList = new ArrayList<>();
        try {
            List<GatewayBean> list = new Gson().fromJson(json, new TypeToken<List<GatewayBean>>() {
            }.getType());
            if (list != null && list.size() > 0) {
                for (int i = 0; i < list.size(); i++) {
                    GatewayBean gatewayBean = list.get(i);
                    CloudInverterDeviceBean inverterDeviceBean = new CloudInverterDeviceBean();
                    inverterDeviceBean.setCategorySecondName(gatewayBean.getCategorySecondName());
                    inverterDeviceBean.setOsn(gatewayBean.getDevice_mac());
                    inverterDeviceBean.setOmodel(gatewayBean.getDevice_model());
                    inverterDeviceBean.setOid(gatewayBean.getOid());
                    inverterDeviceBean.setAddresses(gatewayBean.getAddresses());
                    inverterDeviceBean.setSid(gatewayBean.getSid());
                    inverterDeviceBean.setDeviceId(gatewayBean.getDeviceId());
                    inverterDeviceBean.setName(gatewayBean.getDevice_name());
                    inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
                    inverterDeviceBean.setSpk(gatewayBean.getSpk());
                    inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
                    newList.add(inverterDeviceBean);
                }
            }
        } catch (Exception ignored) {
        }
        HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
            }
        });
    }

    /**
     * 修改设备名称逆变器BMS电池包
     *
     * @param type     账号
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void uniOidEditName(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String deviceType = getKeyValue("deviceType", getKeyValue("data", data));
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        String name = getKeyValue("name", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().setRename(homeId, deviceType, deviceId, name, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
            }
        });
    }


@@ -1740,7 +2174,7 @@
        String tempData = getKeyValue("data", data);
        if (TextUtils.isEmpty(tempData)) {
            uniCallbackData(type, null, -2, "data内容为空", callback);
            //HdlLogLogic.print("data内容为空--->", false);
            //HdlLogLogic.print("data内容为空---", false);
            return;
        }
        ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -1752,24 +2186,24 @@
//        }
        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
            uniCallbackData(type, null, -2, "发送失败,(mac或者oid)为空", callback);
            //HdlLogLogic.print("uni--->发送--->ModBus--->发送失败,(mac或者oid)为空." + Arrays.toString(modBusBean.getData()), true);
            //HdlLogLogic.print("uni---发送---ModBus---发送失败,(mac或者oid)为空." + Arrays.toString(modBusBean.getData()), true);
            return;
        }

        //HdlLogLogic.print("uni--->发送--->ModBus--->" + Arrays.toString(modBusBean.getData()), true);
        //HdlLogLogic.print("uni---发送---ModBus---" + Arrays.toString(modBusBean.getData()), true);
        //发送modbus协议
        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
            @Override
            public void onSuccess(int[] data) {
                uniCallbackData(type, data, callback);
//                HdlLogLogic.print("uni--->接收--->ModBus--->" + Arrays.toString(data), true);
                uniSuccessCallback(type, data, callback);
//                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);
            }
        });
    }
@@ -1805,11 +2239,18 @@
            uniCallBackBaseBean.setData(data);
            return getJSONObject(uniCallBackBaseBean);
        } catch (Exception e) {
            HdlLogLogic.print("uni--->组装发送给uni数据格式有异常--->" + e.getMessage(), false);
            HdlLogLogic.print("uni---组装发送给uni数据格式有异常---" + e.getMessage(), false);
        }
        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发送数据格式
@@ -1830,18 +2271,15 @@
            if (callback != null) {
                callback.invoke(getJSONObject(uniCallBackBaseBean));
//                callback.invoke(uniCallBackBaseBean);
                HdlLogLogic.print("uni--->回复--->" + type + "--->" + new Gson().toJson(uniCallBackBaseBean), true);
                HdlLogLogic.print("uni---回复---" + type + "---" + new Gson().toJson(uniCallBackBaseBean), true);
            }
        } catch (Exception e) {
            HdlLogLogic.print("uni--->回复--->" + type + "--->" + e.getMessage(), true);
            HdlLogLogic.print("uni---回复---" + type + "---" + e.getMessage(), true);
        }


    }

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

    /**
     * 当前对象转 JSONObject