diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index cdf6471e1d..7dba398dba 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -15,11 +15,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.core.app.ActivityCompat; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; - import com.gh.base.BaseActivity; import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceTokenUtils; @@ -54,6 +49,10 @@ import java.util.Date; import java.util.List; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; @@ -123,23 +122,22 @@ public class SplashScreenActivity extends BaseActivity { // 判断是不是光环的新用户 if (SPUtils.getBoolean(SP_BRAND_NEW_USER, true)) { - View introBackground = findViewById(R.id.splash_intro_background); - introBackground.setVisibility(View.VISIBLE); showPrivacyPolicy(() -> { - introBackground.setVisibility(View.GONE); // Dialog dismiss 后的回调 + guideLayout.setVisibility(View.VISIBLE); SPUtils.setBoolean(SP_BRAND_NEW_USER, false); - requestPermissionAndLaunchMainActivity(); + requestPermission(); }); } else { - requestPermissionAndLaunchMainActivity(); + guideLayout.setVisibility(View.VISIBLE); + requestPermission(); } } else { launchMainActivity(); } } - private void requestPermissionAndLaunchMainActivity() { + private void requestPermission() { if (EasyPermissions.hasPermissions(this, mPermissions)) { GdtHelper.INSTANCE.logAction(ActionType.START_APP, GdtHelper.NETWORK_TYPE, DeviceUtils.getNetwork(this)); } else { diff --git a/app/src/main/res/drawable-nodpi/splash_background.webp b/app/src/main/res/drawable-nodpi/splash_background.webp deleted file mode 100644 index a0122aef77..0000000000 Binary files a/app/src/main/res/drawable-nodpi/splash_background.webp and /dev/null differ diff --git a/app/src/main/res/layout/activity_splash_intro.xml b/app/src/main/res/layout/activity_splash_intro.xml index dd71493558..78e2f6d72d 100644 --- a/app/src/main/res/layout/activity_splash_intro.xml +++ b/app/src/main/res/layout/activity_splash_intro.xml @@ -6,14 +6,7 @@ - - + android:visibility="gone"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash_normal.xml b/app/src/main/res/layout/activity_splash_normal.xml index 71413d0c3d..79fe158e92 100644 --- a/app/src/main/res/layout/activity_splash_normal.xml +++ b/app/src/main/res/layout/activity_splash_normal.xml @@ -1,24 +1,24 @@ - + + android:layout_width="150dp" + android:layout_height="150dp" + android:src="@drawable/splash_logo" /> + android:layout_width="150dp" + android:layout_height="wrap_content" + android:src="@drawable/splash_name" /> + android:layout_width="150dp" + android:layout_height="wrap_content" + android:src="@drawable/splash_slogan" /> - \ No newline at end of file + \ No newline at end of file