~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -9,65 +9,93 @@
			import android.content.pm.PackageManager;
			import android.location.Location;
			import android.location.LocationManager;
			import android.net.wifi.ScanResult;
			import android.os.IBinder;
			import android.os.SystemClock;
			import android.provider.Settings;
			import android.text.TextUtils;
			import android.view.View;
			import android.widget.TextView;
			import android.util.Log;

			import androidx.core.app.ActivityCompat;

			import com.alibaba.fastjson.JSON;
			import com.google.gson.Gson;
			import com.google.gson.JsonArray;
			import com.google.gson.JsonObject;
			import com.google.gson.reflect.TypeToken;
			import com.hdl.link.error.HDLLinkCode;
			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.GatewayDriverBean;
			import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
			import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
			import com.hdl.photovoltaic.HDLApp;
			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.bean.InverterBean;
			import com.hdl.photovoltaic.bean.LocalResponse;
			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.HttpClient;
			import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
			import com.hdl.photovoltaic.internet.TcpClient;
			import com.hdl.photovoltaic.internet.api.TopicApi;
			import com.hdl.photovoltaic.listener.CloudCallBeak;
			import com.hdl.photovoltaic.listener.LinkCallBack;
			import com.hdl.photovoltaic.ui.bean.CUserInfo;
			import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
			import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
			import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
			import com.hdl.photovoltaic.ui.bean.Geolocation;
			import com.hdl.photovoltaic.ui.bean.HouseIdBean;
			import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
			import com.hdl.photovoltaic.ui.bean.LinkBean;
			import com.hdl.photovoltaic.ui.bean.MemberBean;
			import com.hdl.photovoltaic.ui.bean.NotRunBean;
			import com.hdl.photovoltaic.ui.bean.OidBean;
			import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
			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;
			import com.hdl.photovoltaic.uni.HDLUniMP;
			import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
			import com.hdl.photovoltaic.utils.NetworkUtils;
			import com.hdl.photovoltaic.utils.PermissionUtils;
			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;
			import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
			import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
			import com.hdl.sdk.link.core.callback.GatewayCallBack;
			import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
			import com.hdl.sdk.link.core.callback.ModbusCallBack;
			import com.hdl.sdk.link.core.config.HDLLinkConfig;
			import com.hdl.sdk.link.core.connect.HDLModBusConnect;
			import com.hdl.sdk.link.core.connect.HDLUdpConnect;
			import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;

			import org.greenrobot.eventbus.EventBus;
			import org.json.JSONArray;
			import org.json.JSONObject;


			import java.io.File;
			import java.io.InputStream;
			import java.io.OutputStream;
			import java.lang.reflect.Type;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.net.InetSocketAddress;
			import java.net.Socket;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;
			import java.util.Objects;
			import java.util.concurrent.atomic.AtomicInteger;
			@@ -80,6 +108,8 @@
			*/
			public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
			private static volatile HdlUniLogic sHdlUniLogic;

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

			/**
			* 获取当前对象
			@@ -115,10 +145,12 @@
			if (!HDLUniMP.UNI_APP_ID.equals(appId)) {
			return;
			}
			long startTime = System.currentTimeMillis();
			Log.d("===开始时间===", String.valueOf(startTime));
			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 + "---" + data, true);
			if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
			//用户模块
			switch (type) {
			@@ -126,9 +158,29 @@
			case HDLUniMP.UNI_EVENT_REPLY_USER_INFO: {
			this.uniGetUserInfo(mode_type, data, callback);
			}
			break;
			//用户头像（旧平台逻辑是头像单独获取下载地址）
			case HDLUniMP.UNI_EVENT_REPLY_USER_IMAGE: {
			uniGetImageKey(mode_type, data, callback);
			}
			break;
			//用户本地缓存信息
			case HDLUniMP.UNI_EVENT_REPLY_USER_LOCAL_INFO: {
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
			jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
			jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
			jsonObject.addProperty("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
			jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
			jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
			if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
			AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
			}
			jsonObject.addProperty("serverAddress", AppConfigManage.getUserRegionUrl());
			jsonObject.addProperty("appKey", AppConfigManage.getAppKey());
			jsonObject.addProperty("appSecret", AppConfigManage.getAppSecret());
			uniSuccessCallback(mode_type, jsonObject, callback);
			HdlLogLogic.print("获取用户本地缓存信息----" + jsonObject.toString());
			}
			break;
			}
			@@ -136,57 +188,124 @@
			} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(topic)) {
			//住宅模块
			switch (type) {
			//扫码添加电站
			case HDLUniMP.UNI_EVENT_REPLY_HOME_ADD: {
			String url = getKeyValue("url", getKeyValue("data", data));
			//EventBus事件分发
			HdlCommonLogic.getInstance().postEventBusSticky(HDLUniMP.UNI_EVENT_REPLY_HOME_ADD, HDLUniMP.UNI_EVENT_REPLY_HOME_ADD, url);

			if (callback != null) {
			uniSuccessCallback(type, null, callback);
			}
			}
			break;
			//账号下是否有电站列表
			case HDLUniMP.UNI_EVENT_REPLY_HOME_LIST: {
			if (callback != null) {
			uniSuccessCallback(type, HdlResidenceLogic.getInstance().getHouseIdList().size(), callback);
			}
			}
			break;
			//创建电站
			case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
			//uin创建电站成功后通知
			// HdlResidenceLogic.getInstance().getResidenceIdList("","","","","","",1,50,null);
			try {
			String dataJsonStr = getKeyValue("data", data);
			if (!TextUtils.isEmpty(dataJsonStr)) {
			Gson gson = new Gson();
			HouseIdBean houseIdBean = gson.fromJson(dataJsonStr, HouseIdBean.class);
			HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
			}
			HdlLogLogic.print("uin创建电站成功后通知---"+dataJsonStr, true);
			} catch (Exception e) {
			HdlLogLogic.print("uin创建电站成功后通知---" + e.getMessage(), true);
			}

			//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);
			// HdlCommonLogic.getInstance().postEventBusSticky(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION, getKeyValue("data", data));
			if (callback != null) {
			uniSuccessCallback(type, null, callback);
			}
			}

			break;
			//读取详情
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {

			if (callback != null) {
			uniSuccessCallback(type, null, callback);
			}
			}
			break;
			//电站删除
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DEl: {
			this.uniGetDelResidence(mode_type, data, callback);
			}
			break;
			//关闭详情页
			case HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE: {
			//EventBus事件分发
			BaseEventBus baseEventBus = new BaseEventBus();
			baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);
			baseEventBus.setData(getKeyValue("data", data));
			EventBus.getDefault().post(baseEventBus);
			// todo 在HDLUniMPSDKManager类里面有方法()监听到小程序关闭，然后发布调用EventBus发布出去;
			// HdlCommonLogic.getInstance().postEventBus(
			// HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE,
			// LowerTagType.power_station.toString(),
			// getKeyValue("data", data));
			if (callback != null) {
			uniSuccessCallback(type, null, callback);
			}
			}
			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);
			HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL, HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT, getKeyValue("data", data));
			if (callback != null) {
			uniSuccessCallback(type, null, callback);
			}
			}
			break;
			// //电站的交付二维码(安装商)
			// case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			// uniGetDeliveryUrlQrcode(type, data, callback);
			// }
			// break;
			//电站的交付URL(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			uniGetDeliveryUrl(type, data, callback);
			}
			break;
			//电站手动交付(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
			uniGetDeliverToAccount(type, data, callback);

			}
			break;
			//电站授权安装商(C端)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM: {
			uniHomeUpdateDebugPerm(type, data, callback);

			}
			break;

			}
			if (callback != null) {
			uniCallbackData(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);
			}
			break;
			//添加多个逆变器到云端
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD_All: {
			this.uniAddAllInverterDeviceToCloud(mode_type, data, callback);
			}

			break;
			//删除云端逆变器
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
			@@ -203,11 +322,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);
			@@ -217,7 +331,6 @@
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
			this.uniGetInverterTime(mode_type, data, callback);
			}

			break;
			//逆变器时间编辑
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
			@@ -234,35 +347,123 @@
			this.uniClearInverterHomeId(mode_type, data, callback);
			}
			break;
			//spk属性编辑
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_Link_edit_SEND: {
			this.uniLinkSpkAttributeEdit(mode_type, data, callback);
			}
			break;
			//spk属性读取
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_Link_read_SEND: {
			this.uniLinkSpkAttributeRead(mode_type, data, callback);
			}
			break;
			//获取未处理/未读消息数量
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MESSAGE_NUMBER: {
			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;
			//获取未运行逆变器列表
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NOT_RUN_DEVICE_LIST: {
			this.uniGetListNotRun(mode_type, data, callback);
			}
			break;
			//快捷开启逆变器
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST: {
			this.uniSetDeviceStartup(mode_type, data, callback);
			}
			break;
			//获取设备详情（云端设备）
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_info: {
			this.uniGetDeviceInfo(mode_type, data, callback);
			}
			break;
			//获取逆变器详情（物理设备）
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_gateway_info: {
			this.uniGetGatewayInfo(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: {
			//获取位置权限
			case HDLUniMP.UNI_EVENT_REPLY_AUTHORIZATION_GET: {
			boolean isLocalAuthor = PermissionUtils.checkPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION);
			if (callback != null) {
			uniCallbackData(mode_type, wifiUtils.getScanResult(), callback);
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("localAuthor", isLocalAuthor);
			uniSuccessCallback(mode_type, jsonObject, callback);
			}
			}
			break;
			//当前wifi详情
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
			//获取手机wifi列表
			case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
			if (callback != null) {
			uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
			uniSuccessCallback(mode_type, wifiUtils.getScanResult(), callback);
			}
			}
			break;
			//wifi连接
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {

			//获取手机当前wifi详情
			case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_INFO: {
			if (callback != null) {
			uniSuccessCallback(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
			}
			}
			break;
			//打开手机Wifi设置界面
			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: {
			if (callback != null) {
			uniSuccessCallback(type, "", callback);
			}
			//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;

			@@ -347,29 +548,6 @@
			break;

			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
			//其它模块
			switch (type) {
			//获取温度单位
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
			uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
			}
			break;
			//获取当前app语言
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
			uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
			}
			break;
			//获取位置信息
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
			this.uniGetLocationInfo(mode_type, data, callback);
			}
			//专门收集uni日志
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
			String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
			HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
			}
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_MINE_MODEL.equals(topic)) {
			//我的模块
			switch (type) {
			@@ -377,7 +555,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;
			@@ -391,9 +569,17 @@
			break;
			//消息中心
			case HDLUniMP.UNI_EVENT_REPLY_MINE_MESSAGE_CENTER: {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
			Intent intent = new Intent();
			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
			intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
			if (!TextUtils.isEmpty(homeId)) {
			intent.putExtra("homeId", homeId);
			}
			if (!TextUtils.isEmpty(isShowFault)) {
			intent.putExtra("isShowFault", isShowFault);
			}
			HDLApp.getInstance().startActivity(intent);
			}
			break;
			@@ -411,15 +597,261 @@
			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
			intent.setClass(HDLApp.getInstance(), SetActivity.class);
			HDLApp.getInstance().startActivity(intent);

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

			}
			break;
			//成员列表
			case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {
			uniGetMemberList(type, data, callback);
			}
			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_DETAIL: {
			uniGetStaffInfo(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_USERRIGHTTYP: {
			uniGetUserRightType(type, data, callback);

			}
			break;


			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
			//其它模块
			switch (type) {

			//获取温度单位
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
			uniSuccessCallback(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
			}
			break;
			//获取当前app语言
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
			uniSuccessCallback(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
			}
			break;
			//获取位置信息
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
			this.uniGetLocationInfo(mode_type, data, callback);
			}
			break;
			//应用冲突
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
			if (callback != null) {
			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);

			}
			break;
			//uni主页点击返回通知
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
			//EventBus事件分发
			HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL, HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);

			}
			break;
			//uni通知原生退出登录
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
			HdlLogLogic.print("uni通知原生退出登录---", true);
			HDLLinkPMUser.getInstance().logout(0);
			}
			break;
			//本地密钥获取
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_GET: {
			String localSecret = HDLLinkConfig.getInstance().getLocalSecret();
			JsonObject jsonObject = new JsonObject();
			jsonObject.addProperty("local_encrypt", localSecret);
			HdlLogLogic.print("uni---log---本地密钥获取---" + localSecret, true);
			if (callback != null) {
			uniSuccessCallback(type, jsonObject, callback);
			}

			}
			break;
			//本地密钥设置
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_SET: {
			String local_encrypt = getKeyValue("local_encrypt", getKeyValue("data", data));
			if (!TextUtils.isEmpty(local_encrypt)) {
			//重新设置本地通讯秘钥
			UserConfigManage.getInstance().setLocalSecret(local_encrypt);
			UserConfigManage.getInstance().Save();
			//配置本地通信的信息
			HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
			HdlLogLogic.print("uni---log---本地密钥设置---" + local_encrypt, true);
			}
			if (callback != null) {
			uniSuccessCallback(type, true, callback);
			}
			}
			break;
			//link进行密码验证
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_PASSWORD_VERIFIY: {
			uniCheckPasswordVerification(mode_type, data, callback);
			}
			break;
			//本地json资源文件获取
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_LOCAL_JSON: {
			// String url = getKeyValue("url", getKeyValue("data", data));
			String fileName = getKeyValue("fileName", getKeyValue("data", data));//唯一标识
			String deviceType = getKeyValue("deviceType", getKeyValue("data", data));//设备类型
			String deviceModel = getKeyValue("deviceModel", getKeyValue("data", data));//设备模型
			String language = getKeyValue("language", getKeyValue("data", data));
			String json = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName + ".json", deviceModel);
			if (TextUtils.isEmpty(json)) {
			//本地没有缓存
			HdlESLocalJsonLogic.getInstance().getHdlESLocalJson(fileName, deviceType, deviceModel, false, new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String obj) {
			// if (callback != null) {
			// uniSuccessCallback(type, obj, callback);
			// }
			String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(fileName, deviceModel);
			//本地缓存数据
			if (callback != null) {
			try {
			if (s.startsWith("{")) {
			uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
			} else if (s.startsWith("[")) {
			uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
			} else {
			uniSuccessCallback(type, s, callback);
			}
			} catch (Exception e) {
			uniSuccessCallback(type, s, callback);
			}
			}
			}

			@Override
			public void onFailure(HDLException e) {
			if (callback != null) {
			uniExceptionCallback(type, e, callback);
			}
			}
			});
			} else {
			//本地缓存数据
			if (callback != null) {
			try {
			if (json.startsWith("{")) {
			uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
			} else if (json.startsWith("[")) {
			uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
			} else {
			uniSuccessCallback(type, json, callback);
			}
			} catch (Exception e) {
			uniSuccessCallback(type, json, callback);
			}
			long endTime = System.currentTimeMillis() - startTime;
			Log.d("====耗时时间====", String.valueOf(endTime));
			}
			}
			}
			break;
			//uni获取图片
			case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_SELECTED_IMAGE: {

			}
			break;
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_UNI_SEND_TO_CLOUD.equals(topic)) {
			//网络请求模块
			JsonObject jObject = new JsonObject();
			String body = getKeyValue("data", data);
			if (!TextUtils.isEmpty(body)) {
			try {
			jObject = new Gson().fromJson(body, JsonObject.class);
			} catch (Exception ignored) {
			}
			}
			HttpClient.getInstance().requestHttp(type, jObject.toString(), new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String jsonStr) {
			//本地缓存数据
			if (callback != null) {
			try {
			if (jsonStr.startsWith("{")) {
			uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonObject.class), callback);
			} else if (jsonStr.startsWith("[")) {
			uniSuccessCallback(mode_type, new Gson().fromJson(jsonStr, JsonArray.class), callback);
			} else {
			uniSuccessCallback(mode_type, jsonStr, callback);
			}
			} catch (Exception e) {
			uniSuccessCallback(mode_type, jsonStr, callback);
			}
			}
			}

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

			}

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

			}
			@@ -434,7 +866,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);
			}

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

			@@ -463,6 +895,475 @@
			//region ****uni接口方法****

			/**
			* link进行本地密码登录验证
			*/
			private void uniCheckPasswordVerification(String type, Object data, DCUniMPJSCallback callback) {
			String password = getKeyValue("password", getKeyValue("data", data));
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getPasswordVerification(mac, password, new LinkCallBack<LocalResponse>() {
			@Override
			public void onSuccess(LocalResponse obj) {

			if (callback != null) {
			uniCallbackData(type, obj.getObjects(), obj.getCode(), obj.getMsg(), callback);
			}
			}

			@Override
			public void onError(HDLLinkException e) {

			if (callback != null) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			}
			});
			}

			/**
			* 电站删除
			*/
			private void uniGetDelResidence(String type, Object data, DCUniMPJSCallback callback) {


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


			}
			}

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

			/**
			* 电站授权安装商(C端)
			*/
			private void uniHomeUpdateDebugPerm(String type, Object data, DCUniMPJSCallback callback) {


			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			boolean debugPerm = Boolean.parseBoolean(getKeyValue("debugPerm", getKeyValue("data", data)));
			HdlResidenceLogic.getInstance().homeUpdateDebugPerm(homeId, debugPerm, 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 uniGetDeliverToAccount(String type, Object data, DCUniMPJSCallback callback) {

			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String account = getKeyValue("account", getKeyValue("data", data));
			HdlResidenceLogic.getInstance().getDeliverToAccount(homeId, account, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniSuccessCallback(type, obj, callback);
			//收到成功结果响应后,会自动关闭小程序，在HDLUniMPSDKManager类里面有方法()监听到小程序关闭，监听到小程序关闭事件后，会重新获取电站列表进行刷界面；
			if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
			HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
			}
			}

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

			}

			/**
			* 电站的交付二维码(安装商)
			*/
			private void uniGetDeliveryUrlQrcode(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlResidenceLogic.getInstance().getDeliveryUrlQrcode(homeId, new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String obj) {
			uniSuccessCallback(type, obj, callback);
			}

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

			}

			/**
			* 电站的交付URl(安装商)
			*/
			private void uniGetDeliveryUrl(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String obj) {
			try {
			Gson g = new Gson();
			QrcodeUrlBean qrcodeUrlBean = g.fromJson(obj, QrcodeUrlBean.class);
			uniSuccessCallback(type, qrcodeUrlBean.getDeliveryUrl(), callback);
			} catch (Exception ignored) {
			uniSuccessCallback(type, obj, callback);
			}
			}

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

			}

			/**
			* 获取当前账号在公司的身份
			*/
			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 staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(staffInfo)) {
			try {
			staffBean = new Gson().fromJson(staffInfo, 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 staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(staffInfo)) {
			try {
			staffBean = new Gson().fromJson(staffInfo, 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 staffInfo = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(staffInfo)) {
			try {
			staffBean = new Gson().fromJson(staffInfo, 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 uniGetStaffInfo(String type, Object data, DCUniMPJSCallback callback) {
			String userId = getKeyValue("userId", getKeyValue("data", data));
			HdlMemberLogic.getInstance().getStaffInfo(userId, new CloudCallBeak<StaffBean>() {
			@Override
			public void onSuccess(StaffBean obj) {
			uniSuccessCallback(type, obj, callback);
			}

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

			/**
			* 获取员工列表
			*/
			private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
			long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
			long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
			HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<StaffBean>>() {
			@Override
			public void onSuccess(PageNumberObject<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 memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(memberInfo)) {
			try {
			memberBean = new Gson().fromJson(memberInfo, 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 memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(memberInfo)) {
			try {
			memberBean = new Gson().fromJson(memberInfo, 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 memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(memberInfo)) {
			try {
			memberBean = new Gson().fromJson(memberInfo, 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 uniGetHeadPIortrait(String type, Object data, DCUniMPJSCallback callback) {
			MemberBean memberBean = new MemberBean();
			String memberInfo = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(memberInfo)) {
			try {
			memberBean = new Gson().fromJson(memberInfo, MemberBean.class);
			} catch (Exception ignored) {
			}
			}

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

			@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 s) {
			if (callback != null) {
			try {
			if (s.startsWith("{")) {
			uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
			} else if (s.startsWith("[")) {
			uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
			} else {
			uniSuccessCallback(type, s, callback);
			}
			} catch (Exception e) {
			uniSuccessCallback(type, s, callback);
			}
			}
			}

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


			/**
			* 获取位置信息,包括经纬度
			*/
			private void uniGetLocationInfo(String type, Object data, DCUniMPJSCallback callback) {
			@@ -475,39 +1376,39 @@
			//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) {
			geolocation.setResult(-2);
			geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_no_location_information_permission));
			uniCallbackData(type, geolocation, callback);
			geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_no_location_information_permission));
			uniSuccessCallback(type, geolocation, callback);
			return;
			}
			// 判断设备是否支持定位功能
			if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
			geolocation.setResult(-1);
			geolocation.setDes(HDLApp.getInstance().getString(R.string.exception_the_location_function_is_not_enabled));
			geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().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);
			geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_location_move10_meters_later));
			uniSuccessCallback(type, geolocation, callback);
			return;
			}
			geolocation.setResult(0);
			geolocation.setDes(HDLApp.getInstance().getString(R.string.succeed));
			geolocation.setDes(HDLApp.getInstance().getAppLocaleContext().getString(R.string.succeed));
			BigDecimal latitude = BigDecimal.valueOf(location.getLatitude());//经度
			BigDecimal longitude = BigDecimal.valueOf(location.getLongitude());//纬度
			double lat = latitude.setScale(6, RoundingMode.HALF_DOWN).doubleValue();
			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);
			}
			}

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

			@Override
			@@ -537,10 +1438,12 @@
			*/
			private void uniGetCurrentDeviceFirmwares(String type, Object data, DCUniMPJSCallback callback) {
			String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
			HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
			String oid = getKeyValue("oid", getKeyValue("data", data));//设备oid
			String homeId = getKeyValue("homeId", getKeyValue("data", data));//电站id
			HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, oid, homeId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
			@Override
			public void onSuccess(List<DeviceFirmwareBean> obj) {
			uniCallbackData(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			@@ -560,7 +1463,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
			@@ -591,15 +1494,14 @@
			String[] ary = path.split("/");
			String[] driverInfoAry = ary[ary.length - 1].split("_");
			DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean();
			deviceFirmwareBean.setOid(driverInfoAry[0]);
			deviceFirmwareBean.setImageId(driverInfoAry[1]);
			deviceFirmwareBean.setVersion(driverInfoAry[2].replace(".zip", ""));
			deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), osImageId, deviceFirmwareBean.getVersion()));
			deviceFirmwareBean.setImageId(driverInfoAry[0]);
			deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", ""));
			deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(osImageId, deviceFirmwareBean.getVersion()));
			list.add(deviceFirmwareBean);
			}
			}
			if (callback != null) {
			this.uniCallbackData(type, list, callback);
			this.uniSuccessCallback(type, list, callback);
			}
			} catch (Exception ignored) {
			}
			@@ -622,7 +1524,7 @@
			HdlThreadLogic.runSubThread(new Runnable() {
			@Override
			public void run() {
			String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
			String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
			//不在子线程读流会卡死主线程
			boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
			if (isBoolean) {
			@@ -632,9 +1534,9 @@
			}

			if (isBoolean) {
			uniCallbackData(type, null, 0, "写入新驱动文件到内存成功", callback);
			uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.writing_firmware_upgrade_memory_succeeded), callback);
			} else {
			uniCallbackData(type, null, -2, "下载固件升级文件失败", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.download_firmware_upgrade_file_failed), callback);
			}
			}
			});
			@@ -663,11 +1565,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和端口；
			@@ -676,10 +1578,10 @@
			@Override
			public void onServiceConnected(ComponentName name, IBinder service) {
			//本地升级固件文件路径
			String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
			String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
			byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
			if (data == null \|\| data.length == 0) {
			uniCallbackData(type, null, -2, "本地找不到升级固件文件,请下载好固件文件,再重新升级.", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.found_locally_firmware_upgrade_file), callback);
			return;
			}
			String md5 = HDLMD5Utils.encodeMD5(data);//网关固件需要
			@@ -694,36 +1596,36 @@

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(type, null, -2, "通知给网关升级固件文件地址失败,无法升级,", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.notify_gateway_firmware_upgrade_failed), callback);
			}
			});
			}

			@Override
			public void onServiceDisconnected(ComponentName name) {
			uniCallbackData(type, null, -2, "本地服务有异常失败,无法升级,", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.local_service_fails), callback);
			}
			});
			} else {
			HdlLogLogic.print("在线升级--->", true);
			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(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			return;
			}
			if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().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(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			@@ -744,25 +1646,25 @@

			@Override
			public void onFailure(HDLException e) {
			HdlLogLogic.print("在线升级--->", true);
			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(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			return;
			}
			if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().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(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			@@ -789,10 +1691,11 @@
			*/
			private void uniGetCurrentGatewayDrivers(String type, Object data, DCUniMPJSCallback callback) {
			String deviceOid = getKeyValue("oid", getKeyValue("data", data));
			HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));//电站id
			HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, homeId, new CloudCallBeak<List<GatewayDriverBean>>() {
			@Override
			public void onSuccess(List<GatewayDriverBean> obj) {
			uniCallbackData(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

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

			@Override
			@@ -848,10 +1751,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);
			}

			}
			@@ -885,9 +1788,9 @@
			HdlFileLogic.getInstance().deleteFile(drivePathFileName);//下载失败，删除不完整驱动文件;
			}
			if (isBoolean) {
			uniCallbackData(type, null, 0, "写入新驱动文件到内存成功", callback);
			uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.writing_drive_memory_succeeded), callback);
			} else {
			uniCallbackData(type, null, -2, "下载驱动升级文件失败", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.download_drive_file_failed), callback);
			}
			}
			});
			@@ -915,11 +1818,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和端口；
			@@ -931,7 +1834,7 @@
			String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName(driverCode, version);
			byte[] data = HdlFileLogic.getInstance().readFileByte(drivePathFileName);
			if (data == null \|\| data.length == 0) {
			uniCallbackData(type, null, -2, "本地找不到升级驱动文件,请下载好驱动文件,再重新升级.", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.found_locally_drive_file), callback);
			return;
			}
			String md5 = HDLMD5Utils.encodeMD5(data);//网关驱动需要
			@@ -946,36 +1849,36 @@

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(type, null, -2, "通知给网关升级驱动文件地址失败,无法升级,", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.notify_gateway_drive_failed), callback);
			}
			});
			}

			@Override
			public void onServiceDisconnected(ComponentName name) {
			uniCallbackData(type, null, -2, "本地服务有异常失败,无法升级,", callback);
			uniCallbackData(type, null, -2, HDLApp.getInstance().getAppLocaleContext().getString(R.string.local_service_fails), callback);
			}
			});
			} else {
			HdlLogLogic.print("在线升级--->", true);
			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(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			return;
			}
			if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().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(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			@@ -996,25 +1899,25 @@

			@Override
			public void onFailure(HDLException e) {
			HdlLogLogic.print("在线升级--->", true);
			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(type, null, 6, HDLApp.getInstance().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, 6, HDLApp.getInstance().getAppLocaleContext().getString(R.string.ota_binding_cloud_upgrade_fails), callback);
			return;
			}
			if (cloudInverterDeviceBean.getDeviceStatus() != 3) {
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getString(R.string.ota_not_cloud_upgrade_fails), callback);
			uniCallbackData(type, null, cloudInverterDeviceBean.getDeviceStatus(), HDLApp.getInstance().getAppLocaleContext().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(type, obj, callback);
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			@@ -1040,7 +1943,7 @@
			*/
			private void uniCancelDownloadingUpgradeFile(String type, Object data, DCUniMPJSCallback callback) {
			HdlOtaLogic.getInstance().stopDownloadUpgradeFile();
			uniCallbackData(type, null, 0, "取消下载成功.", callback);
			uniCallbackData(type, null, 0, HDLApp.getInstance().getAppLocaleContext().getString(R.string.cancel_download_successfully), callback);
			}

			/**
			@@ -1091,13 +1994,13 @@
			public String getDeviceStatusString(int deviceStatus) {
			switch (deviceStatus) {
			case 1: {
			return HDLApp.getInstance().getString(R.string.my_power_station_connecting);
			return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_connecting);
			}
			case 2: {
			return HDLApp.getInstance().getString(R.string.my_power_station_malfunction);
			return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_malfunction);
			}
			case 4: {
			return HDLApp.getInstance().getString(R.string.my_power_station_off_line);
			return HDLApp.getInstance().getAppLocaleContext().getString(R.string.my_power_station_off_line);
			}
			default:
			return "";
			@@ -1118,24 +2021,34 @@
			if (cUserInfo == null) {
			return;
			}
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().Save();

			//获取用户头像路径
			if (cUserInfo.getMemberHeadIcon().contains("http")) {
			//更新用户头像
			uniCallbackData(type, cUserInfo, callback);
			uniSuccessCallback(type, cUserInfo, callback);
			UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			UserConfigManage.getInstance().Save();
			HdlLogLogic.print("头像路径---->>>" + cUserInfo.getMemberHeadIcon());
			} else {
			HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String url) {
			cUserInfo.setMemberHeadIcon(url);
			uniCallbackData(type, cUserInfo, callback);
			uniSuccessCallback(type, cUserInfo, callback);
			UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
			UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
			UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
			UserConfigManage.getInstance().setUserImageUrl(cUserInfo.getMemberHeadIcon());
			UserConfigManage.getInstance().Save();
			HdlLogLogic.print("头像路径----" + cUserInfo.getMemberHeadIcon());
			}

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

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

			@Override
			@@ -1200,10 +2113,10 @@
			*/
			private void uniGetMessageNumber(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<String>() {
			HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
			@Override
			public void onSuccess(String data) {
			uniCallbackData(type, data, callback);
			public void onSuccess(UnCountBean data) {
			uniSuccessCallback(type, data, callback);
			}

			@Override
			@@ -1225,7 +2138,7 @@
			GatewayBean gatewayBean = new GatewayBean();
			gatewayBean.setDevice_mac(mac);
			list.add(gatewayBean);
			HdlDeviceLogic.getInstance().uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null);
			HdlDeviceLogic.getInstance().uploadOidDataToCloud(UserConfigManage.getInstance().getHomeId(), list, true, null);
			}

			/**
			@@ -1242,7 +2155,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
			@@ -1264,7 +2177,7 @@
			@Override
			public void onSuccess(DeviceTimeBean deviceTimeBean) {
			if (callback != null) {
			uniCallbackData(type, deviceTimeBean, callback);
			uniSuccessCallback(type, deviceTimeBean, callback);
			}
			}

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

			@@ -1317,14 +2230,14 @@
			public void onSuccess(Boolean obj) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
			if (gatewayBean == null) {
			uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
			uniCallbackData(type, null, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.The_gateway_cannot_be_found_locally), callback);

			return;
			}
			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
			@@ -1358,15 +2271,15 @@
			// com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
			try {
			String devices = getKeyValue("devices", getKeyValue("data", data));
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			Gson gson = new Gson();
			Type typeOfT = new TypeToken<List<GatewayBean>>() {
			}.getType();
			List<GatewayBean> list = gson.fromJson(devices, typeOfT);
			if (list == null \|\| list.size() == 0) {
			uniCallbackData(type, null, -100, HDLApp.getInstance().getString(R.string.The_gateway_cannot_be_found_locally), callback);
			uniCallbackData(type, null, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.The_gateway_cannot_be_found_locally), callback);
			return;
			}
			String homeId = UserConfigManage.getInstance().getHomeId();
			//记录条数
			AtomicInteger atomicInteger = new AtomicInteger(0);
			final boolean[] is_boolean = {false};
			@@ -1384,11 +2297,27 @@
			HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(type, null, callback);
			uniSuccessCallback(type, null, callback);
			}

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

			@Override
			public void onError(HDLLinkException e) {
			HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true);
			}
			});
			}
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			@@ -1427,16 +2356,39 @@
			*/
			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));
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(type, null, callback);
			//初始化逆变器设备
			HdlDeviceLogic.getInstance().initializeInverter(mac, null);
			//移除本地缓存
			HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToDeviceId(homeId, deviceId);
			uniSuccessCallback(type, null, callback);
			}

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

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			});
			} else {
			uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
			}
			}
			});
			}
			@@ -1453,7 +2405,7 @@
			HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
			@Override
			public void onSuccess(List<GatewayBean> gatewayBeanList) {
			uniCallbackData(type, gatewayBeanList, callback);
			uniSuccessCallback(type, gatewayBeanList, callback);
			}

			@Override
			@@ -1473,25 +2425,22 @@
			*/
			private void uniGetCurrentHomeLocalAndCloudGatewayList(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			// UserConfigManage.getInstance().setHomeId(homeId);
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			if (list == null \|\| list.size() == 0) {
			if (callback != null) {
			uniCallbackData(type, list, callback);
			}
			return;
			List<GatewayBean> newList = sortLogic(list);
			if (callback != null) {
			uniSuccessCallback(type, newList, callback);
			}
			//进来住宅详情都要上传一次oid列表到云端;
			HdlDeviceLogic.getInstance().uploadDataToCloud(homeId, list, null);
			//EventBus事件分发,进入住宅开始订阅主题
			BaseEventBus baseEventBus = new BaseEventBus();
			baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
			baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
			baseEventBus.setData(list);
			baseEventBus.setData(homeId);
			EventBus.getDefault().post(baseEventBus);
			if (callback != null) {
			uniCallbackData(type, list, callback);
			}
			//进来住宅详情都要上传一次oid列表到云端;
			HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
			}

			@Override
			@@ -1502,6 +2451,366 @@
			}
			});

			}

			/**
			* 进行排序（逆变器-负载中心）
			*
			* @param list 源数据
			* @return 返回列表
			*/
			private List<GatewayBean> sortLogic(List<GatewayBean> list) {
			if (list == null \|\| list.size() == 0) {
			return new ArrayList<>();
			}
			List<GatewayBean> newList = new ArrayList<>();
			List<GatewayBean> inverterList = new ArrayList<>();
			List<GatewayBean> lcList = new ArrayList<>();
			for (int i = 0; i < list.size(); i++) {
			if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
			inverterList.add(list.get(i));
			} else {
			lcList.add(list.get(i));
			}
			}
			newList.addAll(inverterList);
			newList.addAll(lcList);
			return newList;
			}

			/**
			* link spk 属性编辑
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniLinkSpkAttributeEdit(String type, Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
			JsonArray jay = new JsonArray();
			if (!TextUtils.isEmpty(attribute_data)) {
			try {
			Gson gson = new Gson();
			JsonObject jObject = gson.fromJson(attribute_data, JsonObject.class);
			String objects = jObject.get("objects").toString();
			jay = gson.fromJson(objects, JsonArray.class);
			} catch (Exception ignored) {
			}
			}
			TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_DOWN, jay, "", new HDLLinkCallBack() {
			@Override
			public void onSuccess(String msg) {
			uniSuccessCallback(type, msg, callback);
			}

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

			/**
			* link spk 属性读取
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniLinkSpkAttributeRead(String type, Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
			JsonArray jay = new JsonArray();
			if (!TextUtils.isEmpty(attribute_data)) {
			try {
			Gson gson = new Gson();
			JsonObject jObject = gson.fromJson(attribute_data, JsonObject.class);
			String objects = jObject.get("objects").toString();
			jay = gson.fromJson(objects, JsonArray.class);
			} catch (Exception ignored) {
			}

			}
			TcpClient.getInstance().sendDataToLinkGateway(mac, TopicApi.PROPERTY_READ, jay, "", new HDLLinkCallBack() {
			@Override
			public void onSuccess(String msg) {
			try {
			Gson gson = new Gson();
			Type typeOfT = new TypeToken<BaseLocalResponse<List<LinkBean>>>() {
			}.getType();
			BaseLocalResponse<List<LinkBean>> baseLocalResponse = gson.fromJson(msg, typeOfT);
			uniSuccessCallback(type, baseLocalResponse, callback);
			} catch (Exception e) {
			uniCallbackData(type, msg, -2, "", callback);
			}
			}

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


			/**
			* 发送账号和密码给逆变器
			*
			* @param ssid 账号
			* @param password 密码
			* @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);
			// 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]);
			// logMessage("tcp回复数据", 0, strings[0] + "\r\n" + json.toString());
			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();
			}

			/**
			* 初始化逆变器
			*
			* @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);
			}
			});
			}

			/**
			* 获取未运行逆变器列表
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniGetListNotRun(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getListNotRun(homeId, new CloudCallBeak<List<NotRunBean>>() {
			@Override
			public void onSuccess(List<NotRunBean> obj) {
			uniSuccessCallback(type, obj, callback);
			}

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

			/**
			* 逆变器开机
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniSetDeviceStartup(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
			JsonArray jsonArray = new Gson().fromJson(aryJson, JsonArray.class);
			HdlDeviceLogic.getInstance().setDeviceStartup(homeId, jsonArray, 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);
			}
			});
			}

			/**
			* 获取设备详情（云端）
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniGetDeviceInfo(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String aryJson = getKeyValue("deviceIds", getKeyValue("data", data));
			JsonArray jsonArray = new Gson().fromJson(aryJson, JsonArray.class);
			HdlDeviceLogic.getInstance().getDeviceInfo(homeId, jsonArray, new CloudCallBeak<List<DeviceInfoBean>>() {
			@Override
			public void onSuccess(List<DeviceInfoBean> list) {
			uniSuccessCallback(type, list, callback);
			}

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

			/**
			* 获取逆变器详情
			*
			* @param type 类型
			* @param data uni请求数据
			* @param callback uni回调
			*/
			public void uniGetGatewayInfo(String type, Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getGatewayInfo(mac, new LinkCallBack<InverterBean>() {
			@Override
			public void onSuccess(InverterBean obj) {
			uniSuccessCallback(type, obj, callback);
			}

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


			@@ -1523,7 +2832,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);
			@@ -1535,24 +2844,26 @@
			// }
			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() {
			long startTime = System.currentTimeMillis();
			HDLModBusConnect.getInstance().asyncSend(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);
			long endTime = System.currentTimeMillis() - startTime;
			Log.d("====Mobus耗时时间====", String.valueOf(endTime));
			}

			@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);
			}
			});
			}
			@@ -1574,22 +2885,33 @@
			if (data == null) {
			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());
			}
			// if (isTokenAndRefreshToken) {
			// //小程序那里有自己的请求方法,但需要原生提供这些数据
			// data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
			// data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
			// if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
			// AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
			// }
			// data.put("serverAddress", AppConfigManage.getUserRegionUrl());
			// data.put("appKey", AppConfigManage.getAppKey());
			// data.put("appSecret", AppConfigManage.getAppSecret());
			// }
			data.put("appLanguage", UserConfigManage.getInstance().getCurrentAppLanguage());
			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发送数据格式
			@@ -1605,23 +2927,18 @@
			HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
			try {
			uniCallBackBaseBean.setCode(code);
			uniCallBackBaseBean.setMes(msg);
			uniCallBackBaseBean.setMsg(msg);
			uniCallBackBaseBean.setData(obj);
			if (callback != null) {
			callback.invoke(getJSONObject(uniCallBackBaseBean));
			// callback.invoke(uniCallBackBaseBean);
			HdlLogLogic.print("uni--->接收--->" + type + "--->" + new Gson().toJson(uniCallBackBaseBean), true);
			HdlLogLogic.print("回复---uni---" + type + "---" + getJSONObject(uniCallBackBaseBean).toString(), 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