From a0e8f81afc4fe2a21a5c504d53e569ea50d463d6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 三月 2024 11:51:23 +0800
Subject: [PATCH] 2024年03月15日11:51:17
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 b1e615a..8c0584d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -29,13 +29,13 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.config.AppConfigManage;
-import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
@@ -116,11 +116,11 @@
viewBinding.homeLoginLanguageTv.setText("English");
}
-// String acc = "13375012441";
-// String pws = "123456";
-// //娴嬭瘯鐢�
-// viewBinding.homeLoginAccountEt.setText(acc);
-// viewBinding.homeLoginPasswordEt.setText(pws);
+ String acc = "13375012441";
+ String pws = "123456";
+ //娴嬭瘯鐢�
+ viewBinding.homeLoginAccountEt.setText(acc);
+ viewBinding.homeLoginPasswordEt.setText(pws);
isLoginTextViewEnabled();
}
@@ -245,8 +245,10 @@
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(obj.getRegionUrl());
+// AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+ AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
@Override
@@ -257,7 +259,14 @@
hideLoading();
HdlResidenceLogic.getInstance().setHouseIdList(obj);
restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(MyPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+
finish();
}
@@ -265,7 +274,13 @@
public void onFailure(HDLException e) {
hideLoading();
restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(MyPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
finish();
}
});
--
Gitblit v1.8.0