2024年01月29日15:16:23

mac

2024-01-29 96f2b56c103c53b17cf946d2c733d4cb03d2f39d

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

@@ -1,29 +1,38 @@
package com.hdl.photovoltaic.other;


import android.Manifest;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.IBinder;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
@@ -31,8 +40,9 @@
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -85,25 +95,25 @@
     * 原生接收到uni发来的数据
     *
     * @param appId    -uni小程序指定的appId
     * @param event    -uni小程序发来数据
     * @param topic    -uni小程序发来主题(大类)
     * @param data     JSONObject com.alibaba.fastjson解析处理
     * @param callback callback.invoke(JSONObject) 用com.alibaba.fastjson
     */
    @Override
    public void onOtherUniMPEventReceive(String appId, String event, Object data, DCUniMPJSCallback callback) {
    public void onOtherUniMPEventReceive(String appId, String topic, Object data, DCUniMPJSCallback callback) {
        try {
            if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
                return;
            }
            String type = getKeyValue("type", data);
            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
            String type = getKeyValue("type", data);//小类
            if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(topic)) {
                //住宅模块
                switch (type) {
                    //创建电站
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {

                        //EventBus事件分发
                        BaseEventBus baseEventBus = new BaseEventBus();
                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);
                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION);
                        baseEventBus.setData(getKeyValue("data", data));
                        EventBus.getDefault().post(baseEventBus);
@@ -123,12 +133,22 @@
                        EventBus.getDefault().post(baseEventBus);
                    }
                    break;
                    //住宅【电站】编辑
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT: {
                        //EventBus事件分发
                        BaseEventBus baseEventBus = new BaseEventBus();
                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);
                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT);
                        baseEventBus.setData(getKeyValue("data", data));
                        EventBus.getDefault().post(baseEventBus);
                    }
                    break;

                }
                if (callback != null) {
                    uniCallbackData(null, callback);
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
                //设备模块
                switch (type) {
                    //添加逆变器到云端
@@ -148,7 +168,7 @@
                    break;
                    //获取逆变器列表
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
                        this.uniGetCurrentHomeLocalAndCloudGatewayList(callback);
                        this.uniGetCurrentHomeLocalAndCloudGatewayList(data, callback);
                    }
                    break;
                    //modBus协议专用
@@ -185,8 +205,8 @@

                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
                WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
                WifiUtils wifiUtils = WifiUtils.getInstance();
                //wifi模块
                switch (type) {
                    //获取wifi列表
@@ -210,7 +230,7 @@
                    break;

                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(event)) {
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
                //OTA升级模块
                switch (type) {
                    //向云端获取oid列表
@@ -268,9 +288,22 @@
                        this.uniUpgradeGatewayDriver(data, callback);
                    }
                    break;
                    //设备取消下载升级文件
                    //设备取消驱动,固件下载升级文件
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: {
                        this.uniCancelDownloadingUpgradeFile(data, callback);
//                        HdlThreadLogic.runSubThread(new Runnable() {
//                            @Override
//                            public void run() {
//                                HdlLogLogic.print("当前线程名称取消下载====" + Thread.currentThread().getName());
//                                uniCancelDownloadingUpgradeFile(data, callback);
//                            }
//                        });
                    }
                    break;
                    //设备驱动,固件取消升级
                    case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: {

                        this.uniCancelUpgrade(data, callback);
                    }
                    break;
                    //打开服务
@@ -285,10 +318,28 @@
                    break;

                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
                //其它模块
                switch (type) {
                    //获取温度单位
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
                        uniCallbackData(UserConfigManage.getInstance().getTemperature_unit(), callback);
                    }
                    break;
                    //获取当前app语言
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
                        uniCallbackData(UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
                    }
                    break;
                    //获取位置信息
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
                        this.uniGetLocationInfo(data, callback);
                    }
                }
            }
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + event + "\r\n" + data, false);
            HdlLogLogic.print("uni发来的数据--->大类--->" + topic + "\r\n" + data, true);
        } catch (Exception e) {
            HdlLogLogic.print("uni===原生接收uni发来的数据===" + e.getMessage(), false);
            HdlLogLogic.print("uni发来的数据--->" + e.getMessage(), true);
        }

    }
@@ -303,7 +354,7 @@
    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);
    }

    /**
@@ -317,7 +368,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);
        }
    }

@@ -330,6 +381,48 @@
    //endregion

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

    /**
     * 获取位置信息,包括经纬度
     */
    private void uniGetLocationInfo(Object data, DCUniMPJSCallback callback) {

        // 初始化LocationManager对象
        LocationManager locationManager = (LocationManager) HDLApp.getInstance().getSystemService(Context.LOCATION_SERVICE);
        JsonObject jsonObject = new JsonObject();
        //INTERNET   允许使用网络
        //ACCESS_FINE_LOCATION   允许使用GPS定位
        //ACCESS_COARSE_LOCATION   允许使用WIFI热点或基站来获取粗略的定位
        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) {
            jsonObject.addProperty("result", -2);//没有位置信息权限
            jsonObject.addProperty("des", HDLApp.getInstance().getString(R.string.exception_no_location_information_permission));
            uniCallbackData(jsonObject.toString(), callback);
            return;
        }

        // 判断设备是否支持定位功能
        if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
            jsonObject.addProperty("result", -1);//没开启定位功能
            jsonObject.addProperty("des", HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
            //todo 提示用户打开定位功能或者引导用户去系统设置页面打开定位功能
            uniCallbackData(jsonObject.toString(), callback);
            return;
        }
        Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
        if (location == null) {
            jsonObject.addProperty("result", -3);//没有位置信息权限
            jsonObject.addProperty("des", HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
            uniCallbackData(jsonObject.toString(), callback);
            return;
        }
        jsonObject.addProperty("result", 0);
        jsonObject.addProperty("des", HDLApp.getInstance().getString(R.string.succeed));
        jsonObject.addProperty("longitude", location.getLongitude());//经度
        jsonObject.addProperty("latitude", location.getLatitude());//纬度
        uniCallbackData(jsonObject.toString(), callback);
        HdlLogLogic.print("经纬度--->经度:" + location.getLongitude() + "纬度:" + location.getLatitude(), true);

    }

    /**
     * 向云端获取逆变器oid列表
@@ -395,21 +488,26 @@
     */
    private void uniGetLocalFirmwares(Object data, DCUniMPJSCallback callback) {
        try {
            String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//硬件型号
//            String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//硬件型号
            String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//系统镜像id
            String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//固件版本id
//            String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//固件版本id
//            String oid = getKeyValue("oid", getKeyValue("data", data));//固件oid
            List<DeviceFirmwareBean> list = new ArrayList<>();
            String driverFileList = HdlFileLogic.getInstance().getFirmwareRootPath();
            File file = new File(driverFileList);
            if (file.list() != null) {
                for (int i = 0; i < Objects.requireNonNull(file.list()).length; i++) {
                    String path = Objects.requireNonNull(file.list())[i];
                    if (!path.contains(osImageId)) {
                        continue;
                    }
                    String[] ary = path.split("/");
                    String[] driverInfoAry = ary[ary.length - 1].split("_");
                    DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean();
                    deviceFirmwareBean.setOid(driverInfoAry[0]);
                    deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", ""));
                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), deviceFirmwareBean.getVersion()));
                    deviceFirmwareBean.setImageId(driverInfoAry[1]);
                    deviceFirmwareBean.setVersion(driverInfoAry[2].replace(".zip", ""));
                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), osImageId, deviceFirmwareBean.getVersion()));
                    list.add(deviceFirmwareBean);
                }
            }
@@ -424,8 +522,8 @@
     * 向云端发起【设备固件下载】指令
     */
    private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//设备oid
//        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//该固件的oid
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String version = getKeyValue("version", getKeyValue("data", data));//固件版本
        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//储存在本地固件文件路径
@@ -434,19 +532,33 @@
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, version);
                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                if (isBoolean) {
                    HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧固件文件;
                } else {
                    HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//下载失败，删除不完整固件文件;
                }
                HdlLogLogic.print("写入新固件文件到内存成功.", false);
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {
                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                        //不在子线程读流会卡死主线程
                        boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                        if (isBoolean) {
                            HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧固件文件;
                        } else {
                            HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//下载失败，删除不完整固件文件;
                        }

                        if (isBoolean) {
                            HdlLogLogic.print("写入新固件文件到内存成功.", true);
                            uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                        } else {
                            HdlLogLogic.print("下载固件升级文件失败.", true);
                            uniCallbackData(null, -2, "下载固件升级文件失败", callback);
                        }
                    }
                });

            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("下载固件文件到内存失败.", false);
                HdlLogLogic.print("下载固件文件到内存失败.", true);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
@@ -456,69 +568,87 @@
     * 向云端发起【设备固件】升级OTA指令
     */
    private void uniUpgradeDeviceFirmware(Object data, DCUniMPJSCallback callback) {
        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//网关设备mac（查找socket）
        String homeId = UserConfigManage.getInstance().getHomeId();
        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//逆变器设备mac（查找socket）
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//设备id
        String oid = getKeyValue("oid", getKeyValue("data", data));//升级固件的oid
        String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//固件版本id
        String version = getKeyValue("version", getKeyValue("data", data));//固件版本
        String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//云端上文件MD5
//        String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//云端上文件MD5
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String module = "FW#" + imageId;//模块信息(HW：硬件)

        //升级本地优先->云端升级
        boolean isLocalConnect = HdlDeviceLogic.getInstance().isLocalConnect(deviceMac);
        if (isLocalConnect) {
            //本地
            //1,建立本地服务；
            //2,告诉网关手机ip和端口；
            //实例化 获取ip 地址
            HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                @Override
                public void onServiceConnected(ComponentName name, IBinder service) {
                    //本地升级固件文件路径
                    String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, version);
                    String data = HdlFileLogic.getInstance().readFile(firmwarePathFileName);
                    String md5 = HDLMD5Utils.encodeMD5(data);//网关固件需要
                    //升级固件文件地址
                    String upgradeFileLocalPathUrl = AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;
                    //通知给网关升级固件文件地址等信息
                    HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, hardwareModel, version, data.length() + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
                    HdlLogLogic.print("本地升级--->", true);
                    //本地
                    //1,建立本地服务；
                    //2,告诉网关手机ip和端口；
                    //实例化 获取ip 地址
                    HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                        @Override
                        public void onSuccess(String obj) {
                            HdlLogLogic.print("通知给网关升级固件文件地址成功.", false);
                        public void onServiceConnected(ComponentName name, IBinder service) {
                            //本地升级固件文件路径
                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                            byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
                            if (data == null || data.length == 0) {
                                uniCallbackData(null, -2, "本地找不到升级固件文件,请下载好固件文件,再重新升级.", callback);
                                return;
                            }
                            String md5 = HDLMD5Utils.encodeMD5(data);//网关固件需要
                            //升级固件文件地址
                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;
                            //通知给网关升级固件文件地址等信息
                            HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                                @Override
                                public void onSuccess(String obj) {
                                    HdlLogLogic.print("通知给网关升级固件文件地址成功.", true);
                                }

                                @Override
                                public void onError(HDLLinkException e) {
                                    HdlLogLogic.print("通知给网关升级固件文件地址失败,无法升级.", true);
                                    uniCallbackData(null, -2, "通知给网关升级固件文件地址失败,无法升级,", callback);
                                }
                            });
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("通知给网关升级固件文件地址失败,无法升级.", false);
                            uniCallbackData(null, -2, "通知给网关升级固件文件地址失败,无法升级,", callback);
                        public void onServiceDisconnected(ComponentName name) {
                            uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                        }
                    });
                }

                @Override
                public void onServiceDisconnected(ComponentName name) {
                    uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                }
            });

        } else {
            //远程升级需要检测在逆变器有没有连接上云
            HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                @Override
                public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                    //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                    if (cloudInverterDeviceBean == null) {
                        uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                        return;
                    }
                    if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                        uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                        return;
                    }
                    //4:运行
                    HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                } else {
                    HdlLogLogic.print("在线升级--->", true);
                    //远程升级需要检测在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            uniCallbackData(obj, callback);
                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                            if (cloudInverterDeviceBean == null) {
                                uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                                return;
                            }
                            if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                                uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                                return;
                            }
                            //4:运行
                            HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniCallbackData(obj, callback);
                                }

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

                        }

                        @Override
@@ -526,16 +656,48 @@
                            uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                        }
                    });

                }
            }

                @Override
                public void onFailure(HDLException e) {
                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                }
            });
            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级--->", true);
                //远程升级需要检测在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                            return;
                        }
                        //4:运行
                        HdlOtaLogic.getInstance().upgradeDeviceFirmware(deviceOidId, firmwareVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(obj, callback);
                            }

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

                    }

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

    }

    /**
@@ -583,8 +745,8 @@
    private void uniGetLocalDrivers(Object data, DCUniMPJSCallback callback) {
        try {
            String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//驱动编号或驱动名称
            String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//驱动类型id
            String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动类型id
//            String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//驱动类型id
//            String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动类型id
            List<GatewayDriverBean> list = new ArrayList<>();
            String driverFileList = HdlFileLogic.getInstance().getDriveRootPath();
            File file = new File(driverFileList);
@@ -615,30 +777,45 @@
     * 向云端发起【设备驱动下载】指令
     */
    private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {
        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//网关设备oid

//        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//逆变器设备oid
        String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//驱动编码
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//驱动镜像id
//        String imageId = getKeyValue("imageId", getKeyValue("data", data));//驱动镜像id
        String version = getKeyValue("version", getKeyValue("data", data));//驱动版本
        String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动版本id
//        String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动版本id
        String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//储存在本地驱动文件路径
        String url = getKeyValue("url", getKeyValue("data", data));//云端上文件地址
        String md5 = getKeyValue("md5", getKeyValue("data", data));//云端上文件MD5
        HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile(url, new CloudCallBeak<ResponseBody>() {
            @Override
            public void onSuccess(ResponseBody responseBody) {
                String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
                if (isBoolean) {
                    HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧驱动文件;
                } else {
                    HdlFileLogic.getInstance().deleteFile(drivePathFileName);//下载失败，删除不完整驱动文件;
                }
                HdlLogLogic.print("写入新驱动文件到内存成功.", false);
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {

                        String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                        //不在子线程读流会卡死主线程
                        boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5, HdlOtaLogic.driver_type);
                        if (isBoolean) {
                            HdlFileLogic.getInstance().deleteFile(localUrl);//下载成功,删除旧驱动文件;
                        } else {
                            HdlFileLogic.getInstance().deleteFile(drivePathFileName);//下载失败，删除不完整驱动文件;
                        }
                        if (isBoolean) {
                            HdlLogLogic.print("写入新驱动文件到内存成功.", true);
                            uniCallbackData(null, 0, "写入新驱动文件到内存成功", callback);
                        } else {
                            HdlLogLogic.print("下载驱动升级文件失败.", true);
                            uniCallbackData(null, -2, "下载驱动升级文件失败", callback);
                        }
                    }
                });

            }

            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("下载驱动文件到内存失败.", false);
                HdlLogLogic.print("下载驱动文件到内存失败.", true);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
@@ -649,67 +826,85 @@
     */
    private void uniUpgradeGatewayDriver(Object data, DCUniMPJSCallback callback) {

        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//网关设备mac（查找socket）
        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//网关设备oid
        String homeId = UserConfigManage.getInstance().getHomeId();
        String deviceMac = getKeyValue("mac", getKeyValue("data", data));//逆变器设备mac（查找socket）
        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//逆变器设备oid
        String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//驱动版本id
        String module = getKeyValue("module", getKeyValue("data", data));//模块信息
        String version = getKeyValue("version", getKeyValue("data", data));//驱动版本号
        String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//驱动编码
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String module = driverCode + "#" + imageId;
        //升级本地优先->云端升级
        boolean isLocalConnect = HdlDeviceLogic.getInstance().isLocalConnect(deviceMac);
        if (isLocalConnect) {
            //本地
            //1,建立本地服务；
            // 2，告诉网关手机ip和端口；
            //实例化 获取ip 地址
            HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                @Override
                public void onServiceConnected(ComponentName name, IBinder service) {
                    //本地升级驱动文件路径
                    String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                    String data = HdlFileLogic.getInstance().readFile(drivePathFileName);
                    String md5 = HDLMD5Utils.encodeMD5(data);//网关驱动需要
                    //升级驱动文件地址
                    String upgradeFileLocalPathUrl = AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;
                    //通知给网关升级驱动文件地址等信息
                    HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, deviceOid, module, version, data.length() + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
        HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
                    HdlLogLogic.print("本地升级--->", true);
                    //本地
                    //1,建立本地服务；
                    // 2，告诉网关手机ip和端口；
                    //实例化 获取ip 地址
                    HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
                        @Override
                        public void onSuccess(String obj) {
                            HdlLogLogic.print("通知给网关升级驱动文件地址成功.", false);
                        public void onServiceConnected(ComponentName name, IBinder service) {
                            //本地升级驱动文件路径
                            String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
                            byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
                            if (data == null || data.length == 0) {
                                uniCallbackData(null, -2, "本地找不到升级驱动文件,请下载好驱动文件,再重新升级.", callback);
                                return;
                            }
                            String md5 = HDLMD5Utils.encodeMD5(data);//网关驱动需要
                            //升级驱动文件地址
                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;
                            //通知给网关升级驱动文件地址等信息
                            HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, deviceOid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
                                @Override
                                public void onSuccess(String obj) {
                                    HdlLogLogic.print("通知给网关升级驱动文件地址成功.", true);
                                }

                                @Override
                                public void onError(HDLLinkException e) {
                                    HdlLogLogic.print("通知给网关升级驱动文件地址失败,无法升级.", true);
                                    uniCallbackData(null, -2, "通知给网关升级驱动文件地址失败,无法升级,", callback);
                                }
                            });
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("通知给网关升级驱动文件地址失败,无法升级.", false);
                            uniCallbackData(null, -2, "通知给网关升级驱动文件地址失败,无法升级,", callback);
                        public void onServiceDisconnected(ComponentName name) {
                            uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                        }
                    });
                }

                @Override
                public void onServiceDisconnected(ComponentName name) {
                    uniCallbackData(null, -2, "本地服务有异常失败,无法升级,", callback);
                }
            });
        } else {
            //远程升级需要【检测】在逆变器有没有连接上云
            HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                @Override
                public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                    //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                    if (cloudInverterDeviceBean == null) {
                        uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                        return;
                    }
                    if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                        uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                        return;
                    }
                    //4:运行
                    HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                } else {
                    HdlLogLogic.print("在线升级--->", true);
                    //远程升级需要【检测】在逆变器有没有连接上云
                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            uniCallbackData(obj, callback);
                        public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                            //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                            if (cloudInverterDeviceBean == null) {
                                uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                                return;
                            }
                            if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                                uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                                return;
                            }
                            //4:运行
                            HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                                @Override
                                public void onSuccess(Boolean obj) {
                                    uniCallbackData(obj, callback);
                                }

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

                        }

                        @Override
@@ -717,23 +912,73 @@
                            uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                        }
                    });

                }
            }

                @Override
                public void onFailure(HDLException e) {
                    uniCallbackData(null, e.getCode(), e.getMsg(), callback);
                }
            });
            @Override
            public void onFailure(HDLException e) {
                HdlLogLogic.print("在线升级--->", true);
                //远程升级需要【检测】在逆变器有没有连接上云
                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
                    @Override
                    public void onSuccess(CloudInverterDeviceBean cloudInverterDeviceBean) {
                        //1：连接中,2：故障,3：运行,4：离线,6:逆变器连不上云(自定义)
                        if (cloudInverterDeviceBean == null) {
                            uniCallbackData(null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
                            return;
                        }
                        if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
                            uniCallbackData(null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
                            return;
                        }
                        //4:运行
                        HdlOtaLogic.getInstance().upgradeGatewayDriver(deviceOid, driverVersionId, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(obj, callback);
                            }

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

                    }

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

    }

    /**
     * 取消下载升级文件
     * 取消下载【驱动,固件】升级文件
     */
    private void uniCancelDownloadingUpgradeFile(Object data, DCUniMPJSCallback callback) {
        HdlOtaLogic.getInstance().setStopDriversDownload();
        HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
        uniCallbackData(null, 0, "取消下载成功.", callback);
    }

    /**
     * 取消【驱动,固件】升级
     */
    private void uniCancelUpgrade(Object data, DCUniMPJSCallback callback) {
        HdlOtaLogic.getInstance().cancelUpgrade("", new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {

            }

            @Override
            public void onError(HDLLinkException e) {

            }
        });
    }

    /**
@@ -810,7 +1055,7 @@
     */
    private void uniUploadDataToCloud(Object data, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().uploadDataToCloud(mac, null);
        HdlDeviceLogic.getInstance().uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
    }

    /**
@@ -823,7 +1068,8 @@
        String mac = getKeyValue("mac", getKeyValue("data", data));
        String date = getKeyValue("date", getKeyValue("data", data));
        String time = getKeyValue("time", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
        String timezone = getKeyValue("timezone", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, timezone, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(true, callback);
@@ -880,6 +1126,7 @@
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });

    }

    /**
@@ -890,7 +1137,8 @@
     */
    private void uniAddInverterDeviceToCloud(Object data, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
        String homeId = UserConfigManage.getInstance().getHomeId();
        HdlDeviceLogic.getInstance().setGatewayRemoteParam(homeId, mac, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
@@ -898,10 +1146,11 @@
                    public void onSuccess(Boolean obj) {
                        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
                        if (gatewayBean == null) {
                            uniCallbackData(null, -100, "本地找不到网关", callback);
                            uniCallbackData(null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);

                            return;
                        }
                        HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
                        HdlDeviceLogic.getInstance().addInverterDeviceToCloud(homeId, mac, gatewayBean.getGatewayType(), gatewayBean.getSid(), gatewayBean.getOid(), gatewayBean.getDevice_name(), new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                uniCallbackData(null, callback);
@@ -936,7 +1185,8 @@
     */
    private void uniDelInverterDevice(Object data, DCUniMPJSCallback callback) {
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().delInverterDevice(deviceId, new CloudCallBeak<Boolean>() {
        String homeId = UserConfigManage.getInstance().getHomeId();
        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(null, callback);
@@ -956,7 +1206,7 @@
     * @param callback uni回调
     */
    private void uniSearchGateway(DCUniMPJSCallback callback) {
        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                uniCallbackData(gatewayBeanList, callback);
@@ -976,18 +1226,27 @@
     *
     * @param callback uni回调
     */
    private void uniGetCurrentHomeLocalAndCloudGatewayList(DCUniMPJSCallback callback) {
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
    private void uniGetCurrentHomeLocalAndCloudGatewayList(Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> list) {
                GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list, homeId);
                if (gatewayBean != null) {
                    //进来住宅详情都要上传一次oid列表到云端;
                    HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, gatewayBean.getDevice_mac(), null);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
                baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                baseEventBus.setData(list);

                EventBus.getDefault().post(baseEventBus);
                if (callback != null) {
                    uniCallbackData(list, callback);
                    //EventBus事件分发
                    BaseEventBus baseEventBus = new BaseEventBus();
                    baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
                    baseEventBus.setData(list);
                    EventBus.getDefault().post(baseEventBus);
                }


            }

            @Override
@@ -1018,7 +1277,7 @@
    private void sendModBus(Object data, DCUniMPJSCallback callback) {
        String tempData = getKeyValue("data", data);
        if (TextUtils.isEmpty(tempData)) {
            HdlLogLogic.print("data内容为空", false);
            HdlLogLogic.print("data内容为空--->", false);
            return;
        }
        ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -1029,7 +1288,7 @@
//            modBusBean.setOid("0101050217BBC400");
//        }
        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
            HdlLogLogic.print("内容为空===oid=" + modBusBean.getMac() + " data=" + Arrays.toString(modBusBean.getData()), false);
            HdlLogLogic.print("内容为空--->oid--->" + modBusBean.getMac() + " data--->" + Arrays.toString(modBusBean.getData()), false);
            return;
        }

@@ -1067,13 +1326,17 @@
                data = new JSONObject();
            }
            if (isTokenAndRefreshToken) {
                //小程序那里有自己的请求方法,需要这些数据
                data.put("token", UserConfigManage.getInstance().getToken());
                data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
                data.put("serverAddress", AppConfigManage.getUserRegionUrl());
                data.put("appKey", AppConfigManage.getAppKey());
                data.put("appSecret", AppConfigManage.getAppSecret());
            }
            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();
    }
@@ -1097,10 +1360,11 @@
            if (callback != null) {
                callback.invoke(getJSONObject(uniCallBackBaseBean));
//                callback.invoke(uniCallBackBaseBean);
                HdlLogLogic.print("uni--->组装uni发送数据格式--->" + new Gson().toJson(uniCallBackBaseBean), false);

            }
        } catch (Exception e) {
            HdlLogLogic.print("uni===组装uni发送数据格式===" + e.getMessage(), false);
            HdlLogLogic.print("uni--->组装uni发送数据格式--->" + e.getMessage(), false);
        }


@@ -1115,7 +1379,7 @@
     *
     * @return JSONObject
     */
    private JSONObject getJSONObject(Object obj) {
    public JSONObject getJSONObject(Object obj) {
        try {
            if (obj == null) {
                return new JSONObject();
@@ -1144,7 +1408,7 @@
     * @param obj -
     * @return value
     */
    private String getKeyValue(String key, Object obj) {
    public String getKeyValue(String key, Object obj) {
        try {
            JSONObject jsonObject = this.getJSONObject(obj);
            if (jsonObject.has(key)) {