Merge remote-tracking branch 'origin/4.1.66' into 4.1.66

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

@@ -106,7 +106,7 @@ object LoginUtils {
         val size = ActivityManager.getActivitySize()
         if (size <= 2) {//当前stack只有两个页面，必然没有MainActivity
             ActivityManager.finishAll()
-            if (StatusUtils.isFirstLogin && StatusUtils.isFromGuide) {
+            if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
                 activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
             }else {
                 UserIn.mainIntent(activity)
@@ -135,7 +135,7 @@ object LoginUtils {
                 FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
             } else {
                 ActivityManager.finishAll()
-                if (StatusUtils.isFirstLogin && StatusUtils.isFromGuide) {
+                if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
                     activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
                 } else {
                     UserIn.mainIntent(activity)

m-user/src/main/java/com/yidianling/user/StatusUtils.java

@@ -10,8 +10,7 @@ public class StatusUtils {
      * 是否是注册
      */
     public static boolean isFirstLogin = false;
-    /**
-     * 是否是第一次打开App
-     */
-    public static boolean isFromGuide = false;
+
+    // 是否第一次启动App
+    public static boolean isFirstStartApp = false;
 }

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

@@ -137,7 +137,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         isBindPhone = intent.getBooleanExtra(BIND_PHONE, false)
         isFromGuide = intent.getBooleanExtra(IS_FROM_GUIDE, false)
         isFromOneKeyLogin = intent.getBooleanExtra(IS_FROM_ONE_KEY_LOGIN, false)
-        StatusUtils.isFromGuide = isFromGuide
 
         setWindowStatusBarColor()
         initAuthHelper()