change method and docs

gzu-liyujiang · Apr 8, 2021 · ad40f7f · ad40f7f
1 parent 96d0ca7
commit ad40f7f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 ## 3.0.2 - 2021/04/08
 
-- 小米手机获取OAID问题 @andot PR#18
+- 小米手机获取OAID问题 [@andot PR#18](https://github.com/gzu-liyujiang/Android_CN_OAID/pull/18)
 - 增加数字版权管理设备ID
 - 增加各大手机厂商关于OAID的说明文档
+- 允许判断设备是否支持OAID [@andot PR#19](https://github.com/gzu-liyujiang/Android_CN_OAID/pull/19)
 
 ## 3.0.1 - 2021/03/29
 

diff --git a/OAID_IMPL/src/main/java/com/github/gzuliyujiang/oaid/DeviceID.java b/OAID_IMPL/src/main/java/com/github/gzuliyujiang/oaid/DeviceID.java
@@ -54,7 +54,7 @@
  */
 public final class DeviceID {
     private static String clientId;
-    private static IOAID oaid;
+    private static IOAID ioaid;
 
     private DeviceID() {
         super();
@@ -123,7 +123,7 @@ public static String getClientIdSHA1() {
         return clientId == null ? "" : calculateHash(clientId, "SHA-1");
     }
 
-    private static IOAID getIOAID(@NonNull Context context) {
+    private static IOAID createIOAID(@NonNull Context context) {
         if (OAIDRom.isLenovo() || OAIDRom.isMotolora()) {
             return new LenovoImpl(context);
         }
@@ -164,22 +164,22 @@ private static IOAID getIOAID(@NonNull Context context) {
      * @param getter  回调
      */
     public static void getOAID(@NonNull Context context, @NonNull IGetter getter) {
-        if (oaid == null) {
-            oaid = getIOAID(context);
+        if (ioaid == null) {
+            ioaid = createIOAID(context);
         }
-        oaid.doGet(getter);
+        ioaid.doGet(getter);
     }
 
     /**
      * 判断是否支持OAID
      *
      * @param context 上下文
      */
-    public static boolean supported(@NonNull Context context) {
-        if (oaid == null) {
-            oaid = getIOAID(context);
+    public static boolean supportedOAID(@NonNull Context context) {
+        if (ioaid == null) {
+            ioaid = createIOAID(context);
         }
-        return oaid.supported();
+        return ioaid.supported();
     }
 
     /**

diff --git a/README.md b/README.md
@@ -90,6 +90,9 @@ dependencies {
         // 获取GUID，随机生成，不会为空
         builder.append(DeviceID.getGUID(this));
         builder.append("\n");
+        // 是否支持OAID
+        builder.append("supportedOAID:").append(DeviceID.supportedOAID(this));
+        builder.append("\n");
         // 获取OAID，异步回调
         DeviceID.getOAID(this, new IGetter() {
             @Override

diff --git a/app/src/main/java/com/github/gzuliyujiang/demo/MainActivity.java b/app/src/main/java/com/github/gzuliyujiang/demo/MainActivity.java
@@ -111,6 +111,9 @@ private void obtainDeviceId() {
         // 获取GUID，随机生成，不会为空
         builder.append(DeviceID.getGUID(this));
         builder.append("\n");
+        // 是否支持OAID
+        builder.append("supportedOAID: ").append(DeviceID.supportedOAID(this));
+        builder.append("\n");
         // 获取OAID，异步回调
         DeviceID.getOAID(this, new IGetter() {
             @Override