diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/SplashActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/SplashActivity.java index 0e4189c..e4c5b09 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/SplashActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/SplashActivity.java @@ -8,16 +8,13 @@ import com.tairui.industrial_operation.databinding.ActivitySplashBinding; import com.tairui.industrial_operation.ui.account.LoginActivity; import com.tairui.industrial_operation.util.IntentUtil; import com.tairui.industrial_operation.util.MyCountDownTimer; -import com.tairui.industrial_operation.util.SingleClickListener; import android.text.TextUtils; -import android.view.View; public class SplashActivity extends BaseActivity { private CountTimer countTimer; private static final int INTERVAL = 1000; - private boolean isSkipAble = true;// 跳过按钮可以点击 @Override protected Class getBindingClass() { @@ -26,12 +23,6 @@ public class SplashActivity extends BaseActivity { @Override protected void onBindListener() { - binding.txtTimerSplash.setOnClickListener(new SingleClickListener() { - @Override - protected void onSingleClick(View v) { - skipTimeCountDown(); - } - }); } @Override @@ -40,35 +31,10 @@ public class SplashActivity extends BaseActivity { } private void goMain() { - if (null != binding.txtTimerSplash) { - setGone(binding.txtTimerSplash, true); - countTimer = new CountTimer(1 * 1000, INTERVAL); - WeakReference weakTimerCountDowner = new WeakReference<>(countTimer); - if (null != weakTimerCountDowner.get()) { - weakTimerCountDowner.get().start(); - } - } - } - - /** - * 跳过倒计时 - */ - private void skipTimeCountDown() { - if (isSkipAble) { - isSkipAble = false; - if (null != binding.txtTimerSplash) { - binding.txtTimerSplash.setClickable(false); - } - if (null != countTimer) { - countTimer.cancel(); - countTimer = null; - } - if (TextUtils.isEmpty(AppConfig.getInstance().getToken())) { - IntentUtil.startActivity(mContext, LoginActivity.class, null); - finish(); - } else { - gotoMain(); - } + countTimer = new CountTimer(1 * 1000, INTERVAL); + WeakReference weakTimerCountDowner = new WeakReference<>(countTimer); + if (null != weakTimerCountDowner.get()) { + weakTimerCountDowner.get().start(); } } @@ -104,11 +70,6 @@ public class SplashActivity extends BaseActivity { @Override public void onTick(long millisUntilFinished) { - int time = (int) (millisUntilFinished / INTERVAL) + 1; - if (null != binding.txtTimerSplash) { - String TIME_PASS = "跳过 "; - binding.txtTimerSplash.setText(TIME_PASS + time); - } } @Override diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 02f113c..77c7aa7 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -14,21 +14,5 @@ android:layout_marginBottom="32dp" android:src="@mipmap/ic_slogon" /> - - \ No newline at end of file