From 0a18a8180bc6040c941b07df1be1f7b726b4c155 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 367716d..54bc272 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -23,6 +23,11 @@
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
+import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
+import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
+import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -41,6 +46,8 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.nostra13.dcloudimageloader.utils.L;
import org.json.JSONException;
import org.json.JSONObject;
@@ -202,13 +209,14 @@
// return;
// }
showLoading(getString(R.string.home_login_鐧诲綍涓�));
- HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() {
+ HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
- public void onSuccess(LoginUserRegionBean obj) {
+ public void onSuccess(HDLUserRegionBean obj) {
AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
- HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
+ HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
+ HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
@Override
- public void onSuccess(LoginUserBean obj) {
+ public void onSuccess(HDLLoginBean obj) {
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
public void onSuccess(List<HouseIdBean> obj) {
@@ -219,7 +227,7 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
hideLoading();
restoreButtonStyleToInitializeState();
startActivity(MyPowerStationActivity.class);
@@ -228,14 +236,14 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException exception) {
hideLoading();
}
});
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
hideLoading();
}
});
--
Gitblit v1.8.0