From 51bd5829118714be826ab9de93d822615ef48a4f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:50:14 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 540949f..fa9bc5a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -31,8 +31,11 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
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;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
@@ -306,7 +309,8 @@
currentFragmentIndex = 0;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.homepage);
+ HdlCommonLogic.lowerTagType = LowerTagType.home;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.homepage.toString());
}
});
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -318,7 +322,8 @@
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.powerstation);
+ HdlCommonLogic.lowerTagType = LowerTagType.power_station;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.powerstation.toString());
}
});
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -330,7 +335,8 @@
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.message);
+ HdlCommonLogic.lowerTagType = LowerTagType.message;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -342,7 +348,8 @@
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.me);
+ HdlCommonLogic.lowerTagType = LowerTagType.me;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.me.toString());
}
});
@@ -410,17 +417,6 @@
}
}
- /**
- * 鍙戝竷鐐瑰嚮浜嬩欢
- *
- * @param tabSwitch -
- */
- private void postEventBus(HomepageTitleTabSwitch tabSwitch) {
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
- baseEventBus.setType(tabSwitch.toString());
- EventBus.getDefault().postSticky(baseEventBus);
- }
public void requestPermissions() {
//娑堟伅閫氱煡闄愭潈
@@ -636,6 +632,12 @@
}
});
}
+ } else if (event.getTopic().contains(ConstantManage.station_status)) {
+ currentFragmentIndex = 1;
+ bottomViewChangeOfStyle();
+ showFragment();
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, event.getType());
+
}
}
--
Gitblit v1.8.0