From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
index 6cb0f7b..72ebfb8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -1,10 +1,12 @@
package com.hdl.photovoltaic.other;
+import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.SystemClock;
import android.text.TextUtils;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
@@ -17,6 +19,7 @@
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -38,6 +41,9 @@
public class HdlCommonLogic {
private static volatile HdlCommonLogic sHdlCommonLogic;
+
+
+ public static LowerTagType lowerTagType = LowerTagType.home;
/**
@@ -84,10 +90,30 @@
if (TextUtils.isEmpty(value)) {
return UnitType.noValue + unit;
}
- BigDecimal formattedValue = getBigDecimal(value);
- return formattedValue.toString() + unit;
+ if (unit.equals(UnitType.kW)) {
+ return divideByOneThousandAndFormat(value).toString() + unit;
+ }
+ return getBigDecimal(value).toString() + unit;
}
+
+ /**
+ * @param value 鍊�
+ * @param unitValue 渚嬪:UnitType.kWh
+ * @param isUnit true琛ㄧず鏈夊崟浣嶈繑鍥�
+ * @return 甯﹀崟浣嶅�艰繑鍥�
+ */
+ public static String getConvertDoubleUnit(String value, String unitValue, boolean isUnit) {
+ if (TextUtils.isEmpty(value)) {
+ return UnitType.noValue + (isUnit ? unitValue : "");
+ }
+ if (unitValue.equals(UnitType.kW)) {
+ return divideByOneThousandAndFormat(value).toString() + (isUnit ? unitValue : "");
+ }
+ return getBigDecimal(value).toString() + (isUnit ? unitValue : "");
+
+ }
+
/**
* @param value 鍊�
@@ -114,6 +140,18 @@
}
double doubleValue = Double.parseDouble(value);
return BigDecimal.valueOf(doubleValue).setScale(2, RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 闄や互涓�鍗冨拰鏍煎紡
+ *
+ * @param value 鍊�
+ * @return BigDecimal
+ */
+ public static BigDecimal divideByOneThousandAndFormat(String value) {
+ double doubleValue = Double.parseDouble(value);
+ BigDecimal bigDecimal = new BigDecimal(doubleValue);
+ return bigDecimal.divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN);
}
@@ -179,6 +217,8 @@
}
}
+
+
/**
* 娌℃湁鏁版嵁鐣岄潰鐨勬牱寮�
*
--
Gitblit v1.8.0