From 60f74b306659cba1a8ed7378f9df54a71e48a614 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 28 六月 2023 18:04:09 +0800
Subject: [PATCH] 临时
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 4af46c0..d367a11 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -1,6 +1,8 @@
package com.hdl.photovoltaic.ui;
+import android.Manifest;
+import android.content.pm.PackageManager;
import android.os.Bundle;
import android.text.Editable;
import android.text.Spannable;
@@ -15,12 +17,18 @@
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.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+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;
@@ -28,6 +36,15 @@
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 {
@@ -191,27 +208,22 @@
HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
@Override
public void onSuccess(LoginUserBean obj) {
- HdlThreadLogic.runMainThread(new Runnable() {
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
- public void run() {
- HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- hideLoading();
- restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
- }
-
- @Override
- public void onFailure(Exception exception) {
- hideLoading();
- restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
- }
- });
+ public void onSuccess(List<HouseIdBean> obj) {
+ hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ restoreButtonStyleToInitializeState();
+ startActivity(MyPowerStationActivity.class);
}
- }, null, null);
+ @Override
+ public void onFailure(Exception exception) {
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ startActivity(MyPowerStationActivity.class);
+ }
+ });
}
@Override
@@ -234,15 +246,8 @@
viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+// requestPermissions();
// startActivity(MyPowerStationActivity.class);
-
- HdlThreadLogic.runMainThread(new Runnable() {
- @Override
- public void run() {
-//
- }
- }, _mActivity, ShowErrorMode.YES);
}
});
@@ -292,10 +297,15 @@
* 鎭㈠缁勪欢鏍峰紡鍒板垵濮嬪寲鐘舵��
*/
private void restoreButtonStyleToInitializeState() {
- viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
- viewBinding.homeLoginAccountTextErrorTv.setText("");
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
- viewBinding.homeLoginPasswordTextErrorTv.setText("");
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+ viewBinding.homeLoginAccountTextErrorTv.setText("");
+ viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+ viewBinding.homeLoginPasswordTextErrorTv.setText("");
+ }
+ }, null, null);
}
/**
@@ -312,4 +322,5 @@
view.setText(spannable);
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0