From de2d3696f975cf6e6df2e580bab305fa9859feea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 26 十月 2023 17:55:36 +0800
Subject: [PATCH] 2023年10月26日17:55:33
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 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 66b8b35..263a352 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,31 +6,37 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.provider.Settings;
import android.view.View;
import com.google.gson.Gson;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
-import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
-import com.hdl.photovoltaic.HDLApp;
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.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.ModbusResponse;
+import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import java.util.Random;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+
/**
* 鎴戠殑鐢电珯鐣岄潰
@@ -51,7 +57,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- getWindow().setStatusBarColor(getColor(R.color.text_245EC3));
+
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -100,9 +106,9 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.my_power_station_title);
- viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message_娑堟伅);
- viewBinding.myMeBottomIl3.titleTv.setText(R.string.my_power_station_me);
+ viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
+ viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
+ viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
}
@@ -221,18 +227,53 @@
public void onSuccess(MqttInfo info) {
if (info != null) {
MqttRecvClient.init(_mActivity, info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
- HdlLogLogic.print("mqtt鍒濆鍖栨垚鍔�!", info);
- } else {
- HdlLogLogic.print("mqtt鍒濆鍖栧け璐�!", null);
}
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("mqtt鍒濆鍖栧け璐�", e.getMessage(), e.getCode());
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触", e.getMessage(), e.getCode());
}
});
}
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
+ //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
+ if (event == null) {
+ 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(event.getGatewayId())) {
+ 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) {
+
+ }
+ });
+ }
+
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0