zhangshi_app_android.git

			@@ -12,15 +12,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:id="@+id/title_bar"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			app:title="@{viewModel.beanLiveData.title}"
			app:title="@{viewModel.beanLiveData.name==null?`新增旅游费用记录`:viewModel.beanLiveData.name}"
			app:titleGravity="left"
			/>
			>
			<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 +52,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"
			/>
			@@ -47,10 +63,12 @@
			android:layout_height="wrap_content"
			android:inputType="text"
			android:autofillHints="creditCardNumber"
			android:hint="@{viewModel.typeLiveData?`请输入旅游名称`:``}"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:textSize="16sp"
			android:text="@{viewModel.beanLiveData.title}"
			android:text="@={viewModel.beanLiveData.name}"
			android:enabled="@{viewModel.typeLiveData}"
			/>

			<TextView
			@@ -63,13 +81,18 @@
			/>

			<EditText
			android:id="@+id/et_start_time"
			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.startTime}"
			android:textSize="16sp" />
			android:textSize="16sp"
			app:isEditable="@{false}"
			android:enabled="@{viewModel.typeLiveData}"
			/>
			<TextView
			android:layout_width="wrap_content"
			android:layout_marginTop="10dp"
			@@ -79,31 +102,101 @@
			android:textSize="12sp"
			/>
			<EditText
			android:id="@+id/et_end_time"
			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:text="@={viewModel.beanLiveData.endTime}"
			android:textColor="#DE000000"
			android:textSize="16sp" />
			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:text="去向"
			android:textColor="#767375"
			android:textSize="12sp"
			/>
			<EditText
			android:id="@+id/et_whereabouts"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="2dp"
			android:textColorHint="#6b000000"
			android:hint="@{viewModel.typeLiveData?`请选择去向`:``}"
			android:text="@={viewModel.beanLiveData.destination}"
			android:textColor="#DE000000"
			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"
			/>
			<EditText
			android:id="@+id/et_tourism_nature"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="2dp"
			android:textColorHint="#6b000000"
			android:hint="@{viewModel.typeLiveData?`请选择旅游性质`:``}"
			android:text="@={viewModel.beanLiveData.property}"
			android:textColor="#DE000000"
			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"
			/>
			<EditText
			android:id="@+id/et_tourism_way"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="2dp"
			android:textColorHint="#6b000000"
			android:hint="@{viewModel.typeLiveData?`请选择旅游方式`:``}"
			android:text="@={viewModel.beanLiveData.manner}"
			android:textColor="#DE000000"
			android:textSize="16sp"
			android:enabled="@{viewModel.typeLiveData}"
			app:isEditable="@{false}"
			/>
			<TextView
			android:layout_width="wrap_content"
			android:layout_marginTop="@dimen/dp_10"
			android:layout_height="@dimen/dp_20"
			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:autofillHints="creditCardNumber"
			android:hint="@{viewModel.typeLiveData?`请输入团费`:``}"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.totalDay}"
			android:textSize="16sp" />
			android:textSize="16sp"
			android:text="@={viewModel.beanLiveData.groupTotal}"
			android:enabled="@{viewModel.typeLiveData}"
			android:inputType="numberDecimal"
			/>
			<TextView
			android:layout_width="wrap_content"
			android:layout_marginTop="10dp"
			@@ -112,207 +205,255 @@
			android:textColor="#767375"
			android:textSize="12sp"
			/>
			<EditText
			<androidx.constraintlayout.widget.ConstraintLayout
			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.totalMoney}"
			android:textSize="16sp" />
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="12dp"
			>
			<LinearLayout
			android:layout_width="0dp"
			<EditText
			android:id="@+id/et_total_cost"
			android:layout_width="match_parent"
			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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			tools:text="aaa"
			android:text="@={viewModel.beanLiveData.totalMoney}"
			android:textSize="16sp" />

			</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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.mealMoney}"
			android:textSize="16sp" />

			</LinearLayout>
			</LinearLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			tools:text="aaa"
			android:text="@={viewModel.beanLiveData.hotelMoney}"
			android:textSize="16sp" />

			</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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.trafficMoney}"
			android:textSize="16sp" />

			</LinearLayout>
			</LinearLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			tools:text="aaa"
			android:text="@={viewModel.beanLiveData.ticketMoney}"
			android:textSize="16sp" />

			</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:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="text"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.shoppingMoney}"
			android:textSize="16sp" />

			</LinearLayout>
			</LinearLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginTop="14dp"
			android:gravity="center_vertical"
			>
			<TextView
			android:layout_width="0dp"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:text="每日详细消费记录"
			android:textSize="20sp"
			android:textColor="@color/black"
			android:layout_marginTop="2dp"
			android:inputType="numberDecimal"
			android:textColorHint="#6b000000"
			android:hint="@{viewModel.typeLiveData?`0`:``}"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.totalPrice}"
			android:textSize="16sp"
			android:enabled="false"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			/>
			<ImageView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:background="@drawable/ic_tourism_add"
			<View
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:background="@color/color_non_editable"
			app:layout_constraintTop_toTopOf="@id/et_total_cost"
			app:layout_constraintStart_toStartOf="@id/et_total_cost"
			app:layout_constraintBottom_toBottomOf="@id/et_total_cost"
			app:layout_constraintEnd_toEndOf="@id/et_total_cost"
			android:visibility="@{viewModel.typeLiveData}"
			/>

			</LinearLayout>
			<androidx.recyclerview.widget.RecyclerView
			android:id="@+id/rv_daily_consume_record"
			android:orientation="vertical"
			</androidx.constraintlayout.widget.ConstraintLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			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.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			>
			<EditText
			android:id="@+id/et_stay"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:inputType="numberDecimal"
			android:textColorHint="#6b000000"
			android:hint="@{viewModel.typeLiveData?`0`:``}"
			android:textColor="#DE000000"
			android:text="@={viewModel.beanLiveData.stayTotal}"
			android:textSize="16sp"
			android:enabled="false"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			/>
			<View
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:background="@color/color_non_editable"
			app:layout_constraintTop_toTopOf="@id/et_stay"
			app:layout_constraintStart_toStartOf="@id/et_stay"
			app:layout_constraintBottom_toBottomOf="@id/et_stay"
			app:layout_constraintEnd_toEndOf="@id/et_stay"
			android:visibility="@{viewModel.typeLiveData}"
			/>
			</androidx.constraintlayout.widget.ConstraintLayout>

			</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"
			/>
			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			>
			<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.travelTotal}"
			android:textSize="16sp"
			android:enabled="false"
			android:hint="@{viewModel.typeLiveData?`0`:``}"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			/>
			<View
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:background="@color/color_non_editable"
			app:layout_constraintTop_toTopOf="@id/et_traffic"
			app:layout_constraintStart_toStartOf="@id/et_traffic"
			app:layout_constraintBottom_toBottomOf="@id/et_traffic"
			app:layout_constraintEnd_toEndOf="@id/et_traffic"
			android:visibility="@{viewModel.typeLiveData}"
			/>
			</androidx.constraintlayout.widget.ConstraintLayout>

			</LinearLayout>
			</LinearLayout>
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			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.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			>
			<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.entranceTotal}"
			android:textSize="16sp"
			android:hint="@{viewModel.typeLiveData?`0`:``}"
			android:enabled="false"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			/>
			<View
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:background="@color/color_non_editable"
			app:layout_constraintTop_toTopOf="@id/et_entrance"
			app:layout_constraintStart_toStartOf="@id/et_entrance"
			app:layout_constraintBottom_toBottomOf="@id/et_entrance"
			app:layout_constraintEnd_toEndOf="@id/et_entrance"
			android:visibility="@{viewModel.typeLiveData}"
			/>
			</androidx.constraintlayout.widget.ConstraintLayout>

			</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"
			/>
			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			>
			<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.eatTotal}"
			android:textSize="16sp"
			android:hint="@{viewModel.typeLiveData?`0`:``}"
			android:enabled="false"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			/>
			<View
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:background="@color/color_non_editable"
			app:layout_constraintTop_toTopOf="@id/et_eat"
			app:layout_constraintStart_toStartOf="@id/et_eat"
			app:layout_constraintBottom_toBottomOf="@id/et_eat"
			app:layout_constraintEnd_toEndOf="@id/et_eat"
			android:visibility="@{viewModel.typeLiveData}"
			/>
			</androidx.constraintlayout.widget.ConstraintLayout>

			</LinearLayout>
			</LinearLayout>
			<TextView
			android:layout_width="wrap_content"
			android:layout_marginTop="10dp"
			android:layout_height="wrap_content"
			android:text="感言"
			android:textColor="#767375"
			android:textSize="12sp"
			/>
			<RelativeLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="@drawable/shape_6b0000_stroke"
			android:padding="10dp"
			>
			<EditText
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:autofillHints="creditCardNumber"
			android:hint="@{viewModel.typeLiveData?`请输入感言`:``}"
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:textSize="16sp"
			android:text="@={viewModel.beanLiveData.spee}"
			android:enabled="@{viewModel.typeLiveData}"
			android:inputType="textMultiLine"
			android:background="@null"
			/>


			</RelativeLayout>
			</LinearLayout>
			</ScrollView>