diff --git a/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java b/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java index e43bafdc0..62ee4f488 100644 --- a/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java +++ b/app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java @@ -116,6 +116,7 @@ public class SplashActivity extends BaseActivity implements View.OnClickListener private void showSplash() { + mBinding.tvSkip.setVisibility(View.VISIBLE); // 不过期的,并且已经下载出来图片的闪屏页数据 mLocalSplashVo = InitialModel.get().getLocalSplashVo(); if (mLocalSplashVo != null && @@ -126,8 +127,9 @@ public class SplashActivity extends BaseActivity implements View.OnClickListener //添加图片处理机制 .apply(RequestOptions.bitmapTransform(new SplashBitmapTransformation())) .into(mBinding.ivActivity); - mBinding.tvJump.setVisibility(View.VISIBLE); - mBinding.tvSkip.setVisibility(View.VISIBLE); + if (mLocalSplashVo.getType() != 0 && !TextUtils.isEmpty(mLocalSplashVo.getLink())) { + mBinding.tvJump.setVisibility(View.VISIBLE); + } } else { NimMiddleActivity.delayOpenCommunity = false; MainActivity.start(SplashActivity.this); @@ -136,7 +138,7 @@ public class SplashActivity extends BaseActivity implements View.OnClickListener } private void animation() { - AlphaAnimation alphaAnimation = new AlphaAnimation(0,1); + AlphaAnimation alphaAnimation = new AlphaAnimation(0, 1); alphaAnimation.setDuration(500); mBinding.ivActivity.startAnimation(alphaAnimation); mBinding.ivActivity.postDelayed(() -> { @@ -146,7 +148,7 @@ public class SplashActivity extends BaseActivity implements View.OnClickListener NimMiddleActivity.delayOpenCommunity = false; MainActivity.start(SplashActivity.this); finish(); - },COUNT_DOWN_TIME * 1000); + }, COUNT_DOWN_TIME * 1000); } @@ -162,9 +164,9 @@ public class SplashActivity extends BaseActivity implements View.OnClickListener Intent intent = new Intent(); intent.putExtra("url", link); intent.putExtra("type", type); - NimMiddleActivity.delayOpenCommunity = false; MainActivity.start(this, intent); + finish(); break; case R.id.tv_skip: if (mLocalSplashVo == null) { diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 44bc2e641..e63449085 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -37,7 +37,7 @@ android:text="@string/text_skip" android:textColor="@color/white" android:textSize="13dp" - android:visibility="visible" /> + android:visibility="gone" /> + android:visibility="gone" />