ZhangXinYu преди 6 години
родител
ревизия
a0361f4ff9

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

@@ -28,7 +28,7 @@
 
         </activity>
         <activity
-            android:name=".ui.activity.LoginActivity"
+            android:name=".ui.activity.StartActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -37,6 +37,9 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".ui.activity.LoginActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
             android:name=".ui.activity.MineCenterActivity"
             android:screenOrientation="portrait" />
         <activity

+ 96 - 0
app/src/main/java/com/webrain/happywork/ui/activity/StartActivity.java

@@ -0,0 +1,96 @@
+package com.webrain.happywork.ui.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.webrain.baselibrary.AppConstant;
+import com.webrain.baselibrary.utils.AppUtils;
+import com.webrain.happywork.AppCacheManager;
+import com.webrain.happywork.R;
+import com.webrain.happywork.ui.base.BaseActivity;
+import com.webrain.happywork.ui.base.IPresenter;
+
+import java.util.concurrent.TimeUnit;
+
+import butterknife.BindView;
+import io.reactivex.Observable;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+
+public class StartActivity extends BaseActivity {
+    @BindView(R.id.tv_version)
+    TextView tvVersion;
+
+    private Disposable mDisposable;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_start;
+    }
+
+    @Override
+    public IPresenter bindPresenter() {
+        return null;
+    }
+
+    @Override
+    public boolean isShowActionBar() {
+        return false;
+    }
+
+    @Override
+    public boolean isShowStatusTitle() {
+        return false;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        tvVersion.setText("v" + AppUtils.getVersionName(mContext));
+        Observable.timer(3, TimeUnit.SECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<Long>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable disposable) {
+                        mDisposable = disposable;
+                    }
+
+                    @Override
+                    public void onNext(@NonNull Long number) {
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        goJump();
+                    }
+                });
+    }
+
+    private void goJump() {
+        if (mDisposable != null && !mDisposable.isDisposed()) {
+            mDisposable.dispose();
+            if (AppCacheManager.getInstance().isLogin() && AppCacheManager.getInstance().getLoginModel().getRegisterFrom() == AppConstant.REGISTER_FROM_SERVICE) {
+                startActivity(new Intent(mContext, MainActivity.class));
+            } else {
+                startActivity(new Intent(mContext, LoginActivity.class));
+            }
+            finish();
+        }
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mDisposable != null && !mDisposable.isDisposed()) {//关闭定时器
+            mDisposable.dispose();
+        }
+    }
+}

+ 0 - 4
app/src/main/java/com/webrain/happywork/ui/mvp/presenter/LoginPresenter.java

@@ -112,10 +112,6 @@ public class LoginPresenter extends BasePresenter<LoginActivity> implements Logi
         if (isViewAttach()) {
             getAppAllPermissions();
             mvpReference.get().onSpannableInit();
-            if (AppCacheManager.getInstance().isLogin() && AppCacheManager.getInstance().getLoginModel().getRegisterFrom() == AppConstant.REGISTER_FROM_SERVICE) {
-                mvpReference.get().startActivity(new Intent(mvpReference.get(), MainActivity.class));
-                mvpReference.get().finish();
-            }
         }
     }
 

+ 22 - 0
app/src/main/res/layout/activity_start.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/ic_start_bg"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+
+    <TextView
+        android:id="@+id/tv_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="22dp"
+        android:text="v1.0.0"
+        android:textColor="@color/text_gray_88"
+        android:textSize="@dimen/px39_13sp" />
+
+</RelativeLayout>

BIN
app/src/main/res/mipmap-hdpi/ic_start_bg.png


BIN
app/src/main/res/mipmap-xhdpi/ic_start_bg.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_start_bg.png


BIN
app/src/main/res/mipmap-xxxhdpi/ic_start_bg.png


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

@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowBackground">@mipmap/ic_start_bg</item>
         <item name="android:windowTranslucentStatus">true</item><!--沉静式-->
     </style>