From 45d5814c1b2055965c5a0b8ee159b953d56bd61f Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Wed, 9 Oct 2024 16:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=89=E6=B5=B8=E5=BC=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=8F;=20=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                            | 5 +++++
 app/src/main/AndroidManifest.xml                            | 3 ++-
 app/src/main/java/com/hjx/parent/HomeworkShareActivity.java | 2 ++
 app/src/main/java/com/hjx/parent/HuyouDetailActivity.java   | 2 ++
 app/src/main/res/layout/activity_homework_share.xml         | 5 +++--
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e270a87..f4ffa0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,4 +88,9 @@ dependencies {
     implementation("com.contrarywind:Android-PickerView:4.1.9")
 
     implementation 'com.google.android:flexbox:1.0.0'
+
+    // 沉浸式状态栏和他的Kotlin拓展
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
+    implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.2'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79761ab..df10c5b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -156,7 +156,8 @@
         <activity android:name=".HomeworkSelectActivity" />
         <activity android:name=".HomeworkFeedbackActivity" />
         <activity android:name=".HomeworkTopicActivity" />
-        <activity android:name=".HomeworkShareActivity" />
+        <activity android:name=".HomeworkShareActivity"
+            android:screenOrientation="landscape"/>
         <activity android:name=".HuyouDetailActivity" />
 
         <provider
diff --git a/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java b/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java
index df157ec..9ff034f 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkShareActivity.java
@@ -17,6 +17,7 @@ import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
+import com.gyf.immersionbar.ImmersionBar;
 import com.hjx.parent.databinding.ActivityHomeworkShareBinding;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.ResponseResult;
@@ -55,6 +56,7 @@ public class HomeworkShareActivity extends BaseRxActivity<ActivityHomeworkShareB
     @SuppressLint("SetTextI18n")
     @Override
     public void initView(Bundle savedInstanceState) {
+        ImmersionBar.with(this).init();
         binding.btnBack.setOnClickListener(v -> onBackPressed());
         binding.rvWrong.setAdapter(mAdapter);
         mAdapter.setEmptyView(R.layout.empty_statistical_no_error, binding.rvWrong);
diff --git a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
index 0a3814a..88d5b57 100644
--- a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
@@ -25,6 +25,7 @@ import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.data.LineData;
 import com.github.mikephil.charting.data.LineDataSet;
 import com.github.mikephil.charting.formatter.ValueFormatter;
+import com.gyf.immersionbar.ImmersionBar;
 import com.hjx.parent.databinding.ActivityHuyouDetailBinding;
 import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.Student;
@@ -71,6 +72,7 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
     @SuppressLint("CheckResult")
     @Override
     public void initView(Bundle savedInstanceState) {
+        ImmersionBar.with(this).init();
         id = getIntent().getStringExtra("id");
         type = getIntent().getIntExtra("type", 0);
         student = (Student) getIntent().getSerializableExtra("student");
diff --git a/app/src/main/res/layout/activity_homework_share.xml b/app/src/main/res/layout/activity_homework_share.xml
index 30f0f20..c4e5f1e 100644
--- a/app/src/main/res/layout/activity_homework_share.xml
+++ b/app/src/main/res/layout/activity_homework_share.xml
@@ -11,6 +11,7 @@
 
     <androidx.appcompat.widget.Toolbar
         app:contentInsetStart="0px"
+        android:paddingTop="16dp"
         android:layout_width="match_parent"
         android:layout_height="70dp">
         <androidx.appcompat.widget.AppCompatImageView
@@ -46,8 +47,7 @@
     </androidx.appcompat.widget.Toolbar>
 
     <androidx.core.widget.NestedScrollView
-        android:layout_marginHorizontal="25dp"
-        android:layout_marginBottom="28dp"
+        android:layout_marginHorizontal="16dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <LinearLayout
@@ -56,6 +56,7 @@
             android:background="@drawable/bg_statistical_once_content"
             android:paddingVertical="8dp"
             android:paddingHorizontal="16dp"
+            android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <androidx.constraintlayout.utils.widget.ImageFilterView
-- 
1.9.0