增加设备号字段

usercenter/src/main/java/com/cooleshow/usercenter/presenter/LoginPresenter.kt

@@ -1,12 +1,9 @@
 package com.cooleshow.usercenter.presenter
 
 import com.cooleshow.base.constanst.Constants
-import com.cooleshow.base.data.net.ApiException
 import com.cooleshow.base.presenter.BasePresenter
 import com.cooleshow.base.rx.BaseObserver
-import com.cooleshow.base.utils.ErrorParse
-import com.cooleshow.base.utils.ToastUtil
-import com.cooleshow.base.utils.ToastUtils
+import com.cooleshow.base.utils.DeviceUtils
 import com.cooleshow.usercenter.bean.UserLoginInfo
 import com.cooleshow.usercenter.data.api.UserApi
 import com.cooleshow.usercenter.presenter.contract.LoginContract
@@ -25,6 +22,7 @@ class LoginPresenter constructor() : BasePresenter<LoginContract.LoginView>(),
         params["clientSecret"] = Constants.CLIENT
         params["username"] = mobile
         params["password"] = pwd
+        params["deviceNum"] = DeviceUtils.getAndroidID()
         addSubscribe(create(UserApi::class.java).login(params),
             object : BaseObserver<UserLoginInfo>(view) {
                 override fun onSuccess(data: UserLoginInfo) {

usercenter/src/main/java/com/cooleshow/usercenter/presenter/VerifyLoginPresenter.java

@@ -5,6 +5,8 @@ import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.DeviceUtil;
+import com.cooleshow.base.utils.DeviceUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
@@ -114,6 +116,7 @@ public class VerifyLoginPresenter extends BasePresenter<VerifyLoginContract.Veri
         maps.put("phone", mobile);
         maps.put("smsCode", code);
         maps.put("isSurportRegister", "true");
+        maps.put("deviceNum", DeviceUtils.getAndroidID());
         addSubscribe(create(UserApi.class).loginByCode(maps), new BaseObserver<UserLoginInfo>(getView()) {
             @Override
             protected void onSuccess(UserLoginInfo data) {

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeLoginActivity.java

@@ -21,6 +21,7 @@ import com.cooleshow.base.data.net.CommonParamsHelper;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.DeviceUtils;
 import com.cooleshow.base.utils.PhoneUtils;
 import com.cooleshow.base.utils.SpannableStringUtils;
 import com.cooleshow.base.utils.ToastUtil;
@@ -47,6 +48,7 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
     public static final int TEACHER_ITEM = 1;
     public static final int STUDENT_ITEM = 2;
     private String mExtra;
+    private int onDeviceClickNum = 0;//用于显示设备号
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -69,6 +71,7 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
         }
         viewBinding.tvSendVerifyCode.setOnClickListener(this);
         viewBinding.tvLoginByCode.setOnClickListener(this);
+        viewBinding.viewDeviceView.setOnClickListener(this);
         mExtra = getIntent().getStringExtra(Constants.COMMON_EXTRA_KEY);
         String phoneNum = getIntent().getStringExtra(UserConstants.PHONE_NUM_KEY);
         if (!TextUtils.isEmpty(phoneNum)) {
@@ -122,6 +125,16 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
                         .withString(VerifyCodeInputActivity.TARGET_PHONE, phone)
                         .navigation(this, LOGIN_STATUS_REQUEST_CODE);
             }
+            return;
+        }
+        if (v.getId() == R.id.view_device_view) {
+            onDeviceClickNum++;
+            if (onDeviceClickNum >= 5) {
+                viewBinding.tvDevice.setVisibility(View.VISIBLE);
+                viewBinding.tvDevice.setText("本机设备号为：" + DeviceUtils.getAndroidID());
+                onDeviceClickNum = 0;
+            }
+            return;
         }
     }
 

usercenter/src/main/res/layout/activity_verify_code_login.xml

@@ -155,6 +155,25 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
+    <TextView
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@+id/cb_privacy"
+        android:layout_marginTop="20dp"
+        tools:text="您的设备号:19291289128"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:textColor="@color/color_666666"
+        android:textSize="@dimen/sp_14"
+        android:id="@+id/tv_device"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:id="@+id/view_device_view"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="100dp"
+        android:layout_height="100dp"/>
     <!--    <TextView-->
     <!--        android:id="@+id/mForgetPwdTv"-->
     <!--        style="@style/WrapWrap"-->