Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-21 5eccb41335402ee7e97ca68ee4b6555cf3411cb9

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/SDK/SDKUtility.cs

@@ -262,19 +262,6 @@
#endif

    }



    public string GetPackageFlag()

    {

        switch (Application.platform)

        {

            case RuntimePlatform.Android:

                return "flag";//自由星河平台需要返回一个固定值，定了告诉智荣，其他平台返回java获取的一个值

            case RuntimePlatform.IPhonePlayer:

                return "ios";//ios平台固定返回ios

            default:

                return string.Empty;

        }

    }



    #endregion



    #region 处理与SDK交互的底层方法

@@ -292,33 +279,44 @@


    public string GetSplicePackageID()

    {

        string _result = null;

#if UNITY_ANDROID

        if (ChannelPlatform == E_ChannelPlatform.Sp)

        var _result = "default";

        switch (Application.platform)

        {

            using (AndroidJavaClass _jc = new AndroidJavaClass("com.sp.sdk.utils.SDKManagerUtils"))

            {

                using (AndroidJavaObject _jo = _jc.CallStatic<AndroidJavaObject>("getAssetPropConfig", GetApplicationContext(), "plugin_config.properties"))

            case RuntimePlatform.Android:

                if (ChannelPlatform == E_ChannelPlatform.Sp)

                {

                    _result = _jo.Call<string>("get", "game_id");

                    using (AndroidJavaClass _jc = new AndroidJavaClass("com.sp.sdk.utils.SDKManagerUtils"))

                    {

                        using (AndroidJavaObject _jo = _jc.CallStatic<AndroidJavaObject>("getAssetPropConfig", GetApplicationContext(), "plugin_config.properties"))

                        {

                            _result = _jo.Call<string>("get", "game_id");

                        }

                    }

                }

            }

                else if (ChannelPlatform == E_ChannelPlatform.Mr)

                {

                    using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

                    {

                        _result = _jc.CallStatic<string>("getMetaString", "Mr_GAME_ID");

                    }

                }

                else if (ChannelPlatform == E_ChannelPlatform.Js)

                {

                    using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

                    {

                        _result = _jc.CallStatic<string>("getMetaString", "LL_APPID");

                    }

                }

                else

                {

                    _result = "freeplatform";

                }

                break;

            case RuntimePlatform.IPhonePlayer:

                _result = "ios";//ios平台固定返回ios

                break;

        }

        else if (ChannelPlatform == E_ChannelPlatform.Mr)

        {

            using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

            {

                _result = _jc.CallStatic<string>("getMetaString", "Mr_GAME_ID");

            }

        }

        else if (ChannelPlatform == E_ChannelPlatform.Js)

        {

            using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

            {

                _result = _jc.CallStatic<string>("getMetaString", "LL_APPID");

            }

        }

#endif



        return _result;

    }




 System/ClientVersion/VersionUtility.cs

@@ -22,7 +22,6 @@


    public string androidRoot { get { return StringUtility.Contact(SDKUtility.Instance.DeviceRootPath, "/", VersionConfig.Get().bundleIdentifier); } }





    public float progress {

        get { return RemoteFile.TotalDownloadedSize / ((float)GetApkSize() * 1024); }

    }

@@ -113,7 +112,7 @@
        {

            var lines = _result.Split(new string[] { FileExtersion.lineSplit }, StringSplitOptions.RemoveEmptyEntries);

            apkDownUrls.Clear();

            for (int i = 0; i < lines.Length; i++)

            for (int i = 3; i < lines.Length; i++)

            {

                var apkDownUrl = new ApkDownUrl(lines[i]);

                apkDownUrls[apkDownUrl.flag] = apkDownUrl;

@@ -206,7 +205,7 @@
        }

        else

        {

            var flag = SDKUtility.Instance.GetPackageFlag();

            var flag = SDKUtility.Instance.GetSplicePackageID();

            if (apkDownUrls.ContainsKey(flag))

            {

                return apkDownUrls[flag].url;

@@ -231,7 +230,7 @@
        }

        else

        {

            var flag = SDKUtility.Instance.GetPackageFlag();

            var flag = SDKUtility.Instance.GetSplicePackageID();

            if (apkDownUrls.ContainsKey(flag))

            {

                return apkDownUrls[flag].size;