From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 09 四月 2025 09:06:29 +0800 Subject: [PATCH] Merge branch '1.5.2' into dev --- app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 236 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 164 insertions(+), 72 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/MessageFragment.java index 3c1e038..5b8011c 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java @@ -1,6 +1,7 @@ package com.hdl.photovoltaic.ui.message; import android.annotation.SuppressLint; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -12,6 +13,7 @@ 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; @@ -28,6 +30,7 @@ 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.sdk.link.core.bean.eventbus.BaseEventBus; @@ -41,7 +44,7 @@ import java.util.Map; /** - * 娑堟伅 + * 娑堟伅妯″潡鐣岄潰 */ public class MessageFragment extends CustomBaseFragment { @@ -51,10 +54,13 @@ private boolean isAlarmDeviceClick = true;//true琛ㄧず鍛婅璁惧琚�変腑,鍒檉alse琛ㄧず鎶ヨ璁板綍琚�変腑 private final List<MessageBean> mList = new ArrayList<>(); + + private boolean isRefreshTotalCount = true; + private int mTotalCount = 0; //鎬绘潯鏁� private int mCurrentPage = 0; // 褰撳墠椤电爜 private int mCurrentTotal = 0; // 鎬婚〉鐮� - private String mDeviceTypeFilterKye = FilterType.deviceType;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級 - private String mDeviceTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級 + private String mDeviceTypeFilterKye = FilterType.deviceType;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿紱"LOAD_CENTRE"锛氳礋杞芥帶鍒朵腑蹇冿級 + private String mDeviceTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿紱"LOAD_CENTRE"锛氳礋杞芥帶鍒朵腑蹇� private String mTypeFilterKye = FilterType.all;//杩囨护绫诲瀷 type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱 private String mTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱 @@ -84,6 +90,7 @@ private void initEvent() { + //鍙戠敓涓� viewBinding.messageTabNascentTitleTv.setOnClickListener(new View.OnClickListener() { @Override @@ -91,11 +98,21 @@ if (isAlarmDeviceClick) { return; } + mDeviceTypeFilterKye = FilterType.deviceType; + mDeviceTypeFilterValue = FilterType.all; + mTypeFilterKye = FilterType.all; + mTypeFilterValue = FilterType.all; + mTimeTypeFilterKye = FilterType.all; + mTimeTypeFilterValue = FilterType.all; + viewBinding.allDeviceTitleTv.setText(getString(R.string.alarm_all_device)); + viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade)); + viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time)); isAlarmDeviceClick = true; - viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style); - viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style); - viewBinding.allClearTv.setVisibility(View.VISIBLE); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + isRefreshTotalCount = true; + viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style); + viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style); + viewBinding.allClearIv.setVisibility(View.VISIBLE); + loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); } }); //鎶ヨ璁板綍 @@ -105,16 +122,42 @@ if (!isAlarmDeviceClick) { return; } + mDeviceTypeFilterKye = FilterType.deviceType; + mDeviceTypeFilterValue = FilterType.all; + mTypeFilterKye = FilterType.all; + mTypeFilterValue = FilterType.all; + mTimeTypeFilterKye = FilterType.all; + mTimeTypeFilterValue = FilterType.all; + viewBinding.allDeviceTitleTv.setText(getString(R.string.alarm_all_device)); + viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade)); + viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time)); isAlarmDeviceClick = false; - viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style); - viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style); - viewBinding.allClearTv.setVisibility(View.GONE); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + isRefreshTotalCount = true; + viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text14Style); + viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text18Style); + viewBinding.allClearIv.setVisibility(View.GONE); + loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + } + }); + //鎼滅储娑堟伅 + viewBinding.messageSearchCl.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String messageStateType; + if (isAlarmDeviceClick) { + messageStateType = MessageStateType.untreated; + } else { + messageStateType = MessageStateType.processed; + } + Intent intent = new Intent(); + intent.putExtra("MessageStateType", messageStateType); + intent.setClass(_mActivity, SearchMessageActivity.class); + startActivity(intent); } }); //娓呯┖鎵�鏈夋湭璇绘寜閽� - viewBinding.allClearTv.setOnClickListener(new View.OnClickListener() { + viewBinding.allClearIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { showLoading(); @@ -122,7 +165,7 @@ @Override public void onSuccess(Boolean obj) { hideLoading(); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); } @Override @@ -141,21 +184,7 @@ viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.up); viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down); viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down); - List<String> stringList = getTypeList(FilterType.deviceType); - TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList); - typeTitleListDialog.show(); - typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { - @Override - public void onClick(int position, String title) { - - viewBinding.allDeviceTitleTv.setText(title); - mDeviceTypeFilterKye = FilterType.deviceType; - mDeviceTypeFilterValue = findFilterValueString(title); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); - - } - }); - + setTypeTitleListDialog(viewBinding.allDeviceTitleTv, FilterType.deviceType, getTypeList(FilterType.deviceType)); } }); @@ -166,18 +195,8 @@ viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down); viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.up); viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down); - List<String> stringList = getTypeList(FilterType.type); - TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList); - typeTitleListDialog.show(); - typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { - @Override - public void onClick(int position, String title) { - viewBinding.allGradeTitleTv.setText(title); - mTypeFilterKye = FilterType.type; - mTypeFilterValue = findFilterValueString(title); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); - } - }); + setTypeTitleListDialog(viewBinding.allGradeTitleTv, FilterType.type, getTypeList(FilterType.type)); + } }); //鍏ㄩ儴鏃堕棿(褰撳ぉ銆佽繎3澶┿�佽繎7澶┿�佽繎30澶�)鎸夐挳 @@ -187,18 +206,7 @@ viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down); viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down); viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.up); - List<String> stringList = getTypeList(FilterType.timeType); - TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList); - typeTitleListDialog.show(); - typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { - @Override - public void onClick(int position, String title) { - viewBinding.allTimeTitleTv.setText(title); - mTimeTypeFilterKye = FilterType.timeType; - mTimeTypeFilterValue = findFilterValueString(title); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); - } - }); + setTypeTitleListDialog(viewBinding.allTimeTitleTv, FilterType.timeType, getTypeList(FilterType.timeType)); } }); @@ -208,7 +216,7 @@ @Override public void onRefresh() { viewBinding.messageSrl.setRefreshing(false); - loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); } }); //涓婃媺鎸夐挳 @@ -228,7 +236,7 @@ if (!isLoadingMore) { // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔 HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴"); - loadNextPageMessageList(++mCurrentPage, false, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, false); + loadNextPageMessageList(false, ++mCurrentPage, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, false); } } } @@ -238,7 +246,7 @@ @Override public void onClick(int position, MessageBean messageBean) { Intent intent = new Intent(); - intent.putExtra("msgId", messageBean.getMsgId().toString()); + intent.putExtra("messageBean", new Gson().toJson(messageBean)); intent.setClass(_mActivity, MessageInfoActivity.class); startActivity(intent); } @@ -247,16 +255,61 @@ } } + /** + * 绫诲瀷绛涢�� + * + * @param textView 缁勪欢鏄剧ず + * @param filterType 杩囨护绫诲瀷 + * @param stringList 杩囨护绫诲瀷鍊艰〃 + */ + private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) { + BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList, textView.getText().toString()); + typeTitleListDialog.show(); + typeTitleListDialog.setOnListener(new BTypeTitleListDialog.OnClickListener() { + @Override + public void onClick(int position, String title) { + textView.setText(title); + switch (filterType) { + case FilterType.deviceType: { + mDeviceTypeFilterKye = filterType; + mDeviceTypeFilterValue = findFilterValueString(title); + } + break; + case FilterType.type: { + mTypeFilterKye = filterType; + mTypeFilterValue = findFilterValueString(title); + } + break; + case FilterType.timeType: { + mTimeTypeFilterKye = filterType; + mTimeTypeFilterValue = findFilterValueString(title); + } + break; + } + loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true); + } + }); + typeTitleListDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down); + viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down); + viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down); + } + }); + } + private void initView() { if (isAlarmDeviceClick) { - viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style); - viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style); + viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style); + viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style); } else { - viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style); - viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style); + viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style); + viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style); } - +// viewBinding..topMoreBtn.setVisibility(View.VISIBLE); +// viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall); mMessageAdapter = new MessageAdapter(_mActivity); viewBinding.messageRcv.setLayoutManager(new LinearLayoutManager(_mActivity)); viewBinding.messageRcv.setAdapter(mMessageAdapter); @@ -264,7 +317,7 @@ private void initData() { //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�),app鍚姩鏃跺�欒鍙栵紝涓轰簡鍒锋柊娑堟伅妯″潡鐨勮鏍� - loadNextPageMessageList(1, true, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, true); + loadNextPageMessageList(true, 1, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, true); } @@ -280,10 +333,16 @@ // 鍙栨秷绮樻�т簨浠� EventBus.getDefault().removeStickyEvent(eventBus); //杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�) - initData(); +// initData(); HdlLogLogic.print("姝e湪鐐瑰嚮銆愭秷鎭��"); } + } else if (eventBus.getTopic().equals(ConstantManage.message_function_push_post)) { + if (eventBus.getType().equals(MessageStateType.untreated)) { + updateListData(); + }/* else if (eventBus.getType().equals(MessageStateType.processed)) { + updateListData(); + }*/ } } @@ -299,8 +358,9 @@ * @param isClear true琛ㄧず娓呯┖缂撳瓨 */ private void loadNextPageMessageList( - int pageNo, + boolean isShowLoading, + int pageNo, String deviceType_filter_key, String deviceType_filter_value, String type_filter_key, @@ -328,12 +388,13 @@ } 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>() { + 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>() { @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; @@ -351,6 +412,7 @@ if (isShowLoading) { hideLoading(); } + HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")"); } }); @@ -370,20 +432,25 @@ updateRecyclerViewList(); //鏄剧ず鏈淇℃伅鎬绘暟閲� getUnreadCount(); + if (isAlarmDeviceClick) { + refreshNascentTotalCount(mTotalCount); + } else { + refreshRecoverTotalCount(mTotalCount); + } //鏄剧ず娌℃暟鎹甎i鏍峰紡 nullDataUpdateUi(); + } }); } /** - * 鍒锋柊淇℃伅鏁伴噺鎬绘暟 + * 鍒锋柊鍙戦�佷腑娑堟伅鎬绘暟閲� * * @param nascentTotalCount 鍙戦�佷腑娑堟伅鎬绘暟閲� - * @param recoverTotalCount 鎶ヨ璁板綍娑堟伅鎬绘暟閲� */ - private void refreshAascentAndRecoverTotalCount(int nascentTotalCount, int recoverTotalCount) { + private void refreshNascentTotalCount(int nascentTotalCount) { HdlThreadLogic.runMainThread(new Runnable() { @Override public void run() { @@ -396,6 +463,20 @@ nascentTv.setText(s); } } + } + }); + + } + + /** + * 鍒锋柊鎶ヨ璁板綍娑堟伅鎬绘暟閲� + * + * @param recoverTotalCount 鎶ヨ璁板綍娑堟伅鎬绘暟閲� + */ + private void refreshRecoverTotalCount(int recoverTotalCount) { + HdlThreadLogic.runMainThread(new Runnable() { + @Override + public void run() { //鎶ヨ璁板綍鎬绘暟閲� TextView recoverTV = _mActivity.findViewById(R.id.message_tab_recover_title_tv); if (recoverTV != null) { @@ -483,8 +564,12 @@ if (unCountBean == null) { return; } - refreshAascentAndRecoverTotalCount(unCountBean.getUntreatedCount(), unCountBean.getProcessedCount()); refreshUnreadCount(unCountBean.getUnreadCount()); + if (isRefreshTotalCount) { + isRefreshTotalCount = false; + refreshNascentTotalCount(unCountBean.getUntreatedCount()); + refreshRecoverTotalCount(unCountBean.getProcessedCount()); + } } }); @@ -492,10 +577,15 @@ @Override public void onFailure(HDLException e) { - TextView textView = _mActivity.findViewById(R.id.my_message_bottom_il2).findViewById(R.id.red_count_tv); - if (textView != null) { - textView.setVisibility(View.GONE); - } + HdlThreadLogic.runMainThread(new Runnable() { + @Override + public void run() { + TextView textView = _mActivity.findViewById(R.id.my_message_bottom_il2).findViewById(R.id.red_count_tv); + if (textView != null) { + textView.setVisibility(View.GONE); + } + } + }); } }); } @@ -520,6 +610,7 @@ map.put(getString(R.string.alarm_all_device_inverter), "INV"); map.put(getString(R.string.alarm_all_device_bms), "BMS"); map.put(getString(R.string.alarm_all_device_battery_cell), "BATTERY"); + map.put(getString(R.string.alarm_all_device_load_centre), "LOAD_CENTRE"); map.put(getString(R.string.alarm_all_grade), "");//璁剧瓑绾у叏閮� map.put(getString(R.string.alarm_all_grade_malfunction), "FAULT"); map.put(getString(R.string.alarm_all_grade_warning), "WARN"); @@ -552,6 +643,7 @@ stringList.add(getString(R.string.alarm_all_device_inverter)); stringList.add(getString(R.string.alarm_all_device_bms)); stringList.add(getString(R.string.alarm_all_device_battery_cell)); + stringList.add(getString(R.string.alarm_all_device_load_centre)); } break; case FilterType.type: { -- Gitblit v1.8.0