From 6696322d7aee62b0247878ddcd1edc10f736b8b3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 01 七月 2024 17:09:03 +0800
Subject: [PATCH] 2024年07月01日17:09:01
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 42 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index f1d023e..90f3014 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -30,6 +30,8 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
+import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -47,6 +49,7 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
+import com.hdl.sdk.link.common.exception.HDLLinkException;
import java.util.List;
@@ -118,7 +121,9 @@
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
+// String acc = "18402017839";
String acc = "13375012441";
+// String acc = "18316672920";
// String acc = "nuy13368@uzxia.com";
String pws = "123456";
//娴嬭瘯鐢�
@@ -163,15 +168,19 @@
}
});
+ //杈撳叆璐﹀彿
viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
+ //娓呴櫎璐﹀彿鎸夐挳
viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
viewBinding.homeLoginAccountEt.setText("");
+ viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
}
});
-
+ //杈撳叆瀵嗙爜
viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
+ //瀵嗙爜闅愯棌鎸夐挳
viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -199,7 +208,7 @@
UserConfigManage.getInstance().setBAccount(v.isSelected());
viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ viewBinding.homeLoginRegisterTv.setVisibility(View.INVISIBLE);
} else {
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
@@ -234,45 +243,55 @@
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);
+ //寮�鍙戠幆澧�
+// String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
+// AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
//鍒濆鍖栨湇鍔″煙鍚�
-// AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+ AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
@Override
public void onSuccess(HDLLoginBean obj) {
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
- hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ restoreButtonStyleToInitializeState();
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ hideLoading();
+ finish();
+ } else {
+ //C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
+ hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+ finish();
}
- finish();
- }
- @Override
- public void onFailure(HDLException e) {
- hideLoading();
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+ finish();
}
- finish();
- }
- });
+ });
+ }
}
@Override
@@ -485,26 +504,28 @@
* 寮圭獥
*/
private void getDialog() {
- ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
- dialog.setTitle(getString(R.string.loading_privacy));
- dialog.setContent(getString(R.string.loading_privacy_server));
- dialog.show();
- setStringDifferentColors(dialog.getContentTextView());
- dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
+ confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+ confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
+ confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
-
UserConfigManage.getInstance().setAcceiptPolicy(true);
viewBinding.homeLoginPrivacyCheckIv.setSelected(true);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
- dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
UserConfigManage.getInstance().setAcceiptPolicy(false);
viewBinding.homeLoginPrivacyCheckIv.setSelected(false);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
--
Gitblit v1.8.0