~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -113,90 +113,22 @@
			switch (type) {
			//添加逆变器到云端
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
			if (gatewayBean == null) {
			uniCallbackData(null, -100, "本地找不到网关", callback);
			return;
			}
			HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac,
			gatewayBean.getGatewayType(),
			gatewayBean.getSid(),
			gatewayBean.getOid(),
			gatewayBean.getDevice_name(),
			new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(null, callback);
			}
			this.uniAddInverterDeviceToCloud(data, callback);

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});


			}
			//删除云端逆变器
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
			this.uniDelInverterDevice(data, callback);
			}
			break;
			//局域网搜索逆变器列表
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_NET_LIST: {
			HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
			@Override
			public void onSuccess(List<GatewayBean> gatewayBeanList) {
			uniCallbackData(gatewayBeanList, callback);
			}

			@Override
			public void onError(HDLLinkException e) {
			//发送失败
			uniCallbackData(null, e.getCode(), "", callback);
			}
			});
			this.uniSearchGateway(callback);
			}
			break;
			//获取逆变器列表
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			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
			public void onFailure(HDLException e) {
			if (callback != null) {
			uniCallbackData(null, -2, e.getMessage(), callback);
			}
			}
			});
			this.uniGetCurrentHomeLocalAndCloudGatewayList(callback);
			}
			break;
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
			@@ -206,43 +138,28 @@
			break;
			//获取oid列表
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {

			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
			@Override
			public void onSuccess(List<OidBean> list) {
			if (callback != null) {
			uniCallbackData(list, callback);
			}
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -2, e.getMsg(), callback);
			}
			});
			this.uniGetInverterOidList(data, callback);
			}
			break;
			//逆变器时间读取
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {

			}

			@Override
			public void onError(HDLLinkException e) {

			}
			});
			this.uniGetInverterTime(data, callback);
			}

			break;
			//逆变器时间编辑
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
			this.uniEditInverterTime(data, callback);
			}
			break;
			//逆变器上传数据到云端
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_UPLOADING_DATA: {
			this.uniUploadDataToCloud(data, callback);
			}
			break;
			//逆变器清空住宅id
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_CLEAR_DATA: {
			this.uniClearInverterHomeId(data, callback);
			}
			break;

			@@ -280,6 +197,256 @@
			}

			}


			/**
			* 原生打开uni指定页面
			*
			* @param path 打开路径
			* @param jsonObject 附件数据(没有数据填null)
			*/
			public void openUniMP(String path, JSONObject jsonObject) {

			JSONObject json = this.createdJsonDate(jsonObject, true);
			HdlLogLogic.print("uni===组装uni发送数据格式", json.toString());
			HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
			}

			/**
			* 原生【主动】向小程序发送通知事件
			* 注意：需要提前小程序在运行才可成功
			*
			* @param topic 主题大类(如:UNI_EVENT_REPLY_HOME_MODEL)
			* @param callBackBaseBean ——
			*/
			public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
			try {
			HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
			} catch (Exception e) {
			HdlLogLogic.print("uni===原生主动向小程序发送通知事件", e.getMessage());
			}
			}

			/**
			* 检测是否当前页面注册的callback,是的话则移除
			*/
			public void checkRemoveOtherUniMPEventCallBack() {
			HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
			}
			//endregion

			//region ****uni逻辑方法****

			/**
			* 逆变器清空住宅id
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniClearInverterHomeId(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().clearInverterHomeId(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(null, callback);
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			/**
			* 逆变器上传数据到云端
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniUploadDataToCloud(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().uploadDataToCloud(mac, null);
			}

			/**
			* 编辑逆变器时间
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniEditInverterTime(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
			}

			/**
			* 获取逆变器时间
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniGetInverterTime(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {

			}

			@Override
			public void onError(HDLLinkException e) {

			}
			});
			}

			/**
			* 获取oid列表
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniGetInverterOidList(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
			@Override
			public void onSuccess(List<OidBean> list) {
			if (callback != null) {
			uniCallbackData(list, callback);
			}
			}

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

			/**
			* 逆变器添加到云端上
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniAddInverterDeviceToCloud(Object data, DCUniMPJSCallback callback) {
			String mac = getKeyValue("mac", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
			if (gatewayBean == null) {
			uniCallbackData(null, -100, "本地找不到网关", callback);
			return;
			}
			HdlDeviceLogic.getInstance().addInverterDeviceToCloud(mac,
			gatewayBean.getGatewayType(),
			gatewayBean.getSid(),
			gatewayBean.getOid(),
			gatewayBean.getDevice_name(),
			new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(null, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			@Override
			public void onError(HDLLinkException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}

			/**
			* 逆变器添加到云端上
			*
			* @param data uni数据
			* @param callback uni回调
			*/
			private void uniDelInverterDevice(Object data, DCUniMPJSCallback callback) {
			String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
			HdlDeviceLogic.getInstance().delInverterDevice(deviceId, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniCallbackData(null, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniCallbackData(null, -100, e.getMessage(), callback);
			}
			});
			}


			/**
			* 局域网搜索逆变器列表
			*
			* @param callback uni回调
			*/
			private void uniSearchGateway(DCUniMPJSCallback callback) {
			HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
			@Override
			public void onSuccess(List<GatewayBean> gatewayBeanList) {
			uniCallbackData(gatewayBeanList, callback);
			}

			@Override
			public void onError(HDLLinkException e) {
			//发送失败
			uniCallbackData(null, e.getCode(), "", callback);
			}
			});

			}

			/**
			* 获取逆变器列表
			*
			* @param callback uni回调
			*/
			private void uniGetCurrentHomeLocalAndCloudGatewayList(DCUniMPJSCallback callback) {
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			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
			public void onFailure(HDLException e) {
			if (callback != null) {
			uniCallbackData(null, -2, e.getMessage(), callback);
			}
			}
			});

			}


			/**
			* 发送modbus协议数据
			@@ -321,42 +488,7 @@
			});
			}

			/**
			* 原生打开uni指定页面
			*
			* @param path 打开路径
			* @param jsonObject 附件数据(没有数据填null)
			*/
			public void openUniMP(String path, JSONObject jsonObject) {

			JSONObject json = this.createdJsonDate(jsonObject, true);
			HdlLogLogic.print("uni===组装uni发送数据格式", json.toString());
			HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
			}

			/**
			* 原生【主动】向小程序发送通知事件
			* 注意：需要提前小程序在运行才可成功
			*
			* @param topic 主题大类(如:UNI_EVENT_REPLY_HOME_MODEL)
			* @param callBackBaseBean ——
			*/
			public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
			try {
			HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
			} catch (Exception e) {
			HdlLogLogic.print("uni===原生主动向小程序发送通知事件", e.getMessage());
			}
			}

			/**
			* 检测是否当前页面注册的callback,是的话则移除
			*/
			public void checkRemoveOtherUniMPEventCallBack() {
			HDLUniMPSDKManager.getInstance().checkRemoveOtherUniMPEventCallBack(this);
			}
			//endregion


			//region ****一般方法****