From e5e9dcc7d02b7d7ca8d67f5083292c8e7129e346 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 19 十一月 2018 16:59:25 +0800
Subject: [PATCH] 4241 易接sdk
---
System/Login/LoginModel.cs | 23 ++++++++++++++++++-----
Core/SDK/SDKUtility.cs | 25 +++++++++++++++++++++++++
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index af62c1f..e4ed180 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -23,6 +23,7 @@
Mr = 2,// 鐚��
Sp = 3,// 鎬濈挒
Js = 4,// 鏋侀��
+ Yj = 5,// 鏄撴帴
}
public E_ChannelPlatform ChannelPlatform { get; set; }
@@ -355,6 +356,10 @@
{
ChannelPlatform = E_ChannelPlatform.Js;
}
+ else if (_channelPlatform.Equals("yj"))
+ {
+ ChannelPlatform = E_ChannelPlatform.Yj;
+ }
}
}
break;
@@ -590,6 +595,8 @@
public int accountID;
public string timeStamp;
public string sessionID;
+ public string yjAppId;
+ public string yjSdkId;
}
public struct FP_CheckIDAuthentication
@@ -695,6 +702,14 @@
else if (ChannelPlatform == E_ChannelPlatform.Sp)
{
m_PaymentTable["RechargeChannel"] = "2";
+ }
+ else if (ChannelPlatform == E_ChannelPlatform.Js)
+ {
+ m_PaymentTable["RechargeChannel"] = "3";
+ }
+ else if (ChannelPlatform == E_ChannelPlatform.Yj)
+ {
+ m_PaymentTable["RechargeChannel"] = "5";
}
var _stringBuilder = new System.Text.StringBuilder();
@@ -879,6 +894,16 @@
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;
}
diff --git a/System/Login/LoginModel.cs b/System/Login/LoginModel.cs
index f39eb69..fd7d856 100644
--- a/System/Login/LoginModel.cs
+++ b/System/Login/LoginModel.cs
@@ -16,7 +16,8 @@
public SDKUtility.FP_LoginOk sdkLoginResult;
public SDKUtility.FP_CheckIDAuthentication sdkIDCheckIDAuthentication;
- public string localSaveAccountName {
+ public string localSaveAccountName
+ {
get { return LocalSave.GetString(USER_ACCOUNT); }
set { LocalSave.SetString(USER_ACCOUNT, value); }
}
@@ -25,19 +26,22 @@
public event Action accountBindOkEvent;
bool m_ReconnecBackGround = false;
- public bool reconnectBackGround {
+ public bool reconnectBackGround
+ {
get { return m_ReconnecBackGround; }
set { m_ReconnecBackGround = value; }
}
bool m_OnCreateRole = false;
- public bool onCreateRole {
+ public bool onCreateRole
+ {
get { return m_OnCreateRole; }
set { m_OnCreateRole = value; }
}
bool m_Busy = false;
- public bool busy {
+ public bool busy
+ {
get { return m_Busy; }
set { m_Busy = value; }
}
@@ -297,12 +301,21 @@
send.IDType = 3;
send.Extra += ("|" + SDKUtility.Instance.FreePlatformInfo.sessionID);
send.ExtraLen = (byte)send.Extra.Length;
- }else if(SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Js)
+ }
+ else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Js)
{
send.IDType = 4;
send.Extra += ("|" + sdkLoginResult.token);
send.ExtraLen = (byte)send.Extra.Length;
}
+ else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yj)
+ {
+ send.IDType = 5;
+ send.Extra += ("|" + SDKUtility.Instance.FreePlatformInfo.yjSdkId + "|" +
+ SDKUtility.Instance.FreePlatformInfo.yjAppId + "|" +
+ SDKUtility.Instance.FreePlatformInfo.accountID);
+ send.ExtraLen = (byte)send.Extra.Length;
+ }
send.AccID = sdkLoginResult.account;
send.Password = sdkLoginResult.token;
send.MAC = DeviceUtility.GetMac();
--
Gitblit v1.8.0