From 9eef1c69f214882b5ada2dae2a55df21bdd3058b Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 26 六月 2023 16:02:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 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 231ce2a..adf4e9f 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,18 +17,24 @@
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+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.LoginBean;
+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.utils.PermissionUtils;
+import com.hdl.photovoltaic.utils.WifiUtils;
public class HomeLoginActivity extends CustomBaseActivity {
@@ -45,6 +53,30 @@
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
+ //鍦ㄧ晫闈腑浣跨敤
+// KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
+// @Override
+// public void onKeyboardShow(int h) {
+// //Toast.makeText(MainActivity.this,"閿洏寮瑰嚭",Toast.LENGTH_SHORT).show();
+// ConstraintSet cs = new ConstraintSet();
+// cs.clone(viewBinding.homeLoginParentCl);
+//// (viewBinding.loadingConfirmationRl.getTop()-dip2px(h))
+// cs.connect(R.id.home_login_tv, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, h);//
+// //搴旂敤绾︽潫
+// cs.applyTo(viewBinding.homeLoginParentCl);
+// }
+//
+// @Override
+//
+// public void onKeyboardHide(int h) {
+// ConstraintSet cs = new ConstraintSet();
+// cs.clone(viewBinding.homeLoginParentCl);
+// cs.connect(R.id.home_login_tv, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, h);//
+// //搴旂敤绾︽潫
+// cs.applyTo(viewBinding.homeLoginParentCl);
+// }
+//
+// });
}
@@ -52,7 +84,7 @@
private void initView() {
setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
//娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText("18402017839");
+ viewBinding.homeLoginAccountEt.setText("13375012441");
viewBinding.homeLoginPasswordEt.setText("123456");
isLoginTextViewEnabled();
}
@@ -162,28 +194,28 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<LoginUserRegionBean>() {
@Override
public void onSuccess(LoginUserRegionBean obj) {
- AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
- HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginBean>() {
+ AppConfigManage.setUserRegionUrl("http://59.41.255.150:7777");//obj.getRegionUrl()
+ HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
@Override
- public void onSuccess(LoginBean obj) {
+ public void onSuccess(LoginUserBean obj) {
HdlThreadLogic.runMainThread(new Runnable() {
@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);
}
});
- hideLoading();
- restoreButtonStyleToInitializeState();
- startActivity(MyPowerStationActivity.class);
-
}
}, null, null);
@@ -209,7 +241,14 @@
viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(MyPowerStationActivity.class);
+// requestPermissions();
+// startActivity(MyPowerStationActivity.class);
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ int s = 1 / 0;
+ }
+ }, _mActivity, ShowErrorMode.YES);
}
});
@@ -280,4 +319,33 @@
}
+ private void requestPermissions() {
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
+ if (ary.length > 0) {
+ requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ } else {
+ wifi();
+ }
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+ if (requestCode == PermissionUtils.STATUS_SUCCESS) {
+ for (int i = 0; i < permissions.length; i++) {
+ if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
+ wifi();
+ }
+
+ }
+ }
+
+ }
+
+ public void wifi() {
+ WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
+// wifiUtils.getCurrentConnectWifiInfo();
+// wifiUtils.getScanResult();
+ wifiUtils.connectWiFi("Application", "12345678", 3);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0