From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 96 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 22 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 6d1618e..ede598c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -17,6 +17,7 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.view.View;
+import android.widget.TextView;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -31,9 +32,12 @@
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
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;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -41,10 +45,11 @@
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.home.HomePageFragment;
import com.hdl.photovoltaic.ui.me.MeFragment;
import com.hdl.photovoltaic.ui.message.MessageFragment;
-import com.hdl.photovoltaic.ui.powerstation.HouseListFragment;
+import com.hdl.photovoltaic.ui.powerstation.HouseAndDeviceFragment;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
@@ -113,6 +118,8 @@
this.clickJpushNotificationMessage();
//鍒濆鍖栨潈闄�
this.requestPermissions();
+ //璇诲彇娑堟伅鏈鏁伴噺
+ this.getUnreadCount();
}
@@ -126,7 +133,7 @@
mFragmentManager = getSupportFragmentManager();
//纰庣墖鍒濆鍖�
HomePageFragment mHomePageFragment = new HomePageFragment();
- HouseListFragment mHouseListFragment = new HouseListFragment();
+ HouseAndDeviceFragment mHouseAndDeviceFragment = new HouseAndDeviceFragment();
MessageFragment mMessageFragment = new MessageFragment();
MeFragment mMeFragment = new MeFragment();
if (savedInstanceState != null) {
@@ -143,7 +150,7 @@
} else {
//姝ｅ父鍚姩鏃惰皟鐢�
fragmentList.add(mHomePageFragment);
- fragmentList.add(mHouseListFragment);
+ fragmentList.add(mHouseAndDeviceFragment);
fragmentList.add(mMessageFragment);
fragmentList.add(mMeFragment);
showFragment();
@@ -301,7 +308,7 @@
currentFragmentIndex = 0;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.homepage);
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.homepage.toString());
}
});
viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -313,7 +320,7 @@
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.powerstation);
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.powerstation.toString());
}
});
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -325,7 +332,7 @@
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.message);
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -337,7 +344,7 @@
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.me);
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.me.toString());
}
});
@@ -365,7 +372,7 @@
if (this.currentFragmentIndex == 0) {
//棣栭〉鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
@@ -377,7 +384,7 @@
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6000000));
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.me_unselected));
@@ -389,7 +396,7 @@
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_65000000));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6000000));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_65000000));
} else if (this.currentFragmentIndex == 3) {
@@ -401,21 +408,10 @@
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.me_selected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_90000000));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6000000));
}
}
- /**
- * 鍙戝竷鐐瑰嚮浜嬩欢
- *
- * @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() {
//娑堟伅閫氱煡闄愭潈
@@ -631,10 +627,66 @@
}
});
}
+ } else if (event.getTopic().contains(ConstantManage.station_status)) {
+ currentFragmentIndex = 1;
+ bottomViewChangeOfStyle();
+ showFragment();
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, event.getType());
+
}
}
/**
+ * 璇诲彇娑堟伅銆愭湭璇绘暟閲�,鏈鐞嗘�绘暟閲忥紝宸插鐞嗘�绘暟閲忋��
+ */
+ private void getUnreadCount() {
+ HdlMessageLogic.getInstance().getMessageUntreatedCount("", new CloudCallBeak<UnCountBean>() {
+ @Override
+ public void onSuccess(UnCountBean unCountBean) {
+
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (unCountBean == null) {
+ return;
+ }
+ //鍒锋柊銆愭秷鎭ā鍧椼�戜笅瑙掓爣鏁板��
+ TextView textView = _mActivity.findViewById(R.id.my_message_bottom_il2).findViewById(R.id.red_count_tv);
+ if (textView != null) {
+ if (unCountBean.getUnreadCount() == 0) {
+ textView.setVisibility(View.GONE);
+ } else {
+ textView.setVisibility(View.VISIBLE);
+ if (unCountBean.getUnreadCount() > 99) {
+ textView.setText("99+");
+ } else {
+ textView.setText(unCountBean.getUnreadCount() + "");
+ }
+ }
+ }
+ }
+
+ });
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ TextView textView = _mActivity.findViewById(R.id.my_message_bottom_il2).findViewById(R.id.red_count_tv);
+ if (textView != null) {
+ textView.setVisibility(View.GONE);
+ }
+ }
+ });
+
+ }
+ });
+ }
+
+
+ /**
* 鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
*/
private void clickJpushNotificationMessage() {
--
Gitblit v1.8.0