From 3f8f1590859188c334739f76f1d64c2b6c2bfd55 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 17:01:06 +0800
Subject: [PATCH] 2024年10月31日17:01:04
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 0b9fd3d..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);
//鍒濆鍖�
@@ -280,6 +279,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() {
@@ -366,9 +366,9 @@
}
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.alarm);
+ viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
}
@@ -569,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);
}
}
@@ -659,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();
+ }
}
}
@@ -775,10 +777,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() {
@@ -810,6 +812,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