From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 f04b9bb..bd543f8 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
@@ -2,7 +2,9 @@
import static com.android.app_base.base.BaseConfig.EXTRA_TYPE;
+import android.Manifest;
import android.content.Intent;
+import android.text.TextUtils;
import android.view.View;
import androidx.annotation.NonNull;
@@ -10,10 +12,13 @@
import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.manager.AppManager;
import com.android.app_base.manager.UserManager;
+import com.android.app_base.utils.SPUtils;
+import com.android.app_base.utils.ToastUtils;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.databinding.ActivityLoginBinding;
import com.application.zhangshi_app_android.ui.main.MainActivity;
+import com.blankj.utilcode.util.PermissionUtils;
import com.gyf.immersionbar.ImmersionBar;
/**
@@ -35,18 +40,21 @@
@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);
+ String selectLoginBackground = SPUtils.getInstance("loginBackground").getString("selectLoginBackground");
+ if (!TextUtils.isEmpty(selectLoginBackground)){
+ viewModel.getSelectLoginBackgroundLiveData().setValue(selectLoginBackground);
+ }
}
@Override
public void initView() {
if (type == 1){
- binding.tvTitle.setText("寮犳皬APP璐﹀彿娉ㄥ唽");
+ binding.tvTitle.setText("鏈兘閮藉缃戣处鍙锋敞鍐�");
binding.layoutPasswordAgain.setVisibility(View.VISIBLE);
binding.layoutWxLogin.setVisibility(View.GONE);
binding.tvLogin.setText("娉ㄥ唽");
--
Gitblit v1.9.1