From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 e2cd970..03df85b 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,6 +3,7 @@
import android.os.Bundle;
import android.os.CountDownTimer;
+import android.os.Process;
import android.text.TextUtils;
import android.view.View;
@@ -15,6 +16,7 @@
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;
@@ -77,7 +79,8 @@
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setBingEmail(mailStr);
UserConfigManage.getInstance().Save();
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.set_bind_mail_succeed), 0);
+ setResult(20);
+ finish();
}
@Override
@@ -167,14 +170,25 @@
}
-
@Override
protected void onDestroy() {
super.onDestroy();
+
if (countDownTimer != null) {
countDownTimer.cancel();
countDownTimer = null;
}
}
+
+
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ setResult(20);
+ super.onBackPressed();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0