Merge branch 'dev' into feature/v1.4.1

mac

2024-06-04 276156837ebca8b8b08a516e61fe105e670375fc

Merge branch 'dev' into feature/v1.4.1

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

@@ -60,7 +60,7 @@
        HouseIdBean houseIdBean = this.mList.get(position);
        holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
        //装机容量
        String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp);
        String capacity = mContext.getString(R.string.string_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp);
        holder.capacityTv.setText(capacity);
        //发电功率
        holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW));

 app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java

@@ -417,7 +417,7 @@
        String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType));
        viewBinding.yearMonthDayTv.setText(dataStr);

        String installed_capacity = getString(R.string.installed_capacity) + "(" + UnitType.kWp + ")";
        String installed_capacity = getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
        viewBinding.infoRl1Text2Tv.setText(installed_capacity);
        String generated_power = getString(R.string.generated_power) + "(" + UnitType.kW + ")";
        viewBinding.infoRl1Text4Tv.setText(generated_power);

 app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java

@@ -20,6 +20,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.databinding.ActivitySearchMessgeBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
@@ -152,6 +153,7 @@
                currSearchText = "";
                viewBinding.messageSearchEt.setText("");
                viewBinding.historyListParent.setVisibility(View.VISIBLE);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                viewBinding.listParent.setVisibility(View.GONE);
                searchHistoryAdapter.setList(searchHistoryTitleList);
                clearCacheData();
@@ -163,6 +165,7 @@
            public void onClick(View v) {
                searchHistoryTitleList = new ArrayList<>();
                searchHistoryAdapter.setList(searchHistoryTitleList);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
            }
        });
@@ -271,6 +274,7 @@
                if (searchMessageAdapter != null) {
                    searchMessageAdapter.setList(mList);
                }
                nullDataUpdateUi();
            }
        });
    }
@@ -426,6 +430,14 @@
    }

    /**
     * 没有消息列表的样式
     */
    private void nullDataUpdateUi() {
        boolean is_data = mList != null && mList.size() > 0;
        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.message_alarm_data_null), is_data);
    }

    /**
     * 获取【搜索历史记录文件】全路径
     */
    public String getHistoryFileNamePath() {

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java

@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
@@ -162,6 +163,7 @@
                viewBinding.powerStationSearchEt.setText("");
                viewBinding.historyListParent.setVisibility(View.VISIBLE);
                viewBinding.listParent.setVisibility(View.GONE);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                searchHistoryAdapter.setList(searchHistoryTitleList);
                clearData();
            }
@@ -172,6 +174,7 @@
            public void onClick(View v) {
                searchHistoryTitleList = new ArrayList<>();
                searchHistoryAdapter.setList(searchHistoryTitleList);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
            }
        });
@@ -354,6 +357,7 @@
                                //更新UI
                                searchDeviceAdapter.setList(deviceList);
                            }
                            nullDataUpdateUi();
                        }
                    }
                }, _mActivity, ShowErrorMode.YES);
@@ -428,6 +432,15 @@
        }
    }


    /**
     * 没有设备列表的样式
     */
    private void nullDataUpdateUi() {
        boolean is_data = deviceList != null && deviceList.size() > 0;
        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.no_equipment), is_data);
    }

    /**
     * 添加历史记录
     */

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java

@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.enums.SortType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -156,6 +157,7 @@
                viewBinding.powerStationSearchEt.setText("");
                viewBinding.historyListParent.setVisibility(View.VISIBLE);
                viewBinding.listParent.setVisibility(View.GONE);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                searchHistoryAdapter.setList(searchHistoryTitleList);
                clearData();
            }
@@ -166,6 +168,7 @@
            public void onClick(View v) {
                searchHistoryTitleList = new ArrayList<>();
                searchHistoryAdapter.setList(searchHistoryTitleList);
                viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
                HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
            }
        });
@@ -331,6 +334,7 @@
                                        //更新UI
                                        searchHouseAdapter.setList(houseListBeanIDList);
                                    }
                                    nullDataUpdateUi();
                                }
                            }
                        }, _mActivity, ShowErrorMode.YES);
@@ -405,6 +409,7 @@
        }
    }


    /**
     * 添加历史记录
     */
@@ -424,6 +429,14 @@
    }

    /**
     * 没有电站列表的样式
     */
    private void nullDataUpdateUi() {
        boolean is_data = houseListBeanIDList != null && houseListBeanIDList.size() > 0;
        HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), is_data);
    }

    /**
     * 获取【搜索历史记录文件】全路径
     */
    public String getHistoryFileNamePath() {

 app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java

@@ -15,6 +15,9 @@
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
import com.hdl.photovoltaic.enums.GridType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;

public class DefaultFilteringDialog extends BaseDialog {
@@ -312,6 +315,8 @@

    private void initView() {

        String s = mContext.getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
        viewBinding.capacityTv.setText(s);
        viewBinding.text1Tv.setTag(text1);
        viewBinding.text2Tv.setTag(text2);
        viewBinding.text3Tv.setTag(text3);

 app/src/main/res/layout/activity_device_search.xml

@@ -165,4 +165,17 @@

    </androidx.constraintlayout.widget.ConstraintLayout>


    <!--没有数据显示样式-->
    <include
        android:id="@+id/device_null_data_ic"
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/layout/activity_house_search.xml

@@ -163,5 +163,16 @@
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

    </androidx.constraintlayout.widget.ConstraintLayout>
    <!--没有数据显示样式-->
    <include
        android:id="@+id/device_null_data_ic"
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/layout/activity_search_messge.xml

@@ -164,4 +164,16 @@

    </androidx.constraintlayout.widget.ConstraintLayout>

    <!--没有数据显示样式-->
    <include
        android:id="@+id/device_null_data_ic"
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/message_search_cl" />

</androidx.constraintlayout.widget.ConstraintLayout>

 app/src/main/res/layout/dialog_default_filtering.xml

@@ -87,7 +87,7 @@


        <TextView

            android:id="@+id/capacity_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_20"

 app/src/main/res/layout/fragment_home_page.xml

@@ -14,7 +14,7 @@
        android:layout_height="@dimen/dp_26"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="58dp"
        android:text="@string/power_shome_page"
        android:text="@string/summarize"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

@@ -146,7 +146,7 @@
                            android:layout_below="@+id/info_rl1_text1_tv"
                            android:layout_alignStart="@+id/info_rl1_text1_tv"
                            android:layout_marginTop="3dp"
                            android:text="@string/installed_capacity" />
                            android:text="@string/string_capacity" />

                        <TextView
                            android:id="@+id/info_rl1_text3_tv"

 app/src/main/res/layout/item_plant_details.xml

@@ -54,7 +54,7 @@
                android:layout_alignStart="@+id/device_details_name_tv"
                android:layout_marginTop="@dimen/dp_3"
                android:gravity="center_vertical"
                android:text="@string/installed_capacity"
                android:text="@string/string_capacity"
                android:textColor="@color/text_66000000"
                android:textSize="@dimen/text_12" />


 app/src/main/res/layout/null_data_view.xml

@@ -20,7 +20,6 @@
        android:layout_height="22.5dp"
        android:layout_marginTop="11.5dp"
        android:gravity="center"
        android:text="数据为空,赶快创建一个吧"
        android:textColor="@color/text_7C8590"
        android:textSize="@dimen/text_16"
        app:layout_constraintEnd_toEndOf="parent"

 app/src/main/res/values-en/strings.xml

@@ -77,7 +77,7 @@
    <string name="power_station_generated_power">Power generation</string>
    <string name="power_station_Power_generation_today">Today power generation</string>
    <string name="power_station_creation_time">Established at</string>
    <string name="my_power_station_installed_capacity">Installed capacity</string>
    <string name="my_power_station_installed_capacity1">Installed capacity</string>
    <string name="my_power_station_connecting">Connecting</string>
    <string name="my_power_station_off_line">Offline</string>
    <string name="my_power_station_malfunction">Malfunction</string>
@@ -104,7 +104,7 @@
    <string name="message_alarm_details_time">Alarm time</string>
    <string name="message_alarm_details_back">Back</string>
    <string name="message_alarm_details_resolved">Solved</string>
    <string name="message_alarm_data_null">No alarm</string>
    <string name="message_alarm_data_null">No alarm!</string>


    <!--我的-->
@@ -274,7 +274,6 @@
    <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>
@@ -283,7 +282,7 @@
    <string name="no_equipment">暂无设备.</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
    <string name="string_capacity">组串容量（kWp)</string>
    <string name="string_capacity">组串容量</string>
    <string name="grid_connected_state">并网状态</string>
    <string name="grid_connected">并网</string>
    <string name="off_network">离网</string>

 app/src/main/res/values-zh/strings.xml

@@ -77,13 +77,13 @@
    <string name="power_station_generated_power">发电功率</string>
    <string name="power_station_Power_generation_today">今日发电</string>
    <string name="power_station_creation_time">创建时间</string>
    <string name="my_power_station_installed_capacity">装机容量</string>
    <string name="my_power_station_installed_capacity1">装机容量</string>
    <string name="my_power_station_connecting">连接中</string>
    <string name="my_power_station_off_line">离线</string>
    <string name="my_power_station_malfunction">故障</string>
    <string name="my_power_station_operation">运行</string>
    <string name="my_power_station_await">待机</string>
    <string name="my_power_station_data_null">数据为空,赶快创建一个吧!</string>
    <string name="my_power_station_data_null">暂无电站!</string>

    <!--设备-->
    <string name="device_manual_connection">手动连接</string>
@@ -104,7 +104,7 @@
    <string name="message_alarm_details_time">报警时间</string>
    <string name="message_alarm_details_back">返回</string>
    <string name="message_alarm_details_resolved">已解决</string>
    <string name="message_alarm_data_null">暂无报警</string>
    <string name="message_alarm_data_null">暂无报警!</string>


    <!--我的-->
@@ -222,7 +222,6 @@
    <string name="exception_unable_location_move10_meters_later">无法获取位置,请移动手机10米后,再重新获取.</string>
    <string name="succeed">成功.</string>


    <string name="delete_power_station">是否要删除%s电站?</string>
    <string name="power_station_selection">电站选择</string>
    <string name="alarm_all_device">全部设备</string>
@@ -246,8 +245,6 @@
    <string name="already_the_first_one">已经是第一个了.</string>
    <string name="restarting_please_wait">重启中,请等待…</string>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string>



    <string name="cancel_download_successfully">取消下载成功.</string>
    <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string>
@@ -275,16 +272,15 @@
    <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="no_equipment">暂无设备!</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
    <string name="string_capacity">组串容量（kWp)</string>
    <string name="string_capacity">组串容量</string>
    <string name="grid_connected_state">并网状态</string>
    <string name="grid_connected">并网</string>
    <string name="off_network">离网</string>

 app/src/main/res/values/strings.xml

@@ -77,13 +77,13 @@
    <string name="power_station_generated_power">发电功率</string>
    <string name="power_station_Power_generation_today">今日发电</string>
    <string name="power_station_creation_time">创建时间</string>
    <string name="my_power_station_installed_capacity">装机容量</string>
    <string name="my_power_station_installed_capacity1">装机容量</string>
    <string name="my_power_station_connecting">连接中</string>
    <string name="my_power_station_off_line">离线</string>
    <string name="my_power_station_malfunction">故障</string>
    <string name="my_power_station_operation">运行</string>
    <string name="my_power_station_await">待机</string>
    <string name="my_power_station_data_null">数据为空,赶快创建一个吧!</string>
    <string name="my_power_station_data_null">暂无电站!</string>

    <!--设备-->
    <string name="device_manual_connection">手动连接</string>
@@ -104,7 +104,7 @@
    <string name="message_alarm_details_time">报警时间</string>
    <string name="message_alarm_details_back">返回</string>
    <string name="message_alarm_details_resolved">已解决</string>
    <string name="message_alarm_data_null">暂无报警</string>
    <string name="message_alarm_data_null">暂无报警!</string>


    <!--我的-->
@@ -246,7 +246,6 @@
    <string name="restarting_please_wait">重启中,请等待…</string>
    <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>
@@ -273,16 +272,15 @@
    <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="no_equipment">暂无设备!</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
    <string name="string_capacity">组串容量（kWp)</string>
    <string name="string_capacity">组串容量</string>
    <string name="grid_connected_state">并网状态</string>
    <string name="grid_connected">并网</string>
    <string name="off_network">离网</string>
@@ -307,5 +305,6 @@
    <string name="t">吨</string>
    <string name="number">棵</string>
    <string name="device_off">设备已离线!</string>
    <string name="summarize">概览</string>

</resources>