Merge branch 'feat/qj/fix_login' into 'release'

修复登录不进去首页

See merge request app_android_lib/YDL-Component!152

m-user/src/main/java/com/yidianling/user/LoginUtils.kt

 package com.yidianling.user
 
 import android.app.Activity
-import android.content.Intent
 import com.tencent.bugly.crashreport.CrashReport
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.utils.ActivityManager
@@ -21,7 +20,6 @@ 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.collect.CollectSexAndBirthActivity
 import com.yidianling.user.ui.login.InputPassWordActivity
 import com.yidianling.user.ui.login.OneKeyLoginHelp
 import com.yidianling.user.ui.login.RegisterAndLoginActivity
@@ -130,7 +128,11 @@ object LoginUtils {
             //这里不能引用到MainActivity 想别的办法
             var flag = 0
             //判断stack中activity是否属于登录相关的三个页面
+            var containMainActivity = false
             for (activity in ActivityManager.getInstance().getActivitys()) {
+                if (activity.javaClass.name == "com.cxzapp.yidianling.activity.MainActivity") {
+                    containMainActivity = true
+                }
                 if (activity is RegisterAndLoginActivity
                     || activity is VerificationCodeActivity
                     || activity is InputPassWordActivity
@@ -148,6 +150,9 @@ object LoginUtils {
                 ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
                 ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
                 FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
+                if (!containMainActivity) {
+                    UserIn.mainIntent(activity)
+                }
             } else {
                 ActivityManager.finishAll()
                 if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {