From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 90 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 17 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 5a4fd71..4720942 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -1,46 +1,32 @@
package com.hdl.photovoltaic.other;
-import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
-import android.os.SystemClock;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.view.View;
-import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
-import com.google.gson.JsonObject;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
-import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
-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;
-import com.hdl.sdk.link.core.callback.BaseCallBack;
import org.greenrobot.eventbus.EventBus;
-import org.json.JSONObject;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.net.InetSocketAddress;
-import java.net.Socket;
import java.util.Hashtable;
/**
@@ -85,6 +71,7 @@
}
return divideByOneThousandAndFormat(value).toString();
}
+
/**
* @param value 鍊�
* @param diploidValue 鍊嶆暟
@@ -111,7 +98,7 @@
BigDecimal bigDecimal = new BigDecimal(doubleValue);
return bigDecimal.divide(new BigDecimal(diploidValue), 2, RoundingMode.HALF_EVEN);
} catch (Exception e) {
- return new BigDecimal(0);
+ return new BigDecimal(0);
}
}
@@ -127,7 +114,6 @@
double doubleValue = Double.parseDouble(value);
return BigDecimal.valueOf(doubleValue).setScale(2, RoundingMode.HALF_UP);
}
-
/**
@@ -198,6 +184,76 @@
}
}
+
+ /**
+ * 杞崲鐢甸噺(kWh)鍗曚綅
+ *
+ * @param value 鍊�
+ */
+ public static String convertKWHUnit(String value) {
+ try {
+ double doubleValue = Double.parseDouble(value);
+ if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
+ return UnitType.mWh;
+ } else if (doubleValue > 1000 * 1000 && doubleValue < 1000 * 1000 * 1000) {
+ return UnitType.gWh;
+ } else if (doubleValue > 1000 * 1000 * 1000) {
+ return UnitType.tWh;
+ } else {
+ return UnitType.kWh;
+ }
+ } catch (Exception e) {
+ return UnitType.kWh;
+ }
+
+ }
+
+ /**
+ * 杞崲鍔熺巼(kW)鍗曚綅
+ *
+ * @param value 鍊�
+ */
+ public static String convertKWUnit(String value) {
+ try {
+ double doubleValue = Double.parseDouble(value);
+ if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
+ return UnitType.mW;
+ } else if (doubleValue > 1000 * 1000 && doubleValue < 1000 * 1000 * 1000) {
+ return UnitType.gW;
+ } else if (doubleValue > 1000 * 1000 * 1000) {
+ return UnitType.tW;
+ } else {
+ return UnitType.kW;
+ }
+ } catch (Exception e) {
+ return UnitType.kW;
+ }
+
+ }
+
+ /**
+ * 杞崲(kWp)鍗曚綅
+ *
+ * @param value 鍊�
+ */
+ public static String convertKWPUnit(String value) {
+ try {
+ double doubleValue = Double.parseDouble(value);
+ if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
+ return UnitType.MWp;
+ } else if (doubleValue > 1000 * 1000 && doubleValue < 1000 * 1000 * 1000) {
+ return UnitType.GWp;
+ } else if (doubleValue > 1000 * 1000 * 1000) {
+ return UnitType.TWp;
+ } else {
+ return UnitType.kWp;
+ }
+ } catch (Exception e) {
+ return UnitType.kWp;
+ }
+
+ }
+
/**
* 鐢熸垚浜岀淮鐮�
@@ -309,7 +365,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(HDLApp.getInstance().getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(HDLApp.getInstance().getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(isUnderline);
}
--
Gitblit v1.8.0