Skip to content

T
TangKuPos
Commit 1d6ddd99 authored by zhang_z's avatar zhang_z
Browse files
Options

提交代码;

parent 01e6c297
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 40 deletions
.idea/dictionaries/Eurus.xml
View file @ 1d6ddd99
......@@ -10,6 +10,7 @@
<w>huanggai</w>
<w>huangxin</w>
<w>inputer</w>
<w>kongming</w>
<w>kongrun</w>
<w>likui</w>
<w>liubei</w>
......
app/src/main/AndroidManifest.xml
View file @ 1d6ddd99
......@@ -26,11 +26,6 @@
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
......@@ -49,7 +44,14 @@
<activity
android:name=".ui.payment.PaymentActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
android:windowSoftInputMode="adjustUnspecified|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".ui.marketing.integral.IntegralActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 1d6ddd99
package com.xingdata.zzdpos.ui.settle;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySettleBinding;
......@@ -7,6 +8,7 @@ import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.fragment.CashPayFragment;
import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment;
import java.util.List;
......@@ -15,6 +17,7 @@ import java.util.List;
public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettleBinding> implements SettleContract.View {
private SettleFragment mSettleFragment = new SettleFragment();
private CashPayFragment mCashPayFragment = new CashPayFragment();
@Override
public int getLayoutId() {
......@@ -75,6 +78,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
@Override
public void showPayFragment(int payChannel) {
switch (payChannel) {
case C.PAY_CHANNEL.CASH:
this.start(mCashPayFragment);
break;
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/CashPayFragment.java
View file @ 1d6ddd99
......@@ -4,9 +4,12 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentPayCashBinding;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.view.InputerView;
public class CashPayFragment extends BaseFragment<SettlePresenter, FragmentPayCashBinding> {
private InputerView<SettlePresenter> mInputerView = new InputerView<>();
@Override
public int getLayoutId() {
return R.layout.fragment_pay_cash;
......@@ -14,6 +17,6 @@ public class CashPayFragment extends BaseFragment<SettlePresenter, FragmentPayCa
@Override
public void initView() {
this.loadRootFragment(R.id.f_inputer, mInputerView);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/view/InpterView.java → app/src/main/java/com/xingdata/zzdpos/ui/settle/view/InputerView.java
View file @ 1d6ddd99
......@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.settle.view;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -10,7 +9,7 @@ import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.databinding.ViewInputerBinding;
import com.xingdata.zzdpos.util.ConvertUtil;
public class InpterView<P extends BasePresenter> extends BaseFragment<P, ViewInputerBinding> {
public class InputerView<P extends BasePresenter> extends BaseFragment<P, ViewInputerBinding> {
private String mValue;
......@@ -44,8 +43,7 @@ public class InpterView<P extends BasePresenter> extends BaseFragment<P, ViewInp
settle();
break;
default:
if (view instanceof TextView) {
}
break;
}
if (mOnResultChangeListener != null) {
......
app/src/main/res/layout/fragment_pay_cash.xml
View file @ 1d6ddd99
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
</android.support.constraint.ConstraintLayout>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/all_margin"
android:layout_marginBottom="@dimen/all_margin_big"
android:layout_weight="4"
app:cardCornerRadius="@dimen/all_shape_radius">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_caocao"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:gravity="center"
android:text="@string/settle_order_amt"
android:textColor="@color/black_likui"
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
<TextView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:text="￥50.00"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/fragment_settle_bigtextsize"
android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_spacing">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settle_pay_amt"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_sub_title_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:text="￥40.00"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_sub_title_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_spacing">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settle_pay_change"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_sub_title_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:text="￥10.00"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_sub_title_size" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<FrameLayout
android:id="@+id/f_inputer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="7" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_payment.xml
View file @ 1d6ddd99
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
......@@ -72,6 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:text="@string/payment_total"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size" />
<TextView
......
app/src/main/res/layout/fragment_settle.xml
View file @ 1d6ddd99
......@@ -96,7 +96,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{phone}"
android:textColor="@color/gray_huanggai"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
</LinearLayout>
......
app/src/main/res/layout/view_calculator.xml
View file @ 1d6ddd99
......@@ -21,7 +21,7 @@
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:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -39,7 +39,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -56,7 +56,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -72,7 +72,7 @@
android:id="@+id/tv_del"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -90,7 +90,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -107,7 +107,7 @@
android:id="@+id/tv_2"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -123,7 +123,7 @@
android:id="@+id/tv_3"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -140,7 +140,7 @@
android:id="@+id/tv_sub"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -157,7 +157,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -174,7 +174,7 @@
android:id="@+id/tv_5"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -190,7 +190,7 @@
android:id="@+id/tv_6"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -206,7 +206,7 @@
android:id="@+id/tv_add"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -224,7 +224,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -241,7 +241,7 @@
android:id="@+id/tv_8"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -257,7 +257,7 @@
android:id="@+id/tv_9"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -278,7 +278,7 @@
android:gravity="center"
android:onClickListener="@{onClick}"
android:text="@string/inputer_settle"
android:textColor="@color/white"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_0"
app:layout_constraintLeft_toLeftOf="@id/tv_del"
......@@ -290,7 +290,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_line_width"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......@@ -307,7 +307,7 @@
android:id="@+id/tv_point"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClickListener="@{onClick}"
......
app/src/main/res/layout/view_inputer.xml
View file @ 1d6ddd99
......@@ -18,6 +18,8 @@
android:id="@+id/tv_1"
android:layout_width="0dp"
android:layout_height="0dp"
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"
......
app/src/main/res/values/colors.xml
View file @ 1d6ddd99
......@@ -124,6 +124,7 @@
<color name="gray_zhouyu">#f1f3f7</color>
<color name="gray_huanggai">#afb9c3</color>
<color name="gray_kongming">#e6e6e6</color>
<color name="white_caocao">#ffffff</color>
......
app/src/main/res/values/strings.xml
View file @ 1d6ddd99
......@@ -173,8 +173,6 @@
<string name="settle_channel_tally_arrear_hint">余额:</string>
<string name="settle_pay">支付</string>
<string name="settle_print_receipt">打印小票</string>
<string name="settle_pay_amt">实收:</string>
<string name="settle_pay_change">找零:</string>
<string name="settle_money_unit">￥</string>
<string name="settle_channel_input_hint">扫描或输入条码数字</string>
<string name="settle_pay_change_text">￥%s</string>
......@@ -502,6 +500,7 @@
<string name="settle_vip_dis_rate_hint">折扣:</string>
<string name="settle_vip_dis_rate">折</string>
<string name="settle_btn_expand">收款</string>
<string name="settle_order_amt">应收金额</string>
<string name="settle_pay_amt">实收金额</string>
<string name="settle_pay_change">找零金额</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