张钢
2024-09-11 e7a6728aea008cab5befa5980382370c32974ce5
修改了百年心愿模块的排版和显示不正确的问题
3个文件已修改
146 ■■■■ 已修改文件
app/src/main/res/layout/activity_hundred_wish.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_hundred_wish_detail.xml 129 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/item_hundred_wish.xml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_hundred_wish.xml
@@ -282,7 +282,7 @@
                        android:layout_weight="4"
                        android:layout_height="wrap_content"
                        android:background="@null"
                        android:inputType="text"
                        android:inputType="textMultiLine"
                        android:layout_marginStart="6dp"
                        android:text="@={viewModel.requestBeanLiveData.title}"
                        android:hint="请输入理想标题"
app/src/main/res/layout/activity_hundred_wish_detail.xml
@@ -25,181 +25,184 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            >
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                android:paddingHorizontal="20dp"
                android:paddingBottom="20dp"
                >
                android:scrollbarAlwaysDrawVerticalTrack="true">
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="@dimen/dp_10"
                    android:layout_height="@dimen/dp_20"
                    android:layout_marginTop="@dimen/dp_10"
                    android:text="理想标题/百年愿望"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:inputType="text"
                    android:autofillHints="creditCardNumber"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.title}"
                    />
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="时间"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.happenTime}"
                    android:textColor="#DE000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="始于何因"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.cause}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="受惠人"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.beneficiary}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="继承人"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.heir}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="实现难度"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.difficulty}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="是否依旧有效"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.isEffective}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="备注"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp" />
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp"
                    android:inputType="textMultiLine"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="电子文件"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />
                <RelativeLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="@drawable/shape_6b0000_stroke"
                    >
                    android:background="@drawable/shape_6b0000_stroke">
                    <com.android.app_base.widget.WrapRecyclerView
                        android:id="@+id/rv_image"
                        android:orientation="vertical"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginBottom="10dp"
                        android:layout_marginTop="2sp"
                        android:paddingStart="10dp"
                        android:paddingEnd="5dp"
                        android:layout_marginBottom="10dp"
                        android:orientation="vertical"
                        android:paddingVertical="10dp"
                        />
                        android:paddingStart="10dp"
                        android:paddingEnd="5dp" />
                </RelativeLayout>
            </LinearLayout>
        </ScrollView>
app/src/main/res/layout/item_hundred_wish.xml
@@ -48,7 +48,7 @@
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toTopOf="parent"
                        app:layout_constraintWidth_percent="0.5"
                        tools:text="张氏App立项" />
                         />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
@@ -57,7 +57,6 @@
                        android:text="@{bean.happenTime}"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"
                        tools:text="2023-05-16"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintTop_toTopOf="parent"
                        app:layout_constraintEnd_toStartOf="@id/iv_fold"
@@ -102,6 +101,8 @@
                            android:text="@{bean.cause}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="1"
                            android:ellipsize="end"
                            />
                    </LinearLayout>
                    <LinearLayout
@@ -123,6 +124,8 @@
                            android:text="@{bean.beneficiary}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="1"
                            android:ellipsize="end"
                            />
                    </LinearLayout>
                    <LinearLayout
@@ -144,6 +147,8 @@
                            android:text="@{bean.heir}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="1"
                            android:ellipsize="end"
                            />
                    </LinearLayout>
                    <LinearLayout
@@ -165,6 +170,8 @@
                            android:text="@{bean.difficulty}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="1"
                            android:ellipsize="end"
                            />
                    </LinearLayout>
@@ -188,6 +195,8 @@
                            android:text="@{bean.isEffective}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="1"
                            android:ellipsize="end"
                            />
                    </LinearLayout>
                    <LinearLayout
@@ -209,6 +218,8 @@
                            android:text="@{bean.remark}"
                            android:textColor="@color/black"
                            android:textSize="12sp"
                            android:maxLines="2"
                            android:ellipsize="end"
                            />
                    </LinearLayout>