From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageActivity.java | 147 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 53 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageActivity.java
similarity index 86%
rename from app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/message/MessageActivity.java
index 2f63d48..dd50313 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageActivity.java
@@ -5,39 +5,32 @@
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
-
-import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.base.CustomBaseFragment;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.databinding.FragmentMessageBinding;
import com.hdl.photovoltaic.enums.FilterType;
-import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.MessageStateType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
-import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.adapter.MessageAdapter;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.widget.BTypeTitleListDialog;
-import com.hdl.photovoltaic.widget.TypeTitleListDialog;
import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
-import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -47,15 +40,15 @@
import java.util.Map;
/**
- * 娑堟伅妯″潡鐣岄潰
+ * 鐢电珯娑堟伅鐣岄潰
*/
-public class MessageFragment extends CustomBaseFragment {
+public class MessageActivity extends CustomBaseActivity {
private FragmentMessageBinding viewBinding;
private MessageAdapter mMessageAdapter;
private boolean isAlarmDeviceClick = true;//true琛ㄧず鍛婅璁惧琚�変腑,鍒檉alse琛ㄧず鎶ヨ璁板綍琚�変腑
-
+ private MessageBean mMessageBean;
private final List<MessageBean> mList = new ArrayList<>();
private boolean isRefreshTotalCount = true;
@@ -82,6 +75,19 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
+ try {
+ String json = getIntent().getStringExtra("messageBean");
+ mMessageBean = new Gson().fromJson(json, MessageBean.class);
+ if (mMessageBean == null) {
+ mMessageBean = new MessageBean();
+ }
+ } catch (Exception ignored) {
+ if (mMessageBean == null) {
+ mMessageBean = new MessageBean();
+ }
+ }
//鍒濆鍖栫晫闈�
initView();
//鍒濆鍖栫洃鍚櫒
@@ -92,8 +98,14 @@
}
private void initEvent() {
-
-
+ //鍚庨��鐨勪簨浠�
+ viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
+ finish();
+ }
+ });
//鍙戠敓涓�
viewBinding.messageTabNascentTitleTv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -163,8 +175,11 @@
viewBinding.allClearIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (TextUtils.isEmpty(mMessageBean.getHomeId().replace(" ", ""))) {
+ return;
+ }
// showLoading();
- HdlMessageLogic.getInstance().messageAllRead("", new CloudCallBeak<Boolean>() {
+ HdlMessageLogic.getInstance().messageAllRead(mMessageBean.getHomeId(), new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
// hideLoading();
@@ -354,8 +369,13 @@
private void initData() {
- //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�),app鍚姩鏃跺�欒鍙栵紝涓轰簡鍒锋柊娑堟伅妯″潡鐨勮鏍�
- loadNextPageMessageList(true, 1, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, true);
+ HdlThreadLogic.runSubThread(new Runnable() {
+ @Override
+ public void run() {
+ //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�),app鍚姩鏃跺�欒鍙栵紝涓轰簡鍒锋柊娑堟伅妯″潡鐨勮鏍�
+ loadNextPageMessageList(true, 1, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, true);
+ }
+ });
}
@@ -365,17 +385,7 @@
if (eventBus == null) {
return;
}
- //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
- if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
- if (eventBus.getType().equals(HomepageTitleTabSwitch.message.toString())) {
- // 鍙栨秷绮樻�т簨浠�
- EventBus.getDefault().removeStickyEvent(eventBus);
- //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�)
-// initData();
- HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭秷鎭��");
-
- }
- } else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
+ if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) {
if (eventBus.getType().equals(MessageStateType.untreated)) {
updateListData();
}/* else if (eventBus.getType().equals(MessageStateType.processed)) {
@@ -396,7 +406,6 @@
* @param isClear true琛ㄧず娓呯┖缂撳瓨
*/
private void loadNextPageMessageList(
-
boolean isShowLoading,
int pageNo,
String deviceType_filter_key,
@@ -406,6 +415,9 @@
String timeType_filter_key,
String timeType_filter_value,
boolean isClear) {
+ if (TextUtils.isEmpty(mMessageBean.getHomeId().replace(" ", ""))) {
+ return;
+ }
if (isClear) {
//琛ㄧず浠庣涓�椤靛彲浠ヨ鍙栵紝榛樿娓呯┖鎵�鏈夌紦瀛樻暟鎹�;
clearCacheData();
@@ -417,40 +429,59 @@
return;
}
isLoadingMore = true;//鏍囪璇诲彇鐘舵��
- if (isShowLoading) {
- showLoading();
- }
String messageStateType;
if (isAlarmDeviceClick) {
messageStateType = MessageStateType.untreated;
} else {
messageStateType = MessageStateType.processed;
}
- HdlMessageLogic.getInstance().getPageNoMessageList("", pageNo, messageStateType, deviceType_filter_key, deviceType_filter_value, type_filter_key, type_filter_value, timeType_filter_key, timeType_filter_value, "", new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
+
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isShowLoading) {
+ showLoading();
+ }
+
+ }
+ });
+
+ HdlMessageLogic.getInstance().getPageNoMessageList(mMessageBean.getHomeId(), pageNo, messageStateType, deviceType_filter_key, deviceType_filter_value, type_filter_key, type_filter_value, timeType_filter_key, timeType_filter_value, "", new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
@Override
public void onSuccess(HdlMessageLogic.MessageListClass messageListClass) {
- if (messageListClass != null) {
- mCurrentTotal = (int) messageListClass.getTotalPage();
- mCurrentPage = (int) messageListClass.getPageNo();
- mTotalCount = (int) messageListClass.getTotalCount();
- updateListData();
- }
- isLoadingMore = false;
- if (isShowLoading) {
- hideLoading();
- }
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isShowLoading) {
+ hideLoading();
+ }
+ if (messageListClass != null) {
+ mCurrentTotal = (int) messageListClass.getTotalPage();
+ mCurrentPage = (int) messageListClass.getPageNo();
+ mTotalCount = (int) messageListClass.getTotalCount();
+ updateListData();
+ }
+ isLoadingMore = false;
+ }
+ });
+
}
@Override
public void onFailure(HDLException e) {
- if (mCurrentPage > 1) {
- --mCurrentPage;
- }
- isLoadingMore = false;
- if (isShowLoading) {
- hideLoading();
- }
- HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isShowLoading) {
+ hideLoading();
+ }
+ if (mCurrentPage > 1) {
+ --mCurrentPage;
+ }
+ isLoadingMore = false;
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
}
});
@@ -592,7 +623,10 @@
* 璇诲彇娑堟伅銆愭湭璇绘暟閲�,鏈鐞嗘�绘暟閲忥紝宸插鐞嗘�绘暟閲忋��
*/
private void getUnreadCount() {
- HdlMessageLogic.getInstance().getMessageUntreatedCount("", new CloudCallBeak<UnCountBean>() {
+ if (TextUtils.isEmpty(mMessageBean.getHomeId().replace(" ", ""))) {
+ return;
+ }
+ HdlMessageLogic.getInstance().getMessageUntreatedCount(mMessageBean.getHomeId(), new CloudCallBeak<UnCountBean>() {
@Override
public void onSuccess(UnCountBean unCountBean) {
@@ -702,4 +736,11 @@
}
return stringList;
}
-}
+
+ @Override
+ public void onBackPressed() {
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
+ super.onBackPressed();
+
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0