Commit 74be40ab authored by zhang_z's avatar zhang_z

营销相关代码;

parent 8e577dfe
...@@ -106,6 +106,23 @@ public class DBFactory { ...@@ -106,6 +106,23 @@ public class DBFactory {
return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp.class).findAll()) return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp.class).findAll())
.flatMap(sskugrps -> Observable.just(getList(sskugrps))); .flatMap(sskugrps -> Observable.just(getList(sskugrps)));
} }
/**
* 查询营销活动
*
* @return 营销活动
*/
public static Observable<List<Ms>> queryMss() {
RealmQuery<Ms> query = DB.getInstance().get(MainPresenter.class).where(Ms.class);
query.equalTo("msStatus", 0);
query.notEqualTo("msTools", C.MS_TYPE.GIFT);
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
.flatMap(ms -> Observable.just(getList(ms)));
}
} }
public static class Settle { public static class Settle {
......
...@@ -114,7 +114,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -114,7 +114,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
@Override @Override
public void loadSaledetails(List<Saledetail> saledetails) { public void loadSaledetails(List<Saledetail> saledetails) {
mSettleFragment.loadSaledetails(saledetails);
} }
@Override @Override
......
...@@ -138,6 +138,11 @@ interface SettleContract { ...@@ -138,6 +138,11 @@ interface SettleContract {
*/ */
public abstract void initSettle(); public abstract void initSettle();
/**
* 结算页面 - 初始化商店信息
*/
public abstract void initStoreInfo();
/** /**
* 结算页面 - 点击会员View * 结算页面 - 点击会员View
*/ */
......
...@@ -102,6 +102,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -102,6 +102,13 @@ public class SettlePresenter extends SettleContract.Presenter {
this.reprice(); this.reprice();
} }
@Override
public void initStoreInfo() {
mView.loadSaledetails(mSaledetails);
mSaleorder.setSaledetails(mSaledetails);
reprice();
}
@Override @Override
public void clickVipView() { public void clickVipView() {
mView.showVipFragment(); mView.showVipFragment();
...@@ -126,6 +133,8 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -126,6 +133,8 @@ public class SettlePresenter extends SettleContract.Presenter {
this.setVip(vip); this.setVip(vip);
// 重新设置购物车 // 重新设置购物车
mSaleorder.setSaledetails(mSaledetails); mSaleorder.setSaledetails(mSaledetails);
// 加载购物车
mView.loadSaledetails(mSaledetails);
// 计算价格 // 计算价格
this.reprice(); this.reprice();
......
package com.xingdata.zzdpos.ui.settle.fragment; package com.xingdata.zzdpos.ui.settle.fragment;
import android.support.design.widget.BottomSheetBehavior; import android.support.design.widget.BottomSheetBehavior;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.StaggeredGridLayoutManager; import android.support.v7.widget.StaggeredGridLayoutManager;
import android.view.View; import android.view.View;
...@@ -10,9 +11,11 @@ import com.xingdata.zzdpos.R; ...@@ -10,9 +11,11 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSettleBinding; import com.xingdata.zzdpos.databinding.FragmentSettleBinding;
import com.xingdata.zzdpos.model.Pay; import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder; import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Vip; import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.SettlePresenter; import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.adapter.DisAdapter;
import com.xingdata.zzdpos.ui.settle.adapter.PayAdapter; import com.xingdata.zzdpos.ui.settle.adapter.PayAdapter;
import com.xingdata.zzdpos.ui.settle.adapter.SaledetailAdapter; import com.xingdata.zzdpos.ui.settle.adapter.SaledetailAdapter;
import com.xingdata.zzdpos.util.ConvertUtil; import com.xingdata.zzdpos.util.ConvertUtil;
...@@ -27,6 +30,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle ...@@ -27,6 +30,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
private List<Pay> mPays; private List<Pay> mPays;
private SaledetailAdapter mSaledetailAdapter; private SaledetailAdapter mSaledetailAdapter;
private DisAdapter mDisAdapter;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -92,23 +96,32 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle ...@@ -92,23 +96,32 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
private void initStoreView() { private void initStoreView() {
//init s //init s
mSaledetailAdapter = new SaledetailAdapter(); mSaledetailAdapter = new SaledetailAdapter();
mViewBinding.rlSaledetail.setAdapter(mPayAdapter); mViewBinding.rlSaledetail.setAdapter(mSaledetailAdapter);
mViewBinding.rlSaledetail.setLayoutManager(new LinearLayoutManager(mContext)); mViewBinding.rlSaledetail.setLayoutManager(new LinearLayoutManager(mContext));
mSaledetailAdapter.addHeaderView(getLayoutInflater().inflate(R.layout.view_saledetail_header, null));
//init d
mDisAdapter = new DisAdapter();
mViewBinding.rlDis.setAdapter(mDisAdapter);
mViewBinding.rlDis.setLayoutManager(new GridLayoutManager(mContext, 4));
mViewBinding.rlDis.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(4, getResources().getDimensionPixelOffset(R.dimen.all_margin), false));
//set other listener //set other listener
mViewBinding.llSaledetail.setOnClickListener(view -> mViewBinding.cbSaledetail.setChecked(!mViewBinding.cbSaledetail.isChecked())); mViewBinding.llSaledetailHint.setOnClickListener(view -> mViewBinding.cbSaledetail.setChecked(!mViewBinding.cbSaledetail.isChecked()));
mViewBinding.llMs.setOnClickListener(view -> mViewBinding.cbMs.setChecked(!mViewBinding.cbMs.isChecked())); mViewBinding.llDisHint.setOnClickListener(view -> mViewBinding.cbDis.setChecked(!mViewBinding.cbDis.isChecked()));
mViewBinding.cbSaledetail.setOnCheckedChangeListener((compoundButton, b) -> { mViewBinding.cbSaledetail.setOnCheckedChangeListener((compoundButton, b) -> {
mViewBinding.cbSaledetail.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled); mViewBinding.cbSaledetail.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled);
mViewBinding.rlSaledetail.setVisibility(b ? View.VISIBLE : View.GONE); mViewBinding.llSaledetail.setVisibility(b ? View.VISIBLE : View.GONE);
}); });
mViewBinding.cbMs.setOnCheckedChangeListener((compoundButton, b) -> { mViewBinding.cbDis.setOnCheckedChangeListener((compoundButton, b) -> {
mViewBinding.cbMs.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled); mViewBinding.cbDis.setButtonDrawable(b ? R.mipmap.but_up : R.mipmap.but_unfurled);
mViewBinding.rlMs.setVisibility(b ? View.VISIBLE : View.GONE); mViewBinding.llDis.setVisibility(b ? View.VISIBLE : View.GONE);
}); });
//init //init
mPresenter.initStoreInfo();
} }
...@@ -159,13 +172,25 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle ...@@ -159,13 +172,25 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
* @param saleorder 订单信息 * @param saleorder 订单信息
*/ */
public void loadSaleorder(Saleorder saleorder) { public void loadSaleorder(Saleorder saleorder) {
mViewBinding.setOrderAuthAmt(saleorder.getOrderAuthAmt()); mViewBinding.setOrderAuthAmt(saleorder.getOrderVipOffAmt() - saleorder.getMsDisAmt());
mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt()); mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt());
mViewBinding.setTicketAmt(saleorder.getTicketAmt()); mViewBinding.setTicketAmt(saleorder.getTicketAmt());
mViewBinding.setAvlPoints(saleorder.getBoundNum()); mViewBinding.setAvlPoints(saleorder.getBoundNum());
mViewBinding.setPointDisAmt(ConvertUtil.fenToYuan(saleorder.getBoundAmt())); mViewBinding.setPointDisAmt(ConvertUtil.fenToYuan(saleorder.getBoundAmt()));
if (mDisAdapter != null) mDisAdapter.setNewData(saleorder.getDisList());
}
/**
* 加载购物车信息
*
* @param saledetails 购物车信息
*/
public void loadSaledetails(List<Saledetail> saledetails) {
if (mSaledetailAdapter != null) mSaledetailAdapter.setNewData(saledetails);
} }
/** /**
......
...@@ -77,7 +77,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -77,7 +77,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
@Override @Override
public void loadMss(List<Ms> mss) { public void loadMss(List<Ms> mss) {
mStoreFragment.loadMss(mss);
} }
@Override @Override
...@@ -115,6 +115,11 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -115,6 +115,11 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this); mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this);
} }
@Override
public void showMsDialog(List<Ms> mss) {
mMsDialog.setMss(mss).show(this);
}
@Override @Override
public void showSettle(List<Saledetail> saledetails) { public void showSettle(List<Saledetail> saledetails) {
Intent intent = new Intent(StoreActivity.this, SettleActivity.class); Intent intent = new Intent(StoreActivity.this, SettleActivity.class);
......
...@@ -86,6 +86,10 @@ interface StoreContract { ...@@ -86,6 +86,10 @@ interface StoreContract {
*/ */
void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails); void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails);
/**
* 显示营销方案
*/
void showMsDialog(List<Ms> mss);
/** /**
* 显示结算页面 * 显示结算页面
...@@ -139,6 +143,11 @@ interface StoreContract { ...@@ -139,6 +143,11 @@ interface StoreContract {
*/ */
public abstract void clickSkugrp(Sskugrp sskugrp); public abstract void clickSkugrp(Sskugrp sskugrp);
/**
* 商店页面 - 点击营销方案
*/
public abstract void clickMs();
/** /**
* 商店页面 - 点击添加商品 * 商店页面 - 点击添加商品
* *
......
...@@ -49,6 +49,7 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -49,6 +49,7 @@ public class StorePresenter extends StoreContract.Presenter {
@Override @Override
public void clickSettle() { public void clickSettle() {
if (mSaledetails.size() == 0) return;
mView.showSettle(mSaledetails); mView.showSettle(mSaledetails);
} }
...@@ -60,6 +61,7 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -60,6 +61,7 @@ public class StorePresenter extends StoreContract.Presenter {
@Override @Override
public void initStore() { public void initStore() {
this.getSkugrp(); this.getSkugrp();
this.getMs();
this.refreshSku(); this.refreshSku();
} }
...@@ -94,6 +96,11 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -94,6 +96,11 @@ public class StorePresenter extends StoreContract.Presenter {
public void clickSkugrp(Sskugrp sskugrp) { public void clickSkugrp(Sskugrp sskugrp) {
} }
@Override
public void clickMs() {
mView.showMsDialog(mMss);
}
@Override @Override
public <Sku extends BaseSku> void clickAddSku(Sku sku) { public <Sku extends BaseSku> void clickAddSku(Sku sku) {
//更新购物车信息 //更新购物车信息
...@@ -163,6 +170,20 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -163,6 +170,20 @@ public class StorePresenter extends StoreContract.Presenter {
); );
} }
/**
* 获取营销计划
*/
private void getMs() {
mCompositeDisposable.add(
DBFactory.Store.queryMss().subscribe(ms -> {
mMss = ms;
mView.loadMss(mMss);
}, throwable -> {
})
);
}
/** /**
* 搜索商品 * 搜索商品
*/ */
......
package com.xingdata.zzdpos.ui.store.dialog; package com.xingdata.zzdpos.ui.store.dialog;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSheetDialog; import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogStoreMsBinding; import com.xingdata.zzdpos.databinding.DialogStoreMsBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBinding> { public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBinding> {
private List<Ms> mMss;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.dialog_store_ms; return R.layout.dialog_store_ms;
...@@ -15,6 +22,87 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi ...@@ -15,6 +22,87 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi
@Override @Override
public void initView() { public void initView() {
mViewBinding.setDisInfo("");
mViewBinding.setPromotionInfo("");
mViewBinding.setMoneyOffInfo("");
mViewBinding.setGiftInfo("");
mViewBinding.tvClose.setOnClickListener(view -> this.dismiss());
for (int i = 0; i < mMss.size(); i++) {
switch (mMss.get(i).getMsTools()) {
case C.MS_TYPE.DIS:
mViewBinding.setDisInfo(mViewBinding.getDisInfo() + getMsDescription(mMss.get(i)) + "\n");
break;
case C.MS_TYPE.PROMOTION:
mViewBinding.setPromotionInfo(mViewBinding.getPromotionInfo() + getMsDescription(mMss.get(i)) + "\n");
break;
case C.MS_TYPE.SECOND:
mViewBinding.setDisInfo(mViewBinding.getDisInfo() + getMsDescription(mMss.get(i)) + "\n");
break;
case C.MS_TYPE.MONEY_OFF:
mViewBinding.setMoneyOffInfo(mViewBinding.getMoneyOffInfo() + getMsDescription(mMss.get(i)) + "\n");
break;
case C.MS_TYPE.GIFT:
mViewBinding.setGiftInfo(mViewBinding.getGiftInfo() + getMsDescription(mMss.get(i)) + "\n");
break;
}
}
}
/**
* 设置营销方案
*
* @param mss 营销方案
*/
public MsDialog setMss(List<Ms> mss) {
this.mMss = mss;
return this;
}
/**
* 获取营销计划的文字描述
*
* @param ms 营销计划
* @return 文字描述
*/
private String getMsDescription(Ms ms) {
String strGroup = "", strType = "";
switch (ms.getMsTouchTag2()) {
case C.MS_GROUP.ALL:
strGroup = getString(R.string.ms_group_all_info);
break;
case C.MS_GROUP.BRAND:
strGroup = getString(R.string.ms_group_all_info);
break;
case C.MS_GROUP.CATE:
//TODO 获取分组名
strGroup = getString(R.string.ms_group_cate_info, ms.getSpuCateId() + "");
break;
case C.MS_GROUP.SKU:
//TODO 获取商品名
strGroup = getString(R.string.ms_group_sku_info, ms.getSkuId() + "");
break;
}
switch (ms.getMsTools()) {
case C.MS_TYPE.DIS:
strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break;
case C.MS_TYPE.PROMOTION:
strType = getString(R.string.ms_type_promotion);
break;
case C.MS_TYPE.SECOND:
strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break;
case C.MS_TYPE.MONEY_OFF:
strType = getString(R.string.ms_type_money_off_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftOffAmt()));
break;
case C.MS_TYPE.GIFT:
strType = getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), ms.getGiftSkuName());
break;
}
return strGroup + strType;
} }
} }
...@@ -9,18 +9,20 @@ import com.xingdata.zzdpos.R; ...@@ -9,18 +9,20 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSku; import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentStoreBinding; import com.xingdata.zzdpos.databinding.FragmentStoreBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Saledetail; import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter; import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter;
import com.xingdata.zzdpos.ui.store.adapter.SkugrpAdapter; import com.xingdata.zzdpos.ui.store.adapter.SkugrpAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List; import java.util.List;
public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBinding> { public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBinding> {
private SkuAdapter mSkuAdapter;
private SkugrpAdapter mSkugrpAdapter; private SkugrpAdapter mSkugrpAdapter;
private SkuAdapter mSkuAdapter;
public interface OnCountChangeListener { public interface OnCountChangeListener {
void onCountChange(BaseSku sku, int value); void onCountChange(BaseSku sku, int value);
...@@ -52,15 +54,18 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -52,15 +54,18 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
else mPresenter.clickRemoveSku(sku); else mPresenter.clickRemoveSku(sku);
}); });
// set grp listener // set grp listener
mSkugrpAdapter.setOnItemClickListener((adapter, view, position) -> mPresenter.clickSkugrp(mSkugrpAdapter.getData().get(position))); mSkugrpAdapter.setOnItemClickListener((adapter, view, position) -> mPresenter.clickSkugrp(mSkugrpAdapter.getData().get(position)));
// set other listener
mViewBinding.llMs.setOnClickListener(view -> mPresenter.clickMs());
// set empty // set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null); @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
mSkuAdapter.setEmptyView(view); mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false); mSkuAdapter.isUseEmpty(false);
// init data // init data
mPresenter.initStore(); mPresenter.initStore();
} }
...@@ -89,6 +94,87 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -89,6 +94,87 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mSkugrpAdapter.setNewData(sskugrps); mSkugrpAdapter.setNewData(sskugrps);
} }
/**
* 加载营销方案
*
* @param mss 营销列表
*/
public void loadMss(List<Ms> mss) {
mViewBinding.setMsCount(mss.size());
if (mss.size() > 0) {
Ms showMs = mss.get(0);
switch (showMs.getMsTools()) {
case C.MS_TYPE.DIS:
mViewBinding.tvMsType.setText(R.string.ms_type_dis);
mViewBinding.tvMsType.setBackgroundResource(R.drawable.shape_red_r1);
break;
case C.MS_TYPE.PROMOTION:
mViewBinding.tvMsType.setText(R.string.ms_type_promotion);
mViewBinding.tvMsType.setBackgroundResource(R.drawable.shape_orange_r1);
break;
case C.MS_TYPE.SECOND:
mViewBinding.tvMsType.setText(R.string.ms_type_dis);
mViewBinding.tvMsType.setBackgroundResource(R.drawable.shape_red_r1);
break;
case C.MS_TYPE.MONEY_OFF:
mViewBinding.tvMsType.setText(R.string.ms_type_money_off);
mViewBinding.tvMsType.setBackgroundResource(R.drawable.shape_green_r1);
break;
case C.MS_TYPE.GIFT:
mViewBinding.tvMsType.setText(R.string.ms_type_gift);
mViewBinding.tvMsType.setBackgroundResource(R.drawable.shape_green_r1);
break;
}
mViewBinding.tvMsDis.setText(getMsDescription(showMs));
}
}
/**
* 获取营销计划的文字描述
*
* @param ms 营销计划
* @return 文字描述
*/
private String getMsDescription(Ms ms) {
String strGroup = "", strType = "";
switch (ms.getMsTouchTag2()) {
case C.MS_GROUP.ALL:
strGroup = getString(R.string.ms_group_all_info);
break;
case C.MS_GROUP.BRAND:
strGroup = getString(R.string.ms_group_all_info);
break;
case C.MS_GROUP.CATE:
//TODO 获取分组名
strGroup = getString(R.string.ms_group_cate_info, ms.getSpuCateId() + "");
break;
case C.MS_GROUP.SKU:
//TODO 获取商品名
strGroup = getString(R.string.ms_group_sku_info, ms.getSkuId() + "");
break;
}
switch (ms.getMsTools()) {
case C.MS_TYPE.DIS:
strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break;
case C.MS_TYPE.PROMOTION:
strType = getString(R.string.ms_type_promotion);
break;
case C.MS_TYPE.SECOND:
strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break;
case C.MS_TYPE.MONEY_OFF:
strType = getString(R.string.ms_type_money_off_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftOffAmt()));
break;
case C.MS_TYPE.GIFT:
strType = getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), ms.getGiftSkuName());
break;
}
return strGroup + strType;
}
/** /**
* 加载商品 * 加载商品
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/blue_mawu" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/green_chengyaojin" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/orange_shixiu" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/red_guanyu" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="disInfo"
type="String" />
<variable
name="promotionInfo"
type="String" />
<variable
name="moneyOffInfo"
type="String" />
<variable
name="giftInfo"
type="String" />
</data>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/transparent" android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout
android:id="@+id/fl_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/ms_dialog_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<TextView
android:id="@+id/tv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:text="@string/all_close"
android:textColor="@color/black_baozheng" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toBottomOf="@id/fl_title" />
<TextView
android:layout_width="wrap_content" <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="AAAAAAAAAAAAAAAAAA" /> android:gravity="top|start"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin"
android:visibility="@{disInfo.length()>0?View.VISIBLE:View.GONE}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_red_r1"
android:paddingBottom="@dimen/all_shape_radius"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:paddingTop="@dimen/all_shape_radius"
android:text="@string/ms_type_dis"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_dis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:lineSpacingExtra="@dimen/all_spacing"
android:text="@{disInfo}"
android:textColor="@color/black_baozheng" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin"
android:visibility="@{promotionInfo.length()>0?View.VISIBLE:View.GONE}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_orange_r1"
android:paddingBottom="@dimen/all_shape_radius"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:paddingTop="@dimen/all_shape_radius"
android:text="@string/ms_type_promotion"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_promotion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:lineSpacingExtra="@dimen/all_spacing"
android:text="@{promotionInfo}"
android:textColor="@color/black_baozheng" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin"
android:visibility="@{moneyOffInfo.length()>0?View.VISIBLE:View.GONE}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_green_r1"
android:paddingBottom="@dimen/all_shape_radius"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:paddingTop="@dimen/all_shape_radius"
android:text="@string/ms_type_money_off"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_money_off"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:lineSpacingExtra="@dimen/all_spacing"
android:text="@{moneyOffInfo}"
android:textColor="@color/black_baozheng" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|start"
android:paddingBottom="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin"
android:visibility="@{giftInfo.length()>0?View.VISIBLE:View.GONE}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_r1"
android:paddingBottom="@dimen/all_shape_radius"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:paddingTop="@dimen/all_shape_radius"
android:text="@string/ms_type_gift"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_gift"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:lineSpacingExtra="@dimen/all_spacing"
android:text="@{giftInfo}"
android:textColor="@color/black_baozheng" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/ll_saledetail" android:id="@+id/ll_saledetail_hint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
...@@ -215,11 +215,64 @@ ...@@ -215,11 +215,64 @@
android:foreground="?android:attr/actionBarItemBackground" /> android:foreground="?android:attr/actionBarItemBackground" />
</LinearLayout> </LinearLayout>
<android.support.v7.widget.RecyclerView <LinearLayout
android:id="@+id/rl_saledetail" android:id="@+id/ll_saledetail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" /> android:orientation="vertical"
android:visibility="gone">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_saledetail"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="6"
android:gravity="start"
android:text="@string/cart_amt"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_order_cnt"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_vip_off_amt"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:gravity="end"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -228,9 +281,8 @@ ...@@ -228,9 +281,8 @@
android:layout_marginStart="@dimen/all_margin" android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" /> android:background="@color/gray_kongming" />
<LinearLayout <LinearLayout
android:id="@+id/ll_ms" android:id="@+id/ll_dis_hint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
...@@ -245,33 +297,48 @@ ...@@ -245,33 +297,48 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/settle_ms_hint" android:text="@string/settle_dis_hint"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size" />
<CheckBox <CheckBox
android:id="@+id/cb_ms" android:id="@+id/cb_dis"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:button="@mipmap/but_unfurled" android:button="@mipmap/but_unfurled"
android:foreground="?android:attr/actionBarItemBackground" /> android:foreground="?android:attr/actionBarItemBackground" />
</LinearLayout> </LinearLayout>
<LinearLayout
<View android:id="@+id/ll_dis"
android:id="@+id/rl_ms"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="wrap_content"
android:background="@color/red_diaochan" android:orientation="vertical"
android:visibility="gone" /> android:visibility="gone">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_dis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/white_caocao" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_vip" android:id="@+id/ll_vip"
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -2,23 +2,77 @@ ...@@ -2,23 +2,77 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="msCount"
type="int" />
</data>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <FrameLayout
android:id="@+id/ll_ms"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"> android:background="@color/white_caocao"
android:orientation="vertical"
android:visibility="@{msCount>0 ?View.VISIBLE:View.GONE}">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:foreground="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:padding="@dimen/all_spacing">
<TextView
android:id="@+id/tv_ms_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/all_shape_radius"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:paddingTop="@dimen/all_shape_radius"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_ms_dis"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing"
android:layout_weight="1"
android:textColor="@color/black_baozheng" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:drawableEnd="@mipmap/but_unfurled"
android:drawablePadding="@dimen/all_spacing"
android:text="@{msCount +@string/store_ms_count}"
android:textColor="@color/black_baozheng" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
</LinearLayout> </FrameLayout>
<View <View
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
android:id="@+id/tv_type" android:id="@+id/tv_type"
android:layout_width="@dimen/all_margin_big" android:layout_width="@dimen/all_margin_big"
android:layout_height="@dimen/all_margin_big" android:layout_height="@dimen/all_margin_big"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center" android:gravity="center"
android:text="满" android:text="满"
android:textColor="@color/white_caocao" android:textColor="@color/white_caocao"
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="2" android:maxLines="2"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="6" app:layout_constraintHorizontal_weight="6"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
...@@ -29,7 +28,6 @@ ...@@ -29,7 +28,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/tv_name" app:layout_constraintLeft_toRightOf="@+id/tv_name"
...@@ -43,7 +41,6 @@ ...@@ -43,7 +41,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:textColor="@color/gray" android:textColor="@color/gray"
android:textSize="@dimen/all_caption_size"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/tv_price" app:layout_constraintBottom_toTopOf="@+id/tv_price"
app:layout_constraintLeft_toRightOf="@+id/tv_count" app:layout_constraintLeft_toRightOf="@+id/tv_count"
...@@ -57,7 +54,6 @@ ...@@ -57,7 +54,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2" app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_count" app:layout_constraintLeft_toRightOf="@+id/tv_count"
...@@ -70,7 +66,6 @@ ...@@ -70,7 +66,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end" android:gravity="end"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2" app:layout_constraintHorizontal_weight="2"
app:layout_constraintLeft_toRightOf="@+id/tv_price" app:layout_constraintLeft_toRightOf="@+id/tv_price"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<string name="all_dialog">对话框</string> <string name="all_dialog">对话框</string>
<string name="all_cancel">取消</string> <string name="all_cancel">取消</string>
<string name="all_confirm">确认</string> <string name="all_confirm">确认</string>
<string name="all_close">关闭</string>
<string name="all_add">添加</string> <string name="all_add">添加</string>
<string name="all_no"></string> <string name="all_no"></string>
<string name="all_yes"></string> <string name="all_yes"></string>
...@@ -521,7 +522,7 @@ ...@@ -521,7 +522,7 @@
<string name="settle_point_amt_text"> , 可抵用</string> <string name="settle_point_amt_text"> , 可抵用</string>
<string name="settle_balance">账户余额</string> <string name="settle_balance">账户余额</string>
<string name="settle_saledetail_hint">商品详情</string> <string name="settle_saledetail_hint">商品详情</string>
<string name="settle_ms_hint">账户余额</string> <string name="settle_dis_hint">优惠项目</string>
<!--支付里的Vip--> <!--支付里的Vip-->
<string name="settle_vip_search_hint">请输入会员手机号</string> <string name="settle_vip_search_hint">请输入会员手机号</string>
...@@ -543,6 +544,28 @@ ...@@ -543,6 +544,28 @@
<string name="store_search_hint">请输入商品名称/助记码/条码</string> <string name="store_search_hint">请输入商品名称/助记码/条码</string>
<string name="store_reduce">减少</string> <string name="store_reduce">减少</string>
<string name="store_increase">添加</string> <string name="store_increase">添加</string>
<string name="store_ms_count">项优惠</string>
<!--优惠-->
<string name="ms_dialog_title">优惠活动</string>
<string name="ms_group_all">全场</string>
<string name="ms_group_all_info">全场</string>
<string name="ms_group_brand">品牌</string>
<string name="ms_group_brand_info">买%s</string>
<string name="ms_group_cate">品类</string>
<string name="ms_group_cate_info">买%s</string>
<string name="ms_group_sku">指定商品</string>
<string name="ms_group_sku_info">买%s</string>
<string name="ms_type_dis">打折</string>
<string name="ms_type_dis_info">享受%s折优惠</string>
<string name="ms_type_promotion">促销</string>
<string name="ms_type_promotion_info">享受促销价</string>
<string name="ms_type_money_off">满减</string>
<string name="ms_type_money_off_info">满%s元减%s元</string>
<string name="ms_type_second">打折</string>
<string name="ms_type_second_info">第二件享受%s折优惠</string>
<string name="ms_type_gift">换购</string>
<string name="ms_type_gift_info">满%s元加%s元换购%s一件</string>
<!--帮助POS--> <!--帮助POS-->
<string name="help_hint">帮助</string> <string name="help_hint">帮助</string>
......
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