From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 六月 2025 10:37:28 +0800
Subject: [PATCH] 2025年06月05日10:37:26
---
app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
index b7475f0..afa02c2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
@@ -6,6 +6,7 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.TimeType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -13,8 +14,11 @@
import com.hdl.photovoltaic.ui.bean.DataOverBean;
import com.hdl.photovoltaic.ui.bean.SocialContributionBean;
import com.hdl.photovoltaic.ui.bean.StatisticsBean;
+import com.hdl.photovoltaic.utils.TimeUtils;
import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -40,6 +44,7 @@
return sHdlPowerStationDataStatisticsLogic;
}
+
/**
* 鑾峰彇缁熻姒傝鏁版嵁(鍏徃缁村害)
*
@@ -52,15 +57,18 @@
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String jsonStr) {
- if (TextUtils.isEmpty(jsonStr)) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(null);
+ try {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new DataOverBean());
+ }
}
- }
- Gson gson = new Gson();
- DataOverBean dataOverBean = gson.fromJson(jsonStr, DataOverBean.class);
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(dataOverBean);
+ Gson gson = new Gson();
+ DataOverBean dataOverBean = gson.fromJson(jsonStr, DataOverBean.class);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(dataOverBean);
+ }
+ } catch (Exception ignored) {
}
}
@@ -85,9 +93,23 @@
public void getStatistics(String type, String time, CloudCallBeak<List<StatisticsBean>> cloudCallBeak) {
String requestUrl = HttpApi.POST_Home_page_statistics;
JsonObject json = new JsonObject();
- json.addProperty("dataType", "GE");//鍙戠數閲�
+ if (TimeType.day.equals(type)) {
+ json.addProperty("dataType", "POWER");//鍙戠數閲忥紙GE 锛� 鍙戠數閲� ;POWER 锛� 鍙戠數鍔熺巼锛�
+ } else {
+ json.addProperty("dataType", "GE");//鍙戠數閲忥紙GE 锛� 鍙戠數閲� ;POWER 锛� 鍙戠數鍔熺巼锛�
+ }
json.addProperty("type", type);//绫诲瀷
if (!TextUtils.isEmpty(time)) {
+ if (!UserConfigManage.getInstance().isZh()) {
+ //鑻辨枃鐨勬椂鍊欓渶瑕佹棩鏈熸牸寮�
+ if (TimeType.day.equals(type)) {
+ String[] ary = time.split("/");
+ time = ary[2] + "/" + ary[1] + "/" + ary[0];
+ } else if (TimeType.month.equals(type)) {
+ String[] ary = time.split("/");
+ time = ary[1] + "/" + ary[0];
+ }
+ }
json.addProperty("time", time);//鏃堕棿
}
//json.addProperty("zoneType", "password");//鍖哄煙
--
Gitblit v1.8.0