From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index b1cbd5c..5e96e8f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -33,6 +33,7 @@
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
@@ -210,17 +211,6 @@
intent.setClass(HDLApp.getInstance(), StartActivity.class);
startActivity(intent);
viewBinding.homeLoginLanguageTv.setText(itemData.getTitle());
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
- HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
- }
-
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔け璐� PushToken:" + UserConfigManage.getInstance().getPushToken() + " 閿欒锛�" + e.getMessage(), true);
- }
- });
}
});
}
@@ -433,13 +423,14 @@
if (e.getCode() == 10019) {
//鐢ㄦ埛宸茬粡琚攣瀹氶敊璇爜
try {
- if (e.getmExtra() != null) {
- if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
- long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
- int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
- HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
- }
- }
+// if (e.getmExtra() != null) {
+// if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
+// long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
+// int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
+// HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
+// }
+// }
+ HdlThreadLogic.toast(_mActivity, e.getMsg());
} catch (Exception ee) {
HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
--
Gitblit v1.8.0