From 32af30cdbb9e750a1bd059cacf2d8c8c37776dad Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:48:57 +0800
Subject: [PATCH] 2025年07月31日14:48:56
---
app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java | 27 +++++++++++++++++++++++----
app/src/main/res/values-zh/strings.xml | 3 +++
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 6 +++---
app/src/main/res/values/strings.xml | 3 +++
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 8 ++++++--
app/src/main/res/values-en/strings.xml | 3 +++
7 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index b21f7ed..3bf0ddc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -39,6 +39,8 @@
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.newC.PowerStationsListActivity;
+import com.hdl.photovoltaic.ui.newC.PowerStationsMoveActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
@@ -534,8 +536,10 @@
}
} catch (Exception e) {
}
- //閫氱煡鐢电珯鍒楄〃鏇存柊
- HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
+ if (AppManagerUtils.getAppManager().existsTopActivity(PowerStationsListActivity.class, PowerStationsMoveActivity.class)) {
+ //瀛樺湪鏍堥噷鍐嶉�氱煡鏇存柊
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.REFRESH_HOME_LIST, ConstantManage.REFRESH_HOME_LIST);
+ }
HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index 75c641e..b4a9ca8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -246,16 +246,16 @@
private void initView() {
- viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
- viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
+ viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.event_device);
viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
- viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
+ viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);
viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
index 8268619..73f9c81 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
@@ -32,6 +32,7 @@
import com.hdl.photovoltaic.ui.device.ScanActivity;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
@@ -181,7 +182,6 @@
viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
// 鏈巿鏉� 濡傛灉搴旂敤绋嬪簭娌℃湁鎵�闇�鐨勬潈闄愶紝鍒欐樉绀鸿В閲婅鏄�
PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
index 7429be0..b04e5bc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/AppManagerUtils.java
@@ -115,6 +115,26 @@
}
/**
+ * Activity鏄惁鍦ㄩ《閮�
+ */
+ public boolean existsTopActivity(Class<?>... args) {
+ try {
+ if (activityStack == null || activityStack.size() == 0) {
+ return false;
+ }
+ final int index = activityStack.size() - 1;
+ for (Class<?> cls : args) {
+ if (activityStack.get(index).getClass().equals(cls)) {
+ return true;
+ }
+ }
+ } catch (Exception e) {
+ return false;
+ }
+ return false;
+ }
+
+ /**
* 鎸囧畾涓�涓被鍚�,浠庢寚瀹氱被鍚嶅紑濮嬬Щ闄ゅ悗闈㈡墍鏈堿ctivity
*
* @param className Activity-绫诲悕(activity.getClass().getName())
@@ -154,7 +174,7 @@
}
- public boolean existsActivity(Context activity,String className){
+ public boolean existsActivity(Context activity, String className) {
boolean isLoginActivity = false;
// 鑾峰彇褰撳墠Activity鐨勫垪琛�
ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
@@ -168,8 +188,9 @@
break;
}
}
- return isLoginActivity;
+ return isLoginActivity;
}
+
/**
* 缁撴潫鎵�鏈堿ctivity
@@ -208,8 +229,6 @@
}
return null;
}
-
-
/**
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4abba39..750315a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -369,8 +369,11 @@
<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
<string name="simple_debugging">Simple debugging</string>
<string name="general_debugging">General debugging</string>
+ <string name="event_details">Event details</string>
<string name="event_title">Event title</string>
<string name="event_content">Event content</string>
+ <string name="event_device">Event device</string>
+ <string name="event_time">Event time</string>
<string name="remark">remark</string>
<string name="treatment_options">Treatment options</string>
<string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 99429db..8f435c2 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -365,8 +365,11 @@
<string name="no_permission_delete_home">鏃犳潈闄愬垹闄わ紝璇疯仈绯荤鐞嗗憳杩涜鎿嶄綔</string>
<string name="simple_debugging">绠�鏄撹皟璇�</string>
<string name="general_debugging">甯歌璋冭瘯</string>
+ <string name="event_details">浜嬩欢璇︽儏</string>
<string name="event_title">浜嬩欢鏍囬</string>
<string name="event_content">浜嬩欢鍐呭</string>
+ <string name="event_device">浜嬩欢璁惧</string>
+ <string name="event_time">浜嬩欢鏃堕棿</string>
<string name="remark">澶囨敞</string>
<string name="treatment_options">澶勭悊鏂规</string>鏄惁灏嗙數绔欑殑璋冭瘯鐘舵�佸洖閫�鍒拌皟璇曚腑
<string name="debug_status_rollback">鏄惁灏�%s鐢电珯鐨勮皟璇曠姸鎬佸洖閫�鍒拌皟璇曚腑锛�</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f2a5d1..ac5e0c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -371,8 +371,11 @@
<string name="no_permission_delete_home">No permission to delete, please contact the administrator for operation</string>
<string name="simple_debugging">Simple debugging</string>
<string name="general_debugging">General debugging</string>
+ <string name="event_details">Event details</string>
<string name="event_title">Event title</string>
<string name="event_content">Event content</string>
+ <string name="event_device">Event device</string>
+ <string name="event_time">Event time</string>
<string name="remark">remark</string>
<string name="treatment_options">Treatment options</string>
<string name="debug_status_rollback">Should the commissioning status of the %s power station be rolled back to commissioning?</string>
--
Gitblit v1.8.0