Explorar el Código

兼容新的卡尔8寸固件,增加开机启动后自动检测升级

weizhengliang hace 2 años
padre
commit
c7e332ea32

+ 11 - 3
home/src/main/code/com/wdkl/ncs/android/component/home/activity/HomeActivity.kt

@@ -256,6 +256,8 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
 
         if ("KT10-3F".equals(Build.MODEL, true) || "KT10-2F".equals(Build.MODEL, true) || "KT8001-2F".equals(Build.MODEL, true)) {
             Constants.imei = NetHelper.getInstance().macAddress
+        } else if ("KT8001_2C".equals(Build.MODEL, true)) {
+            Constants.imei = NetHelper.getInstance().imeI2
         } else {
             Constants.imei = NetHelper.getInstance().imei
         }
@@ -445,6 +447,8 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
             if (Build.BOARD.equals("k37mv1_64_bsp") || Build.MODEL.equals("KT10-3F")) {
                 StatusBarHelper.toggleStatusBar(activity, false)
             }
+
+            startCheckUpdate()
         } catch (e: java.lang.Exception) {
             showMessage("设备数据异常:" + e.message)
         }
@@ -539,9 +543,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
                 if (System.currentTimeMillis() / 1000 - updateLastTime > 10) {
                     showMessage("检查新版本")
                     updateLastTime = System.currentTimeMillis() / 1000
-                    val intent = Intent()
-                    intent.setClass(this, AppUpdateActivity::class.java)
-                    startActivity(intent)
+                    startCheckUpdate()
                 } else {
                     showMessage("请10秒后再尝试")
                 }
@@ -581,6 +583,12 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
         }
     }
 
+    private fun startCheckUpdate() {
+        val intent = Intent()
+        intent.setClass(this, AppUpdateActivity::class.java)
+        startActivity(intent)
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
         if (messageEvent.tag == Constants.BACK_TO_MAIN_MSG) {

+ 24 - 0
home/src/main/code/com/wdkl/ncs/android/component/home/util/NetHelper.java

@@ -471,6 +471,30 @@ public class NetHelper {
         return serial;
     }
 
+    public String getIMEI2() {
+        String serial = "null";
+        try {
+            final TelephonyManager mTelephony = (TelephonyManager) BaseApplication.appContext.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (BaseApplication.appContext.getApplicationContext().checkSelfPermission(Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+                    return serial;
+                }
+            }
+
+            assert mTelephony != null;
+            if (mTelephony.getDeviceId() != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    serial = mTelephony.getImei();
+                } else {
+                    serial = mTelephony.getDeviceId();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return serial;
+    }
+
 
     /**
      * 根据IP地址获取MAC地址