詹子聪 пре 5 година
родитељ
комит
cdc5b3869b

+ 8 - 1
app/src/main/AndroidManifest.xml

@@ -28,9 +28,16 @@
         <activity
             android:name=".ui.mine.login.LoginActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/TextInputStyle">
+            android:theme="@style/TextInputStyle"/>
+
+        <activity
+            android:name=".ui.WelcomeActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Welcome">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

+ 42 - 0
app/src/main/java/com/itant/shibei/ui/WelcomeActivity.java

@@ -0,0 +1,42 @@
+package com.itant.shibei.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+
+import com.itant.shibei.R;
+import com.itant.shibei.base.BaseBeiActivity;
+import com.itant.shibei.manager.UserInfoManager;
+import com.itant.shibei.ui.mine.login.LoginActivity;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/9/2 11:56
+ * Description:
+ */
+public class WelcomeActivity extends BaseBeiActivity {
+    @Override
+    public int getLayoutID() {
+        return R.layout.activity_welcome;
+    }
+
+    @Override
+    public void initViews(Bundle savedInstanceState) {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                // todo 从服务器获取信息
+                if (UserInfoManager.getInstance().isLogin()) {
+                    startActivity(new Intent(WelcomeActivity.this, TabActivity.class));
+                } else {
+                    startActivity(new Intent(WelcomeActivity.this, LoginActivity.class));
+                }
+                finish();
+            }
+        }, 2000);
+
+
+    }
+}

+ 0 - 11
app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java

@@ -5,8 +5,6 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import com.google.android.material.textfield.TextInputEditText;
 import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
@@ -30,15 +28,6 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
     @InjectPresenter
     LoginPresenter presenter;
 
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (UserInfoManager.getInstance().isLogin()) {
-            startActivity(new Intent(this, TabActivity.class));
-            finish();
-        }
-    }
-
     @Override
     public int getLayoutID() {
         return R.layout.activity_login;

+ 13 - 0
app/src/main/res/layout/activity_welcome.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/logo_gray"
+        android:layout_gravity="center"
+        android:tint="@color/black_theme"/>
+</FrameLayout>

+ 14 - 0
app/src/main/res/values/styles.xml

@@ -66,4 +66,18 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
     </style>
+
+
+    <style name="AppTheme.Welcome">
+        <!--<item name="android:windowIsTranslucent">true</item>-->
+        <!--用下面这个属性代替windowIsTranslucent,否则在8.0上配合portrait属性会导致闪退-->
+        <item name="android:windowDisablePreview">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+
+        <!--解决全屏的时候底部content和导航栏之间有一根白线的现象-->
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+    </style>
 </resources>