From bf4e40cdf60c2a2fd8a486051a1ddac2daefef62 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 19:00:24 +0800
Subject: [PATCH] 家大事记完善
---
app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
index 5b5f313..f04b9bb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
@@ -1,12 +1,15 @@
package com.application.zhangshi_app_android.ui.login;
+import static com.android.app_base.base.BaseConfig.EXTRA_TYPE;
+
+import android.content.Intent;
import android.view.View;
import androidx.annotation.NonNull;
import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.manager.AppManager;
-import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.manager.UserManager;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.databinding.ActivityLoginBinding;
@@ -19,6 +22,7 @@
* @desc 鐧诲綍娉ㄥ唽 Activity
*/
public class LoginActivity extends BaseActivity<ActivityLoginBinding,LoginActivityViewModel> {
+ private int type;
@Override
public int getLayoutId() {
return R.layout.activity_login;
@@ -31,29 +35,56 @@
@Override
public void initParam() {
-
+ System.out.println("token"+UserManager.getInstance().getToken());
+ if (!UserManager.getInstance().getToken().isEmpty()){
+ AppManager.getAppManager().startActivity(MainActivity.class);
+ finish();
+ }
+ type = getIntent().getIntExtra(EXTRA_TYPE,0);
}
@Override
public void initView() {
- binding.tvLogin.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- AppManager.getAppManager().startActivity(MainActivity.class);
- }
- });
+ if (type == 1){
+ binding.tvTitle.setText("寮犳皬APP璐﹀彿娉ㄥ唽");
+ binding.layoutPasswordAgain.setVisibility(View.VISIBLE);
+ binding.layoutWxLogin.setVisibility(View.GONE);
+ binding.tvLogin.setText("娉ㄥ唽");
+ binding.tvRegister.setText("宸叉湁璐﹀彿锛岀珛鍗崇櫥褰�");
+ }
+ binding.ivPasswordVisibility.setOnClickListener(v -> {
+ viewModel.getPasswordVisibility().postValue(Boolean.FALSE.equals(viewModel.getPasswordVisibility().getValue()));
+ });
+ binding.ivPasswordAgainVisibility.setOnClickListener(v -> {
+ viewModel.getAgainPasswordVisibility().postValue(Boolean.FALSE.equals(viewModel.getAgainPasswordVisibility().getValue()));
+ });
+ binding.tvLogin.setOnClickListener(view -> {
+ if (type == 1){
+ viewModel.register();
+ }else{
+ viewModel.login();
+ }
+// AppManager.getAppManager().startActivity(MainActivity.class);
+ });
+ binding.tvRegister.setOnClickListener(v -> {
+ if (type == 1){
+ finish();
+ }else{
+ AppManager.getAppManager().startActivity(new Intent(this, LoginActivity.class).putExtra(EXTRA_TYPE,1));
+ }
+ });
+ binding.ivCaptcha.setOnClickListener(v -> viewModel.getCaptchaImage());
}
@Override
public void initData() {
-
+ viewModel.getCaptchaImage();
}
@Override
public void initLiveDataObserve() {
}
-
@NonNull
@Override
protected ImmersionBar createStatusBarConfig() {
--
Gitblit v1.9.1