Browse Source

APN设置为非普通通信卡时的略过处理

allen 4 years ago
parent
commit
ca1f106935

+ 10 - 3
home/src/main/code/com/wdkl/ncs/android/component/home/util/Util.kt

@@ -2,11 +2,13 @@ package com.wdkl.ncs.android.component.home.util
 
 
 import android.annotation.SuppressLint
 import android.annotation.SuppressLint
 import android.app.KeyguardManager
 import android.app.KeyguardManager
+import android.app.Service
 import android.content.Context
 import android.content.Context
+import android.content.Context.KEYGUARD_SERVICE
+import android.os.Build
 import android.os.PowerManager
 import android.os.PowerManager
 import android.telephony.TelephonyManager
 import android.telephony.TelephonyManager
-import android.content.Context.KEYGUARD_SERVICE
-
+import com.umeng.socialize.utils.DeviceConfig
 
 
 
 
 class Util {
 class Util {
@@ -18,7 +20,12 @@ class Util {
     */
     */
     @SuppressLint("MissingPermission")
     @SuppressLint("MissingPermission")
     fun getIMEI(context: Context): String {
     fun getIMEI(context: Context): String {
-        IMEI = (context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager).deviceId
+        val tm = (context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            IMEI = tm.imei
+        } else {
+            IMEI = tm.deviceId
+        }
         return IMEI
         return IMEI
     }
     }