| app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/activity_message_info.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -118,13 +118,13 @@ viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE); } // String acc = "13375012441"; String acc = "13375012441"; // String acc = "18316672920"; // String acc = "nuy13368@uzxia.com"; // String pws = "123456"; String pws = "123456"; //测试用 // viewBinding.homeLoginAccountEt.setText(acc); // viewBinding.homeLoginPasswordEt.setText(pws); viewBinding.homeLoginAccountEt.setText(acc); viewBinding.homeLoginPasswordEt.setText(pws); isLoginTextViewEnabled(); }
@@ -79,7 +79,6 @@ @Override public void onBindView(Bundle savedInstanceState) { LReceiveAndSend.Start(_mActivity); //初始化 initView(); //初始化界面监听器 @@ -160,7 +159,7 @@ return; } timeType = TimeType.day; viewBinding.unitTextTv.setText(getString(R.string.pv_power)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); @@ -193,6 +192,7 @@ return; } timeType = TimeType.month; viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); @@ -225,6 +225,7 @@ return; } timeType = TimeType.year; viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); @@ -255,6 +256,7 @@ return; } timeType = TimeType.all; viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); @@ -391,7 +393,7 @@ if (TimeType.day.equals(timeType)) { aaChartModel = BasicChartComposer.configureAreaChart(getString(R.string.pv_power), fieldNames, fieldValues); } else if (TimeType.month.equals(timeType) || TimeType.year.equals(timeType) || TimeType.all.equals(timeType)) { aaChartModel = configureColorfulColumnChart(getString(R.string.pv_power), fieldNames, fieldValues); aaChartModel = configureColorfulColumnChart(getString(R.string.generation), fieldNames, fieldValues); } aaChartView.aa_drawChartWithChartModel(aaChartModel);
@@ -52,6 +52,9 @@ private boolean isAlarmDeviceClick = true;//true表示告警设备被选中,则false表示报警记录被选中 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（INV ：逆变器；BMS ：BMS控制盒；BATTERY ：电池单元） @@ -93,7 +96,17 @@ 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; isRefreshTotalCount=true; viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style); viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style); viewBinding.allClearTv.setVisibility(View.VISIBLE); @@ -107,7 +120,17 @@ 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; isRefreshTotalCount=true; viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style); viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style); viewBinding.allClearTv.setVisibility(View.GONE); @@ -360,6 +383,7 @@ if (messageListClass != null) { mCurrentTotal = (int) messageListClass.getTotalPage(); mCurrentPage = (int) messageListClass.getPageNo(); mTotalCount = (int) messageListClass.getTotalCount(); updateListData(); } isLoadingMore = false; @@ -396,20 +420,25 @@ updateRecyclerViewList(); //显示未读信息总数量 getUnreadCount(); if (isAlarmDeviceClick) { refreshNascentTotalCount(mTotalCount); } else { refreshRecoverTotalCount(mTotalCount); } //显示没数据Ui样式 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() { @@ -422,6 +451,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) { @@ -509,8 +552,12 @@ if (unCountBean == null) { return; } refreshAascentAndRecoverTotalCount(unCountBean.getUntreatedCount(), unCountBean.getProcessedCount()); refreshUnreadCount(unCountBean.getUnreadCount()); if (isRefreshTotalCount) { isRefreshTotalCount = false; refreshNascentTotalCount(unCountBean.getUntreatedCount()); refreshRecoverTotalCount(unCountBean.getProcessedCount()); } } }); app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -92,6 +92,12 @@ //已经解决掉的隐藏 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); } } }); @@ -230,6 +236,12 @@ //已经解决掉的隐藏 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); } } @@ -255,4 +267,26 @@ 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(); } } } } app/src/main/res/layout/activity_message_info.xml
@@ -71,14 +71,16 @@ <View android:layout_width="match_parent" android:layout_height="@dimen/dp_31" /> <!--产品说硬件没做 隐藏掉 2024年05月28日13:46:53--> <include android:id="@+id/message_info_alarm_range_in" layout="@layout/line_message_info" /> layout="@layout/line_message_info" android:visibility="gone" /> <View android:layout_width="match_parent" android:layout_height="@dimen/dp_31" /> android:layout_height="@dimen/dp_31" android:visibility="gone" /> <include android:id="@+id/message_info_power_station_location_in" app/src/main/res/values/strings.xml
@@ -287,7 +287,7 @@ <string name="grid_connected">并网</string> <string name="off_network">离网</string> <string name="the_input_value_has_been_exceeded">输入值已经超过</string> <string name="all_read">一键清除</string> <string name="all_read">全部已读</string> <string name="contact_us">联系我们</string> <string name="wechat_id">微信号</string> <string name="email_address">邮箱地址</string> @@ -296,7 +296,7 @@ <string name="saving_standard_coal">节约标准煤</string> <string name="co_reduction_rate">CO2减排</string> <string name="quantity_of_equivalent_values">等效值数量</string> <string name="pv_power">Pv发电功率</string> <string name="pv_power">发电功率</string> <string name="device_run_state">设备运行状态</string> <string name="search_station">搜索电站</string> <string name="enter_the_device_sn_and_device_name">输入设备SN号/设备名称</string>
