bug
huangwei 10 months ago
parent 4341935fc8
commit 5b1022a1fd
  1. 102
      app/src/main/java/com/bingce/controlnetwork/activity/user/RegisterActivity.java

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

Loading…
Cancel
Save