diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 93da4dd6ad..d6ea14e30a 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1531,12 +1531,22 @@ public class DialogUtils { dialog.show(); } - public static void showSamePhoneDialog(Context context, @NonNull ConfirmListener listener) { + public static void showNoticeDialog(Context context, String title, String content, @NonNull ConfirmListener listener) { context = checkDialogContext(context); final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent); - View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_same_phone, null); + View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null); + TextView titleTv = contentView.findViewById(R.id.dialog_title); + TextView contentTv = contentView.findViewById(R.id.dialog_content); + + if (title == null) { + titleTv.setVisibility(View.GONE); + } else { + titleTv.setVisibility(View.VISIBLE); + titleTv.setText(title); + } + contentTv.setText(content); contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> { listener.onConfirm(); diff --git a/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java b/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java index d5edcecdda..4c7275e96e 100644 --- a/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java +++ b/app/src/main/java/com/gh/gamecenter/douyinapi/DouYinEntryActivity.java @@ -46,8 +46,9 @@ public class DouYinEntryActivity extends Activity implements IApiEventHandler, D Toast.makeText(this, "授权成功", Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this, "授权失败" + response.grantedPermissions, - Toast.LENGTH_LONG).show(); +// Toast.makeText(this, "授权失败" + response.grantedPermissions, +// Toast.LENGTH_LONG).show(); + Toast.makeText(this, "授权失败", Toast.LENGTH_SHORT).show(); } finish(); } diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index 7704f2ff15..0c3d36ccbf 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -13,10 +13,7 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import butterknife.BindView import butterknife.OnClick -import com.gh.common.util.DialogUtils -import com.gh.common.util.EntranceUtils -import com.gh.common.util.PatternUtils -import com.gh.common.util.viewModelProvider +import com.gh.common.util.* import com.gh.common.view.ClearEditTextNormal import com.gh.gamecenter.R import com.gh.gamecenter.manager.UserManager @@ -99,7 +96,7 @@ class BindPhoneFragment : NormalFragment(){ override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mBindPhoneSkip.visibility = if (mFromLogin) View.VISIBLE else View.GONE + mBindPhoneSkip.goneIf(!mFromLogin) mBindPhoneTitle.text = if (mChangePhone) requireContext().resources.getString(R.string.bind_phone_title2) else requireContext().resources.getString(R.string.bind_phone_title1) mBindPhoneDesc.text = if (mChangePhone) { @@ -164,7 +161,10 @@ class BindPhoneFragment : NormalFragment(){ @OnClick(R.id.bind_phone_skip, R.id.bind_phone_captcha, R.id.bind_phone_btn) override fun onClick(v : View) { when (v.id) { - R.id.bind_phone_skip -> { requireActivity().finish() } + R.id.bind_phone_skip -> { + DialogUtils.showNoticeDialog(requireContext(), getString(R.string.bind_phone_title1), + getString(R.string.bind_phone_notice)) { requireActivity().finish() } + } R.id.bind_phone_captcha -> { val phoneNum: String = mBindPhoneEt.text.toString().trim { it <= ' ' }.replace(" ".toRegex(), "") @@ -181,7 +181,7 @@ class BindPhoneFragment : NormalFragment(){ val phoneNum: String = mBindPhoneEt.text.toString().trim { it <= ' ' }.replace(" ".toRegex(), "") // 更换手机号,当输入手机号和当前手机号相同则弹出提示 if (mChangePhone && phoneNum == oldPhoneNum) { - DialogUtils.showSamePhoneDialog(requireContext()) { + DialogUtils.showNoticeDialog(requireContext(), null, getString(R.string.change_phone_same)) { mBindPhoneEt.setText("") } return diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index e90963d0dd..d8c871ad55 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -241,6 +241,9 @@ public class SettingsFragment extends NormalFragment { case "weibo": loginType = "新浪微博"; break; + case "douyin": + loginType = "抖音"; + break; default: if (loginType.length() == 11) { String sub1 = loginType.substring(0, 3); diff --git a/app/src/main/res/layout/dialog_same_phone.xml b/app/src/main/res/layout/dialog_notice.xml similarity index 75% rename from app/src/main/res/layout/dialog_same_phone.xml rename to app/src/main/res/layout/dialog_notice.xml index a1f5fb1d4c..0556e9c9f4 100644 --- a/app/src/main/res/layout/dialog_same_phone.xml +++ b/app/src/main/res/layout/dialog_notice.xml @@ -6,21 +6,30 @@ + + + android:textSize="14sp" /> 绑定手机 绑定手机号 更换手机号 + 登录后你可以在【我的光环--账户安全】\n或【设置-账户安全】中绑定手机号噢~ 绑定手机后手机号将用于光环助手活动奖励领取、安全验证等用途 下一步 完成