|
|
@@ -16,6 +16,7 @@ import com.adealink.frame.network.data.Res
|
|
|
import com.adealink.frame.router.Router
|
|
|
import com.adealink.frame.util.AppUtil
|
|
|
import com.adealink.frame.util.getSimMmc
|
|
|
+import com.adealink.tcturing.TCTuringManager
|
|
|
import com.adealink.weparty.App
|
|
|
import com.adealink.weparty.account.ban.banManager
|
|
|
import com.adealink.weparty.account.constant.AccountFBSelectError
|
|
|
@@ -227,6 +228,7 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
val isEmulator = App.instance.securityService.isEmulator()
|
|
|
val isVirtualApk = App.instance.securityService.isVirtualApk()
|
|
|
val appsflyerId = AttributionModule.getAppsFlyerUID()
|
|
|
+ val deviceToken = TCTuringManager.getDeviceToken()
|
|
|
var tidReq: Long? = null //用户登录tid
|
|
|
Log.i(TAG_ACCOUNT_LOGIN, "login, isVirtualApk:${isVirtualApk}, isEmulator${isEmulator}")
|
|
|
var loginReq = LoginReq(
|
|
|
@@ -243,7 +245,8 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
simMcc = getSimMmc(),
|
|
|
tid = tid,
|
|
|
inviterUidCode = inviteUidCode,
|
|
|
- shareScene = shareScene
|
|
|
+ shareScene = shareScene,
|
|
|
+ deviceToken = deviceToken
|
|
|
)
|
|
|
//判断一个fb账号是否关联两个账号
|
|
|
if (authType == ThirdType.FB && tid == null && token != "") {
|
|
|
@@ -299,6 +302,7 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
val isEmulator = App.instance.securityService.isEmulator()
|
|
|
val isVirtualApk = App.instance.securityService.isVirtualApk()
|
|
|
val appsflyerId = AttributionModule.getAppsFlyerUID()
|
|
|
+ val deviceToken = TCTuringManager.getDeviceToken()
|
|
|
val rlt = loginService.phoneLogin(
|
|
|
PhoneLoginReq(
|
|
|
phone,
|
|
|
@@ -309,7 +313,8 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
countryCode,
|
|
|
simulator = isEmulator,
|
|
|
virtualApk = isVirtualApk,
|
|
|
- appsflyerId = appsflyerId
|
|
|
+ appsflyerId = appsflyerId,
|
|
|
+ deviceToken = deviceToken
|
|
|
)
|
|
|
)
|
|
|
if (rlt is Rlt.Success) {
|
|
|
@@ -343,6 +348,7 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
val isEmulator = App.instance.securityService.isEmulator()
|
|
|
val isVirtualApk = App.instance.securityService.isVirtualApk()
|
|
|
val appsflyerId = AttributionModule.getAppsFlyerUID()
|
|
|
+ val deviceToken = TCTuringManager.getDeviceToken()
|
|
|
val rlt = loginService.phoneLogin(
|
|
|
PhoneLoginReq(
|
|
|
phone,
|
|
|
@@ -353,7 +359,8 @@ class LoginManager : BaseFrame<ILoginListener>(), ILoginManager {
|
|
|
countryCode,
|
|
|
simulator = isEmulator,
|
|
|
virtualApk = isVirtualApk,
|
|
|
- appsflyerId = appsflyerId
|
|
|
+ appsflyerId = appsflyerId,
|
|
|
+ deviceToken = deviceToken
|
|
|
)
|
|
|
)
|
|
|
if (rlt is Rlt.Success) {
|