From b8209d15d915f72d9abe3a68b76e1f4cfd21eac3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:37:00 +0800
Subject: [PATCH] 2023年09月23日14:36:51
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 d367a11..bbe33e5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -1,8 +1,7 @@
package com.hdl.photovoltaic.ui;
-import android.Manifest;
-import android.content.pm.PackageManager;
+import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.Spannable;
@@ -17,36 +16,31 @@
import android.widget.TextView;
-import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.hdl.photovoltaic.HDLApp;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
+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.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
-import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.other.HdlFileLogic;
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.bean.HouseIdBean;
-import com.hdl.photovoltaic.ui.bean.LoginUserBean;
-import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
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.device.FastScanActivity;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.utils.PermissionUtils;
-import com.hdl.photovoltaic.utils.WifiUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
import java.util.List;
-
+/**
+ * 鐧诲綍鐨勭晫闈�
+ */
public class HomeLoginActivity extends CustomBaseActivity {
private ActivityHomeLoginBinding viewBinding;
@@ -201,13 +195,14 @@
// return;
// }
showLoading(getString(R.string.home_login_鐧诲綍涓�));
- HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() {
+ HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
- public void onSuccess(LoginUserRegionBean obj) {
+ public void onSuccess(HDLUserRegionBean obj) {
AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
- HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
+ HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
+ HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
@Override
- public void onSuccess(LoginUserBean obj) {
+ public void onSuccess(HDLLoginBean obj) {
HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
public void onSuccess(List<HouseIdBean> obj) {
@@ -218,7 +213,7 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
hideLoading();
restoreButtonStyleToInitializeState();
startActivity(MyPowerStationActivity.class);
@@ -227,14 +222,14 @@
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException exception) {
hideLoading();
}
});
}
@Override
- public void onFailure(Exception exception) {
+ public void onFailure(HDLException e) {
hideLoading();
}
});
@@ -248,6 +243,25 @@
public void onClick(View v) {
// requestPermissions();
// startActivity(MyPowerStationActivity.class);
+ HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
+ }
+ });
+ //娉ㄥ唽
+ viewBinding.homeLoginRegisterTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(HomeLoginActivity.this, RegisterAccountActivity.class);
+ startActivity(intent);
+ }
+ });
+ //蹇樿瀵嗙爜
+ viewBinding.homeLoginForgetPasswordTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(HomeLoginActivity.this, ChangePassword.class);
+ startActivity(intent);
}
});
@@ -286,7 +300,7 @@
if (password.length() < 6 || password.length() > 16) {
viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
- viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_鏈�灏�6_16涓瓧绗�);
+ viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_6_16_str);
return false;
}
return true;
--
Gitblit v1.8.0