From 116def783f85af5896fc4500bc8a690d8b1eb5f3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:46:27 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into wjc
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 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 107c441..1708f29 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -26,12 +26,14 @@
import java.nio.charset.StandardCharsets;
-
+/**
+ * 鎴戠殑鐢电珯鐣岄潰
+ */
public class MyPowerStationActivity extends CustomBaseActivity {
private ActivityMyPowerStationBinding viewBinding;
- private int currentFragmentIndex = 0;
+ private int currentFragmentIndex = 1;
private EventListener allTopicsListener;
@@ -56,17 +58,25 @@
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- currentFragmentIndex = 0;
- bottomViewChangeOfStyle();
- }
- });
- viewBinding.myPowerStationBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
}
});
+ viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ currentFragmentIndex = 2;
+ bottomViewChangeOfStyle();
+ }
+ });
+ viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ currentFragmentIndex = 3;
+ bottomViewChangeOfStyle();
+ }
+ });
+
}
@@ -81,28 +91,43 @@
private void initView() {
viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.my_power_station_鐢电珯);
- viewBinding.myPowerStationBottomIl2.titleTv.setText(R.string.my_power_station_鎴戠殑);
+ viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message_娑堟伅);
+ viewBinding.myMeBottomIl3.titleTv.setText(R.string.my_power_station_鎴戠殑);
this.bottomViewChangeOfStyle();
}
private void bottomViewChangeOfStyle() {
- if (this.currentFragmentIndex == 0) {
+ if (this.currentFragmentIndex == 1) {
viewBinding.myPowerStationFcv1.setVisibility(View.VISIBLE);
- viewBinding.myPowerStationFcv2.setVisibility(View.GONE);
+ viewBinding.myMessageFcv2.setVisibility(View.GONE);
+ viewBinding.myMeFcv3.setVisibility(View.GONE);
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000));
- viewBinding.myPowerStationBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
- viewBinding.myPowerStationBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
- } else {
+ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ } else if (this.currentFragmentIndex == 2) {
viewBinding.myPowerStationFcv1.setVisibility(View.GONE);
- viewBinding.myPowerStationFcv2.setVisibility(View.VISIBLE);
+ viewBinding.myMessageFcv2.setVisibility(View.VISIBLE);
+ viewBinding.myMeFcv3.setVisibility(View.GONE);
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
- viewBinding.myPowerStationBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedme));
- viewBinding.myPowerStationBottomIl2.titleTv.setTextColor(getColor(R.color.text_90000000));
-
-
+ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedme));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
+ } else if (this.currentFragmentIndex == 3) {
+ viewBinding.myPowerStationFcv1.setVisibility(View.GONE);
+ viewBinding.myMessageFcv2.setVisibility(View.GONE);
+ viewBinding.myMeFcv3.setVisibility(View.VISIBLE);
+ viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.unselectedpowerstation));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_65000000));
+ viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.selectedme));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_90000000));
}
}
@@ -157,8 +182,9 @@
allTopicsListener = new EventListener() {
@Override
public void onMessage(Object msg) {
- if (msg instanceof LinkResponse) {
- LinkResponse response = (LinkResponse) msg;
+
+ if (msg instanceof ModbusResponse) {
+ ModbusResponse response = (ModbusResponse) msg;
if (response.getTopic() == null) {
return;
}
--
Gitblit v1.8.0