~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -13,6 +13,7 @@
			import android.os.SystemClock;
			import android.provider.Settings;
			import android.text.TextUtils;
			import android.util.Log;

			import androidx.core.app.ActivityCompat;

			@@ -141,6 +142,8 @@
			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;//用来打印的
			@@ -244,16 +247,15 @@
			}
			}
			break;
			//电站的交付二维码(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			uniGetDeliveryUrlQrcode(type, data, callback);
			}
			break;
			// //电站的交付二维码(安装商)
			// case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			// uniGetDeliveryUrlQrcode(type, data, callback);
			// }
			// break;
			//电站的交付URL(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			uniGetDeliveryUrl(type, data, callback);
			}

			break;
			//电站手动交付(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
			@@ -426,12 +428,18 @@
			break;
			//逆变器以太网配置
			case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
			uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
			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);
			if (callback != null) {
			uniSuccessCallback(type, "", callback);
			}
			//uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
			}
			break;

			@@ -765,6 +773,8 @@
			} catch (Exception e) {
			uniSuccessCallback(type, json, callback);
			}
			long endTime = System.currentTimeMillis() - startTime;
			Log.d("====耗时时间====", String.valueOf(endTime));
			}
			}
			}
			@@ -812,7 +822,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);
			}

			/**
			@@ -841,7 +851,7 @@
			//region ****uni接口方法****

			/**
			* link进行密码验证
			* link进行本地密码登录验证
			*/
			private void uniCheckPasswordVerification(String type, Object data, DCUniMPJSCallback callback) {
			String password = getKeyValue("password", getKeyValue("data", data));
			@@ -996,7 +1006,14 @@
			HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String obj) {
			uniSuccessCallback(type, obj, callback);
			try {
			Gson g = new Gson();
			JsonObject jObject = g.fromJson(obj, JsonObject.class);
			String deliveryUrl = jObject.get("deliveryUrl").toString();
			uniSuccessCallback(type, deliveryUrl, callback);
			} catch (Exception ignored) {
			uniSuccessCallback(type, obj, callback);
			}
			}

			@Override
			@@ -2359,8 +2376,9 @@
			HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
			@Override
			public void onSuccess(List<GatewayBean> list) {
			List<GatewayBean> newList = sortLogic(list);
			if (callback != null) {
			uniSuccessCallback(type, list, callback);
			uniSuccessCallback(type, newList, callback);
			}
			//EventBus事件分发,进入住宅开始订阅主题
			BaseEventBus baseEventBus = new BaseEventBus();
			@@ -2369,7 +2387,7 @@
			baseEventBus.setData(homeId);
			EventBus.getDefault().post(baseEventBus);
			//进来住宅详情都要上传一次oid列表到云端;
			HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
			HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
			}

			@Override
			@@ -2380,6 +2398,31 @@
			}
			});

			}

			/**
			* 进行排序（逆变器-负载中心）
			*
			* @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;
			}

			/**
			@@ -2754,12 +2797,14 @@

			//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) {
			uniSuccessCallback(type, data, callback);
			// HdlLogLogic.print("uni---接收---ModBus---" + Arrays.toString(data), true);

			long endTime = System.currentTimeMillis() - startTime;
			Log.d("====Mobus耗时时间====", String.valueOf(endTime));
			}

			@Override