2024年06月03日19:25:19

mac

2024-06-03 f26c763192e7ac6264278ac891ee86486fcbd636

2024年06月03日19:25:19

 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.my_power_station_installed_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/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/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

@@ -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/my_power_station_installed_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/my_power_station_installed_capacity"
                android:textColor="@color/text_66000000"
                android:textSize="@dimen/text_12" />


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

@@ -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

@@ -272,7 +272,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>
@@ -281,7 +280,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/strings.xml

@@ -272,7 +272,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>
@@ -281,7 +280,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>