From cea2d6c31c751ba91b0756b0fc0eb8b786311bae Mon Sep 17 00:00:00 2001
From: wds <wds811@126.com>
Date: Wed, 26 May 2021 19:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myapplication/activity/LoginActivity.java       |   5 +++++
 .../myapplication/activity/MainActivity.java        |   2 +-
 .../myapplication/activity/ManagementFragment.java  |   6 ++----
 app/src/main/res/layout/activity_login.xml          |   1 +
 app/src/main/res/layout/fragment_forget_paw.xml     |   1 +
 app/src/main/res/layout/fragment_register.xml       |   1 +
 .../res/{mipmap-xxhdpi => mipmap-ldpi}/article.png  | Bin
 .../article_select.png                              | Bin
 .../main/res/{mipmap-xxhdpi => mipmap-ldpi}/map.png | Bin
 .../{mipmap-xxhdpi => mipmap-ldpi}/map_select.png   | Bin
 .../res/{mipmap-xxhdpi => mipmap-ldpi}/mine.png     | Bin
 .../{mipmap-xxhdpi => mipmap-ldpi}/mine_select.png  | Bin
 .../res/{mipmap-xxhdpi => mipmap-ldpi}/task.png     | Bin
 .../{mipmap-xxhdpi => mipmap-ldpi}/task_select.png  | Bin
 14 files changed, 11 insertions(+), 5 deletions(-)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/article.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/article_select.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/map.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/map_select.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/mine.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/mine_select.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/task.png (100%)
 rename app/src/main/res/{mipmap-xxhdpi => mipmap-ldpi}/task_select.png (100%)

diff --git a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
index 61aaf86..4d3d326 100644
--- a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
+++ b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
@@ -37,6 +37,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
         tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
         tvLogin = (TextView) findViewById(R.id.tv_login);
+        tvLogin.setOnClickListener(this::onClick);
         tvRegister.setOnClickListener(this);
         tvForgetPaw.setOnClickListener(this);
     }
@@ -54,6 +55,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 forgetPaw.putExtra("tag", 6);
                 startActivity(forgetPaw);
                 break;
+            case R.id.tv_login:
+                Intent intent = new Intent(this, HomeActivity.class);
+                startActivity(intent);
+                break;
         }
     }
 }
diff --git a/app/src/main/java/com/example/myapplication/activity/MainActivity.java b/app/src/main/java/com/example/myapplication/activity/MainActivity.java
index 85eee38..c5cfbf0 100644
--- a/app/src/main/java/com/example/myapplication/activity/MainActivity.java
+++ b/app/src/main/java/com/example/myapplication/activity/MainActivity.java
@@ -27,7 +27,7 @@ public class MainActivity extends BaseActivity {
 
             @Override
             public void onFinish() {
-                Intent intent = new Intent(MainActivity.this, HomeActivity.class);
+                Intent intent = new Intent(MainActivity.this, LoginActivity.class);
                 startActivity(intent);
                 finish();
             }
diff --git a/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java b/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
index b597180..a1e42f6 100644
--- a/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
+++ b/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
@@ -133,7 +133,6 @@ public class ManagementFragment extends BaseActivity {
                     fragmentTransaction.add(R.id.frame_layout, forgetPawFragment);
                 } else {
                     fragmentTransaction.show(forgetPawFragment);
-
                 }
                 break;
             case 7:
@@ -150,11 +149,10 @@ public class ManagementFragment extends BaseActivity {
                     fragmentTransaction.add(R.id.frame_layout, taskExplainFragment);
                 } else {
                     fragmentTransaction.show(taskExplainFragment);
-                    break;
-
                 }
-                fragmentTransaction.commit();
+                break;
         }
+                fragmentTransaction.commit();
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3d652ac..c7edd17 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/bg"
     tools:context="activity.LoginActivity">
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml
index 630d6d9..e58dae6 100644
--- a/app/src/main/res/layout/fragment_forget_paw.xml
+++ b/app/src/main/res/layout/fragment_forget_paw.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@mipmap/bg"
     tools:context=".fragment.ForgetPawFragment">
     <include layout="@layout/register_title" android:id="@+id/forgetPaw"/>
     <TextView
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index fb630b0..a2d7ae5 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@mipmap/bg"
     tools:context=".fragment.RegisterFragment">
 
     <include layout="@layout/register_title"
diff --git a/app/src/main/res/mipmap-xxhdpi/article.png b/app/src/main/res/mipmap-ldpi/article.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/article.png
rename to app/src/main/res/mipmap-ldpi/article.png
diff --git a/app/src/main/res/mipmap-xxhdpi/article_select.png b/app/src/main/res/mipmap-ldpi/article_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/article_select.png
rename to app/src/main/res/mipmap-ldpi/article_select.png
diff --git a/app/src/main/res/mipmap-xxhdpi/map.png b/app/src/main/res/mipmap-ldpi/map.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/map.png
rename to app/src/main/res/mipmap-ldpi/map.png
diff --git a/app/src/main/res/mipmap-xxhdpi/map_select.png b/app/src/main/res/mipmap-ldpi/map_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/map_select.png
rename to app/src/main/res/mipmap-ldpi/map_select.png
diff --git a/app/src/main/res/mipmap-xxhdpi/mine.png b/app/src/main/res/mipmap-ldpi/mine.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/mine.png
rename to app/src/main/res/mipmap-ldpi/mine.png
diff --git a/app/src/main/res/mipmap-xxhdpi/mine_select.png b/app/src/main/res/mipmap-ldpi/mine_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/mine_select.png
rename to app/src/main/res/mipmap-ldpi/mine_select.png
diff --git a/app/src/main/res/mipmap-xxhdpi/task.png b/app/src/main/res/mipmap-ldpi/task.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/task.png
rename to app/src/main/res/mipmap-ldpi/task.png
diff --git a/app/src/main/res/mipmap-xxhdpi/task_select.png b/app/src/main/res/mipmap-ldpi/task_select.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/task_select.png
rename to app/src/main/res/mipmap-ldpi/task_select.png