From 715b7407a765deb093b1677705b151d268e3dd4d Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 12 六月 2023 18:56:31 +0800 Subject: [PATCH] 2023年06月12日18:56:25 --- app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 85 +++++++++++++++++++++++++++++++----------- 1 files changed, 62 insertions(+), 23 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 ba77b80..231ce2a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java @@ -19,11 +19,14 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; -import com.hdl.photovoltaic.bean.LoginUserRegionBean; -import com.hdl.photovoltaic.config.ConfigManagement; +import com.hdl.photovoltaic.other.HdlResidenceLogic; +import com.hdl.photovoltaic.ui.bean.LoginBean; +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; public class HomeLoginActivity extends CustomBaseActivity { @@ -48,6 +51,10 @@ private void initView() { setStringDifferentColors(viewBinding.homeLoginPrivacyTv); + //娴嬭瘯鐢� + viewBinding.homeLoginAccountEt.setText("18402017839"); + viewBinding.homeLoginPasswordEt.setText("123456"); + isLoginTextViewEnabled(); } private void initEvent() { @@ -139,7 +146,10 @@ viewBinding.homeLoginTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - boolean isLogin = isLocalCheckAccountAndPassword(); + + String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", ""); + String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", ""); + boolean isLogin = isLocalCheckAccountAndPassword(account, password); if (!isLogin) { return; } @@ -148,9 +158,49 @@ // //闅愮鍗忚鎻愮ず // return; // } - restoreButtonStyleToInitializeState(); + showLoading(getString(R.string.home_login_鐧诲綍涓�)); + 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>() { + @Override + public void onSuccess(LoginBean obj) { + HdlThreadLogic.runMainThread(new Runnable() { + @Override + public void run() { + HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { - startActivity(MyPowerStationActivity.class); + } + + @Override + public void onFailure(Exception exception) { + + } + }); + hideLoading(); + restoreButtonStyleToInitializeState(); + startActivity(MyPowerStationActivity.class); + + } + }, null, null); + + } + + @Override + public void onFailure(Exception exception) { + hideLoading(); + } + }); + } + + @Override + public void onFailure(Exception exception) { + hideLoading(); + } + }); } @@ -159,19 +209,7 @@ viewBinding.homeLoginExperienceTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { -// startActivity(MyPowerStationActivity.class); - HdlAccountLogic.getInstance().regionByAccount("18402017839", new CloudCallBeak<LoginUserRegionBean>() { - @Override - public void onSuccess(LoginUserRegionBean obj) { - ConfigManagement.setUserRegionUrl(obj.getRegionUrl()); - } - - @Override - public void onFailure(Exception exception) { - - } - }); - + startActivity(MyPowerStationActivity.class); } }); @@ -189,12 +227,13 @@ /** * 鏈湴鏍¢獙杈撳叆璐﹀彿鎴栬�呭瘑鐮佹槸鍚︽纭� - * 姝g‘杩斿洖<true>true</true> - * 涓�鑸柟娉� + * + * @param account 璐﹀彿 + * @param password 瀵嗙爜 + * 姝g‘杩斿洖<true>true</true> + * 涓�鑸柟娉� */ - private boolean isLocalCheckAccountAndPassword() { - String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", ""); - String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", ""); + private boolean isLocalCheckAccountAndPassword(String account, String password) { if (TextUtils.isEmpty(account)) { viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545)); viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_璐﹀彿涓嶈兘涓虹┖); -- Gitblit v1.8.0