~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -4,29 +4,32 @@
			import androidx.appcompat.content.res.AppCompatResources;

			import android.Manifest;
			import android.content.Intent;
			import android.content.ComponentName;
			import android.content.ServiceConnection;
			import android.content.pm.PackageManager;
			import android.os.Bundle;
			import android.os.IBinder;
			import android.os.Process;
			import android.text.TextUtils;
			import android.util.Log;
			import android.view.View;

			import com.google.gson.Gson;
			import com.hdl.linkpm.sdk.core.exception.HDLException;
			import com.hdl.linkpm.sdk.home.type.HomeType;
			import com.hdl.photovoltaic.HDLApp;
			import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
			import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
			import com.hdl.photovoltaic.R;
			import com.hdl.photovoltaic.base.CustomBaseActivity;
			import com.hdl.photovoltaic.bean.MqttInfo;
			import com.hdl.photovoltaic.config.UserConfigManage;
			import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
			import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
			import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
			import com.hdl.photovoltaic.listener.CloudCallBeak;
			import com.hdl.photovoltaic.other.HdlDeviceLogic;
			import com.hdl.photovoltaic.other.HdlFileLogic;
			import com.hdl.photovoltaic.other.HdlLogLogic;
			import com.hdl.photovoltaic.other.HdlMqttLogic;
			import com.hdl.photovoltaic.other.HdlOtaLogic;
			import com.hdl.photovoltaic.other.HdlThreadLogic;
			import com.hdl.photovoltaic.other.HdlUniLogic;
			import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
			@@ -46,6 +49,8 @@
			import org.greenrobot.eventbus.ThreadMode;

			import java.util.List;

			import okhttp3.ResponseBody;


			/**
			@@ -78,12 +83,7 @@
			//初始化mqtt客户端
			initMqttClient();

			String path = HdlFileLogic.getInstance().getDriveRootPath() + "/036F6C1B.zip";
			MyNanoHttpServer.getInstance(AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()));
			//MyNanoHttpServer.getInstance("127.0.0.1");
			Intent intentServer = new Intent();
			intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
			startService(intentServer);


			}

			@@ -270,48 +270,56 @@

			@Subscribe(threadMode = ThreadMode.MAIN)
			public void onEventMessage(BaseEventBus event) {
			//网关更新mqtt秘钥更新通知

			if (event == null) {
			return;
			}
			if (TextUtils.isEmpty(event.getTopic())) {
			return;
			}
			String[] topics = event.getTopic().split("/");
			//主题不符合规则不处理
			if (topics.length < 3) {
			return;
			}
			int index = -1;
			List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
			for (int i = 0; i < list.size(); i++) {
			GatewayBean gatewayBean = list.get(i);
			if (gatewayBean.getGatewayId().equals(topics[2])) {
			index = i;
			break;
			//网关更新mqtt秘钥更新通知
			if (event.getTopic().contains("/custom/mqtt/secret/change")) {
			String[] topics = event.getTopic().split("/");
			//主题不符合规则不处理
			if (topics.length < 3) {
			return;
			}
			}
			if (index > -1) {
			GatewayBean gatewayBean = list.get(index);
			HdlDeviceLogic.getInstance().getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() {
			@Override
			public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
			if (deviceRemoteInfo != null) {
			//更新mqtt通讯的新秘钥
			gatewayBean.setAesKey(deviceRemoteInfo.getSecret());
			//用之前的库,底层mqtt订阅，加解密会用到该参数;
			HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//设置mqtt通讯秘钥库
			int index = -1;
			List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
			for (int i = 0; i < list.size(); i++) {
			GatewayBean gatewayBean = list.get(i);
			if (gatewayBean.getGatewayId().equals(topics[2])) {
			index = i;
			break;
			}
			}
			if (index > -1) {
			GatewayBean gatewayBean = list.get(index);
			HdlDeviceLogic.getInstance().getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() {
			@Override
			public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
			if (deviceRemoteInfo != null) {
			//更新mqtt通讯的新秘钥
			gatewayBean.setAesKey(deviceRemoteInfo.getSecret());
			//用之前的库,底层mqtt订阅，加解密会用到该参数;
			HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//设置mqtt通讯秘钥库
			}
			}
			}

			@Override
			public void onFailure(HDLException e) {
			@Override
			public void onFailure(HDLException e) {

			}
			});
			}
			});
			}
			} else if (event.getTopic().contains(HdlOtaLogic.localDownloadProgress)) {
			//下载云端驱动或者固件文件,自己计算进度条上报到uni那边
			HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
			uniCallBackBaseBean.setType(HdlOtaLogic.localDownloadProgress);
			uniCallBackBaseBean.setData(event.getData());
			HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
			HdlLogLogic.print(((HdlOtaLogic.Progress) event.getData()).step + "", false);
			}


			}


			@@ -345,4 +353,8 @@
			super.onBackPressed();
			}





			}