修改了国籍和民族字段反转的问题

张钢

2024-09-12 f278edbd3f0f809e4a3b59bf16d24c624a43f98d

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

@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools">

    <data>
        <import type="android.text.TextUtils"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.TourismExperienceDetailActivityViewModel" />
@@ -12,15 +13,31 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/color_normal_background"
        android:background="?attr/detailPageBackgroundColor"
        android:orientation="vertical">

        <com.android.app_base.widget.ExtendTitleBar
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:title="@{viewModel.beanLiveData.title}"
            app:title="@{TextUtils.isEmpty(viewModel.beanLiveData.address)?`新建旅游经历`:viewModel.beanLiveData.address}"
            app:titleGravity="left"
            />
            app:leftIcon="@drawable/ic_back"
            >
            <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="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}"
                    />
            </FrameLayout>
        </com.android.app_base.widget.ExtendTitleBar>
        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@@ -36,7 +53,7 @@
                    android:layout_width="wrap_content"
                    android:layout_marginTop="@dimen/dp_10"
                    android:layout_height="@dimen/dp_20"
                    android:text="标题"
                    android:text="行程地点"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
@@ -48,50 +65,41 @@
                    android:inputType="text"
                    android:autofillHints="creditCardNumber"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入行程地点`:``}"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:text="@={viewModel.beanLiveData.title}"
                    />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="时间"
                    android:textColor="#767375"
                    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:text="@={viewModel.beanLiveData.time}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="地点"
                    android:textColor="#767375"
                    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:text="@={viewModel.beanLiveData.address}"
                    android:textColor="#DE000000"
                    android:textSize="16sp" />
                    android:enabled="@{viewModel.typeLiveData}"
                    />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="人物"
                    android:text="行程时间"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />

                <EditText
                    android:id="@+id/et_time"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请选择行程时间`:``}"
                    android:text="@={viewModel.beanLiveData.happenDate}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    app:isEditable="@{false}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="景点"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
@@ -101,14 +109,17 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入景点`:``}"
                    android:text="@={viewModel.beanLiveData.scenic}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.person}"
                    android:textSize="16sp" />
                    android:enabled="@{viewModel.typeLiveData}"
                    android:textSize="16sp"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="旅期"
                    android:text="住宿酒店"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
@@ -118,63 +129,187 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入住宿酒店`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.travelTime}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="持证旅游"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    android:text="@={viewModel.beanLiveData.hotel}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <EditText


                <LinearLayout
                    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.certificate}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="费用"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                <EditText
                    android:layout_marginTop="12dp"
                    >
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="住宿费"
                            android:textColor="#767375"
                            android:textSize="12sp"
                            />
                        <androidx.appcompat.widget.AppCompatEditText
                            android:id="@+id/et_stay"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
                            android:textColorHint="#6b000000"
                            android:textColor="#DE000000"
                            android:text="@={viewModel.beanLiveData.stay}"
                            android:hint="0"
                            app:need_modify_null="@{true}"
                            android:textSize="16sp"
                            android:maxLines="1"
                            android:enabled="@{viewModel.typeLiveData}"
                            />

                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        android:layout_marginStart="40dp"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="交通费"
                            android:textColor="#767375"
                            android:textSize="12sp"
                            />
                        <EditText
                            android:id="@+id/et_traffic"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
                            android:textColorHint="#6b000000"
                            android:textColor="#DE000000"
                            android:text="@={viewModel.beanLiveData.travel}"
                            android:hint="0"
                            app:need_modify_null="@{true}"
                            android:textSize="16sp"
                            android:maxLines="1"
                            android:enabled="@{viewModel.typeLiveData}"
                            />

                    </LinearLayout>
                </LinearLayout>
                <LinearLayout
                    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.cost}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="公费或自费"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                <EditText
                    android:layout_marginTop="12dp"
                    >
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="门票费"
                            android:textColor="#767375"
                            android:textSize="12sp"
                            />
                        <EditText
                            android:id="@+id/et_entrance"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
                            android:textColorHint="#6b000000"
                            android:textColor="#DE000000"
                            android:text="@={viewModel.beanLiveData.entrance}"
                            android:hint="0"
                            app:need_modify_null="@{true}"
                            android:textSize="16sp"
                            android:maxLines="1"
                            android:enabled="@{viewModel.typeLiveData}"
                            />

                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        android:layout_marginStart="40dp"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="餐费"
                            android:textColor="#767375"
                            android:textSize="12sp"
                            />
                        <EditText
                            android:id="@+id/et_eat"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
                            android:textColorHint="#6b000000"
                            android:textColor="#DE000000"
                            android:text="@={viewModel.beanLiveData.eat}"
                            android:hint="0"
                            app:need_modify_null="@{true}"
                            android:textSize="16sp"
                            android:maxLines="1"
                            android:enabled="@{viewModel.typeLiveData}"
                            />

                    </LinearLayout>
                </LinearLayout>
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    tools:text="自费"
                    android:drawablePadding="10dp"
                    android:drawableStart="@drawable/ic_radio_button_selected"
                    android:text="@{viewModel.beanLiveData.free==1?`公费`:`自费`}"
                    android:textSize="16sp" />
                    android:layout_marginTop="12dp"
                    >
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        >
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="其他费用"
                            android:textColor="#767375"
                            android:textSize="12sp"
                            />
                        <EditText
                            android:id="@+id/et_other"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
                            android:textColorHint="#6b000000"
                            android:textColor="#DE000000"
                            android:text="@={viewModel.beanLiveData.otherCost}"
                            android:hint="0"
                            app:need_modify_null="@{true}"
                            android:textSize="16sp"
                            android:maxLines="1"
                            android:enabled="@{viewModel.typeLiveData}"
                            />

                    </LinearLayout>
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:orientation="vertical"
                        android:layout_marginStart="40dp"
                        >
                    </LinearLayout>
                </LinearLayout>
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
@@ -189,9 +324,72 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入备注`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp" />
                    android:text="@={viewModel.beanLiveData.backInfo}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="出行方式"
                    android:textColor="#767375"
                    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:hint="@{viewModel.typeLiveData?`请输入出行方式`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.travelMode}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="车次/航班"
                    android:textColor="#767375"
                    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:hint="@{viewModel.typeLiveData?`请输入车次/航班`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.flight}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="使用证件"
                    android:textColor="#767375"
                    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:hint="@{viewModel.typeLiveData?`请输入使用证件`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.document}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"