From 6c7f4753558099fb19919db8a3663c88d2a06e40 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 七月 2024 13:41:50 +0800
Subject: [PATCH] 2024年07月02日13:41:45
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 3 +--
app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java | 2 ++
app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java | 7 -------
app/src/main/res/values-en/strings.xml | 4 ++--
app/src/main/res/layout/dialog_list.xml | 4 ++--
5 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index d5fd1a5..fd20c2d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -175,8 +175,7 @@
viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- viewBinding.homeLoginAccountEt.setText("");
- }
+ viewBinding.homeLoginAccountEt.setText("");}
});
//杈撳叆瀵嗙爜
viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
index 69574b5..d528e4e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
@@ -147,6 +147,8 @@
en.setTitle("English");
en.setLanguage(LocalManageUtil.en);
list.add(en);
+
+
return list;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
index 738b438..6fe6789 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -1,31 +1,24 @@
package com.hdl.photovoltaic.widget;
import android.annotation.SuppressLint;
-import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
-import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
-import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.DialogListBinding;
-import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
-import com.jaeger.library.StatusBarUtil;
import java.util.List;
-import kotlin._Assertions;
/**
* 鍔ㄦ�佸垪琛ㄥ脊绐�
diff --git a/app/src/main/res/layout/dialog_list.xml b/app/src/main/res/layout/dialog_list.xml
index 0170129..4c2699e 100644
--- a/app/src/main/res/layout/dialog_list.xml
+++ b/app/src/main/res/layout/dialog_list.xml
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_60000000"
- >
+ android:background="@color/text_60000000">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/dialog_parent"
@@ -24,6 +23,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
+
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 7aeaf2c..bc7c483 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -150,7 +150,7 @@
<!--app鏇存柊-->
<string name="app_version_number">Version number</string>
- <string name="app_scan_code_download">app_scan_code_download</string>
+ <string name="app_scan_code_download">Scan to download the App</string>
<string name="app_version_upgrade">Version update</string>
<string name="app_new_version">Already the latest version</string>
<string name="app_service_agreement">Service agreement</string>
@@ -180,7 +180,7 @@
<string name="loading_on_agree">Disagree</string>
<string name="loading_privacy">Privacy policy and terms of service</string>
<string name="loading_privacy_server">To better protect your legitimate rights and interests, please read and agree to the following agreements: 銆奝rivacy Policy銆� and 銆奣erms of Service銆�.</string>
- <string name="kill_app">Press again to exit</string>
+ <string name="kill_app">Press again to exit </string>
<string name="loading_not_supported">Sorry, not supported yet</string>
<string name="loading_title_tip">Prompt</string>
<string name="loading_app_restart">Confirm to restart the App.</string>
--
Gitblit v1.8.0