4241 【前端】用易接SDK接入传统渠道

client_Hale

2018-11-22 c80be0d1e2781f37dfb9435e44ce2a64a49039ac

4241 【前端】用易接SDK接入传统渠道

# Conflicts:
#	System/ClientVersion/VersionUtility.cs

 Core/SDK/SDKUtility.cs

@@ -28,6 +28,16 @@


    public E_ChannelPlatform ChannelPlatform { get; set; }



    public static string Yj_AppID

    {

        get; private set;

    }



    public static string Yj_SpID

    {

        get; private set;

    }



    /// <summary>

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

    /// 客户端一般需要等待这个值为true才继续逻辑

@@ -98,6 +108,8 @@


    public void Init()

    {

        Yj_AppID = string.Empty;

        Yj_SpID = string.Empty;

        RegistrationID = string.Empty;

        AssetCopyFinished = false;

        ChannelPlatform = E_ChannelPlatform.Free;

@@ -402,9 +414,21 @@
                        else if (_channelPlatform.Equals("yj"))

                        {

                            ChannelPlatform = E_ChannelPlatform.Yj;



                        }

                    }

                }



                if (_dict.Contains("yj_appid"))

                {

                    Yj_AppID = _json["yj_appid"].ToString();

                }



                if (_dict.Contains("yj_spid"))

                {

                    Yj_SpID = _json["yj_spid"].ToString();

                }



                break;

            case CodeA2U.PushClientID:

                RegistrationID = _json["clientID"].ToString();

@@ -628,7 +652,6 @@
    public UnityAction onFreePlatformPayCancel;

    public UnityAction onFreePlatformBindOk;

    public UnityAction onFreePlatformBindFail;



    public class FP_LoginOk

    {

        public string account;

@@ -935,16 +958,6 @@
        if (_iDict.Contains("timeStamp"))

        {

            FreePlatformInfo.timeStamp = (string)json["timeStamp"];

        }



        if (_iDict.Contains("yjSdkId"))

        {

            FreePlatformInfo.yjSdkId = (string)json["yjSdkId"];

        }



        if (_iDict.Contains("yjAppId"))

        {

            FreePlatformInfo.yjAppId = (string)json["yjAppId"];

        }



        FreePlatformInfo.phone = 0;


 System/ClientVersion/VersionConfig.cs

@@ -13,10 +13,30 @@
    public const string VERSION_ALTERNATIVE = "1.2.0";



    [SerializeField] public string m_AppId = string.Empty;

    public string appId { get { return m_AppId; } }

    public string appId

    {

        get

        {

            if (!string.IsNullOrEmpty(SDKUtility.Yj_AppID))

            {

                return SDKUtility.Yj_AppID;

            }

            return m_AppId;

        }

    }



    [SerializeField] public string m_SpID = string.Empty;

    public string SpID { get { return m_SpID; } }

    public string SpID

    {

        get

        {

            if (!string.IsNullOrEmpty(SDKUtility.Yj_SpID))

            {

                return SDKUtility.Yj_SpID;

            }

            return m_SpID;

        }

    }



    [SerializeField] VersionAuthority m_VersionAuthority;

    public VersionAuthority versionAuthority { get { return m_VersionAuthority; } }

@@ -28,8 +48,10 @@
    public string clientPackageFlag { get { return m_ClientPackageFlag; } }



    [SerializeField] int m_Branch = 0;

    public int branch {

        get {

    public int branch

    {

        get

        {

            if (DebugUtility.Instance.debugAccount && DebugUtility.Instance.debugBranch >= 0)

            {

                return DebugUtility.Instance.debugBranch;

@@ -69,25 +91,29 @@
    public string appleDeveloperTeamID { get { return m_AppleDeveloperTeamID; } }



    [SerializeField] bool m_DebugVersion = false;

    public bool debugVersion {

    public bool debugVersion

    {

        get { return m_DebugVersion; }

        set { m_DebugVersion = value; }

    }



    [SerializeField] bool m_IsBanShu = false;

    public bool isBanShu {

    public bool isBanShu

    {

        get { return m_IsBanShu; }

        set { m_IsBanShu = value; }

    }



    [SerializeField] string m_BuildTime;

    public string buildTime {

    public string buildTime

    {

        get { return m_BuildTime; }

        set { m_BuildTime = value; }

    }



    [SerializeField] int m_BuildIndex;

    public int buildIndex {

    public int buildIndex

    {

        get { return m_BuildIndex; }

        set { m_BuildIndex = value; }

    }


 System/ClientVersion/VersionUtility.cs

@@ -33,9 +33,11 @@
    public bool completed { get { return step == Step.Completed; } }



    Step m_Step = Step.None;

    public Step step {

    public Step step

    {

        get { return m_Step; }

        private set {

        private set

        {

            if (m_Step != value)

            {

                m_Step = value;


 System/Login/LoginModel.cs

@@ -311,8 +311,8 @@
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yj)

                    {

                        send.IDType = 5;

                        send.Extra += ("|" + SDKUtility.Instance.FreePlatformInfo.yjSdkId + "|" +

                                       SDKUtility.Instance.FreePlatformInfo.yjAppId + "|" +

                        send.Extra += ("|" + SDKUtility.Yj_SpID + "|" +

                                       SDKUtility.Yj_AppID + "|" +

                                       SDKUtility.Instance.FreePlatformInfo.accountID);

                        send.ExtraLen = (byte)send.Extra.Length;

                    }