merge

config.gradle

@@ -50,7 +50,7 @@ ext {
             "m-fm"            : "0.0.15",
             "m-muse"          : "0.0.11",
             "m-tests"         : "0.0.10",
-            "m-user"          : "0.0.30",
+            "m-user"          : "0.0.31",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.1",

m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt

@@ -127,7 +127,7 @@ class ConsultAssistantDialogUtils private constructor() {
             object : ConsultAssistantDialog.OnConsultAssistantClickListener {
                 override fun onClickAction() {
                     // 咨询师列表页面且未登录情况下，跳转登录页面
-                    if (expertSearchPageHasShown && !ConsultantIn.isLogin()) {
+                    if (!ConsultantIn.isLogin()) {
                         ConsultantIn.toLogin(activity)
                     } else {
                         //获取用户uid
@@ -151,10 +151,12 @@ class ConsultAssistantDialogUtils private constructor() {
      * 咨询师列表页面使用的重置本单例关于专家咨询列表页面得状态
      */
     fun resetStatus() {
+        consultAssistantDialogFromHomePage?.dismiss()
         consultAssistantDialog?.dismiss()
         timer?.cancel()
         timer = null
         expertSearchPageHasShown = false
+        consultAssistantDialogFromHomePage = null
         consultAssistantDialog = null
     }
 

m-consultant/src/main/java/com/yidianling/consultant/router/ConsultantIn.kt

@@ -37,7 +37,7 @@ object ConsultantIn {
     }
 
     fun toLogin(activity: Activity) {
-        ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity)
+        activity.startActivity(ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity))
     }
 
 }
\ No newline at end of file

m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt

@@ -19,6 +19,9 @@ import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.R
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.route.UserIn
+import com.yidianling.user.safePrivate.FingerPrintCheckActivity
+import com.yidianling.user.safePrivate.FingerPrintUtil
+import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.login.contract.IInputPassWordContract
 import com.yidianling.user.ui.login.presenter.InputPassWordPresenterImpl
 import kotlinx.android.synthetic.main.user_activity_input_password.*
@@ -282,7 +285,12 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
             var flag = 0
             //判断stack中activity是否属于登录相关的三个页面
             for (activity in ActivityManager.getInstance().getActivitys()) {
-                if (activity is RegisterAndLoginActivity || activity is VerificationCodeActivity || activity is InputPassWordActivity) {
+                if (activity is RegisterAndLoginActivity
+                    || activity is VerificationCodeActivity
+                    || activity is InputPassWordActivity
+                    || activity is FingerPrintCheckActivity
+                    || activity is HandUnlockCheckActivity
+                ) {
                     flag++
                 }
             }
@@ -291,6 +299,9 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
                 ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
                 ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
                 ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+                ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
+                ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
+                FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
             } else {
                 ActivityManager.finishAll()
                 startActivity(UserIn.mainIntent(this))

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -44,6 +44,9 @@ import com.yidianling.user.http.request.BindPhoneJavaParam
 import com.yidianling.user.http.request.PhoneLoginAutoParam
 import com.yidianling.user.http.response.ChcekPhoneResponeBean
 import com.yidianling.user.route.UserIn
+import com.yidianling.user.safePrivate.FingerPrintCheckActivity
+import com.yidianling.user.safePrivate.FingerPrintUtil
+import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.CountryListActivity
 import com.yidianling.user.ui.login.contract.ILoginContract
 import com.yidianling.user.ui.login.presenter.LoginPresenterImpl
@@ -450,9 +453,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             tv_reg_title.text = "手机号绑定"
             tv_protocol.visibility = View.GONE
         } else {
-            ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
-            ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
-            ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+            finishPrePage()
             if (isFromGuide) {
                 startActivity(UserIn.mainIntent(this))
             }
@@ -527,9 +528,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         UserHelper.getUserInfo()!!.userInfo!!.bind_phone = 1
         UserHelper.getUserInfo()!!.userInfo!!.phone = userPhoneNumber
 
-        ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
-        ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
-        ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+        finishPrePage()
     }
 
     /**
@@ -559,13 +558,22 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                 ActivityManager.finishAll()
                 startActivity(UserIn.mainIntent(this))
             } else {
-                ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
-                ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
-                ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+                finishPrePage()
             }
         }, 3000)
     }
 
+    private fun finishPrePage() {
+        ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
+        ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
+        ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+
+        //关闭手势解锁页面与指纹解锁页面
+        ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
+        ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
+        FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
+    }
+
 
     override fun onBackPressed() {
         //当前stack只有一个activity，说明被挤掉线的

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -10,10 +10,8 @@ import android.view.View
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.ydl.ydlcommon.utils.actionutil.BIConstants
 import com.yidianling.common.tools.RxKeyboardTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.R
@@ -21,6 +19,9 @@ import com.yidianling.user.UserHelper
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.http.request.BindPhoneJavaParam
 import com.yidianling.user.route.UserIn
+import com.yidianling.user.safePrivate.FingerPrintCheckActivity
+import com.yidianling.user.safePrivate.FingerPrintUtil
+import com.yidianling.user.safePrivate.HandUnlockCheckActivity
 import com.yidianling.user.ui.login.contract.IVerificationCodeContract
 import com.yidianling.user.ui.login.presenter.VerificationCodePresenterImpl
 import io.reactivex.Observable
@@ -280,7 +281,12 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
             var flag = 0
             //判断stack中activity是否属于登录相关的三个页面
             for (activity in ActivityManager.getInstance().getActivitys()) {
-                if (activity is RegisterAndLoginActivity || activity is VerificationCodeActivity || activity is InputPassWordActivity) {
+                if (activity is RegisterAndLoginActivity
+                    || activity is VerificationCodeActivity
+                    || activity is InputPassWordActivity
+                    || activity is FingerPrintCheckActivity
+                    || activity is HandUnlockCheckActivity
+                ) {
                     flag++
                 }
             }
@@ -289,6 +295,9 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
                 ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
                 ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
                 ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
+                ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
+                ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
+                FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
             } else {
                 ActivityManager.finishAll()
                 startActivity(UserIn.mainIntent(this))