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/AppUpdate.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/library-APPUpdate/src/com/yeshi/appupdate/AppUpdate.java b/library-APPUpdate/src/com/yeshi/appupdate/AppUpdate.java
index 71e4d8f..9a99447 100644
--- a/library-APPUpdate/src/com/yeshi/appupdate/AppUpdate.java
+++ b/library-APPUpdate/src/com/yeshi/appupdate/AppUpdate.java
@@ -14,7 +14,9 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.content.ContextCompat;
+
 import android.telephony.TelephonyManager;
 import android.text.Html;
 import android.widget.Toast;
@@ -23,6 +25,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.lcjian.library.util.common.DeviceUtil;
 import com.loopj.android.http.TextHttpResponseHandler;
 import com.yeshi.appupdate.api.AppUpdateAPI;
 import com.yeshi.appupdate.entity.UpdateBean;
@@ -59,12 +62,16 @@
     private void getUpdateInfo() {
         TelephonyManager manager = (TelephonyManager) mActivity
                 .getSystemService(Activity.TELEPHONY_SERVICE);
-        String deviceId="";
+        String deviceId = "";
         if (ContextCompat.checkSelfPermission(mActivity, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
                 || ContextCompat.checkSelfPermission(mActivity, android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-             deviceId = manager.getDeviceId();// 鑾峰彇deviceId
+            try {
+                deviceId = DeviceUtil.getImeiCache(mActivity);
+            } catch (Exception e) {
+
+            }
         }
-            int versionCode = 1;// 鐗堟湰鍙�
+        int versionCode = 1;// 鐗堟湰鍙�
         try {
             versionCode = mActivity.getPackageManager().getPackageInfo(
                     mActivity.getPackageName(),
@@ -88,6 +95,8 @@
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
+                        if (jsonObject == null)
+                            return;
                         if (Integer.parseInt(jsonObject.optString("code")) == 0) {
                             Gson gson = new GsonBuilder().setPrettyPrinting()
                                     .create();

--
Gitblit v1.8.0