From 276156837ebca8b8b08a516e61fe105e670375fc Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 04 六月 2024 10:35:23 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index a92d567..c03eb47 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/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);
--
Gitblit v1.8.0