From ac4cd9dae58bc753609aebd35ccda8785b806e3e Mon Sep 17 00:00:00 2001
From: 蔡瀚 <339726288@qq.com>
Date: 星期三, 23 一月 2019 12:01:10 +0800
Subject: [PATCH] Merge commit '1506bbf613d88c9c83179ef30c8a0a9da1ccaa3a'
---
Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java b/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
index 11899ea..036232e 100644
--- a/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
+++ b/Project/yl_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
@@ -128,12 +128,20 @@
Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
{
_deviceId = tm.getDeviceId();
+ }
+ else
+ {
+ _deviceId = get(context);
+ }
+
+ if (_deviceId.length() != 0)
+ {
SharedPreferences.Editor _e = _sp.edit();
_e.putString(StaticDefine.LS_KEY_IMEI, _deviceId);
_e.apply();
- return _deviceId;
}
- return "";
+
+ return _deviceId;
}
public static String getLocalMac(Context context)
--
Gitblit v1.8.0