~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -10,6 +10,7 @@
			import android.location.Location;
			import android.location.LocationManager;
			import android.os.IBinder;
			import android.provider.Settings;
			import android.text.TextUtils;

			import androidx.core.app.ActivityCompat;
			@@ -68,9 +69,13 @@


			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.List;
			import java.util.Objects;
			@@ -278,18 +283,28 @@
			}
			break;
			//当前wifi详情
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_PHONE_INFO: {
			if (callback != null) {
			uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
			}
			}
			break;
			//wifi连接
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
			//配置WiFi信息给逆变器
			case HDLUniMP.UNI_EVENT_REPLY_WIFI_SET_DEVICE: {
			String mac = getKeyValue("mac", getKeyValue("data", data));//
			String wif_type = getKeyValue("wif_type", getKeyValue("data", data));//1：热点,2：无线wifi,3：以太网
			String ssid = getKeyValue("ssid", getKeyValue("data", data));//
			String password = getKeyValue("password", getKeyValue("data", data));//
			startTcpThreadSendAccountAndPassword(mode_type, ssid, password, callback);

			}
			break;

			//打开手机Wifi设置界面
			case HDLUniMP.UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS: {
			Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
			HDLApp.getInstance().startActivity(intent);
			}
			break;
			}
			} else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
			//OTA升级模块
			@@ -640,10 +655,9 @@
			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);
			}
			}
			@@ -671,7 +685,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) {
			@@ -725,7 +739,7 @@
			@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, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback);
			@@ -1630,6 +1644,84 @@


			/**
			* 发送账号和密码给逆变器
			*
			* @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) {
			uniCallbackData(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();
			}


			/**
			* 发送modbus协议数据
			* 透传协议
			* 下发主题：/user/${gw_id}/custom/native/${driver}/down;
			@@ -1732,7 +1824,7 @@
			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));