1.去掉账号密码登陆方式

.idea/misc.xml

@@ -555,7 +555,7 @@
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/activity_video_player.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/dialog_game_tasks.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/layout/item_live_broadcast.xml" value="0.6" />
-        <entry key="..\:/workspace/hcp-pads/login/src/main/res/layout/activity_login.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/login/src/main/res/layout/activity_login.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_common_head_layout.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_comprehensive_evaluation.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_diagnosis.xml" value="0.151" />

baselib/src/main/java/com/yingyangfly/baselib/utils/CommonParam.kt

@@ -5,7 +5,6 @@ object CommonParam {
     val PHONE = "phone"
     val AVATAR = "avatar"
     val NAME = "name"
-    val PASSWORD = "password"
     val ID = "id"
     val TASKDIALOG = "taskDialog"
     val VOICETOKEN = "voice_token"

baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -26,21 +26,6 @@ object User {
         }
     }
 
-    /**
-     * 保存用户登陆密码
-     */
-    fun savePassword(password: String) {
-        Preferences.put(CommonParam.PASSWORD, password)
-    }
-
-    fun getPassword(): String {
-        return if (Preferences.getString(CommonParam.PASSWORD).isNullOrEmpty()) {
-            ""
-        } else {
-            Preferences.getString(CommonParam.PASSWORD)!!
-        }
-    }
-
     /**
      * 保存用户token
      */

login/src/main/java/com/yingyang/login/service/InitService.kt

@@ -9,17 +9,12 @@ import android.os.Build
 import android.os.IBinder
 import android.text.TextUtils
 import android.util.Log
-import com.alibaba.android.arouter.launcher.ARouter
 import com.tencent.imsdk.v2.V2TIMCallback
 import com.tencent.imsdk.v2.V2TIMManager
-import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.net.BaseObserver
 import com.yingyangfly.baselib.net.BaselibServiceFactory
-import com.yingyangfly.baselib.net.MyRxScheduler
-import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.NetWorkUtils
 import com.yingyangfly.baselib.utils.User
-import io.reactivex.schedulers.Schedulers
 
 class InitService : Service() {
 

login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -2,18 +2,14 @@ package com.yingyang.login.ui.login
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.Typeface
 import android.os.Build
-import android.text.InputType
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ForegroundColorSpan
 import android.view.MotionEvent
 import android.view.View
-import android.widget.TextView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
-import com.google.android.material.tabs.TabLayout
 import com.yingyang.login.R
 import com.yingyang.login.databinding.ActivityLoginBinding
 import com.yingyang.login.service.InitService
@@ -30,36 +26,15 @@ import com.yingyangfly.baselib.utils.User
  */
 @Route(path = RouterUrlCommon.login)
 class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
-    View.OnTouchListener, TabLayout.OnTabSelectedListener {
+    View.OnTouchListener {
 
-    private var tabTitles = mutableListOf("账号登录", "手机号登录")
+    private var tabTitles = mutableListOf("手机号登录")
     private var loginType = 0
     private lateinit var rxTimer: RxTimer
 
     override fun initViews() {
         rxTimer = RxTimer()
-        initTabLayout()
-    }
 
-    @SuppressLint("InflateParams")
-    private fun initTabLayout() {
-        for (position in tabTitles.indices) {
-            val doc = tabTitles[position]
-            val view = layoutInflater.inflate(R.layout.layout_tab_view, null)
-            val tab = binding.tabTitle.newTab()
-            view as TextView
-            if (position == 0) {
-                view.text = doc
-            } else {
-                view.text = doc
-            }
-            if (position == 0) {
-                view.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
-            }
-            tab.customView = view
-            hideToolTipText(tab)
-            binding.tabTitle.addTab(tab)
-        }
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -67,26 +42,9 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
         binding {
             login.setOnTouchListener(this@LoginActivity)
             tvCode.setOnTouchListener(this@LoginActivity)
-            tabTitle.addOnTabSelectedListener(this@LoginActivity)
         }
     }
 
-    /**
-     * 非空验证
-     */
-    private fun judgeByAccount(): Boolean {
-        if (binding.username.text.toString().trim().isEmpty()) {
-            "请输入用户名".toast()
-            return false
-        }
-        if (binding.username.text.toString().trim().isEmpty()) {
-            "请输入密码".toast()
-            return false
-        }
-        return true
-    }
-
-
     /**
      * 非空验证
      */
@@ -137,34 +95,11 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
             })
     }
 
-    /**
-     * 用户登录
-     */
-    private fun loginByAccount() {
-        viewModel.login(
-            binding.username.text.toString().trim(),
-            binding.password.text.toString().trim(),
-            fail = {
-                it.toast()
-            },
-            success = {
-                if (it != null) {
-                    User.savePhone(binding.username.text.toString().trim())
-                    User.savePassword(binding.password.text.toString().trim())
-                    User.saveToken(it)
-                    getUserInfo()
-                }
-            })
-    }
-
     override fun onResume() {
         super.onResume()
         if (User.getPhone().isEmpty().not()) {
             binding.username.setText(User.getPhone())
         }
-        if (User.getPassword().isEmpty().not()) {
-            binding.password.setText(User.getPassword())
-        }
     }
 
     /**
@@ -212,14 +147,8 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 if (v.id == R.id.login) {
-                    if (loginType == 0) {
-                        if (judgeByAccount()) {
-                            loginByAccount()
-                        }
-                    } else {
-                        if (judgeByCode()) {
-                            loginMsg()
-                        }
+                    if (judgeByCode()) {
+                        loginMsg()
                     }
                 } else if (v.id == R.id.tvCode) {
                     if (judgeFormCode()) {
@@ -260,7 +189,7 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
                 rxTimer.cancel()
                 binding.tvCode.text = "重新发送"
                 binding.tvCode.isClickable = true
-            } else{
+            } else {
                 binding.tvCode.text = setTvSendColor("重新发送(${time - 1 - it}s)")
             }
         }
@@ -278,69 +207,6 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>(),
         return spannableString
     }
 
-    /**
-     * 隐藏长按显示文本
-     */
-    private fun hideToolTipText(tab: TabLayout.Tab) {
-        // 取消长按事件
-        tab.view.isLongClickable = false
-        // api 26 以上 设置空text
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
-            tab.view.tooltipText = ""
-        }
-    }
-
-    @SuppressLint("CutPasteId")
-    override fun onTabSelected(tab: TabLayout.Tab?) {
-        tab?.customView?.findViewById<TextView>(R.id.tv_tab)?.isSelected = true
-        val tv: TextView? = tab?.customView?.findViewById(R.id.tv_tab)
-        tv?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
-        tv?.invalidate()
-        val index = tab?.position ?: 0
-        loginType = index
-        if (index == 0) {
-            binding {
-                password.post {
-                    username.hint = "请输入用户名"
-                    password.hint = "请输入密码"
-                    password.inputType =
-                        InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
-                    if (password.text.toString().trim().isNotEmpty()) {
-                        password.setSelection(password.text.toString().trim().length)
-                    }
-                    tvCode.clearAnimation()
-                    tvCode.visibility = View.GONE
-                }
-            }
-        } else {
-            binding {
-                password.post {
-                    username.hint = "请输入手机号"
-                    password.hint = "请输入验证码"
-                    password.inputType =
-                        InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD or InputType.TYPE_CLASS_NUMBER
-                    if (password.text.toString().trim().isNotEmpty()) {
-                        password.setSelection(password.text.toString().trim().length)
-                    }
-                    tvCode.visibility = View.VISIBLE
-                }
-            }
-
-        }
-        tab?.customView?.findViewById<TextView>(R.id.tv_tab)?.isSelected = false
-    }
-
-    @SuppressLint("CutPasteId")
-    override fun onTabUnselected(tab: TabLayout.Tab?) {
-        tab?.customView?.findViewById<TextView>(R.id.tv_tab)?.isSelected = false
-        val tv: TextView? = tab?.customView?.findViewById(R.id.tv_tab)
-        tv?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-        tv?.invalidate()
-    }
-
-    override fun onTabReselected(tab: TabLayout.Tab?) {
-    }
-
     override fun onDestroy() {
         rxTimer.cancel()
         super.onDestroy()

login/src/main/res/layout/activity_login.xml

@@ -25,10 +25,10 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/appImage"
-                android:layout_width="@dimen/divider_330px"
-                android:layout_height="@dimen/divider_350px"
-                android:layout_marginTop="@dimen/divider_218px"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:background="@mipmap/icon_login"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -36,7 +36,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/divider_55px"
+                android:layout_marginTop="@dimen/divider_20px"
                 android:text="@string/future_dolphin_awareness_platform"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_32px"
@@ -58,20 +58,20 @@
             app:layout_constraintStart_toEndOf="@id/imageLayout"
             app:layout_constraintTop_toTopOf="parent">
 
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabTitle"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_215px"
+                android:paddingStart="@dimen/divider_71px"
+                android:paddingEnd="@dimen/divider_71px"
+                android:text="@string/account_phone"
+                android:textColor="@color/color_FF343434"
+                android:textSize="@dimen/divider_42px"
+                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tabIndicator="@drawable/bg_underline"
-                app:tabIndicatorColor="@color/color_FF4A76FF"
-                app:tabMode="auto"
-                app:tabSelectedTextColor="@color/color_FF343434"
-                app:tabTextAppearance="@style/MyTabLayout"
-                app:tabTextColor="@color/color_FF343434" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/username"
@@ -90,7 +90,7 @@
                 android:textSize="@dimen/divider_28px"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tabTitle" />
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
             <LinearLayout
                 android:id="@+id/passwordLayout"
@@ -111,7 +111,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@null"
-                    android:hint="@string/prompt_password"
+                    android:hint="@string/prompt_verification_code"
                     android:inputType="textPassword"
                     android:paddingStart="@dimen/divider_21px"
                     android:paddingEnd="@dimen/divider_21px"
@@ -128,8 +128,7 @@
                     android:paddingEnd="@dimen/divider_20px"
                     android:text="@string/get_verification_code"
                     android:textColor="@color/color_FF4A76FF"
-                    android:textSize="@dimen/divider_24px"
-                    android:visibility="gone" />
+                    android:textSize="@dimen/divider_24px" />
 
             </LinearLayout>
 

login/src/main/res/values/strings.xml

@@ -2,6 +2,7 @@
     <!-- Strings related to login -->
     <string name="prompt_email" tools:ignore="ResourceName">请输入用户名</string>
     <string name="prompt_password" tools:ignore="ResourceName">请输入密码</string>
+    <string name="prompt_verification_code" tools:ignore="ResourceName">请输入验证码</string>
     <string name="action_sign_in" tools:ignore="ResourceName">登录</string>
     <string name="account_login" tools:ignore="ResourceName">账号登录</string>
     <string name="account_phone" tools:ignore="ResourceName">手机号登录</string>