From 823f534dff0da0b34f68e32cdfe2651d1bb81db3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 七月 2023 17:16:40 +0800
Subject: [PATCH] 2023年07月12日17:16:39

---
 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java |   21 ++++++++++++++-------
 1 files changed, 14 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..5292e09 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;
@@ -201,14 +206,16 @@
 //                    //闅愮鍗忚鎻愮ず
 //                    return;
 //                }
+                Log.d("娴嬭瘯涓�", "123456789");
                 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 +226,7 @@
                                     }
 
                                     @Override
-                                    public void onFailure(Exception exception) {
+                                    public void onFailure(HDLException e) {
                                         hideLoading();
                                         restoreButtonStyleToInitializeState();
                                         startActivity(MyPowerStationActivity.class);
@@ -228,14 +235,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