Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提高 targetSDK 至 8.1，升级 MTA 版本

Browse Source
This commit is contained in:
chenjuntao
2018-09-07 14:53:37 +08:00
parent 0197355126
commit de1558d58f
6 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
View File

@ -8,6 +8,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.PagerAdapter;
@ -116,7 +117,7 @@ public class SplashScreenActivity extends BaseActivity {
if (isNewFirstLaunch) {
mContentView.setPadding(0, 0, 0, 0);
ViewPager guideLayout = (ViewPager) findViewById(R.id.splash_intro_vp_guide);
ViewPager guideLayout = findViewById(R.id.splash_intro_vp_guide);
guideLayout.setAdapter(new GuidePagerAdapter());
}
@ -204,12 +205,7 @@ public class SplashScreenActivity extends BaseActivity {
if (!isNewFirstLaunch) {
long end = System.currentTimeMillis() - start;
if (end < 2000) {
getWindow().getDecorView().postDelayed(new Runnable() {
@Override
public void run() {
launch();
}
}, 2000 - end);
getWindow().getDecorView().postDelayed(this::launch, 2000 - end);
} else {
launch();
}
@ -234,33 +230,15 @@ public class SplashScreenActivity extends BaseActivity {
if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) { // 设置"不要再询问",必须手动到系统设置授权
DialogUtils.showPermissionDialog(this, "重要提醒",
"请授予光环助手权限,否则将无法使用\n请点击\"设置\"-\"应用\"-\"光环助手\"-\"权限\"-打开所需权限", "去设置", "退出",
new DialogUtils.ConfirmListener() {
@Override
public void onConfirm() {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + getPackageName()));
startActivity(intent);
}
}, new DialogUtils.CancelListener() {
@Override
public void onCancel() {
finish();
}
});
() -> {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + getPackageName()));
startActivity(intent);
}, this::finish);
} else {
DialogUtils.showPermissionDialog(this, "重要提醒",
"请授予光环助手权限,否则将无法使用", "重试", "退出",
new DialogUtils.ConfirmListener() {
@Override
public void onConfirm() {
checkAndRequestPermission();
}
}, new DialogUtils.CancelListener() {
@Override
public void onCancel() {
finish();
}
});
this::checkAndRequestPermission, this::finish);
}
}
@ -293,19 +271,17 @@ public class SplashScreenActivity extends BaseActivity {
return mPics.length;
}
@NonNull
@Override
public Object instantiateItem(ViewGroup container, int position) {
public Object instantiateItem(@NonNull ViewGroup container, int position) {
View view = View.inflate(container.getContext(), R.layout.splash_guide_item, null);
ImageView ivImage = (ImageView) view.findViewById(R.id.splsh_guide_iv_image);
ImageView ivImage = view.findViewById(R.id.splsh_guide_iv_image);
ivImage.setImageResource(mPics[position]);
if (position == mPics.length - 1) {
TextView tvSkip = (TextView) view.findViewById(R.id.splsh_guide_tv_skip);
tvSkip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (EasyPermissions.hasPermissions(SplashScreenActivity.this, mPermissions)) {
launch();
}
TextView tvSkip = view.findViewById(R.id.splsh_guide_tv_skip);
tvSkip.setOnClickListener(v -> {
if (EasyPermissions.hasPermissions(SplashScreenActivity.this, mPermissions)) {
launch();
}
});
@ -315,12 +291,12 @@ public class SplashScreenActivity extends BaseActivity {
}
@Override
public void destroyItem(ViewGroup container, int position, Object object) {
public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
container.removeView((View) object);
}
@Override
public boolean isViewFromObject(View view, Object object) {
public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
return view == object;
}