From f054e584e270374829e02e755956d41a8982f64d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 15:50:03 +0800
Subject: [PATCH] 2024年06月05日15:50:01
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 88 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 38 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 f1d023e..f0daeec 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -118,12 +118,13 @@
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
- String acc = "13375012441";
-// String acc = "nuy13368@uzxia.com";
- String pws = "123456";
- //娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText(acc);
- viewBinding.homeLoginPasswordEt.setText(pws);
+// String acc = "13375012441";
+//// String acc = "18316672920";
+//// String acc = "nuy13368@uzxia.com";
+// String pws = "123456";
+// //娴嬭瘯鐢�
+// viewBinding.homeLoginAccountEt.setText(acc);
+// viewBinding.homeLoginPasswordEt.setText(pws);
isLoginTextViewEnabled();
}
@@ -234,45 +235,55 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
public void onSuccess(HDLUserRegionBean obj) {
- String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
- AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
+ //寮�鍙戠幆澧�
+// String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
+// AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
//鍒濆鍖栨湇鍔″煙鍚�
-// AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+ AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
@Override
public void onSuccess(HDLLoginBean obj) {
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
- hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ restoreButtonStyleToInitializeState();
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ hideLoading();
+ finish();
+ } else {
+ //C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
+ hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+ finish();
}
- finish();
- }
- @Override
- public void onFailure(HDLException e) {
- hideLoading();
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+ finish();
}
- finish();
- }
- });
+ });
+ }
}
@Override
@@ -486,9 +497,10 @@
*/
private void getDialog() {
ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
- dialog.setTitle(getString(R.string.loading_privacy));
- dialog.setContent(getString(R.string.loading_privacy_server));
dialog.show();
+// dialog.setTitle(getString(R.string.loading_privacy));
+ dialog.isHideTitle(true);
+ dialog.setContent(getString(R.string.loading_privacy_server));
setStringDifferentColors(dialog.getContentTextView());
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
--
Gitblit v1.8.0