diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java index a6ff2e2..abb5dba 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java +++ b/app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java @@ -105,56 +105,60 @@ public class RegisterActivity extends ColorfulActivity { break; } } -// if (!isSpecial && Build.VERSION.SDK_INT >= 29) { -// mBtnTaobaoLink.setVisibility(View.GONE); -// new AlertDialog.Builder(this) -// .setMessage("由于安卓10及以上系统限制App读取硬件信息,原来绑定手机激活的方式已经不可用,如果您之前绑定手机激活过,很遗憾,现在只能刷机降级到安卓9或安卓8重新输入激活才可以。如果您不想刷机,可以购买会员继续使用") -// .setPositiveButton(R.string.user_vip_activate, new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// if (LCUser.getCurrentUser() == null) { -// Intent intent = new Intent(Utils.getApp(), LoginActivity.class); -// intent.putExtra("finishTo", UserInfoActivity.class.getName()); -// startActivity(intent); -// } else { -// startActivity(new Intent(RegisterActivity.this, UserInfoActivity.class)); -// } -// } -// }) -// .setNeutralButton(R.string.opening_vip_tutorial, new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// AgentWebActivity.navigation2(RegisterActivity.this, -// "android_url_opening_renewal_tutorial"); -// } -// }) -// .setNegativeButton(R.string.cancel, null) -// .setOnDismissListener(new DialogInterface.OnDismissListener() { -// @Override -// public void onDismiss(DialogInterface dialog) { -// if (!hasAndroidPermission) -// finish(); -// } -// }).show(); -// } else { -// int checkStoragePermission = ContextCompat.checkSelfPermission(Utils.getApp(), Manifest.permission.READ_PHONE_STATE); -// if (checkStoragePermission != PackageManager.PERMISSION_GRANTED) { -// requestPhoneStatePermission(this); -// } else { -// if ("".equals(RegisterUtil.getOriginalMachineCode()) || "SERIALNUMBERunknown".equals(RegisterUtil.getOriginalMachineCode()) || "SERIALNUMBERnull".equals(RegisterUtil.getOriginalMachineCode())) { -// new MaterialDialog.Builder(this) -// .title(R.string.hint) -// .content("此手机机器码未知,请关闭相关限制软件请重启软件") -// .positiveText(R.string.i_know) -// .dismissListener(new DialogInterface.OnDismissListener() { -// @Override -// public void onDismiss(DialogInterface dialog) { -// finish(); -// } -// }).show(); -// } -// } -// } + if (!isSpecial && Build.VERSION.SDK_INT >= 29) { + mBtnTaobaoLink.setVisibility(View.GONE); + new AlertDialog.Builder(this) + .setMessage("由于安卓10及以上系统限制App读取硬件信息,原来绑定手机激活的方式已经不可用,如果您之前绑定手机激活过,很遗憾,现在只能刷机降级到安卓9或安卓8重新输入激活才可以。如果您不想刷机,可以购买会员继续使用") + .setPositiveButton(R.string.user_vip_activate, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (LCUser.getCurrentUser() == null) { + Intent intent = new Intent(Utils.getApp(), LoginActivity.class); + intent.putExtra("finishTo", UserInfoActivity.class.getName()); + startActivity(intent); + } else { + startActivity(new Intent(RegisterActivity.this, UserInfoActivity.class)); + } + } + }) + .setNeutralButton(R.string.opening_vip_tutorial, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { +// Intent intent = new Intent(); +// intent.setClass(Utils.getApp(), AgentWebActivity.class); +// intent.putExtra("short_url", "android_url_opening_renewal_tutorial"); +// startActivity(intent); + AgentWebActivity.navigation2(RegisterActivity.this, + "android_url_opening_renewal_tutorial"); + } + }) + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + if (!hasAndroidPermission) + finish(); + } + }).show(); + } else { + int checkStoragePermission = ContextCompat.checkSelfPermission(Utils.getApp(), Manifest.permission.READ_PHONE_STATE); + if (checkStoragePermission != PackageManager.PERMISSION_GRANTED) { + requestPhoneStatePermission(this); + } else { + if ("".equals(RegisterUtil.getOriginalMachineCode()) || "SERIALNUMBERunknown".equals(RegisterUtil.getOriginalMachineCode()) || "SERIALNUMBERnull".equals(RegisterUtil.getOriginalMachineCode())) { + new MaterialDialog.Builder(this) + .title(R.string.hint) + .content("此手机机器码未知,请关闭相关限制软件请重启软件") + .positiveText(R.string.i_know) + .dismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + finish(); + } + }).show(); + } + } + } if (VipManager.getInstance().checkReg()) { getSupportActionBar().setTitle(R.string.activated); met_activate_code.setText(((App) Utils.getApp()).registerCodeV2);