zhangshi_app_android.git

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

			<data>
			<import type="com.android.app_base.utils.StringStatus"/>
			<variable
			name="viewModel"
			type="com.application.zhangshi_app_android.ui.function.MeetingapproveDetailActivityViewModel" />
			@@ -19,7 +20,7 @@
			android:id="@+id/titleBar"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			app:title="@{viewModel.beanLiveData.id==0?`会议申请详情`:viewModel.beanLiveData.title}"
			app:title="@{viewModel.beanLiveData.id==0?`会议审批详情`:viewModel.beanLiveData.title}"
			app:titleGravity="left"
			>

			@@ -37,8 +38,7 @@
			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}"
			/>
			android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}" />

			</FrameLayout>
			</com.android.app_base.widget.ExtendTitleBar>
			@@ -187,38 +187,18 @@
			>

			<EditText
			android:id="@+id/et_date1"
			android:id="@+id/et_start_time"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:enabled="@{viewModel.typeLiveData}"
			android:hint="@{viewModel.typeLiveData?`请输入开始时间的年月日`:``}"
			android:hint="@{viewModel.typeLiveData?`请输入开始时间`:``}"
			android:inputType="text"
			android:text="@={viewModel.beanLiveData.date1}"
			android:text="@={viewModel.beanLiveData.startTime}"
			android:textColor="#DE000000"
			android:textColorHint="#6b000000"
			android:textSize="16sp"
			app:isEditable="@{false}" />
			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text=" "
			/>
			<EditText
			android:id="@+id/et_time1"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:enabled="@{viewModel.typeLiveData}"
			android:hint="@{viewModel.typeLiveData?`请输入开始时间的时分秒`:``}"
			android:inputType="text"
			android:text="@={viewModel.beanLiveData.time1}"
			android:textColor="#DE000000"
			android:textColorHint="#6b000000"
			android:textSize="16sp"
			app:isEditable="@{false}" />


			</LinearLayout>


			@@ -239,38 +219,18 @@
			>

			<EditText
			android:id="@+id/et_date2"
			android:id="@+id/et_end_time"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:enabled="@{viewModel.typeLiveData}"
			android:hint="@{viewModel.typeLiveData?`请输入结束时间的年月日`:``}"
			android:hint="@{viewModel.typeLiveData?`请输入结束时间`:``}"
			android:inputType="text"
			android:text="@={viewModel.beanLiveData.date2}"
			android:text="@={viewModel.beanLiveData.endTime}"
			android:textColor="#DE000000"
			android:textColorHint="#6b000000"
			android:textSize="16sp"
			app:isEditable="@{false}" />
			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text=" "
			/>
			<EditText
			android:id="@+id/et_time2"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:enabled="@{viewModel.typeLiveData}"
			android:hint="@{viewModel.typeLiveData?`请输入结束时间的时分秒`:``}"
			android:inputType="text"
			android:text="@={viewModel.beanLiveData.time2}"
			android:textColor="#DE000000"
			android:textColorHint="#6b000000"
			android:textSize="16sp"
			app:isEditable="@{false}" />


			</LinearLayout>

			<TextView
			@@ -347,7 +307,7 @@
			android:textColorHint="#6b000000"
			android:textColor="#DE000000"
			android:textSize="16sp"
			android:text="@={viewModel.beanLiveData.statu}"
			android:text="@={StringStatus.statusToText(viewModel.beanLiveData.statu)}"
			android:enabled="@{viewModel.typeLiveData}"
			/>