周报布局调整

shixianjie
1 parent 4cd487c75a
Showing 4 changed files with 27 additions and 11 deletions Show diff stats
.idea/deploymentTargetDropDown.xml
app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
app/src/main/res/layout/activity_huyou_detail.xml
app/src/main/res/layout/activity_huyou_detail_a4.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>
@@ -72,7 +72,7 @@ public class HuyouDetailActivity extends BaseRxActivity&lt;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");
@@ -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="周作业学习报告"
@@ -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="周作业学习报告"
...	...	@@ -15,7 +15,7 @@
15	15	</deviceKey>
16	16	</Target>
17	17	</runningDeviceTargetSelectedWithDropDown>
18		- <timeTargetWasSelectedWithDropDown value="2024-10-11T03:19:45.857926300Z" />
	18	+ <timeTargetWasSelectedWithDropDown value="2024-10-11T03:36:34.174716500Z" />
19	19	</State>
20	20	</entry>
21	21	</value>
...	...
...	...	@@ -72,7 +72,7 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
72	72	@SuppressLint("CheckResult")
73	73	@Override
74	74	public void initView(Bundle savedInstanceState) {
75		- ImmersionBar.with(this).init();
	75	+ binding.btnBack.setOnClickListener(v -> onBackPressed());
76	76	id = getIntent().getStringExtra("id");
77	77	type = getIntent().getIntExtra("type", 0);
78	78	student = (Student) getIntent().getSerializableExtra("student");
...	...
...	...	@@ -21,20 +21,27 @@
21	21	<FrameLayout
22	22	android:orientation="horizontal"
23	23	android:paddingHorizontal="16dp"
24		- android:layout_marginTop="34dp"
	24	+ android:layout_marginTop="16dp"
25	25	android:layout_width="match_parent"
26	26	android:layout_height="wrap_content">
27		- <FrameLayout
	27	+ <LinearLayout
28	28	android:id="@+id/toolbar"
29	29	android:layout_gravity="center_vertical"
30	30	android:layout_width="match_parent"
31	31	android:layout_height="wrap_content">
32	32	<TextView
	33	+ android:id="@+id/btnBack"
	34	+ android:text="返回"
	35	+ android:textSize="16sp"
	36	+ android:textColor="#333"
	37	+ android:layout_width="wrap_content"
	38	+ android:layout_height="wrap_content"/>
	39	+ <Space style="@style/empty_space"/>
	40	+ <TextView
33	41	android:id="@+id/btnSwitch"
34	42	android:text="A4版"
35	43	android:textSize="16sp"
36	44	android:textColor="#333"
37		- android:layout_marginStart="48dp"
38	45	android:layout_width="wrap_content"
39	46	android:layout_height="wrap_content"/>
40	47	<TextView
...	...	@@ -42,6 +49,7 @@
42	49	android:text="分享"
43	50	android:textSize="16sp"
44	51	android:textColor="#333"
	52	+ android:layout_marginStart="8dp"
45	53	android:layout_width="wrap_content"
46	54	android:layout_height="wrap_content"/>
47	55	<TextView
...	...	@@ -53,7 +61,7 @@
53	61	android:layout_gravity="center_vertical\|end"
54	62	android:layout_width="wrap_content"
55	63	android:layout_height="wrap_content"/>
56		- </FrameLayout>
	64	+ </LinearLayout>
57	65	<TextView
58	66	android:id="@+id/tvTitle"
59	67	android:text="周作业学习报告"
...	...
...	...	@@ -24,24 +24,32 @@
24	24	android:layout_marginTop="60dp"
25	25	android:layout_width="match_parent"
26	26	android:layout_height="wrap_content">
27		- <FrameLayout
	27	+ <LinearLayout
28	28	android:id="@+id/toolbar"
29	29	android:layout_gravity="center_vertical"
30	30	android:layout_width="match_parent"
31	31	android:layout_height="wrap_content">
32	32	<TextView
	33	+ android:id="@+id/btnBack"
	34	+ android:text="返回"
	35	+ android:textSize="30sp"
	36	+ android:textColor="#333"
	37	+ android:layout_width="wrap_content"
	38	+ android:layout_height="wrap_content"/>
	39	+ <Space style="@style/empty_space"/>
	40	+ <TextView
33	41	android:id="@+id/btnSwitch"
34	42	android:text="看长图"
35		- android:textSize="20sp"
	43	+ android:textSize="30sp"
36	44	android:textColor="#333"
37		- android:layout_marginStart="48dp"
38	45	android:layout_width="wrap_content"
39	46	android:layout_height="wrap_content"/>
40	47	<TextView
41	48	android:id="@+id/btnShare"
42	49	android:text="分享"
43		- android:textSize="20sp"
	50	+ android:textSize="30sp"
44	51	android:textColor="#333"
	52	+ android:layout_marginStart="8dp"
45	53	android:layout_width="wrap_content"
46	54	android:layout_height="wrap_content"/>
47	55	<TextView
...	...	@@ -53,7 +61,7 @@
53	61	android:layout_gravity="end"
54	62	android:layout_width="wrap_content"
55	63	android:layout_height="wrap_content"/>
56		- </FrameLayout>
	64	+ </LinearLayout>
57	65	<TextView
58	66	android:id="@+id/tvTitle"
59	67	android:text="周作业学习报告"
...	...