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 | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 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 441f7b7..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;
/**
@@ -200,11 +186,11 @@
}
/**
- * 杞崲(kWh)鍗曚綅
+ * 杞崲鐢甸噺(kWh)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertKWUnit(String value) {
+ public static String convertKWHUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -223,11 +209,11 @@
}
/**
- * 杞崲(kW)鍗曚綅
+ * 杞崲鍔熺巼(kW)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertKWhUnit(String value) {
+ public static String convertKWUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -246,11 +232,11 @@
}
/**
- * 杞崲(Wp)鍗曚綅
+ * 杞崲(kWp)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertWPUnit(String value) {
+ public static String convertKWPUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -379,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