From 969a251801a4553920b799ba9be0fcb9e69e47ed Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 14 三月 2024 13:44:40 +0800 Subject: [PATCH] 2024年03月14日13:44:32 --- app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 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..011e036 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(); } @@ -257,7 +257,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 +272,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