From 2c5b6e472c368e80d85b8ea2b461c9ea62981d9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 08 十月 2023 11:28:56 +0800
Subject: [PATCH] 广告升级/bug修复

---
 library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java b/library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java
index dc633c5..e956dc4 100644
--- a/library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java
+++ b/library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java
@@ -21,8 +21,6 @@
 import android.text.style.RelativeSizeSpan;
 import android.widget.TextView;
 
-import com.lcjian.library.util.common.DeviceUtil;
-
 /**
  * 鐎涙顑佽箛顐e祹閺傜懓绱¢敍姘灲閺傤厼鐡х粭锔胯<娑擃厽鏋冪�涙顑侀妴渚�鍋栫粻渚�?閹靛婧�閸欐灚?缁屽搫鐡х粭锔�?閺佸瓨鏆熼妴浣硅癁閻愯鏆�>
  */
@@ -172,7 +170,7 @@
 
 	/**
 	 * is null or its length is 0 or it is made by space
-	 * 
+	 *
 	 * @param str
 	 * @return if string is null or its size is 0 or it is made by space, return
 	 *         true, else return false.
@@ -183,7 +181,7 @@
 
 	/**
 	 * is null or its length is 0
-	 * 
+	 *
 	 * @param str
 	 * @return if string is null or its size is 0, return true, else return
 	 *         false.
@@ -194,7 +192,7 @@
 
 	/**
 	 * compare two string
-	 * 
+	 *
 	 * @param actual
 	 * @param expected
 	 * @return
@@ -206,7 +204,7 @@
 
 	/**
 	 * capitalize first letter
-	 * 
+	 *
 	 * <pre>
 	 * capitalizeFirstLetter(null)     =   null;
 	 * capitalizeFirstLetter("")       =   "";
@@ -215,7 +213,7 @@
 	 * capitalizeFirstLetter("ab")     =   "Ab"
 	 * capitalizeFirstLetter("Abc")    =   "Abc"
 	 * </pre>
-	 * 
+	 *
 	 * @param str
 	 * @return
 	 */
@@ -226,8 +224,8 @@
 		char c = str.charAt(0);
 		return (!Character.isLetter(c) || Character.isUpperCase(c)) ? str
 				: new StringBuilder(str.length())
-						.append(Character.toUpperCase(c))
-						.append(str.substring(1)).toString();
+				.append(Character.toUpperCase(c))
+				.append(str.substring(1)).toString();
 	}
 
 
@@ -235,8 +233,8 @@
 		if (text == null || text.length() == 0) {
 			return false;
 		}
-        try {
-            Integer.parseInt(text);
+		try {
+			Integer.parseInt(text);
 			return true;
 		} catch (Exception e) {
 			return false;
@@ -255,7 +253,7 @@
 
 	/**
 	 * 鏄惁鏄纭殑鐢佃瘽鍙风爜
-	 * 
+	 *
 	 * @param mobile
 	 * @return
 	 */
@@ -366,7 +364,7 @@
 
 	/**
 	 * 韬唤璇侀獙锟�?
-	 * 
+	 *
 	 * @param card
 	 * @return
 	 */
@@ -444,14 +442,14 @@
 		String deviceid ="";
 		if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
 				|| ContextCompat.checkSelfPermission(context, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-			deviceid = DeviceUtil.getImeiCache(context);
+			deviceid = tm.getDeviceId();// 鑾峰彇deviceId
 		}
 
 		return deviceid;
 	}
 
 	public static void getdiffrentColor(TextView tv, int color, int start,
-			int end) {
+										int end) {
 		SpannableStringBuilder style = new SpannableStringBuilder(tv.getText());
 		ForegroundColorSpan redSpan = new ForegroundColorSpan(color);
 		style.setSpan(redSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -459,7 +457,7 @@
 	}
 
 	public static void getdiffrentColor(TextView tv, int color, int size,
-			int start, int end) {
+										int start, int end) {
 		SpannableStringBuilder style = new SpannableStringBuilder(tv.getText());
 		ForegroundColorSpan redSpan = new ForegroundColorSpan(color);
 		style.setSpan(redSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);

--
Gitblit v1.8.0