android/charge.git

			@@ -24,7 +24,7 @@
			android:layout_marginTop="24dp"
			android:layout_marginEnd="16dp"
			android:layout_marginBottom="24dp"
			android:visibility="gone"
			android:visibility="visible"
			app:cardBackgroundColor="@android:color/white"
			app:cardCornerRadius="12dp"
			app:cardElevation="4dp"
			@@ -54,9 +54,10 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:gravity="center"
			android:text="（将获取物理卡卡号）"
			android:textColor="#999999"
			android:text="将进行初始化卡片\n耗时较长请不要移动卡片"
			android:textColor="@color/base_blue_bg"
			android:textSize="18sp"
			android:layout_marginTop="20dp"
			android:textStyle="bold" />

			<ImageView
			@@ -84,7 +85,7 @@
			android:layout_height="0dp"
			android:fillViewport="true"
			android:scrollbars="none"
			android:visibility="visible"
			android:visibility="gone"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/titleBar">

			@@ -246,24 +247,38 @@
			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="工本费："
			android:text="充值金额："
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="#FFFFFF"
			android:orientation="vertical">
			android:background="@drawable/edit_text_bg_selector"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:paddingTop="8dp"
			android:paddingBottom="8dp">

			<EditText
			android:id="@+id/newCard_rechargeAmount"
			android:layout_width="match_parent"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:background="@null"
			android:hint="请输入工本费(选填)"
			android:hint="请输入充值金额(选填)"
			android:inputType="numberDecimal"
			android:textColor="#333333"
			android:textColorHint="#BBBBBB"
			android:textSize="@dimen/new_card_size" />

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="元"
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />
			</LinearLayout>
			</LinearLayout>
			@@ -278,28 +293,41 @@
			<TextView
			android:layout_width="105dp"
			android:layout_height="wrap_content"
			android:text="充值金额："
			android:text="工本费："
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="#FFFFFF"
			android:orientation="vertical">
			android:background="@drawable/edit_text_bg_selector"
			android:orientation="horizontal"
			android:gravity="center_vertical"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:paddingTop="8dp"
			android:paddingBottom="8dp">

			<EditText
			android:id="@+id/newCard_cardFee"
			android:layout_width="match_parent"
			android:layout_width="0dp"
			android:layout_weight="1"
			android:layout_height="wrap_content"
			android:background="@null"
			android:hint="请输入充值金额(选填)"
			android:hint="请输入工本费(选填)"
			android:inputType="numberDecimal"
			android:textColor="#333333"
			android:textColorHint="#BBBBBB"
			android:textSize="@dimen/new_card_size" />

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="元"
			android:textColor="#666666"
			android:textSize="@dimen/new_card_size" />
			</LinearLayout>
			</LinearLayout>


			<LinearLayout
			android:layout_width="match_parent"
			@@ -318,8 +346,12 @@
			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:background="#FFFFFF"
			android:orientation="vertical">
			android:background="@drawable/edit_text_bg_selector"
			android:orientation="vertical"
			android:paddingStart="10dp"
			android:paddingEnd="10dp"
			android:paddingTop="8dp"
			android:paddingBottom="8dp">

			<EditText
			android:id="@+id/newCard_remark"
			@@ -328,6 +360,7 @@
			android:background="@null"
			android:hint="请输入备注(选填)"
			android:textColor="#333333"
			android:textColorHint="#BBBBBB"
			android:textSize="@dimen/new_card_size" />
			</LinearLayout>
			</LinearLayout>
			@@ -360,48 +393,7 @@
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="horizontal">

			<RadioButton
			android:id="@+id/newCard_cashPayment"
			android:layout_width="0dp"
			android:layout_height="40dp"
			android:layout_marginRight="15dp"
			android:layout_weight="1"
			android:background="@drawable/radio_selector"
			android:button="@null"
			android:checked="true"
			android:gravity="center"

			android:text="现金"
			android:textColor="@color/radio_button_text_color"
			android:textSize="@dimen/new_card_size" />

			<RadioButton
			android:id="@+id/newCard_posPayment"
			android:layout_width="0dp"
			android:layout_height="40dp"
			android:layout_marginRight="15dp"
			android:layout_weight="1"
			android:background="@drawable/radio_selector"
			android:button="@null"
			android:gravity="center"

			android:text="POS机"
			android:textColor="@color/radio_button_text_color"
			android:textSize="@dimen/new_card_size" />

			<RadioButton
			android:id="@+id/newCard_bankTransfer"
			android:layout_width="0dp"
			android:layout_height="40dp"
			android:layout_weight="1"
			android:background="@drawable/radio_selector"
			android:button="@null"
			android:gravity="center"

			android:text="银行转账"
			android:textColor="@color/radio_button_text_color"
			android:textSize="@dimen/new_card_size" />
			<!-- 动态添加RadioButton，移除固定的RadioButton -->
			</RadioGroup>
			</LinearLayout>
			</androidx.cardview.widget.CardView>