diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Device.java b/app/src/main/java/com/fongmi/android/tv/bean/Device.java index b559734c5..f56bc8d8e 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Device.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Device.java @@ -34,7 +34,7 @@ public class Device { public static Device get() { Device device = new Device(); - device.setUuid(Util.getDeviceId()); + device.setUuid(Util.getAndroidId()); device.setName(Util.getDeviceName()); device.setIp(Server.get().getAddress()); device.setType(Product.getDeviceType()); diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java index 2478fc65b..848740a90 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java @@ -14,6 +14,7 @@ import android.os.Build; import android.os.IBinder; import android.os.Parcelable; import android.provider.Settings; +import android.text.TextUtils; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -83,8 +84,14 @@ public class Util { } } - public static String getDeviceId() { - return Settings.Secure.getString(Init.context().getContentResolver(), Settings.Secure.ANDROID_ID); + public static String getAndroidId() { + try { + String id = Settings.Secure.getString(Init.context().getContentResolver(), Settings.Secure.ANDROID_ID); + if (TextUtils.isEmpty(id)) throw new NullPointerException(); + return id; + } catch (Exception e) { + return "0200000000000000"; + } } public static String getDeviceName() {