From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件
---
app/src/main/res/layout/fragment_home.xml | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 70ac7a4..be0ed04 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -20,49 +20,60 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="瀹舵牴缃戯紙浠呬緵鏌ョ湅锛�"
- app:titleGravity="left" />
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ app:titleGravity="left"
>
- <com.application.zhangshi_app_android.widget.TreeView
- android:id="@+id/treeView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone"
- android:id="@+id/layout_home_root_net"
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
>
<ImageView
- android:id="@+id/iv_treeView"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- app:layout_constraintDimensionRatio="360:417"
- android:background="@drawable/bg_home_root_net"
- app:layout_constraintBottom_toBottomOf="parent" />
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:background="@drawable/bg_home_root_net_grass"
- app:layout_constraintBottom_toBottomOf="@id/iv_treeView"
- app:layout_constraintDimensionRatio="350:217"
- android:layout_marginBottom="-56dp"
+ 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>
+ <com.otaliastudios.zoom.ZoomLayout
+ android:id="@+id/zoomLayout"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ 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"
+ android:background="@color/color_normal_background"
+ >
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/rv_home_member"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:visibility="gone"
+ <com.application.zhangshi_app_android.widget.HomeMindMapLayout
+ android:id="@+id/scrollHomeMindMapLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
/>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </com.otaliastudios.zoom.ZoomLayout>
+
</LinearLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.1