From 54cb06b771447df9bca5f3eae88a9caaf8ec51ff Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 22 七月 2024 17:24:10 +0800
Subject: [PATCH] 2024年07月22日17:24:08
---
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 5e259e1..0dfa869 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -280,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() {
@@ -366,9 +367,9 @@
}
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.myMessageBottomIl2.titleTv.setText(R.string.alarm);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
}
@@ -378,7 +379,7 @@
*/
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));
@@ -521,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);
}
@@ -751,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() {
@@ -786,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