From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index e500277..ae6e205 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -45,7 +45,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setResult(20);
@@ -83,7 +83,7 @@
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setBingPhone(phoneStr);
UserConfigManage.getInstance().Save();
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.set_bind_phone_succeed), 0);
+ setResult(20);
finish();
}
@@ -101,7 +101,7 @@
private void initView() {
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
try {
Country.load(this);
@@ -119,7 +119,8 @@
public void onPick(Country country) {
if (country.flag != 0)
viewBinding.bindAreaTv.setText(country.name);
- viewBinding.bindAreaNumberTv.setText("+" + country.code);
+ String code = "+" + country.code;
+ viewBinding.bindAreaNumberTv.setText(code);
}
});
dialog.show();
@@ -204,6 +205,7 @@
}
}
+
/**
* 鐗╃悊鎸夐敭杩斿洖浜嬩欢
*/
--
Gitblit v1.8.0