1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段

Linjiajia

2024-02-28 b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5

 app/src/main/res/layout/fragment_home.xml

@@ -38,42 +38,57 @@
            </FrameLayout>
        </com.android.app_base.widget.ExtendTitleBar>

        <com.otaliastudios.zoom.ZoomLayout
            android:id="@+id/zoomLayout"
        <androidx.constraintlayout.widget.ConstraintLayout
            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"
            android:background="?attr/pageBackgroundColor"
            >

            <com.application.zhangshi_app_android.widget.HomeMindMapLayout
                android:id="@+id/scrollHomeMindMapLayout"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
            <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>
            <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>