From 4e65f5254a4e74dbbe691e5edba2775d6d66c0b0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 四月 2024 14:41:39 +0800
Subject: [PATCH] 2024年04月30日14:41:34
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 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..511cd4e 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;
@@ -47,6 +47,7 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
+import com.jaeger.library.StatusBarUtil;
import java.util.List;
@@ -67,9 +68,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -106,8 +105,7 @@
* 鍒濆鍖朥I
*/
private void initView() {
- viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
- viewBinding.homeLoginInstallUserTv.setSelected(UserConfigManage.getInstance().isBAccount());
+ viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
@@ -115,12 +113,18 @@
} else {
viewBinding.homeLoginLanguageTv.setText("English");
}
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ } else {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
+ }
-// String acc = "13375012441";
-// String pws = "123456";
-// //娴嬭瘯鐢�
-// viewBinding.homeLoginAccountEt.setText(acc);
-// viewBinding.homeLoginPasswordEt.setText(pws);
+ String acc = "13375012441";
+// String acc = "nuy13368@uzxia.com";
+ String pws = "123456";
+ //娴嬭瘯鐢�
+ viewBinding.homeLoginAccountEt.setText(acc);
+ viewBinding.homeLoginPasswordEt.setText(pws);
isLoginTextViewEnabled();
}
@@ -188,27 +192,13 @@
}
}
});
-
//閫夋嫨b绔紝c绔�
- viewBinding.homeLoginInstallUserTv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.homeLoginCheckBCCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
v.setSelected(!v.isSelected());
UserConfigManage.getInstance().setBAccount(v.isSelected());
viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
- if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
- } else {
- viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
- }
- }
- });
- //閫夋嫨b绔紝c绔�
- viewBinding.homeLoginCheckBCIv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- v.setSelected(!v.isSelected());
- UserConfigManage.getInstance().setBAccount(v.isSelected());
if (UserConfigManage.getInstance().isBAccount()) {
viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
} else {
@@ -245,6 +235,8 @@
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);
//鍒濆鍖栨湇鍔″煙鍚�
AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
@@ -257,7 +249,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 +264,13 @@
public void onFailure(HDLException e) {
hideLoading();
restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(MyPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
finish();
}
});
@@ -560,4 +565,6 @@
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0