android/charge.git

			@@ -11,7 +11,8 @@
			android:layout_height="@dimen/dimen_title_height"
			android:background="@color/title_bar_bg"
			android:elevation="4dp"
			app:centerText="读卡" />
			app:centerText="读卡"
			app:leftImage="@mipmap/icon_back" />

			<ScrollView
			android:layout_width="match_parent"
			@@ -32,7 +33,7 @@
			android:layout_height="match_parent"
			android:gravity="center"
			android:orientation="vertical"
			android:visibility="gone">
			android:visibility="visible">

			<androidx.cardview.widget.CardView
			android:layout_width="match_parent"
			@@ -95,7 +96,7 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			android:visibility="visible">
			android:visibility="gone">

			<!-- 卡内数据区域 -->
			<androidx.cardview.widget.CardView
			@@ -116,9 +117,9 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:background="#F8F9FA"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp">

			<TextView
			@@ -143,15 +144,15 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:background="#FFFFFF"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp">

			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="卡号："
			android:text="卡地址："
			android:textColor="#333333"
			android:textSize="@dimen/text_size" />

			@@ -164,15 +165,42 @@
			android:textColor="#666666"
			android:textSize="@dimen/text_size" />
			</LinearLayout>
			<!-- 卡片状态 -->
			<LinearLayout
			android:id="@+id/ll_card_status"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:background="#FFFFFF"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp"
			android:visibility="visible">

			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="卡片状态："
			android:textColor="#333333"
			android:textSize="@dimen/text_size" />

			<TextView
			android:id="@+id/tv_card_status"
			android:layout_width="0dp"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:text="正常"
			android:textColor="#4CAF50"
			android:textSize="@dimen/text_size" />
			</LinearLayout>
			<!-- 卡片类型 -->
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:background="#F8F9FA"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp">

			<TextView
			@@ -198,11 +226,11 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:visibility="visible"
			android:gravity="center_vertical"
			android:background="#FFFFFF"
			android:padding="12dp">
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp"
			android:visibility="visible">

			<TextView
			android:layout_width="105dp"
			@@ -228,11 +256,11 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:visibility="visible"
			android:gravity="center_vertical"
			android:background="#F8F9FA"
			android:padding="12dp">
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp"
			android:visibility="visible">

			<TextView
			android:layout_width="105dp"
			@@ -256,9 +284,9 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:background="#FFFFFF"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp">

			<TextView
			@@ -283,9 +311,9 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:background="#F8F9FA"
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp">

			<TextView
			@@ -305,34 +333,6 @@
			android:textSize="@dimen/text_size" />
			</LinearLayout>

			<!-- 卡片状态 -->
			<LinearLayout
			android:id="@+id/ll_card_status"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:visibility="visible"
			android:gravity="center_vertical"
			android:background="#FFFFFF"
			android:padding="12dp">

			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="卡片状态："
			android:textColor="#333333"
			android:textSize="@dimen/text_size" />

			<TextView
			android:id="@+id/tv_card_status"
			android:layout_width="0dp"
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:text="正常"
			android:textColor="#4CAF50"
			android:textSize="@dimen/text_size" />
			</LinearLayout>

			<!-- 最后使用时间 -->
			<LinearLayout
			@@ -340,11 +340,11 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_marginBottom="2dp"
			android:orientation="horizontal"
			android:visibility="visible"
			android:gravity="center_vertical"
			android:background="#F8F9FA"
			android:padding="12dp">
			android:gravity="center_vertical"
			android:orientation="horizontal"
			android:padding="12dp"
			android:visibility="visible">

			<TextView
			android:layout_width="105dp"