Skip to content

T
TangKuPos
Commit a61f8a73 authored by 王海's avatar 王海
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 38f3abab 4f0dcac5
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 49 deletions
.idea/dictionaries/Eurus.xml
View file @ a61f8a73
......@@ -3,14 +3,23 @@
<words>
<w>baozheng</w>
<w>caocao</w>
<w>chengyaojin</w>
<w>diaochan</w>
<w>exps</w>
<w>guanyu</w>
<w>huanggai</w>
<w>huangxin</w>
<w>inputer</w>
<w>kongrun</w>
<w>likui</w>
<w>liubei</w>
<w>mawu</w>
<w>patt</w>
<w>shixiu</w>
<w>sunquan</w>
<w>xishi</w>
<w>yanqing</w>
<w>yuefei</w>
<w>zhangfei</w>
<w>zhouyu</w>
</words>
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ a61f8a73
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySettleBinding;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment;
......@@ -61,6 +62,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
}
@Override
public void loadPays(List<Pay> pays) {
mSettleFragment.loadPays(pays);
}
@Override
public void showPayFragment(int payChannel) {
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleContract.java
View file @ a61f8a73
......@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.settle;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Vip;
......@@ -61,6 +62,14 @@ public interface SettleContract {
*/
void loadTicket(Ticket ticket);
/***
* 加载支付方式列表
*
* @param pays 支付方法会列表
*/
void loadPays(List<Pay> pays);
/**
* 显示支付页面
*
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ a61f8a73
......@@ -57,15 +57,14 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override
public void searchVip(String keyword) {
ApiFactory.User.queryUserDetailByKeyword(keyword)
.subscribe(
vip -> {
List<Vip> vips = new ArrayList<>();
vips.add(vip);
mView.loadVips(vips);
},
throwable -> {
});
ApiFactory.User.queryUserDetailByKeyword(keyword).subscribe(
vip -> {
List<Vip> vips = new ArrayList<>();
vips.add(vip);
mView.loadVips(vips);
},
throwable -> {
});
}
@Override
......@@ -81,13 +80,12 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override
public void searchTicket(Long vipId) {
ApiFactory.Ticket.query(vipId)
.subscribe(
tickets -> {
mView.loadTickets(tickets);
},
throwable -> {
});
ApiFactory.Ticket.query(vipId).subscribe(
tickets -> {
mView.loadTickets(tickets);
},
throwable -> {
});
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/PayAdapter.java 0 → 100644
View file @ a61f8a73
package com.xingdata.zzdpos.ui.settle.adapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemPayBinding;
import com.xingdata.zzdpos.model.Pay;
import java.util.ArrayList;
public class PayAdapter extends BaseAdapter<Pay, ItemPayBinding> {
public PayAdapter() {
super(R.layout.item_pay, new ArrayList<>());
}
@Override
protected void convert(ItemPayBinding mViewBinding, Pay item) {
switch (item.getPayType()) {
case C.PAY_CHANNEL.CASH:
break;
case C.PAY_CHANNEL.WECHAT:
break;
case C.PAY_CHANNEL.ALI:
break;
case C.PAY_CHANNEL.BANK:
break;
case C.PAY_CHANNEL.CARD:
break;
case C.PAY_CHANNEL.TALLY:
break;
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
View file @ a61f8a73
package com.xingdata.zzdpos.ui.settle.fragment;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.view.View;
import android.support.v7.widget.StaggeredGridLayoutManager;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSettleBinding;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.ui.settle.adapter.PayAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.List;
public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettleBinding> {
private PayAdapter mPayAdapter;
@Override
public int getLayoutId() {
return R.layout.fragment_settle;
......@@ -20,30 +25,17 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
@Override
public void initView() {
mViewBinding.clVip.setOnClickListener(view -> mViewBinding.setDefualtVip(false));
mViewBinding.setDefualtVip(true);
mViewBinding.setName("张洋");
mViewBinding.setPhone("15201451212");
mViewBinding.setDisRate("8.5");
mViewBinding.tvSettle.setOnClickListener(view -> {
BottomSheetBehavior.from(mViewBinding.llSheet).setState(BottomSheetBehavior.STATE_EXPANDED);
});
BottomSheetBehavior.from(mViewBinding.llSheet).setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
@Override
public void onStateChanged(@NonNull View bottomSheet, int newState) {
if (newState == BottomSheetBehavior.STATE_EXPANDED) {
mViewBinding.tvSettle.setVisibility(View.GONE);
} else {
mViewBinding.tvSettle.setVisibility(View.VISIBLE);
}
}
@Override
public void onSlide(@NonNull View bottomSheet, float slideOffset) {
}
});
mPresenter = new SettlePresenter();
mViewBinding.rlPay.setAdapter(mPayAdapter);
mViewBinding.rlPay.setLayoutManager(new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL));
mViewBinding.rlPay.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(3, 20, true));
}
/**
......@@ -52,11 +44,24 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
* @param vip 会员信息
*/
public void loadVip(Vip vip) {
mViewBinding.setName(vip.getVipName());
mViewBinding.setPhone(ConvertUtil.longToString(vip.getVipMobile()));
if (vip.getVipDefDiscount() < 100 && vip.getVipDefDiscount() > 0) {
mViewBinding.setDisRate(String.valueOf((double) vip.getVipDefDiscount() / 10));
}
mViewBinding.setDefualtVip(false);
mViewBinding.setName("张洋");
mViewBinding.setPhone("15201451212");
mViewBinding.setDisRate("8.5");
// mViewBinding.setDefualtVip(vip.isDefaultVip());
// mViewBinding.setName(vip.getVipName());
// mViewBinding.setPhone(ConvertUtil.longToString(vip.getVipMobile()));
// if (vip.getVipDefDiscount() < 100 && vip.getVipDefDiscount() > 0) {
// mViewBinding.setDisRate(String.valueOf((double) vip.getVipDefDiscount() / 10));
// }
}
/**
* 加载支付方式
*/
public void loadPays(List<Pay> pays) {
mPayAdapter.setNewData(pays);
}
}
app/src/main/res/layout/fragment_settle.xml
View file @ a61f8a73
......@@ -24,14 +24,12 @@
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/red_xishi">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
......@@ -200,7 +198,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/selectableItemBackground"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
......@@ -216,8 +214,9 @@
android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_pay"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_height="wrap_content"
android:background="@color/gray_zhouyu"
android:textAppearance="@android:style/TextAppearance.Large" />
</LinearLayout>
......
app/src/main/res/layout/item_pay.xml 0 → 100644
View file @ a61f8a73
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/settle_pay_item">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundedCornerRadius="@dimen/all_shape_radius" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_logo"
android:layout_width="@dimen/settle_pay_logo"
android:layout_height="@dimen/settle_pay_logo"
app:layout_constraintBottom_toTopOf="@id/iv_background"
app:layout_constraintLeft_toRightOf="@id/iv_background"
app:layout_constraintRight_toLeftOf="@id/iv_background"
app:layout_constraintTop_toBottomOf="@id/iv_background"
app:roundAsCircle="true" />
</android.support.constraint.ConstraintLayout>
</layout>
app/src/main/res/values/colors.xml
View file @ a61f8a73
......@@ -117,13 +117,34 @@
<color name="navy_blue">#1f7bdb</color>
<color name="light_grey">#b9b9b9</color>
<!--新颜色-->
<color name="red_guanyu">#b4282d</color>
<color name="red_xishi">#e57b7b</color>
<color name="red_diaochan">#ff8964</color>
<color name="gray_zhouyu">#f1f3f7</color>
<color name="gray_huanggai">#afb9c3</color>
<color name="white_caocao">#ffffff</color>
<color name="black_zhangfei">#233142</color>
<color name="black_baozheng">#121212</color>
<color name="black_likui">#646464</color>
<color name="blue_yuefei">#50c1ff</color>
<color name="blue_mawu">#3f75a2</color>
<color name="green_chengyaojin">#088b38</color>
<color name="green_kongrun">#35ba6a</color>
<color name="orange_shixiu">#e88108</color>
<color name="cyan_sunquan">#b6cadb</color>
<color name="cyan_liubei">#47dade</color>
<color name="yellow_huangxin">#ffc960</color>
<color name="purple_yanqing">#6590e6</color>
</resources>
app/src/main/res/values/dimens.xml
View file @ a61f8a73
......@@ -181,11 +181,12 @@
<dimen name="editor_item_height">60dp</dimen>
<!--结算-->
<dimen name="settle_vip_head">40dp</dimen>
<dimen name="settle_vip_level">16dp</dimen>
<dimen name="settle_btn_radius">24dp</dimen>
<dimen name="settle_pay_item">108dp</dimen>
<dimen name="settle_pay_logo">72dp</dimen>
</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