This commit is contained in:
chenjuntao
2019-11-29 16:20:22 +08:00
parent 45d2d958a2
commit f07d1b7257
4 changed files with 26 additions and 35 deletions

View File

@ -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 {