From 935e65ca443ad59be576a829ba76a30b235ba858 Mon Sep 17 00:00:00 2001 From: liuxue <q3213421wrwqr> Date: 星期四, 29 四月 2021 19:03:51 +0800 Subject: [PATCH] 8918 【BTZF】9917平台接入专服增加快手SDK 修正6 --- Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java index aed6f2c..5552449 100644 --- a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java +++ b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java @@ -7,6 +7,7 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Process; import android.provider.Settings; @@ -41,24 +42,25 @@ m_MainContainer = (RelativeLayout) findViewById(R.id.main_container); String _brand = NotchPhoneUtil.getDeviceBrand(); - if (_brand.indexOf("vivo") >= 0) + if (_brand.toUpperCase().contains("VIVO")) { isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this); mType = 1; } - else if (_brand.indexOf("HUAWEI") >= 0) + else if (_brand.toUpperCase().contains("HUAWEI") + || _brand.toUpperCase().contains("HONOR")) { - isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this); - mType = 2; +// isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);; +// mType = 2; } - else if (_brand.indexOf("OPPO") >= 0) + else if (_brand.toUpperCase().contains("OPPO")) { - isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this); + isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this); mType = 3; } - else if (_brand.indexOf("Xiaomi") >= 0) + else if (_brand.toUpperCase().contains("XIAOMI")) { - isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this); + isNotch = NotchPhoneUtil.HasNotchXiaoMi(); mType = 4; } -- Gitblit v1.8.0