Fixed AndroidSDK针对刘海屏适配修改

client_Hale

2018-09-30 c1317cc4eb6f3fbabae40253aae92af93c669b1a

Fixed AndroidSDK针对刘海屏适配修改

 ChannelDiff/Android/226114725/AndroidManifest.xml

@@ -243,13 +243,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar

Binary files differ

 ChannelDiff/Android/813015059/AndroidManifest.xml

@@ -243,13 +243,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar

Binary files differ

 ChannelDiff/Android/815035853/AndroidManifest.xml

@@ -243,13 +243,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar

Binary files differ

 ChannelDiff/Android/822055139/AndroidManifest.xml

@@ -254,13 +254,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar

Binary files differ

 ChannelDiff/Android/mrgame/AndroidManifest.xml

@@ -238,13 +238,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar

Binary files differ

 ChannelDiff/Android/spxjgame/AndroidManifest.xml

@@ -254,13 +254,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar

Binary files differ

 Project/app/src/main/AndroidManifest.xml

@@ -43,13 +43,13 @@
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />

        <meta-data
            android:name="android.notch_support"
            android:value="true" />
        <!--<meta-data-->
            <!--android:name="android.notch_support"-->
            <!--android:value="true" />-->

        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />

        <meta-data
            android:name="android.vendor.full_screen"

 Project/app/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;
        }


 Project/js_sdk/src/main/AndroidManifest.xml

@@ -43,13 +43,13 @@
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />

        <meta-data
            android:name="android.notch_support"
            android:value="true" />
        <!--<meta-data-->
            <!--android:name="android.notch_support"-->
            <!--android:value="true" />-->

        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />

        <meta-data
            android:name="android.vendor.full_screen"

 Project/js_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;
        }


 Project/mr_sdk/src/main/AndroidManifest.xml

@@ -43,13 +43,13 @@
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />

        <meta-data
            android:name="android.notch_support"
            android:value="true" />
        <!--<meta-data-->
            <!--android:name="android.notch_support"-->
            <!--android:value="true" />-->

        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />

        <meta-data
            android:name="android.vendor.full_screen"

 Project/mr_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,22 +42,23 @@
        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.hasNotchAtHuawei(MainActivity.this);
            mType = 2;
//            isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);;
//            mType = 2;
        }
        else if (_brand.indexOf("OPPO") >= 0)
        else if (_brand.toUpperCase().contains("OPPO"))
        {
            isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this);
            mType = 3;
        }
        else if (_brand.indexOf("Xiaomi") >= 0)
        else if (_brand.toUpperCase().contains("XIAOMI"))
        {
            isNotch = NotchPhoneUtil.HasNotchXiaoMi();
            mType = 4;

 Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java

@@ -197,7 +197,6 @@
                        lphuawei.leftMargin = 0;
                        lphuawei.rightMargin = 0;
                        viewGroup.setLayoutParams(lphuawei);

                        break;
                    case 3:  //OPPO  目前都为 80px
                        FrameLayout.LayoutParams lpOppo = (FrameLayout.LayoutParams) viewGroup.getLayoutParams();
@@ -205,8 +204,6 @@
                        lpOppo.leftMargin = 0;
                        lpOppo.rightMargin = 0;
                        viewGroup.setLayoutParams(lpOppo);


                        break;
                    case 4:  //Xiaomi
                        int sizeAtXiaomi = NotchPhoneUtil.getStatusBarHeight(activity);
@@ -215,7 +212,6 @@
                        lpXiaomi.leftMargin = 0;
                        lpXiaomi.rightMargin = 0;
                        viewGroup.setLayoutParams(lpXiaomi);

                        break;
                }


 Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java

@@ -24,6 +24,7 @@

import com.unity3d.player.UnityPlayer;

import org.json.JSONException;
import org.json.JSONObject;

import java.io.BufferedReader;
@@ -81,6 +82,22 @@

        JSONObject _jsonObject = new JSONObject(jsonMap);

        UnityPlayer.UnitySendMessage(StaticDefine.UnityGameObjectName,
                                     StaticDefine.UnityHandleFuncName,
                                     _jsonObject.toString());
    }

    public static void sendDebugLogToUnity(String content)
    {
        JSONObject _jsonObject = new JSONObject();
        try
        {
            _jsonObject.put("code", 6);
            _jsonObject.put("info", content);
        } catch (JSONException e)
        {
            e.printStackTrace();
        }
        UnityPlayer.UnitySendMessage(StaticDefine.UnityGameObjectName,
                                     StaticDefine.UnityHandleFuncName,
                                     _jsonObject.toString());
@@ -389,13 +406,20 @@
        return -1;
    }

    public static boolean isEmpty(String s) {
    public static boolean isEmpty(String s)
    {
        if (null == s)
        {
            return true;
        }
        if (s.length() == 0)
        {
            return true;
        }
        if (s.trim().length() == 0)
        {
            return true;
        }
        return false;
    }
}

 Project/sp_sdk/src/main/AndroidManifest.xml

@@ -43,13 +43,13 @@
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />

        <meta-data
            android:name="android.notch_support"
            android:value="true" />
        <!--<meta-data-->
            <!--android:name="android.notch_support"-->
            <!--android:value="true" />-->

        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />

        <meta-data
            android:name="android.vendor.full_screen"

 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;
        }