app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -156,6 +156,7 @@ } break; case 5: case 2: { text = mContext.getString(R.string.my_power_station_off_line); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9); @@ -167,7 +168,6 @@ } break; case 4: case 5: { text = mContext.getString(R.string.my_power_station_malfunction); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343); app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -572,7 +572,7 @@ } viewBinding.socialContributionData1Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCoal()))); viewBinding.socialContributionData2Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCo2()))); viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getTreePlanting()))); viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(socialContributionBean.getTreePlanting())); } @Override app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -30,6 +30,7 @@ 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; import org.greenrobot.eventbus.EventBus; @@ -106,7 +107,7 @@ viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade)); viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time)); isAlarmDeviceClick = true; isRefreshTotalCount=true; isRefreshTotalCount = true; viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style); viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style); viewBinding.allClearTv.setVisibility(View.VISIBLE); @@ -130,7 +131,7 @@ viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade)); viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time)); isAlarmDeviceClick = false; isRefreshTotalCount=true; isRefreshTotalCount = true; viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style); viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style); viewBinding.allClearTv.setVisibility(View.GONE); @@ -261,7 +262,7 @@ * @param stringList 过滤类型值表 */ private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) { BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList); BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList, textView.getText().toString()); typeTitleListDialog.show(); typeTitleListDialog.setOnListener(new BTypeTitleListDialog.OnClickListener() { @Override app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -170,6 +170,16 @@ @Override public void onClick(int position, String title) { viewBinding.messageSearchEt.setText(title); //搜索关键字 currSearchText = viewBinding.messageSearchEt.getText().toString().replace(" ", ""); if (TextUtils.isEmpty(currSearchText)) { HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); loadNextPageMessageList(true, 1, viewBinding.messageSearchEt.getText().toString(), true); } }); //消息点击是事件 @@ -177,7 +187,7 @@ @Override public void onClick(int position, MessageBean messageBean) { Intent intent = new Intent(); intent.putExtra("messageBean",new Gson().toJson(messageBean)); intent.putExtra("messageBean", new Gson().toJson(messageBean)); intent.setClass(_mActivity, MessageInfoActivity.class); startActivity(intent); } @@ -389,7 +399,7 @@ Collections.reverse(searchHistoryTitleList); if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1)); searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } } app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -149,7 +149,7 @@ 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 typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allDeviceTitleTv.getText().toString()); typeTitleListDialog.show(); typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { @Override @@ -174,7 +174,7 @@ 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 typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allGradeTitleTv.getText().toString()); typeTitleListDialog.show(); typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { @Override @@ -195,7 +195,7 @@ 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 typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allTimeTitleTv.getText().toString()); typeTitleListDialog.show(); typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() { @Override app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -179,6 +179,16 @@ @Override public void onClick(int position, String title) { viewBinding.powerStationSearchEt.setText(title); //搜索关键字 currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", ""); if (TextUtils.isEmpty(currSearchText)) { HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); loadNextPageHouseList(true, 1, true); } }); //设备点击是事件 @@ -402,9 +412,10 @@ searchHistoryTitleList.add(currSearchText); // 倒序排列数据(搜索最后排在前面) Collections.reverse(searchHistoryTitleList); if (searchHistoryTitleList.size() > 10) { int maxValue = 10; if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(11)); searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } } app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
@@ -173,6 +173,16 @@ @Override public void onClick(int position, String title) { viewBinding.powerStationSearchEt.setText(title); //搜索关键字 currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", ""); if (TextUtils.isEmpty(currSearchText)) { HdlThreadLogic.toast(_mActivity, R.string.search_content_null); return; } viewBinding.historyListParent.setVisibility(View.GONE); viewBinding.listParent.setVisibility(View.VISIBLE); addSearchTextToList(); loadNextPageHouseList(true, 1, true); } }); //电站点击是事件 @@ -386,7 +396,7 @@ Collections.reverse(searchHistoryTitleList); if (searchHistoryTitleList.size() > maxValue) { //历史记录不能超出10 searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1)); searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue)); } } app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
@@ -23,13 +23,15 @@ private TypeListDialogAdapter typeListDialogAdapter; private Context mContext; String mSelectType; private List<String> mList; public BTypeTitleListDialog(@NonNull Context context, List<String> list) { public BTypeTitleListDialog(@NonNull Context context, List<String> list,String selectType) { super(context, R.style.Custom_Dialog); this.mContext = context; this.mList = list; this.mSelectType=selectType; } @Override @@ -39,7 +41,7 @@ setContentView(viewBinding.getRoot()); setDialogTouchOutsideCloseable(this); LinearLayoutManager linearLayout = new LinearLayoutManager(mContext); typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext); typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext,this.mSelectType); viewBinding.typeListRl.setLayoutManager(linearLayout); viewBinding.typeListRl.setAdapter(typeListDialogAdapter); typeListDialogAdapter.setItemOnclickListener(new TypeListDialogAdapter.OnclickListener() { app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -1,5 +1,7 @@ package com.hdl.photovoltaic.widget; import android.annotation.SuppressLint; import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.text.TextUtils; @@ -45,7 +47,7 @@ viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater()); setContentView(viewBinding.getRoot()); //空白处不能取消动画 setCanceledOnTouchOutside(false); // setCanceledOnTouchOutside(true); //初始化界面控件 initView(); //初始化界面数据 @@ -57,6 +59,12 @@ } private void initEvent() { viewBinding.clickRl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { dismiss(); } }); viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() { @Override app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
@@ -34,13 +34,15 @@ private TypeListDialogAdapter typeListDialogAdapter; private Context mContext; String mSelectType; private List<String> mList; public TypeTitleListDialog(@NonNull Context context, List<String> list) { public TypeTitleListDialog(@NonNull Context context, List<String> list, String selectType) { super(context, R.style.Custom_Dialog); this.mContext = context; this.mList = list; this.mSelectType = selectType; } @Override @@ -50,7 +52,7 @@ setContentView(viewBinding.getRoot()); setDialogTouchOutsideCloseable(this); LinearLayoutManager linearLayout = new LinearLayoutManager(mContext); typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext); typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext, this.mSelectType); viewBinding.typeListRl.setLayoutManager(linearLayout); viewBinding.typeListRl.setAdapter(typeListDialogAdapter); typeListDialogAdapter.setItemOnclickListener(new TypeListDialogAdapter.OnclickListener() { app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java
@@ -18,12 +18,15 @@ private List<String> mList; private final Context mContext; String mSelectType; private TypeListDialogAdapter.OnclickListener itemOnclickListener;//点击了的监听器 public TypeListDialogAdapter(List<String> list, Context context) { public TypeListDialogAdapter(List<String> list, Context context, String selectType) { this.mList = list; this.mContext = context; this.mSelectType = selectType; } @NonNull @@ -42,6 +45,10 @@ if (position == this.mList.size() - 1) { holder.type_line_v.setVisibility(View.GONE); } holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_161718)); if (mSelectType.equals(title)) { holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_38C494)); } holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { app/src/main/res/layout/dialog_default_filtering.xml
@@ -4,6 +4,15 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <RelativeLayout android:id="@+id/click_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_0" app:layout_constraintBottom_toTopOf="@+id/default_filtering_cl" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/default_filtering_cl" android:layout_width="match_parent" app/src/main/res/layout/dialog_type_title_list.xml
@@ -10,9 +10,9 @@ <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/dialog_parent_cl" android:layout_width="match_parent" android:layout_height="270dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="113dp" android:layout_marginTop="103dp" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/loading_ffffffff_4" app:layout_constraintEnd_toEndOf="parent" app/src/main/res/layout/dialog_type_title_list_b.xml
@@ -10,9 +10,9 @@ <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/dialog_parent_cl" android:layout_width="match_parent" android:layout_height="270dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="155dp" android:layout_marginTop="165dp" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/loading_ffffffff_4" app:layout_constraintEnd_toEndOf="parent" app/src/main/res/layout/fragment_home_page.xml
@@ -516,7 +516,7 @@ android:layout_alignBottom="@+id/social_contribution_data_1_tv" android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_1_tv" android:text="(T)" android:text="@string/t" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" @@ -573,7 +573,7 @@ android:layout_alignBottom="@+id/social_contribution_data_2_tv" android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_2_tv" android:text="(T)" android:text="@string/t" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" @@ -616,7 +616,7 @@ android:layout_alignParentTop="true" android:layout_marginStart="@dimen/dp_10" android:layout_marginTop="@dimen/dp_16" android:text="13.14" android:text="13" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" android:textStyle="bold" /> @@ -628,11 +628,9 @@ android:layout_alignBottom="@+id/social_contribution_data_3_tv" android:layout_marginStart="@dimen/dp_2" android:layout_toEndOf="@+id/social_contribution_data_3_tv" android:text="(T)" android:text="@string/number" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" /> <TextView android:id="@+id/social_contribution_des_3_tv" app/src/main/res/layout/spinner_dialog.xml
New file @@ -0,0 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/dialog_parent_cl" android:layout_width="match_parent" android:layout_height="270dp" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="155dp" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/loading_ffffffff_4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <!-- <Spinner--> <!-- android:id="@+id/spinner"--> <!-- android:layout_width="100dp"--> <!-- android:layout_height="@dimen/dp_50"--> <!-- />--> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/values-en/strings.xml
@@ -247,4 +247,65 @@ <string name="restarting_please_wait">Restarting, please wait</string> <string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string> <string name="cancel_download_successfully">取消下载成功.</string> <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string> <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败.</string> <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件,请下载好固件文件,再重新升级.</string> <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败,无法升级.</string> <string name="local_service_fails">本地服务有异常失败,无法升级.</string> <string name="writing_drive_memory_succeeded">写入新驱动文件到内存成功.</string> <string name="download_drive_file_failed">下载驱动升级文件失败.</string> <string name="found_locally_drive_file">本地找不到升级驱动文件,请下载好驱动文件,再重新升级.</string> <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败,无法升级.</string> <string name="time_selectd">时间选择</string> <string name="life_cycle">生命期</string> <string name="year">年</string> <string name="month">月</string> <string name="day">日</string> <string name="hour">时</string> <string name="minutc">分</string> <string name="seconds">秒</string> <string name="the_query_date_is_exceeded">超出查询日期.</string> <string name="energy_generation_statistics">发电量统计</string> <string name="social_contribution">社会贡献</string> <string name="day_power_generation">当日发电量</string> <string name="month_power_generation">当月发电量</string> <string name="year_power_generation">当年发电量</string> <string name="cumulative_power_generation">累计发电量</string> <string name="generated_power">发电功率</string> <string name="installed_capacity">装机容量</string> <string name="generation">发电量</string> <string name="station_name">电站名称</string> <string name="search">搜索</string> <string name="history_search">历史搜索</string> <string name="search_content_null">搜索内容不能为空.</string> <string name="no_equipment">暂无设备.</string> <string name="filtering">筛选</string> <string name="reset">重置</string> <string name="string_capacity">组串容量（kWp)</string> <string name="grid_connected_state">并网状态</string> <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="contact_us">联系我们</string> <string name="wechat_id">微信号</string> <string name="email_address">邮箱地址</string> <string name="successful_replication">已复制到剪切板</string> <string name="to_be_added">待接入</string> <string name="saving_standard_coal">节约标准煤</string> <string name="co_reduction_rate">CO2减排</string> <string name="quantity_of_equivalent_values">等效植树量</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> <string name="enter_alarm_name">输入报警名称</string> <string name="device">设备</string> <string name="Offline_fault">离线有故障</string> <string name="active_power">有功功率</string> <string name="t">t</string> <string name="number"></string> </resources> app/src/main/res/values-zh/strings.xml
@@ -248,4 +248,66 @@ <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string> <string name="cancel_download_successfully">取消下载成功.</string> <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string> <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败.</string> <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件,请下载好固件文件,再重新升级.</string> <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败,无法升级.</string> <string name="local_service_fails">本地服务有异常失败,无法升级.</string> <string name="writing_drive_memory_succeeded">写入新驱动文件到内存成功.</string> <string name="download_drive_file_failed">下载驱动升级文件失败.</string> <string name="found_locally_drive_file">本地找不到升级驱动文件,请下载好驱动文件,再重新升级.</string> <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败,无法升级.</string> <string name="time_selectd">时间选择</string> <string name="life_cycle">生命期</string> <string name="year">年</string> <string name="month">月</string> <string name="day">日</string> <string name="hour">时</string> <string name="minutc">分</string> <string name="seconds">秒</string> <string name="the_query_date_is_exceeded">超出查询日期.</string> <string name="energy_generation_statistics">发电量统计</string> <string name="social_contribution">社会贡献</string> <string name="day_power_generation">当日发电量</string> <string name="month_power_generation">当月发电量</string> <string name="year_power_generation">当年发电量</string> <string name="cumulative_power_generation">累计发电量</string> <string name="generated_power">发电功率</string> <string name="installed_capacity">装机容量</string> <string name="generation">发电量</string> <string name="station_name">电站名称</string> <string name="search">搜索</string> <string name="history_search">历史搜索</string> <string name="search_content_null">搜索内容不能为空.</string> <string name="no_equipment">暂无设备.</string> <string name="filtering">筛选</string> <string name="reset">重置</string> <string name="string_capacity">组串容量（kWp)</string> <string name="grid_connected_state">并网状态</string> <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="contact_us">联系我们</string> <string name="wechat_id">微信号</string> <string name="email_address">邮箱地址</string> <string name="successful_replication">已复制到剪切板</string> <string name="to_be_added">待接入</string> <string name="saving_standard_coal">节约标准煤</string> <string name="co_reduction_rate">CO2减排</string> <string name="quantity_of_equivalent_values">等效植树量</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> <string name="enter_alarm_name">输入报警名称</string> <string name="device">设备</string> <string name="Offline_fault">离线有故障</string> <string name="active_power">有功功率</string> <string name="t">吨</string> <string name="number">棵</string> </resources> app/src/main/res/values/colors.xml
@@ -50,6 +50,7 @@ <color name="text_C2EDDE">#C2EDDE</color> <color name="text_C1C1C1">#C1C1C1</color> <color name="text_1238C494">#1238C494</color> <color name="text_161718">#FF161718</color> </resources> app/src/main/res/values/strings.xml
@@ -295,7 +295,7 @@ <string name="to_be_added">待接入</string> <string name="saving_standard_coal">节约标准煤</string> <string name="co_reduction_rate">CO2减排</string> <string name="quantity_of_equivalent_values">等效值数量</string> <string name="quantity_of_equivalent_values">等效植树量</string> <string name="pv_power">发电功率</string> <string name="device_run_state">设备运行状态</string> <string name="search_station">搜索电站</string> @@ -304,5 +304,7 @@ <string name="device">设备</string> <string name="Offline_fault">离线有故障</string> <string name="active_power">有功功率</string> <string name="t">吨</string> <string name="number">棵</string> </resources>
