From cc3b8aecab8fccf9a985d74a5223be44cc2b5ace Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 30 十月 2024 16:20:39 +0800
Subject: [PATCH] 2024年10月30日16:20:36
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 d4ac517..12871b6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -33,7 +33,6 @@
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.NetworkType;
-import com.hdl.photovoltaic.enums.PowerStationStatusType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
@@ -67,7 +66,6 @@
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -103,6 +101,7 @@
public void onBindView(Bundle savedInstanceState) {
// setNotificationBarBackgroundColor(CustomColor.blue);
setStatusBarTranslucent();
+
//鍒濆鍖栫鐗�
initFragment(savedInstanceState);
//鍒濆鍖�
@@ -367,7 +366,7 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.summarize);
+ viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_home_page);
viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
@@ -570,6 +569,7 @@
if (info != null) {
MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
+ HdlLogLogic.print("mqtt閾炬帴鎴愬姛--->ClientId--->" + info.getClientId(), true);
}
}
@@ -660,12 +660,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