From e1577f14dc7ac4fe8b8df851e63ae7e3aebf72a7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 16:02:14 +0800
Subject: [PATCH] 2024年10月31日16:02:10
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index cbf332e..dcb6b3e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -101,6 +101,7 @@
public void onBindView(Bundle savedInstanceState) {
// setNotificationBarBackgroundColor(CustomColor.blue);
setStatusBarTranslucent();
+
//鍒濆鍖栫鐗�
initFragment(savedInstanceState);
//鍒濆鍖�
@@ -249,14 +250,14 @@
UserConfigManage.getInstance().Save();
}
HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
}
@Override
public void onFailure(HDLException e) {
HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
+ HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
}
});
@@ -362,6 +363,8 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
+
+
}
private void initView() {
@@ -470,7 +473,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false);
+ HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁---" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -500,7 +503,7 @@
} else if (linkResponse.getTopic().endsWith("/custom/device/list/upload")) {
//閫嗗彉鍣ㄦ湁鏂皁id閫氱煡涓婚
if (linkResponse.getData() == null) {
- HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡--->鏁版嵁涓虹┖", false);
+ HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡---鏁版嵁涓虹┖", false);
return;
}
try {
@@ -568,12 +571,13 @@
if (info != null) {
MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
+ HdlLogLogic.print("mqtt閾炬帴鎴愬姛---ClientId---" + info.getClientId(), true);
}
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触---" + e.getMessage(), e.getCode(), true);
}
});
}
@@ -658,12 +662,13 @@
}
});
}
- } else if (event.getTopic().contains(ConstantManage.station_status)) {
- currentFragmentIndex = 1;
- bottomViewChangeOfStyle();
- showFragment();
- HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, event.getType());
-
+ } else if (event.getTopic().contains(ConstantManage.homepage_title_tab_switch)) {
+ if (event.getType().contains(ConstantManage.station_page)) {
+ //浠庨椤垫寚瀹氱數绔欑姸鎬佹墦寮�鐢电珯鐣岄潰
+ currentFragmentIndex = 1;
+ bottomViewChangeOfStyle();
+ showFragment();
+ }
}
}
--
Gitblit v1.8.0