From d24a968bef23a625a987ce8bc70e846846f8e4b3 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Fri, 11 Oct 2024 11:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=8A=A5=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml                     |  2 +-
 .../main/java/com/hjx/parent/HuyouDetailActivity.java  |  2 +-
 app/src/main/res/layout/activity_huyou_detail.xml      | 16 ++++++++++++----
 app/src/main/res/layout/activity_huyou_detail_a4.xml   | 18 +++++++++++++-----
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index aa53434..c1d66df 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -15,7 +15,7 @@
               </deviceKey>
             </Target>
           </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-10-11T03:19:45.857926300Z" />
+          <timeTargetWasSelectedWithDropDown value="2024-10-11T03:36:34.174716500Z" />
         </State>
       </entry>
     </value>
diff --git a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
index 88d5b57..32200d3 100644
--- a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
@@ -72,7 +72,7 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
     @SuppressLint("CheckResult")
     @Override
     public void initView(Bundle savedInstanceState) {
-        ImmersionBar.with(this).init();
+        binding.btnBack.setOnClickListener(v -> onBackPressed());
         id = getIntent().getStringExtra("id");
         type = getIntent().getIntExtra("type", 0);
         student = (Student) getIntent().getSerializableExtra("student");
diff --git a/app/src/main/res/layout/activity_huyou_detail.xml b/app/src/main/res/layout/activity_huyou_detail.xml
index 3d8d23f..cf7d91a 100644
--- a/app/src/main/res/layout/activity_huyou_detail.xml
+++ b/app/src/main/res/layout/activity_huyou_detail.xml
@@ -21,20 +21,27 @@
         <FrameLayout
             android:orientation="horizontal"
             android:paddingHorizontal="16dp"
-            android:layout_marginTop="34dp"
+            android:layout_marginTop="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <FrameLayout
+            <LinearLayout
                 android:id="@+id/toolbar"
                 android:layout_gravity="center_vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
+                    android:id="@+id/btnBack"
+                    android:text="返回"
+                    android:textSize="16sp"
+                    android:textColor="#333"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <Space style="@style/empty_space"/>
+                <TextView
                     android:id="@+id/btnSwitch"
                     android:text="A4版"
                     android:textSize="16sp"
                     android:textColor="#333"
-                    android:layout_marginStart="48dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
@@ -42,6 +49,7 @@
                     android:text="分享"
                     android:textSize="16sp"
                     android:textColor="#333"
+                    android:layout_marginStart="8dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
@@ -53,7 +61,7 @@
                     android:layout_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
-            </FrameLayout>
+            </LinearLayout>
             <TextView
                 android:id="@+id/tvTitle"
                 android:text="周作业学习报告"
diff --git a/app/src/main/res/layout/activity_huyou_detail_a4.xml b/app/src/main/res/layout/activity_huyou_detail_a4.xml
index 46e0981..ad5e79f 100644
--- a/app/src/main/res/layout/activity_huyou_detail_a4.xml
+++ b/app/src/main/res/layout/activity_huyou_detail_a4.xml
@@ -24,24 +24,32 @@
             android:layout_marginTop="60dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <FrameLayout
+            <LinearLayout
                 android:id="@+id/toolbar"
                 android:layout_gravity="center_vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
+                    android:id="@+id/btnBack"
+                    android:text="返回"
+                    android:textSize="30sp"
+                    android:textColor="#333"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+                <Space style="@style/empty_space"/>
+                <TextView
                     android:id="@+id/btnSwitch"
                     android:text="看长图"
-                    android:textSize="20sp"
+                    android:textSize="30sp"
                     android:textColor="#333"
-                    android:layout_marginStart="48dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
                     android:id="@+id/btnShare"
                     android:text="分享"
-                    android:textSize="20sp"
+                    android:textSize="30sp"
                     android:textColor="#333"
+                    android:layout_marginStart="8dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <TextView
@@ -53,7 +61,7 @@
                     android:layout_gravity="end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
-            </FrameLayout>
+            </LinearLayout>
             <TextView
                 android:id="@+id/tvTitle"
                 android:text="周作业学习报告"
-- 
1.9.0