From 5ca2b601848c62607d88fee5afdae6af80f6eea7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 16:12:26 +0800
Subject: [PATCH] 2024年03月20日16:12:17
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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..213d2dc 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();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -116,11 +115,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,6 +244,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 +258,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 +273,13 @@
public void onFailure(HDLException e) {
hideLoading();
restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(MyPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
finish();
}
});
@@ -559,5 +573,12 @@
viewBinding.homeLoginPasswordEt.removeTextChangedListener(passwordTextWatcher);
}
+ // 灏哠tatusBar璁剧疆涓洪�忔槑
+ public void setStatusBarTranslucent() {
+ StatusBarUtil.setTranslucentForImageViewInFragment(this,
+ 0, null);
+ StatusBarUtil.setLightMode(this);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0