Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 Core/SDK/SDKUtility.cs

@@ -25,7 +25,7 @@
        Js = 4,// 极速

    }



    public E_ChannelPlatform ChannelPlatform { get;  set; }

    public E_ChannelPlatform ChannelPlatform { get; set; }



    /// <summary>

    /// sdk初始化是否完成标识

@@ -71,6 +71,8 @@
    /// </summary>

    public UnityAction<NetworkReachability> OnNetworkStatusChanged;



    public static bool builtinAssetCopyFinished { get; private set; }



    /// <summary>

    /// 是否已经将StreamingAsset拷贝至目标路径

    /// </summary>

@@ -104,8 +106,27 @@
        {

            return;

        }



#if UNITY_ANDROID

        var builtinAssetsCopyFinishVersion = LocalSave.GetString("BuiltInAssetCopyCompleted_Android");

        if (string.IsNullOrEmpty(builtinAssetsCopyFinishVersion))

        {

            builtinAssetCopyFinished = false;

        }

        else

        {

            builtinAssetCopyFinished = VersionConfig.Get().version == builtinAssetsCopyFinishVersion;

        }

#endif

#if UNITY_IOS

        var builtinAssetsCopyFinishVersion = LocalSave.GetString("BuiltInAssetCopyCompleted_IOS");

        if (string.IsNullOrEmpty(builtinAssetsCopyFinishVersion))

        {

            builtinAssetCopyFinished = false;

        }

        else

        {

            builtinAssetCopyFinished = VersionConfig.Get().version == builtinAssetsCopyFinishVersion;

        }



        var assetsCopyFinishVersion = LocalSave.GetString("AssetCopyCompleted_IOS");

        if (string.IsNullOrEmpty(assetsCopyFinishVersion))

@@ -185,6 +206,14 @@
        }

        m_Json.Clear();

        m_Json["code"] = CodeU2A.AssetCopy;

        SendMessageToSDK(m_Json);

    }



    public void CopyOneAsset(string relationPath)

    {

        m_Json.Clear();

        m_Json["code"] = CodeU2A.CopyOneAsset;

        m_Json["fileName"] = relationPath;

        SendMessageToSDK(m_Json);

    }



@@ -498,6 +527,7 @@
         * 外部存储根目录地址

         */

        public const int ExteneralStorage = 11;

        public const int CopyOneAsset = 12;

        /**

         * 自由sdk相关

         * */