From d830fef6a2bc2ab061e6ac2b423c4a49dda3cf21 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 06 十二月 2023 18:08:26 +0800 Subject: [PATCH] 2023年12月06日18:08:20 --- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 159 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 119 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java index 48627f5..b1dfead 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -1,10 +1,12 @@ package com.hdl.photovoltaic.ui; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.content.res.AppCompatResources; import android.Manifest; import android.content.ComponentName; +import android.content.Intent; import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.os.Bundle; @@ -17,7 +19,8 @@ import com.google.gson.Gson; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.linkpm.sdk.home.type.HomeType; -import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean; +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; @@ -33,9 +36,7 @@ import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo; import com.hdl.photovoltaic.uni.HDLUniMP; -import com.hdl.photovoltaic.utils.AesUtils; import com.hdl.photovoltaic.utils.AppManagerUtils; -import com.hdl.photovoltaic.utils.Md5Utils; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.common.event.EventListener; @@ -49,13 +50,7 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; - import okhttp3.ResponseBody; @@ -81,6 +76,7 @@ @Override public void onBindView(Bundle savedInstanceState) { + setNotificationBarBackgroundColor(CustomColor.blue); //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -90,6 +86,7 @@ //鍒濆鍖杕qtt瀹㈡埛绔� initMqttClient(); +// dddd(); } @@ -276,49 +273,59 @@ @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璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟; - 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璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟; + 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閭h竟 + HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + uniCallBackBaseBean.setType(event.getType()); + uniCallBackBaseBean.setData(event.getData()); + HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean); + HdlLogLogic.print("杩涘害:" + ((HdlOtaLogic.Progress) event.getData()).step + "", false); } - - } + + /** @@ -352,4 +359,76 @@ } + private void dddd() { +// String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName("036F6C1B", "V01.01.02"); +// String data = HdlFileLogic.getInstance().readFile(drivePathFileName); +// String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕� +// Log.e("", md5); +// HdlOtaLogic.getInstance().getDeviceDriverDownloadFile("http://192.168.16.135:49152/storage/emulated/0/Android/data/com.hdl.photovoltaic/files/Documents/upgrade/drive/036F6C1B_V01.01.02.zip", new CloudCallBeak<ResponseBody>() { +// @Override +// public void onSuccess(ResponseBody responseBody) { +// +// HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, md5); +// +//// //鏈湴鍗囩骇椹卞姩鏂囦欢璺緞 +//// +//// String data = HdlFileLogic.getInstance().readFile(drivePathFileName); +//// String md5 = HDLMD5Utils.encodeMD5(data);//缃戝叧椹卞姩闇�瑕� +// } +// +// @Override +// public void onFailure(HDLException e) { +// +// } +// }); + + +// HdlOtaLogic.getInstance().getNewGatewayDrivers("036F6C1B", "A000", new CloudCallBeak<CloudGatewayDriversBean>() { +// @Override +// public void onSuccess(CloudGatewayDriversBean obj) { +// +// } +// +// @Override +// public void onFailure(HDLException e) { +// +// } +// }); + + +// dowlao(); + HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + + } + + @Override + public void onServiceDisconnected(ComponentName name) { + + } + }); + + } + + void dowlao() { + + HdlOtaLogic.getInstance().getDeviceUpgradeDownloadFile("http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2023/11/1834a1d0-d2a7-4b6f-9877-6f2722e9b7bc.hdlipk_sec", new CloudCallBeak<ResponseBody>() { + @Override + public void onSuccess(ResponseBody responseBody) { + String drivePathFileName = HdlFileLogic.getInstance().getDrivePathFileName("036F6C1B", "V01.01.02"); + HdlOtaLogic.getInstance().disposeDownLoadFile(drivePathFileName, responseBody, "84cd8e62d4311c90508313f0e5965dbb", HdlOtaLogic.driver_type); + +// HdlFileLogic.getInstance().writeFile(drivePathFileName, bytes);//鍐欏叆鏂版枃浠� + HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", false); + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("涓嬭浇椹卞姩鏂囦欢鍒板唴瀛樺け璐�.", false); + } + }); + } + + } \ No newline at end of file -- Gitblit v1.8.0