Commit e4258168 authored by zhang_z's avatar zhang_z

收款页面;

parent ef7e8cfc
......@@ -22,9 +22,10 @@ public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaym
loadRootFragment(R.id.f_inputer, mCalculatorView);
mCalculatorView.setOnResultChangeListener((exp, result) -> {
LogUtils.e(exp + "\n" + result);
mViewBinding.tvExp.setText(exp);
mViewBinding.tvResult.setText(ConvertUtil.fenToYuan(result));
String strResult = ConvertUtil.fenToYuan(result);
mViewBinding.tvResult.setText(strResult);
mViewBinding.tvAmt.setText(strResult);
});
mCalculatorView.setOnSettleClickListener(result -> {
LogUtils.e(ConvertUtil.fenToYuan(result));
......
......@@ -48,13 +48,13 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
public void initView() {
View.OnClickListener mOnClickListener = view -> {
switch (view.getId()) {
case R.id.btn_del:
case R.id.tv_del:
delete();
break;
case R.id.btn_clear:
case R.id.tv_clear:
clear();
break;
case R.id.btn_settle:
case R.id.tv_settle:
settle();
break;
default:
......
......@@ -6,12 +6,31 @@
android:layout_height="match_parent"
android:orientation="vertical">
<Toolbar
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/store_product_bg"
android:title="收款"
android:titleTextColor="@color/white" />
android:layout_height="?attr/actionBarSize"
android:background="@color/black_zhangfei">
<ImageButton
android:layout_width="@dimen/title_height"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:src="@mipmap/back_white" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/payment_title"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_sub_title_size" />
</FrameLayout>
<FrameLayout
android:id="@+id/f_payment"
......
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<LinearLayout
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:background="@color/store_product_bg"
android:orientation="vertical">
android:background="@color/black_zhangfei"
android:gravity="bottom"
android:paddingBottom="@dimen/all_margin">
<TextView
android:id="@+id/tv_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_spacing"
android:layout_marginEnd="@dimen/all_margin"
android:gravity="end|center_vertical"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_title_size"
app:layout_constraintBottom_toTopOf="@id/tv_result"
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/tv_money_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:gravity="end|center_vertical"
android:textColor="@color/white_caocao" />
android:text="@string/money_rmb"
android:textColor="@color/white_caocao"
android:textSize="@dimen/fragment_settle_bigtextsize"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/tv_result" />
<TextView
android:id="@+id/tv_result"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:gravity="end|center_vertical"
android:textColor="@color/white_caocao" />
</LinearLayout>
android:textColor="@color/white_caocao"
android:textSize="@dimen/fragment_settle_bigtextsize"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/tv_money_hint"
app:layout_constraintRight_toRightOf="parent" />
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white"
android:background="@color/white_caocao"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="小计:" />
android:layout_marginEnd="@dimen/all_spacing"
android:text="@string/payment_total"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_amt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="40.00"
android:textColor="@color/deep_red" />
android:layout_marginEnd="@dimen/all_margin"
android:textColor="@color/deep_red"
android:textSize="@dimen/all_sub_title_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin_big"
android:background="@color/gray_huanggai" />
<FrameLayout
android:id="@+id/f_inputer"
android:layout_width="match_parent"
......
......@@ -11,257 +11,312 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/gray_huanggai">
<Button
android:id="@+id/btn_clear"
<TextView
android:id="@+id/tv_clear"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_clear"
app:layout_constraintBottom_toTopOf="@id/btn_1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toTopOf="@id/tv_1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_div"
app:layout_constraintRight_toLeftOf="@id/tv_div"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1" />
<Button
android:id="@+id/btn_div"
<TextView
android:id="@+id/tv_div"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="1dp"
android:layout_marginEnd="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_div"
app:layout_constraintBottom_toBottomOf="@id/btn_clear"
app:layout_constraintLeft_toRightOf="@id/btn_clear"
app:layout_constraintRight_toLeftOf="@id/btn_mul"
app:layout_constraintTop_toTopOf="@id/btn_clear" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_clear"
app:layout_constraintLeft_toRightOf="@id/tv_clear"
app:layout_constraintRight_toLeftOf="@id/tv_mul"
app:layout_constraintTop_toTopOf="@id/tv_clear" />
<Button
android:id="@+id/btn_mul"
<TextView
android:id="@+id/tv_mul"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="1dp"
android:layout_marginEnd="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_mul"
app:layout_constraintBottom_toBottomOf="@id/btn_clear"
app:layout_constraintLeft_toRightOf="@id/btn_div"
app:layout_constraintRight_toLeftOf="@id/btn_del"
app:layout_constraintTop_toTopOf="@id/btn_clear" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_clear"
app:layout_constraintLeft_toRightOf="@id/tv_div"
app:layout_constraintRight_toLeftOf="@id/tv_del"
app:layout_constraintTop_toTopOf="@id/tv_clear" />
<Button
android:id="@+id/btn_del"
<TextView
android:id="@+id/tv_del"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_del"
app:layout_constraintBottom_toBottomOf="@id/btn_clear"
app:layout_constraintLeft_toRightOf="@id/btn_mul"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_clear"
app:layout_constraintLeft_toRightOf="@id/tv_mul"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/btn_clear" />
app:layout_constraintTop_toTopOf="@id/tv_clear" />
<Button
android:id="@+id/btn_1"
<TextView
android:id="@+id/tv_1"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="1dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_1"
app:layout_constraintBottom_toTopOf="@id/btn_4"
app:layout_constraintLeft_toLeftOf="@id/btn_clear"
app:layout_constraintRight_toRightOf="@id/btn_clear"
app:layout_constraintTop_toBottomOf="@id/btn_clear"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toTopOf="@id/tv_4"
app:layout_constraintLeft_toLeftOf="@id/tv_clear"
app:layout_constraintRight_toRightOf="@id/tv_clear"
app:layout_constraintTop_toBottomOf="@id/tv_clear"
app:layout_constraintVertical_weight="1" />
<Button
android:id="@+id/btn_2"
<TextView
android:id="@+id/tv_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_2"
app:layout_constraintBottom_toBottomOf="@id/btn_1"
app:layout_constraintLeft_toLeftOf="@id/btn_div"
app:layout_constraintRight_toRightOf="@id/btn_div"
app:layout_constraintTop_toTopOf="@id/btn_1" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_1"
app:layout_constraintLeft_toLeftOf="@id/tv_div"
app:layout_constraintRight_toRightOf="@id/tv_div"
app:layout_constraintTop_toTopOf="@id/tv_1" />
<Button
android:id="@+id/btn_3"
<TextView
android:id="@+id/tv_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_3"
app:layout_constraintBottom_toBottomOf="@id/btn_1"
app:layout_constraintLeft_toLeftOf="@id/btn_mul"
app:layout_constraintRight_toRightOf="@id/btn_mul"
app:layout_constraintTop_toTopOf="@id/btn_1" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_1"
app:layout_constraintLeft_toLeftOf="@id/tv_mul"
app:layout_constraintRight_toRightOf="@id/tv_mul"
app:layout_constraintTop_toTopOf="@id/tv_1" />
<Button
android:id="@+id/btn_sub"
<TextView
android:id="@+id/tv_sub"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_sub"
app:layout_constraintBottom_toBottomOf="@id/btn_1"
app:layout_constraintLeft_toLeftOf="@id/btn_del"
app:layout_constraintRight_toRightOf="@id/btn_del"
app:layout_constraintTop_toTopOf="@id/btn_1" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_1"
app:layout_constraintLeft_toLeftOf="@id/tv_del"
app:layout_constraintRight_toRightOf="@id/tv_del"
app:layout_constraintTop_toTopOf="@id/tv_1" />
<Button
android:id="@+id/btn_4"
<TextView
android:id="@+id/tv_4"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="1dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_4"
app:layout_constraintBottom_toTopOf="@id/btn_7"
app:layout_constraintLeft_toLeftOf="@id/btn_clear"
app:layout_constraintRight_toRightOf="@id/btn_clear"
app:layout_constraintTop_toBottomOf="@id/btn_1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toTopOf="@id/tv_7"
app:layout_constraintLeft_toLeftOf="@id/tv_clear"
app:layout_constraintRight_toRightOf="@id/tv_clear"
app:layout_constraintTop_toBottomOf="@id/tv_1"
app:layout_constraintVertical_weight="1" />
<Button
android:id="@+id/btn_5"
<TextView
android:id="@+id/tv_5"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_5"
app:layout_constraintBottom_toBottomOf="@id/btn_4"
app:layout_constraintLeft_toLeftOf="@id/btn_div"
app:layout_constraintRight_toRightOf="@id/btn_div"
app:layout_constraintTop_toTopOf="@id/btn_4" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_4"
app:layout_constraintLeft_toLeftOf="@id/tv_div"
app:layout_constraintRight_toRightOf="@id/tv_div"
app:layout_constraintTop_toTopOf="@id/tv_4" />
<Button
android:id="@+id/btn_6"
<TextView
android:id="@+id/tv_6"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_6"
app:layout_constraintBottom_toBottomOf="@id/btn_4"
app:layout_constraintLeft_toLeftOf="@id/btn_mul"
app:layout_constraintRight_toRightOf="@id/btn_mul"
app:layout_constraintTop_toTopOf="@id/btn_4" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_4"
app:layout_constraintLeft_toLeftOf="@id/tv_mul"
app:layout_constraintRight_toRightOf="@id/tv_mul"
app:layout_constraintTop_toTopOf="@id/tv_4" />
<Button
android:id="@+id/btn_add"
<TextView
android:id="@+id/tv_add"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_add"
app:layout_constraintBottom_toBottomOf="@id/btn_4"
app:layout_constraintLeft_toLeftOf="@id/btn_del"
app:layout_constraintRight_toRightOf="@id/btn_del"
app:layout_constraintTop_toTopOf="@id/btn_4" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_4"
app:layout_constraintLeft_toLeftOf="@id/tv_del"
app:layout_constraintRight_toRightOf="@id/tv_del"
app:layout_constraintTop_toTopOf="@id/tv_4" />
<Button
android:id="@+id/btn_7"
<TextView
android:id="@+id/tv_7"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="1dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_7"
app:layout_constraintBottom_toTopOf="@id/btn_0"
app:layout_constraintLeft_toLeftOf="@id/btn_clear"
app:layout_constraintRight_toRightOf="@id/btn_clear"
app:layout_constraintTop_toBottomOf="@id/btn_4"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toTopOf="@id/tv_0"
app:layout_constraintLeft_toLeftOf="@id/tv_clear"
app:layout_constraintRight_toRightOf="@id/tv_clear"
app:layout_constraintTop_toBottomOf="@id/tv_4"
app:layout_constraintVertical_weight="1" />
<Button
android:id="@+id/btn_8"
<TextView
android:id="@+id/tv_8"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_8"
app:layout_constraintBottom_toBottomOf="@id/btn_7"
app:layout_constraintLeft_toLeftOf="@id/btn_div"
app:layout_constraintRight_toRightOf="@id/btn_div"
app:layout_constraintTop_toTopOf="@id/btn_7" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_7"
app:layout_constraintLeft_toLeftOf="@id/tv_div"
app:layout_constraintRight_toRightOf="@id/tv_div"
app:layout_constraintTop_toTopOf="@id/tv_7" />
<Button
android:id="@+id/btn_9"
<TextView
android:id="@+id/tv_9"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_9"
app:layout_constraintBottom_toBottomOf="@id/btn_7"
app:layout_constraintLeft_toLeftOf="@id/btn_mul"
app:layout_constraintRight_toRightOf="@id/btn_mul"
app:layout_constraintTop_toTopOf="@id/btn_7" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_7"
app:layout_constraintLeft_toLeftOf="@id/tv_mul"
app:layout_constraintRight_toRightOf="@id/tv_mul"
app:layout_constraintTop_toTopOf="@id/tv_7" />
<Button
android:id="@+id/btn_settle"
<TextView
android:id="@+id/tv_settle"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/deep_red"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_settle"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@id/btn_0"
app:layout_constraintLeft_toLeftOf="@id/btn_del"
app:layout_constraintRight_toRightOf="@id/btn_del"
app:layout_constraintTop_toTopOf="@id/btn_7" />
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_0"
app:layout_constraintLeft_toLeftOf="@id/tv_del"
app:layout_constraintRight_toRightOf="@id/tv_del"
app:layout_constraintTop_toTopOf="@id/tv_7" />
<Button
android:id="@+id/btn_0"
<TextView
android:id="@+id/tv_0"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="1dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_0"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/btn_clear"
app:layout_constraintRight_toRightOf="@id/btn_div"
app:layout_constraintTop_toBottomOf="@id/btn_7"
app:layout_constraintLeft_toLeftOf="@id/tv_clear"
app:layout_constraintRight_toRightOf="@id/tv_div"
app:layout_constraintTop_toBottomOf="@id/tv_7"
app:layout_constraintVertical_weight="2" />
<Button
android:id="@+id/btn_point"
<TextView
android:id="@+id/tv_point"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_point"
app:layout_constraintBottom_toBottomOf="@id/btn_0"
app:layout_constraintLeft_toLeftOf="@id/btn_mul"
app:layout_constraintRight_toRightOf="@id/btn_mul"
app:layout_constraintTop_toTopOf="@id/btn_0" />
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_0"
app:layout_constraintLeft_toLeftOf="@id/tv_mul"
app:layout_constraintRight_toRightOf="@id/tv_mul"
app:layout_constraintTop_toTopOf="@id/tv_0" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
......@@ -489,5 +489,9 @@
<string name="inputer_mul">×</string>
<string name="inputer_div">÷</string>
<!--收款-->
<string name="payment_title">收款</string>
<string name="payment_total">总计:</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment