From ec282d9bf134fbda578ff901e4a620222a851d3f Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 20 十一月 2024 10:14:46 +0800
Subject: [PATCH] fix bug

---
 app/src/main/java/com/sinata/xqmuse/ui/login/LoginActivity.kt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/sinata/xqmuse/ui/login/LoginActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/login/LoginActivity.kt
index d3bc1a0..1531acc 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/login/LoginActivity.kt
@@ -52,6 +52,10 @@
     private var user = ""
     private var privacy = ""
 
+    private val device by lazy {
+        Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+    }
+
     @SuppressLint("CheckResult")
     override fun initClick() {
         cb_pwd.setOnClickListener {
@@ -219,7 +223,7 @@
         }
 
         tv_action.isEnabled = false
-        HttpManager.captchaLogin(code, et_phone.text.toString())
+        HttpManager.captchaLogin(device,code, et_phone.text.toString())
             .request(this, success = { _, data ->
                 data?.let {
                     loginSuccess(it.accessToken)
@@ -259,7 +263,7 @@
         val avatar = p2?.get("profile_image_url")
         val gender = p2?.get("gender")
         val nickname = p2?.get("name")
-        HttpManager.wxLogin(openid, nickname,if (gender == "0") 1 else 2,avatar).request(this,false,{ _, data ->
+        HttpManager.wxLogin(device,openid, nickname,if (gender == "0") 1 else 2,avatar).request(this,false,{ _, data ->
             data?.let {
                 if (it.bindStatus ==1){
                     startActivityForResult<BindPhoneActivity>(200,"token" to it.accessToken,"openid" to openid)

--
Gitblit v1.7.1