From 78ee656922525e2a10c48e35bcefdd86854a14df Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 四月 2025 20:12:16 +0800
Subject: [PATCH] 2025年04月14日20:12:14
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 7 ++++++-
app/src/main/res/values-zh/strings.xml | 2 +-
app/src/main/res/layout/item_plant_details.xml | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 1001175..c1a4193 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -232,6 +232,6 @@
if (this.location == null) {
return this.address;
}
- return this.location.getNationName() + this.location.getProvinceName() + this.location.getCityName() + this.address;
+ return this.location.getNationName() +"-"+ this.location.getProvinceName() +"-"+ this.location.getCityName() +"-"+ this.address;
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index 4b41efd..60f5e71 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -627,7 +627,12 @@
values[i] = HdlCommonLogic.convertBigDecimal(statisticsBean.getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
}
} else {
- values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue());
+ if (statisticsBean.isFuture()) {
+ //鏈潵鏃堕棿涓嶆樉绀�
+ values[i] = null;
+ } else {
+ values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue());
+ }
}
}
fieldNames = keys;
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 49f9276..d9e61f1 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -84,7 +84,7 @@
<TextView
android:id="@+id/home_debug_state_tv"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="0dp"
android:paddingEnd="@dimen/dp_16"
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index bdc6c73..1b6e721 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -153,7 +153,7 @@
<string name="app_version_upgrade">鐗堟湰鏇存柊</string>
<string name="app_new_version">宸茬粡鏄渶鏂扮増鏈�</string>
<string name="app_service_agreement">鐢ㄦ埛鍗忚</string>
- <string name="app_privacy_policy">闅愮鏀跨瓥</string>
+ <string name="app_privacy_policy">闅愮鍗忚</string>
<string name="app_update_now">绔嬪嵆鏇存柊</string>
<string name="app_cancel_update">鍙栨秷鏇存柊</string>
<string name="app_discover_new_version">鍙戠幇鏂扮増鏈�</string>
--
Gitblit v1.8.0