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/ui/message/MessageInfoActivity.java | 165 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 136 insertions(+), 29 deletions(-)
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 f1c7027..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
@@ -3,6 +3,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
@@ -24,6 +25,7 @@
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+import com.jaeger.library.StatusBarUtil;
import org.greenrobot.eventbus.EventBus;
@@ -45,8 +47,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
try {
String json = getIntent().getStringExtra("messageBean");
mMessageBean = new Gson().fromJson(json, MessageBean.class);
@@ -80,16 +82,61 @@
mMessageBean = msg;
viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
- viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
+ viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
- viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
+
stateStyle(viewBinding.messageInfoAlarmStateTv);
+
+ if (TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
+
+ if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
+ viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
+ }
+
if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
//宸茬粡瑙ｅ喅鎺夌殑闅愯棌
+ viewBinding.messageInfoBackTv.setVisibility(View.GONE);
+ viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ } else {
+ if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ return;
+ }
viewBinding.messageInfoBackTv.setVisibility(View.GONE);
viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
}
@@ -107,7 +154,7 @@
private void initEvent() {
//鍚庨��鐨勪簨浠�
- viewBinding.toolbarTopIn.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mMessageBean == null) {
@@ -199,37 +246,75 @@
private void initView() {
- viewBinding.toolbarTopIn.topTitleTv.setText(R.string.message_alarm_info);
- viewBinding.toolbarTopIn.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopIn.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopIn.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
- if (!UserConfigManage.getInstance().isBAccount()) {
- viewBinding.messageInfoBackTv.setTextColor(getColor(R.color.text_38C494));
- viewBinding.messageInfoBackTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.fillet_line_38c494));
- viewBinding.messageInfoSolveTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.checked_38c494));
- }
- viewBinding.messageInfoAlarmContentIn.leftTitleTv.setText(R.string.messagealarm_details_content);
- viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
- viewBinding.messageInfoAlarmRangeIn.leftTitleTv.setText(R.string.message_alarm_detailsaffect_region);
+ 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.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());
- viewBinding.messageInfoAlarmContentIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
+ viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
- viewBinding.messageInfoAlarmRangeIn.rightContentTv.setText(mMessageBean.getEffectScopeDesc());
viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
stateStyle(viewBinding.messageInfoAlarmStateTv);
- if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
- //宸茬粡瑙ｅ喅鎺夌殑闅愯棌
- viewBinding.messageInfoBackTv.setVisibility(View.GONE);
- viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ //鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
+ viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
+ }
+
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
+// viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
+ } else {
+// viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+ }
+
+ if (TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
+
+ if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
+ viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
+ } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
}
}
@@ -241,18 +326,40 @@
*/
private void stateStyle(TextView textView) {
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
- Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
+ Drawable drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);
if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
type = _mActivity.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_e34343);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_fff55252);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.warn)) {
type = _mActivity.getString(R.string.message_alarm);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.alarm_ffb300);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_satte_ffb300);
} else if (mMessageBean.getType().equals(MessageAlarmStateType.event)) {
type = _mActivity.getString(R.string.loading_title_tip);
- drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(_mActivity, R.drawable.device_state_ffb9b9b9);
}
- textView.setText(type);
+// textView.setText(type);
textView.setBackground(drawable);
}
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ if (mMessageBean == null) {
+ return;
+ }
+ //鏈鐞�
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated)) {
+ //鏀瑰彉缂撳瓨鐘舵��
+ if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.untreated);
+ //閫氱煡鏈鐞嗚鏇存柊鏁版嵁
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.message_function_push_post, MessageStateType.untreated);
+ } else {
+ //闄も�滄晠闅溾�濆锛屽叾浠栫瓑绾т俊鎭�滃凡璇烩�濆悗锛岃嚜鍔ㄧЩ鍑衡�滃彂鐢熶腑鈥濆垪琛ㄥ苟鍔犲叆鈥滃巻鍙茶褰曗�濆垪琛�
+ HdlMessageLogic.getInstance().setMessageState(mMessageBean.getMsgId(), true, MessageStateType.processed);
+ sendEventBus();
+ }
+
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0