From e8e304c98dea8f021b68627253b3515b43b5056b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=87=E6=95=A2di=E7=89=9B=E7=89=9B?=
 <1018389619.@qq.com>
Date: Sat, 14 May 2022 23:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=83=A8=E5=88=86=E7=9A=84UI?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=20=E8=A7=A3=E6=9E=90Json=20?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=20?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D=E8=83=8C=E8=AF=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                | 11 ++++-
 app/build.gradle                              |  5 ++-
 app/src/main/AndroidManifest.xml              | 18 ++++++++-
 .../com/example/testapp/MainActivity.java     |  7 ++++
 .../example/testapp/ui/home/HomeFragment.java | 15 +++++--
 app/src/main/res/layout/activity_main.xml     |  8 ++--
 app/src/main/res/layout/fragment_home.xml     | 33 ++++++++-------
 app/src/main/res/values/colors.xml            | 40 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 9 files changed, 114 insertions(+), 25 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cfbc531..1caa6c1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -30,22 +30,31 @@
         <entry key="..\:/Android Toos/Android project/app/src/main/res/drawable/tools_card_background.xml" value="0.138" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout-v28/bun_view.xml" value="0.1" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/actionbar_translate.xml" value="0.1" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_learn_word.xml" value="0.14166666666666666" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_main.xml" value="0.2" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_navigation.xml" value="0.12601626016260162" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_recite_word.xml" value="0.3333333333333333" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_test.xml" value="0.17916666666666667" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_translate_paragraph.xml" value="0.1" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_translate_paragraph2.xml" value="0.11614583333333334" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_word_book.xml" value="0.1" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/activity_word_detail.xml" value="0.1" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/bun_view.xml" value="0.4" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_dashboard.xml" value="0.12083333333333333" />
-        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_home.xml" value="0.12083333333333333" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_home.xml" value="0.1" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_myself.xml" value="0.1" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_news.xml" value="0.16354166666666667" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_notifications.xml" value="0.12083333333333333" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/fragment_tools.xml" value="0.13257575757575757" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/item_wd_phrase.xml" value="0.15677083333333333" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/item_wd_sentence.xml" value="0.15677083333333333" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/item_word_mean_choice.xml" value="0.14166666666666666" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/my_card_view.xml" value="0.22" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/mycardview.xml" value="0.11822916666666666" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/mylistview.xml" value="0.17864583333333334" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/mylistvuew.xml" value="0.11822916666666666" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/test.xml" value="0.1" />
+        <entry key="..\:/Android Toos/Android project/app/src/main/res/layout/word_book_card.xml" value="0.3333333333333333" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/menu/bottom_menu.xml" value="0.12083333333333333" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/menu/bottom_nav_menu.xml" value="0.12083333333333333" />
         <entry key="..\:/Android Toos/Android project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.127" />
diff --git a/app/build.gradle b/app/build.gradle
index 79cfe2d..403d348 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,11 @@ android {
 
 
 dependencies {
-
+    implementation 'com.squareup.okhttp3:okhttp:3.4.1'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.github.bumptech.glide:glide:4.13.1'
+    implementation files('libs\\litepal-2.0.0.jar')
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.1'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d10e0d6..671cd6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name="org.litepal.LitePalApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -15,10 +16,25 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.TestApp"
         android:usesCleartextTraffic="true">
+        <activity
+            android:name=".TestActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ReciteWord"
+            android:exported="false" />
+        <activity
+            android:name=".WordBook"
+            android:exported="false" />
         <activity
             android:name=".TranslateParagraphActivity"
             android:exported="false"
-            android:label="翻译"/>
+            android:label="翻译" />
+        <activity
+            android:name=".WordDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".LearnWordActivity"
+            android:exported="false" />
         <activity
             android:name=".NavigationActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/example/testapp/MainActivity.java b/app/src/main/java/com/example/testapp/MainActivity.java
index 54c802b..0a61f8b 100644
--- a/app/src/main/java/com/example/testapp/MainActivity.java
+++ b/app/src/main/java/com/example/testapp/MainActivity.java
@@ -79,6 +79,13 @@ public class MainActivity extends Activity {
                 //ShowLoginToast(); //千万不能写在这里，这里网络请求还没回来，res是空的
             }
         });
+        btn_register.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(MainActivity.this,TestActivity.class);
+                startActivity(intent);
+            }
+        });
     }
     public void GetURLResByPost(){
         new Thread(new Runnable(){
diff --git a/app/src/main/java/com/example/testapp/ui/home/HomeFragment.java b/app/src/main/java/com/example/testapp/ui/home/HomeFragment.java
index d3e5e44..ec397f4 100644
--- a/app/src/main/java/com/example/testapp/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/example/testapp/ui/home/HomeFragment.java
@@ -1,20 +1,24 @@
 package com.example.testapp.ui.home;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.example.testapp.WordBook;
 import com.example.testapp.databinding.FragmentHomeBinding;
 
 public class HomeFragment extends Fragment {
 
     private FragmentHomeBinding binding;
+    Button bookManageBtn;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
@@ -23,9 +27,14 @@ public class HomeFragment extends Fragment {
 
         binding = FragmentHomeBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
-
-        final TextView textView = binding.textHome;
-        homeViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        bookManageBtn = binding.bookManger;
+        bookManageBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getContext(), WordBook.class);
+                startActivity(intent);
+            }
+        });
         return root;
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 78cf6f0..5122013 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,16 +8,16 @@
 
     <EditText
         android:id="@+id/edt_user"
-        android:textColor="@color/black"
-        android:background="@drawable/edit_text"
-        android:textColorHint="@color/edit_hint"
         android:layout_width="@dimen/btn_edit_width"
         android:layout_height="@dimen/btn_edit_height"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="250dp"
+        android:background="@drawable/edit_text"
         android:hint="@string/login_login_user"
         android:inputType="text"
-        android:shadowColor="@color/edit_shadow" />
+        android:shadowColor="@color/edit_shadow"
+        android:textColor="@color/black"
+        android:textColorHint="@color/edit_hint" />
 
     <EditText
         android:id="@+id/edt_password"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d3fc02c..5d4fe21 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.home.HomeFragment">
 
-    <TextView
-        android:id="@+id/text_home"
-        android:text="这里是home"
-        android:layout_width="match_parent"
+    <Button
+        android:id="@+id/book_manger"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:text="词书管理"
+        />
+    <Button
+        android:layout_marginStart="100dp"
+        android:id="@+id/btn_recite_word"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="词书管理"
+        />
+
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7de3bce..dfeb0ce 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="btn_green">#3FA162</color>
     <color name="btn_blue">#0079FF</color>
     <color name="red">#F44336</color>
+    <color name="colorLightRed">#FF3A35</color>
     <color name="edit_hint">#80343965</color>
     <color name="edit_shadow">#001DB0</color>
     <color name="transparent">#00F2E9E9</color>
@@ -17,5 +18,44 @@
     <color name="nav_ic_checked_no">#1296db</color>
     <color name="tools_card_background">#F6F6F6</color>
     <color name="transparent_1">#0FF6F6F6</color>
+    <color name="test_color">#E6041717</color>
+    <color name="pa_text">#091630</color>
+    <color name="colorPrimary">#3675FF</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#4089ff</color>
+    <color name="colorMainBlue">#3675FF</color>
+    <color name="colorLightBlue">#4089ff</color>
+    <color name="colorLightBlueN">#3E6AB1</color>
+    <color name="colorLittleBlue">#EBF1FD</color>
+    <color name="colorLittleBlueN">#888C95</color>
+    <color name="colorLightGreen">#00BECE</color>
+    <color name="colorLightRedN">#CF4642</color>
+    <color name="colorLittleRed">#FBECEE</color>
+    <color name="colorLittleRedN">#9F9596</color>
+    <color name="colorLightYellow">#FFBC00</color>
+    <color name="colorLightBlack">#333944</color>
+    <color name="colorLightBlackN">#7C7C7C</color>
+    <color name="colorBgLightBlack">#333944</color>
+    <color name="colorBgLightBlackTop">#2C3039</color>
+    <color name="colorBlack">#000000</color>
+    <color name="colorBlackAS">#000000</color>
+    <color name="colorGrey">#626873</color>
+    <color name="colorLightGrey">#8994A9</color>
+    <color name="colorBgOrange">#FBB692</color>
+    <color name="colorLightWhite">#F2F3F8</color>
+    <color name="colorLightWhiteAS">#F2F3F8</color>
+    <color name="colorLightWhiteN">#3c3c3c</color>
+    <color name="colorLittleWhite">#FBFBFD</color>
+    <color name="colorLittleWhiteN">#424242</color>
+    <color name="colorFontWhite">#EAEAEA</color>
+    <color name="colorMainFont">#ffffff</color>
+    <color name="colorFontInBlue">#FFFFFF</color>
+    <color name="colorFontAS">#FFFFFF</color>
+    <color name="colorFontInWhite">#090909</color>
+    <color name="colorFontInGrey">#ffffff</color>
+    <color name="colorBgWhite">#FFFFFF</color>
+    <color name="colorBgWhiteN">#424242</color>
+    <color name="colorBgLittleWhite">#FBFBFD</color>
+
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71048ff..40a0f1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,5 +21,7 @@
     <string name="edt_put_hit">源自翻译API，翻译结果仅供参考</string>
     <string name="edt_input_hint">输入您需要翻译的段落，并选择”汉译英“或”英译汉“</string>
     <string name="translate_title">段落翻译</string>
+    <string name="word_books">词书管理</string>
+    <string name="down_word_book">下载词书</string>
 
 </resources>
\ No newline at end of file
-- 
GitLab