From a3798b01c03911efcd7f7b28f78cebc35871c528 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 06 八月 2024 18:37:07 +0800
Subject: [PATCH] 2024年08月06日18:37:05
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 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 3425d20..d4ac517 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -7,7 +7,6 @@
import androidx.fragment.app.FragmentTransaction;
import android.Manifest;
-import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -32,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;
@@ -48,7 +50,7 @@
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;
@@ -132,7 +134,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) {
@@ -149,7 +151,7 @@
} else {
//姝ｅ父鍚姩鏃惰皟鐢�
fragmentList.add(mHomePageFragment);
- fragmentList.add(mHouseListFragment);
+ fragmentList.add(mHouseAndDeviceFragment);
fragmentList.add(mMessageFragment);
fragmentList.add(mMeFragment);
showFragment();
@@ -278,6 +280,7 @@
confirmationCancelDialog.setContent(getString(R.string.no_permissions_unable_to_receive_push));
confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -307,7 +310,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() {
@@ -319,7 +323,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() {
@@ -331,7 +336,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() {
@@ -343,7 +349,8 @@
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
showFragment();
- postEventBus(HomepageTitleTabSwitch.me);
+ HdlCommonLogic.lowerTagType = LowerTagType.me;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.me.toString());
}
});
@@ -360,16 +367,19 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page);
+ viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.summarize);
viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
}
+ /**
+ * 搴曢儴妯″潡鏍峰紡鏀瑰彉
+ */
private void bottomViewChangeOfStyle() {
if (this.currentFragmentIndex == 0) {
- //棣栭〉鐣岄潰
+ //姒傝鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected));
viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6000000));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
@@ -411,17 +421,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() {
//娑堟伅閫氱煡闄愭潈
@@ -523,6 +522,30 @@
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(linkResponse.getTopic());
uniCallBackBaseBean.setData(linkResponse.getData());
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+ } else if (linkResponse.getTopic().endsWith("/app/thing/event/appHomeRemoveRefresh/up")) {
+ String[] topicArray = linkResponse.getTopic().split("/");
+ //浣忓畢鍒犻櫎閫氱煡
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_home_remove_refresh);
+ uniCallBackBaseBean.setData(topicArray[1]);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+ } else if (linkResponse.getTopic().endsWith("/app/thing/event/appHomeDebugRefresh/up")) {
+ String[] topicArray = linkResponse.getTopic().split("/");
+ //浣忓畢浜屾璋冭瘯(鎺堟潈鐘舵��)鍒锋柊閫氱煡
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_home_debug_refresh);
+ uniCallBackBaseBean.setData(topicArray[1]);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+ } else if (linkResponse.getTopic().endsWith("/app/thing/event/appHomeDeliverRefresh/up")) {
+ String[] topicArray = linkResponse.getTopic().split("/");
+ //浣忓畢浜や粯鐘舵�佸彉鏇村埛鏂伴�氱煡
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_home_delivery_refresh);
+ uniCallBackBaseBean.setData(topicArray[1]);
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
}
@@ -637,6 +660,12 @@
}
});
}
+ } else if (event.getTopic().contains(ConstantManage.station_status)) {
+ currentFragmentIndex = 1;
+ bottomViewChangeOfStyle();
+ showFragment();
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, event.getType());
+
}
}
@@ -747,10 +776,10 @@
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
- confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
confirmationCancelDialog.setContent(getString(R.string.system_positioning_switch));
confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
@@ -782,6 +811,7 @@
dialog.setTitle(getString(R.string.loading_title_tip));
dialog.setContent(getString(R.string.port_conflict));
dialog.setConfirmation(getString(R.string.home_login_affirm));
+ dialog.isHideTitle(true);
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
--
Gitblit v1.8.0