From e7a6728aea008cab5befa5980382370c32974ce5 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期三, 11 九月 2024 14:51:07 +0800
Subject: [PATCH] 修改了百年心愿模块的排版和显示不正确的问题

---
 app/src/main/res/layout/fragment_home.xml |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d439c25..b6de99b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -6,12 +6,89 @@
     <data>
         <variable
             name="viewModel"
-            type="com.application.zhangshi_app_android.module.home.HomeFragmentViewModel" />
+            type="com.application.zhangshi_app_android.ui.home.HomeFragmentViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         >
-    </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <com.android.app_base.widget.ExtendTitleBar
+            android:id="@+id/titleBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="瀹舵牴缃戯紙浠呬緵鏌ョ湅锛�"
+            app:titleGravity="left"
+            >
+            <FrameLayout
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginHorizontal="16dp"
+                android:layout_gravity="center_vertical|end"
+                >
+                <ImageView
+                    android:id="@+id/iv_operate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="@drawable/ic_operate"
+                    />
+            </FrameLayout>
+        </com.android.app_base.widget.ExtendTitleBar>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="?attr/pageBackgroundColor"
+            >
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:src="@drawable/bg_login_zhang"
+                android:scaleType="fitCenter"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                />
+
+            <com.otaliastudios.zoom.ZoomLayout
+                android:id="@+id/zoomLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical|horizontal"
+                app:transformation="centerInside"
+                app:transformationGravity="auto"
+                app:alignment="center"
+                app:overScrollHorizontal="true"
+                app:overScrollVertical="true"
+                app:overPinchable="true"
+                app:horizontalPanEnabled="true"
+                app:verticalPanEnabled="true"
+                app:zoomEnabled="true"
+                app:flingEnabled="true"
+                app:scrollEnabled="true"
+                app:oneFingerScrollEnabled="true"
+                app:twoFingersScrollEnabled="true"
+                app:threeFingersScrollEnabled="true"
+                app:minZoom="1"
+                app:minZoomType="zoom"
+                app:maxZoom="2.5"
+                app:maxZoomType="realZoom"
+                app:animationDuration="280"
+                app:hasClickableChildren="true"
+                >
+                <com.application.zhangshi_app_android.widget.HomeMindMapLayout
+                    android:id="@+id/scrollHomeMindMapLayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    />
+            </com.otaliastudios.zoom.ZoomLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
 </layout>
\ No newline at end of file

--
Gitblit v1.9.1