From fd384ab72c1671e819298d1f0870e0940e29685c Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期三, 30 十二月 2020 15:15:57 +0800
Subject: [PATCH] plugin 的 清单没办法自动合并，需要手动合并
---
Project/ky_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Project/ky_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java b/Project/ky_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
index 036232e..76afa9d 100644
--- a/Project/ky_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
+++ b/Project/ky_sdk/src/main/java/com/secondworld/univeralsdk/UniqueID.java
@@ -40,8 +40,8 @@
StringBuffer _buffer = new StringBuffer();
- _id = getDeviceId(context);
- _buffer.append(_id);
+// _id = getDeviceId(context);
+// _buffer.append(_id);
_id = getLocalMac(context).replace(":", "");
_buffer.append(_id);
@@ -121,17 +121,12 @@
return _deviceId;
}
- TelephonyManager tm = (TelephonyManager) context
- .getSystemService(Context.TELEPHONY_SERVICE);
-
if (ContextCompat.checkSelfPermission(context,
Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
{
+ TelephonyManager tm = (TelephonyManager) context
+ .getSystemService(Context.TELEPHONY_SERVICE);
_deviceId = tm.getDeviceId();
- }
- else
- {
- _deviceId = get(context);
}
if (_deviceId.length() != 0)
--
Gitblit v1.8.0