From 9d6dd1ccc62eb2c7030eb0cc1e6aa05d7ee67458 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 10:11:10 +0800
Subject: [PATCH] 2024年03月20日10:11:04
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 52c06c8..8c0584d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -25,20 +25,22 @@
import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
+import com.hdl.photovoltaic.HDLApp;
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;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -147,6 +149,11 @@
UserConfigManage.getInstance().Save();
//閰嶇疆鎺ュ彛璇锋眰璇█
HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+ listDialog.dismiss();
+ AppManagerUtils.getAppManager().finishAllActivity();
+ Intent intent = new Intent();
+ intent.setClass(HDLApp.getInstance(), StartActivity.class);
+ startActivity(intent);
viewBinding.homeLoginLanguageTv.setText(itemData.getTitle());
}
});
@@ -224,8 +231,8 @@
String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
- boolean isLogin = isLocalCheckAccountAndPassword(account, password);
- if (!isLogin) {
+ boolean is_login = isLocalCheckAccountAndPassword(account, password);
+ if (!is_login) {
return;
}
boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
@@ -238,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
@@ -250,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();
}
@@ -258,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