Fixed 修改AndroidSDK差异化加载逻辑

client_Hale

2018-08-23 0ce6e3caf3444fb9d306ee8ba9eb55351e6ba9b6

Fixed 修改AndroidSDK差异化加载逻辑

 Assets/Editor/Tool/ClientPackage.cs

@@ -1,30 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
using UnityEditor;
using System.IO;
using System.Text.RegularExpressions;
using System.Text;
using TableConfig;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using System;

using UnityEditor;

using System.IO;

using System.Text.RegularExpressions;

using System.Text;

using TableConfig;



public class ClientPackage

{
    public static readonly string versionsFilePath = Application.dataPath + Path.DirectorySeparatorChar + "Editor/VersionConfigs/Versions.txt";
{

    public static readonly string versionsFilePath = Application.dataPath + Path.DirectorySeparatorChar + "Editor/VersionConfigs/Versions.txt";

    public static readonly string[] baseLevels = new string[] { "Assets/Resources/Scenes/Launch.unity", "Assets/Resources/Scenes/Empty.unity" };



    public static string SDK_PLUGIN_PROJECT {

        get { return LocalSave.GetString("SDK_PROJECT_PATH"); }

        set { LocalSave.SetString("SDK_PROJECT_PATH", value); }

    }

    static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";

    }



    static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";



    static int packageIndex {

        get { return LocalSave.GetInt("ClientPackageIndex", 1); }

        set { LocalSave.SetInt("ClientPackageIndex", value); }

    }

    }



    public static void BuildPublishers(string _sdkPath, string _assetBundlePath, string _output, string _publisherString, bool _development, bool _replace)

    {

        var publisherIds = new List<string>();

@@ -49,7 +49,7 @@
                    }

                    break;

            }

        }
        }



        var smallPackages = new List<string>();

        var halfPackages = new List<string>();

@@ -198,7 +198,7 @@


        packageIndex++;

    }




    public static void BuildApk(string _sdkPath, string _output, string _publisher, bool _development)

    {

        PreBuild(_publisher);

@@ -235,12 +235,12 @@
            Directory.Delete(ANDROID_PLUGIN_PATH, true);

        }



        Debug.LogFormat("执行Android SDK 文件拷贝，from:{0};to:{1}", StringUtility.Contact(_sdkPath, "/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);

        FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);
        Debug.LogFormat("执行Android SDK 文件拷贝，from:{0};to:{1}", StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);

        FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);

        if (!versionConfig.appId.Equals("test"))

        {

            FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/渠道差异/", versionConfig.productName), ANDROID_PLUGIN_PATH);

        }
            FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/ChannelDiff/", versionConfig.appId), ANDROID_PLUGIN_PATH);

        } 
        AssetDatabase.SaveAssets();

        AssetDatabase.Refresh();



@@ -255,8 +255,8 @@
            var apkName = StringUtility.Contact(_output, "/", versionName, "_", versionConfig.clientPackageFlag, "_v", versionConfig.m_Version, "_", index, ".apk");

            BuildPipeline.BuildPlayer(baseLevels, apkName, BuildTarget.Android, BuildOptions.None);

        }

    }

    }



    public static void BuildIpa(string _publisher, bool _replace)

    {

        PreBuild(_publisher);

@@ -271,8 +271,8 @@
        {

            XCodeProjectMod.BuildIOSProject_Append();

        }

    }

    }



    private static void PreBuild(string _publisher)

    {

        try

@@ -323,8 +323,8 @@
            AssetDatabase.Refresh();

        }



    }

    }



    static VersionConfig GetVersionConfig(string _publisher, out string _versionName)

    {

        var lines = File.ReadAllLines(versionsFilePath);

@@ -344,8 +344,8 @@


        _versionName = string.Empty;

        return null;

    }

    }



    static void SetIconAndSplashImage(string _versionName)

    {

        var buildTarget = GetBuildTarget();

@@ -415,8 +415,8 @@
            EditorUtility.SetDirty(textureImporter);

        }



    }

    }



    static BuildTargetGroup GetBuildTarget()

    {

#if UNITY_ANDROID

@@ -426,6 +426,6 @@
#else

        return BuildTargetGroup.Standalone;

#endif

    }

}
    }



}