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/BindMailActivity.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index 6d14d1e..0513ca6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -3,7 +3,6 @@
import android.os.Bundle;
import android.os.CountDownTimer;
-import android.os.Process;
import android.text.TextUtils;
import android.view.View;
@@ -16,10 +15,6 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
-import com.sahooz.library.countrypicker.Country;
-import com.sahooz.library.countrypicker.CountryPickerFragment;
-import com.sahooz.library.countrypicker.PickCountryCallback;
/**
* 淇敼缁戝畾閭鐨勭晫闈�
@@ -47,7 +42,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);
@@ -79,6 +74,7 @@
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setBingEmail(mailStr);
UserConfigManage.getInstance().Save();
+ setResult(20);
finish();
}
@@ -96,7 +92,7 @@
private void initView() {
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_mail);
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));
}
@@ -189,4 +185,5 @@
setResult(20);
super.onBackPressed();
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0