张氏APP Android端
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Linjiajia
2023-12-29 590c1cff46b105d774271f950caa9f65523f05c1 
 app/src/main/res/layout/item_tourism.xml


@@ -19,7 +19,7 @@


            android:layout_height="40dp"


            android:layout_margin="@dimen/dp_2"


            app:cardCornerRadius="@dimen/dp_10"


            app:cardBackgroundColor="@color/color_card_pink"


            app:cardBackgroundColor="?attr/cardBackgroundColorFirst"


            tools:layout_height="wrap_content"


            >


            <LinearLayout


@@ -39,7 +39,7 @@


                        android:layout_height="18dp"


                        android:layout_marginStart="3dp"


                        android:layout_centerVertical="true"


                        android:button="@drawable/selector_checkbox"


                        android:button="?attr/checkboxSelector"


                        android:background="?selectableItemBackgroundBorderless"


                        app:layout_constraintStart_toStartOf="parent"


                        app:layout_constraintTop_toTopOf="parent"


@@ -52,7 +52,7 @@


                        android:layout_centerVertical="true"


                        android:ellipsize="end"


                        android:maxLines="1"


                        android:text="@{bean.title}"


                        android:text="@{bean.name}"


                        android:textColor="@color/black"


                        android:textSize="16sp"


                        android:layout_marginStart="24dp"


@@ -146,14 +146,14 @@


                        <TextView


                            android:layout_width="wrap_content"


                            android:layout_height="wrap_content"


                            android:text="总天数："


                            android:text="团费："


                            android:textColor="@color/black"


                            android:textSize="12sp"


                            />


                        <TextView


                            android:layout_width="wrap_content"


                            android:layout_height="wrap_content"


                            android:text="@{bean.totalDay}"


                            android:text="@{bean.groupTotal}"


                            android:textColor="@color/black"


                            android:textSize="12sp"


                            />


@@ -174,7 +174,7 @@


                        <TextView


                            android:layout_width="wrap_content"


                            android:layout_height="wrap_content"


                            android:text="@{bean.totalCost}"


                            android:text="@{bean.totalPrice}"


                            android:textColor="@color/black"


                            android:textSize="12sp"


                            />


@@ -197,7 +197,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="餐费："


                                android:text="总餐费："


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -205,7 +205,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="@{bean.eat}"


                                android:text="@{bean.eatTotal}"


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -222,7 +222,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="住宿："


                                android:text="总住宿费："


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -230,7 +230,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="@{bean.stay}"


                                android:text="@{bean.stayTotal}"


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -247,7 +247,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="交通："


                                android:text=""


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -255,7 +255,6 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="@{bean.traffic}"


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -272,7 +271,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="门票："


                                android:text="总门票费："


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -280,7 +279,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="@{bean.entrance}"


                                android:text="@{bean.entranceTotal}"


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -296,7 +295,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="购物："


                                android:text="总交通费："


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -304,7 +303,7 @@


                            <TextView


                                android:layout_width="wrap_content"


                                android:layout_height="wrap_content"


                                android:text="@{bean.shopping}"


                                android:text="@{bean.travelTotal}"


                                android:textColor="@color/black"


                                android:textSize="12sp"


                                />


@@ -314,6 +313,7 @@


                        android:layout_width="wrap_content"


                        android:layout_height="wrap_content"


                        android:layout_gravity="center"


                        android:gravity="center_vertical"


                        android:layout_marginBottom="@dimen/dp_12"


                        android:layout_marginTop="6dp"


                        >


@@ -363,9 +363,9 @@


                            android:id="@+id/tv_detail"


                            android:layout_width="wrap_content"


                            android:layout_height="wrap_content"


                            android:text="查看详情"


                            android:text="每日游记"


                            android:textColor="@color/black"


                            android:textSize="14sp"


                            android:textSize="18sp"


                            android:layout_marginStart="20dp"


                            />


                    </LinearLayout>