Skip to content

T
TangKuPos
Commit e1a788e9 authored by 陈前's avatar 陈前
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
parents 96c1765d b27a4a65
Show whitespace changes
Inline Side-by-side
Showing with 805 additions and 288 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ e1a788e9
...@@ -375,7 +375,7 @@ public class C { ...@@ -375,7 +375,7 @@ public class C {
*/ */
public final class VIP { public final class VIP {
private static final String ROOT_URL = PKG + "user/"; private static final String ROOT_URL = PKG + "user/";
public static final String query = PKG + "query"; public static final String query = ROOT_URL + "query";
} }
} }
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ e1a788e9
...@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Gbound; ...@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Mscard; import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.NewSssku; import com.xingdata.zzdpos.model.NewSssku;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Trule; import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Ubound; import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.model.UsskuParam; import com.xingdata.zzdpos.model.UsskuParam;
...@@ -457,7 +456,8 @@ public final class ApiFactory { ...@@ -457,7 +456,8 @@ public final class ApiFactory {
public static class TRULE { public static class TRULE {
public static Observable<Pager<Trule>> truleQuery() { public static Observable<Pager<Trule>> truleQuery() {
return Api.getInstance().service.truleQuery().onErrorReturn(new return Api.getInstance().service.truleQuery(System.currentTimeMillis() + "")
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io()) ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
...@@ -714,8 +714,9 @@ public final class ApiFactory { ...@@ -714,8 +714,9 @@ public final class ApiFactory {
* @return * @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
int int pageSize,
pageSize, long startDate, long endDate) { long startDate,
long endDate) {
return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate, return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
endDate).onErrorReturn(new endDate).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io()) ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
...@@ -752,7 +753,7 @@ public final class ApiFactory { ...@@ -752,7 +753,7 @@ public final class ApiFactory {
public static class Sta { public static class Sta {
/** /**
* /** /**
* 查询统计详情 * 查询统计详情
*/ */
public static Observable<com.xingdata.zzdpos.model.Sta> querySta() { public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
...@@ -870,8 +871,8 @@ public final class ApiFactory { ...@@ -870,8 +871,8 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Vip>> getVipList(int pageNumber) { public static Observable<Pager<Vip>> getVipList(int pageNumber,String vipLevel) {
return Api.getInstance().service.getVipList(pageNumber, 12) return Api.getInstance().service.getVipList(vipLevel,pageNumber, 12)
.onErrorReturn(new ErrorFilter<>()) .onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>()) .map(new ResultFilter<>())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ e1a788e9
...@@ -137,8 +137,13 @@ interface ApiService { ...@@ -137,8 +137,13 @@ interface ApiService {
("wd") String wd); ("wd") String wd);
@POST(C.URL.ORDER.getSaleOrder) @POST(C.URL.ORDER.getSaleOrder)
Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("orderStatus") String orderStatus,@Query("pageNumber") int pageNum, @Query Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("orderStatus") String
("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long orderStatus, @Query
("pageNumber") int pageNum,
@Query
("pageSize") int pageSize,
@Query("startDate") long startDate,
@Query("endDate") long
endDate); endDate);
@POST(C.URL.ORDER.getOrderDetail) @POST(C.URL.ORDER.getOrderDetail)
...@@ -272,7 +277,7 @@ interface ApiService { ...@@ -272,7 +277,7 @@ interface ApiService {
@POST(C.URL.TRULE.truleQuery) @POST(C.URL.TRULE.truleQuery)
Observable<HttpMessage<Pager<Trule>>> truleQuery(); Observable<HttpMessage<Pager<Trule>>> truleQuery(@Query("startDate") String data);
@POST(C.URL.TRULE.truleDetail) @POST(C.URL.TRULE.truleDetail)
Observable<HttpMessage<String>> truleDetail(@Query("id") String id); Observable<HttpMessage<String>> truleDetail(@Query("id") String id);
...@@ -349,7 +354,8 @@ interface ApiService { ...@@ -349,7 +354,8 @@ interface ApiService {
Observable<HttpMessage<Level>> updateVipLevel(@Body Level l); Observable<HttpMessage<Level>> updateVipLevel(@Body Level l);
@POST(C.URL.LEVEL.queryAll) @POST(C.URL.LEVEL.queryAll)
Observable<HttpMessage<Pager<Level>>> getVipLevelList(@Query("pageNumber") int pageNumber, @Query ("pageSize") int pageSize); Observable<HttpMessage<Pager<Level>>> getVipLevelList(@Query("pageNumber") int pageNumber,
@Query("pageSize") int pageSize);
@POST(C.URL.MSCARD.update) @POST(C.URL.MSCARD.update)
Observable<HttpMessage<Mscard>> updateMscard(@Body Mscard m); Observable<HttpMessage<Mscard>> updateMscard(@Body Mscard m);
...@@ -383,4 +389,5 @@ interface ApiService { ...@@ -383,4 +389,5 @@ interface ApiService {
@Query("pageSize") int pageSize); @Query("pageSize") int pageSize);
} }
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @ e1a788e9
...@@ -135,6 +135,9 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind ...@@ -135,6 +135,9 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
if (getBaseActivity() != null && getBaseActivity().mDialogs != null) { if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
getBaseActivity().mDialogs.remove(this); getBaseActivity().mDialogs.remove(this);
} }
if (null != mDisp && (!mDisp.isDisposed())) {
mDisp.dispose();
}
} }
...@@ -203,6 +206,10 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind ...@@ -203,6 +206,10 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
public void dismiss() { public void dismiss() {
if (isShowing) { if (isShowing) {
if (null != mDisp && (!mDisp.isDisposed())) {
mDisp.dispose();
}
super.dismiss(); super.dismiss();
} }
} }
......
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ e1a788e9
...@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.db; ...@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.db;
import com.blankj.utilcode.util.StringUtils; import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.App; import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.base.BaseModel; import com.xingdata.zzdpos.base.BaseModel;
...@@ -15,8 +16,10 @@ import com.xingdata.zzdpos.ui.settle.SettlePresenter; ...@@ -15,8 +16,10 @@ import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.util.StringUtil; import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.realm.Realm; import io.realm.Realm;
...@@ -108,21 +111,44 @@ public class DBFactory { ...@@ -108,21 +111,44 @@ public class DBFactory {
} }
/**
* 查询商品名称
*
* @param skuId 商品Id
* @return 商品名称
*/
public static String querySpuNameBySkuId(Long skuId) {
List<Sssku> ssskus = getList(DB.getInstance().get(StorePresenter.class).where(Sssku.class).equalTo("skuId", skuId).findAll());
if (ssskus.size() > 0) return ssskus.get(0).getSpuName();
else return null;
}
/** /**
* 查询营销活动 * 查询营销活动
* *
* @return 营销活动 * @return 营销活动
*/ */
public static Observable<List<Ms>> queryMss() { public static Observable<List<Ms>> queryMss() {
RealmQuery<Ms> query = DB.getInstance().get(MainPresenter.class).where(Ms.class); RealmQuery<Ms> query = DB.getInstance().get(StorePresenter.class).where(Ms.class);
query.equalTo("msStatus", 0); query.equalTo("msStatus", 0);
query.notEqualTo("msTools", C.MS_TYPE.GIFT); query.notEqualTo("msTools", C.MS_TYPE.GIFT);
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
query.contains("msWeekPlan", weekNow);
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
query.equalTo("msCoustomTag", 0);
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING)) return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
.flatMap(ms -> Observable.just(getList(ms))); .flatMap(ms -> Observable.just(getList(ms)));
} }
} }
public static class Settle { public static class Settle {
...@@ -148,6 +174,18 @@ public class DBFactory { ...@@ -148,6 +174,18 @@ public class DBFactory {
RealmQuery<Ms> query = DB.getInstance().get(SettlePresenter.class).where(Ms.class); RealmQuery<Ms> query = DB.getInstance().get(SettlePresenter.class).where(Ms.class);
query.equalTo("msStatus", 0); query.equalTo("msStatus", 0);
query.notEqualTo("msTools", C.MS_TYPE.GIFT);
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
query.contains("msWeekPlan", weekNow);
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING)) return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
.flatMap(ms -> Observable.just(getList(ms))); .flatMap(ms -> Observable.just(getList(ms)));
} }
......
app/src/main/java/com/xingdata/zzdpos/model/Ms.java
View file @ e1a788e9
...@@ -289,6 +289,8 @@ public class Ms extends RealmObject implements BaseModel, BaseBean { ...@@ -289,6 +289,8 @@ public class Ms extends RealmObject implements BaseModel, BaseBean {
private Long skuPrice1; private Long skuPrice1;
private String cateName;
public Long getId() { public Long getId() {
return id; return id;
} }
...@@ -724,6 +726,14 @@ public class Ms extends RealmObject implements BaseModel, BaseBean { ...@@ -724,6 +726,14 @@ public class Ms extends RealmObject implements BaseModel, BaseBean {
this.skuPrice1 = skuPrice1; this.skuPrice1 = skuPrice1;
} }
public String getCateName() {
return cateName;
}
public void setCateName(String cateName) {
this.cateName = cateName;
}
public List<Saledetail> getSaledetailList() { public List<Saledetail> getSaledetailList() {
return saledetailList; return saledetailList;
} }
......
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
View file @ e1a788e9
...@@ -1096,8 +1096,6 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo ...@@ -1096,8 +1096,6 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
Dis moneyOff = new Dis(C.DIS_TYPE.MONEY_OFF); Dis moneyOff = new Dis(C.DIS_TYPE.MONEY_OFF);
Dis promotion = new Dis(C.DIS_TYPE.PROMOTION); Dis promotion = new Dis(C.DIS_TYPE.PROMOTION);
if (this.vipOffAmt > 0) dis.setDisAmt(dis.getDisAmt() + this.vipOffAmt);
for (Map.Entry<Long, Ms> entry : msMap.entrySet()) { for (Map.Entry<Long, Ms> entry : msMap.entrySet()) {
if (entry.getValue().getDisAmt() > 0) { if (entry.getValue().getDisAmt() > 0) {
switch (entry.getValue().getMsTools()) { switch (entry.getValue().getMsTools()) {
......
app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
View file @ e1a788e9
...@@ -10,10 +10,8 @@ import com.xingdata.zzdpos.base.BaseDialog; ...@@ -10,10 +10,8 @@ import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.base.BasePresenter; import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.databinding.DialogLoadingBinding; import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
import io.reactivex.disposables.Disposable;
public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> { public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
Disposable disp; // Disposable disp;
boolean isClose = true; boolean isClose = true;
@Override @Override
...@@ -39,8 +37,7 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin ...@@ -39,8 +37,7 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
} }
public void show(BaseActivity activity, boolean isClose) { public void show(BaseActivity activity, boolean isClose) {
this.isClose = isClose; super.show(activity);
show(activity);
} }
@Override @Override
...@@ -51,9 +48,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin ...@@ -51,9 +48,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog); super.onDismiss(dialog);
if (null != disp && (!disp.isDisposed())) { // if (null != disp && (!disp.isDisposed())) {
disp.dispose(); // disp.dispose();
} // }
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/BindingCounterFragment.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.login.fragment; package com.xingdata.zzdpos.ui.login.fragment;
import android.graphics.Color;
import android.view.View; import android.view.View;
import android.widget.AdapterView;
import com.bigkoo.pickerview.OptionsPickerView;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -11,6 +12,7 @@ import com.xingdata.zzdpos.databinding.FragmentBindingCounterBinding; ...@@ -11,6 +12,7 @@ import com.xingdata.zzdpos.databinding.FragmentBindingCounterBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog; import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.Cashers;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops; import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -30,7 +32,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -30,7 +32,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
long CounterId = -1; long CounterId = -1;
//-1没有选择，0新增，1绑定现有款台 //-1没有选择，0新增，1绑定现有款台
int isNewCounterCount = -1; int isNewCounterCount = -1;
List<String> dataset; List<Cashers> dataset;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -49,26 +51,16 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -49,26 +51,16 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
if (LoginPresenter.userStoreInfo.getMerchant() != null) { if (LoginPresenter.userStoreInfo.getMerchant() != null) {
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
()); ());
mViewBinding.tvInStorename.setText(mShops.getPickerViewText());
mViewBinding.tvStoreAddress.setText(mShops.getCityProvName()+"/"+mShops.getCityName()+"/"+mShops.getCityCountyName()+"/"+mShops.getCityAddress());
} }
dataset = new ArrayList<>(); dataset = new ArrayList<>();
for (int i = 0; i < mShops.getCashers().size(); i++) { for (int i = 0; i < mShops.getCashers().size(); i++) {
dataset.add(mShops.getCashers().get(i).getCasherNo() + "款台"); dataset.add(mShops.getCashers().get(i));
} }
if (dataset.size() > 0) { if (dataset.size() > 0) {
CounterId = mShops.getCashers().get(0).getCasherId(); CounterId = dataset.get(0).getCasherId();
mViewBinding.counterSpinner.attachDataSource(dataset); mViewBinding.tvSelectCounter.setText(dataset.get(0).getCasherNo() + "号款台");
mViewBinding.counterSpinner.setOnItemSelectedListener(new AdapterView
.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
CounterId = mShops.getCashers().get(i).getCasherId();
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
} }
mViewBinding.setOnClickListener(view -> { mViewBinding.setOnClickListener(view -> {
switch (view.getId()) { switch (view.getId()) {
...@@ -106,6 +98,14 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -106,6 +98,14 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
} }
break; break;
case R.id.tv_select_counter: {
if (dataset.size() > 0) {
ShowPickerViewStoreAddress();
} else {
ToastUtils.showLong("当前门店没有款台请新建款台");
}
}
break;
default: { default: {
} }
...@@ -114,6 +114,29 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -114,6 +114,29 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
}); });
} }
/**
* 弹出款台选择器
*/
private void ShowPickerViewStoreAddress() {// 弹出选择器
OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
OptionsPickerView.OnOptionsSelectListener() {
@Override
public void onOptionsSelect(int options1, int options2, int options3, View v) {
String tx = dataset.get(options1).getPickerViewText();
mViewBinding.tvSelectCounter.setText(tx + "号款台");
CounterId = dataset.get(options1).getCasherNo();
}
}).setTitleText("款台选择")
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
.build();
pvOptions.setPicker(dataset);
pvOptions.show();
}
/** /**
* 设置新增款台或者绑定款台的ui信息 * 设置新增款台或者绑定款台的ui信息
*/ */
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.login.fragment; package com.xingdata.zzdpos.ui.login.fragment;
import android.graphics.Color;
import android.view.View; import android.view.View;
import android.widget.AdapterView;
import com.bigkoo.pickerview.OptionsPickerView;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -26,6 +27,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter, ...@@ -26,6 +27,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
private Shops shops; private Shops shops;
private Boolean lock = false; private Boolean lock = false;
private LoadingDialog mLoadingDialog = new LoadingDialog(); private LoadingDialog mLoadingDialog = new LoadingDialog();
List<Shops> list = new ArrayList<>();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -34,7 +36,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter, ...@@ -34,7 +36,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("绑定款台"); mViewBinding.icTitle.tvTitle.setText("选择门店");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
...@@ -54,6 +56,15 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter, ...@@ -54,6 +56,15 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
} }
// mPresenter.getUserStoreInfo(""); // mPresenter.getUserStoreInfo("");
}
break;
case R.id.tv_select_store: {
if (list.size() > 0) {
ShowPickerViewStoreAddress();
} else {
ToastUtils.showLong("当前没有门店数据，请选择新建门店");
}
} }
break; break;
case R.id.ll_new_store: { case R.id.ll_new_store: {
...@@ -74,29 +85,36 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter, ...@@ -74,29 +85,36 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
lock = true; lock = true;
if (LoginPresenter.userStoreInfo.getShops().size() > 0) { if (LoginPresenter.userStoreInfo.getShops().size() > 0) {
shops = LoginPresenter.userStoreInfo.getShops().get(0); shops = LoginPresenter.userStoreInfo.getShops().get(0);
mViewBinding.tvSelectStore.setText(shops.getPickerViewText());
} }
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName()); mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName());
List<String> dataset = new ArrayList<>();
for (int i = 0; i < LoginPresenter.userStoreInfo.getShops().size(); i++) { for (int i = 0; i < LoginPresenter.userStoreInfo.getShops().size(); i++) {
dataset.add(LoginPresenter.userStoreInfo.getShops().get(i).getShopName()); list.add(LoginPresenter.userStoreInfo.getShops().get(i));
} }
if (dataset.size() > 0) {
mViewBinding.storeSpinner.attachDataSource(dataset);
mViewBinding.storeSpinner.setOnItemSelectedListener(new AdapterView
.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
shops = LoginPresenter.userStoreInfo.getShops().get(i);
} }
/**
* 弹出门店择器
*/
private void ShowPickerViewStoreAddress() {// 弹出选择器
OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
OptionsPickerView.OnOptionsSelectListener() {
@Override @Override
public void onNothingSelected(AdapterView<?> adapterView) { public void onOptionsSelect(int options1, int options2, int options3, View v) {
} String tx = list.get(options1).getPickerViewText();
}); mViewBinding.tvSelectStore.setText(tx);
shops = list.get(options1);
} }
}).setTitleText("门店选择")
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
.build();
pvOptions.setPicker(list);
pvOptions.show();
} }
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/Cashers.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.login.fragment.bean; package com.xingdata.zzdpos.ui.login.fragment.bean;
import com.bigkoo.pickerview.model.IPickerViewData;
/** /**
* Created by Administrator on 2017/11/6. * Created by Administrator on 2017/11/6.
*/ */
public class Cashers { public class Cashers implements IPickerViewData {
private long id; private long id;
private long opMapId; private long opMapId;
private long channelMapId; private long channelMapId;
...@@ -95,4 +97,9 @@ public class Cashers { ...@@ -95,4 +97,9 @@ public class Cashers {
public void setCasherNum(long casherNum) { public void setCasherNum(long casherNum) {
this.casherNum = casherNum; this.casherNum = casherNum;
} }
@Override
public String getPickerViewText() {
return this.casherNo + "";
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/Shops.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.login.fragment.bean; package com.xingdata.zzdpos.ui.login.fragment.bean;
import com.bigkoo.pickerview.model.IPickerViewData;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* Created by Administrator on 2017/11/3. * Created by Administrator on 2017/11/3.
*/ */
public class Shops { public class Shops implements IPickerViewData {
private long shopMapId; private long shopMapId;
private long shopIfId; private long shopIfId;
...@@ -261,4 +263,8 @@ public class Shops { ...@@ -261,4 +263,8 @@ public class Shops {
return createTime; return createTime;
} }
@Override
public String getPickerViewText() {
return this.shopName;
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ e1a788e9
...@@ -6,7 +6,6 @@ import com.xingdata.zzdpos.C; ...@@ -6,7 +6,6 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DBFactory; import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saledetail; import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder; import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Ticket; import com.xingdata.zzdpos.model.Ticket;
...@@ -38,11 +37,7 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -38,11 +37,7 @@ public class SettlePresenter extends SettleContract.Presenter {
* 当前的营销活动列表 * 当前的营销活动列表
*/ */
private List<Ms> mMss; private List<Ms> mMss;
private Ms.OnApplyListener mOnApplyListener;
/**
* 当前设备的支付渠道信息
*/
private List<Pay> mPays;
/** /**
* 当前购物车的商品明细 * 当前购物车的商品明细
...@@ -71,6 +66,24 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -71,6 +66,24 @@ public class SettlePresenter extends SettleContract.Presenter {
this.getStoreIntent(); this.getStoreIntent();
break; break;
} }
mOnApplyListener = new Ms.OnApplyListener() {
@Override
public void setDis(Ms ms) {
mSaleorder.addMsDis(ms);
}
@Override
public void addGift(Long msId, Long skuId, long addAmt) {
//这一版不做处理
}
@Override
public void removeGift(Long msId) {
//这一版不作处理
}
};
} }
/** /**
...@@ -79,7 +92,6 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -79,7 +92,6 @@ public class SettlePresenter extends SettleContract.Presenter {
private void getPaymentIntent() { private void getPaymentIntent() {
Long payAmt = getIntent().getLongExtra(C.EXTRA_KEY.SETTLE_EXTRA, 0); Long payAmt = getIntent().getLongExtra(C.EXTRA_KEY.SETTLE_EXTRA, 0);
mSaledetails.add(0, Saledetail.create("收款", payAmt, mVip)); mSaledetails.add(0, Saledetail.create("收款", payAmt, mVip));
mSaleorder.setSaledetails(mSaledetails);
} }
/** /**
...@@ -87,7 +99,6 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -87,7 +99,6 @@ public class SettlePresenter extends SettleContract.Presenter {
*/ */
private void getStoreIntent() { private void getStoreIntent() {
mSaledetails.addAll((ArrayList) getIntent().getSerializableExtra(C.EXTRA_KEY.SETTLE_EXTRA)); mSaledetails.addAll((ArrayList) getIntent().getSerializableExtra(C.EXTRA_KEY.SETTLE_EXTRA));
mSaleorder.setSaledetails(mSaledetails);
} }
...@@ -105,8 +116,19 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -105,8 +116,19 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override @Override
public void initStoreInfo() { public void initStoreInfo() {
mView.loadSaledetails(mSaledetails); mView.loadSaledetails(mSaledetails);
//设置订单详情
mSaleorder.setSaledetails(mSaledetails); mSaleorder.setSaledetails(mSaledetails);
reprice();
DBFactory.Settle.queryMss().subscribe(ms -> {
mMss = ms;
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).setOnApplyListener(mOnApplyListener);
}
//处理营销活动
this.processMs();
//计算价格
this.reprice();
});
} }
@Override @Override
...@@ -133,6 +155,8 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -133,6 +155,8 @@ public class SettlePresenter extends SettleContract.Presenter {
this.setVip(vip); this.setVip(vip);
// 重新设置购物车 // 重新设置购物车
mSaleorder.setSaledetails(mSaledetails); mSaleorder.setSaledetails(mSaledetails);
//处理营销活动
this.processMs();
// 加载购物车 // 加载购物车
mView.loadSaledetails(mSaledetails); mView.loadSaledetails(mSaledetails);
// 计算价格 // 计算价格
...@@ -302,6 +326,27 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -302,6 +326,27 @@ public class SettlePresenter extends SettleContract.Presenter {
mView.loadAvlTicketNum(avlTicketNum); mView.loadAvlTicketNum(avlTicketNum);
} }
/**
* 处理营销活动
*/
private void processMs() {
//重置商品
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).setSaledetailList(new ArrayList<>());
}
//添加商品
for (int i = 0; i < mSaledetails.size(); i++) {
for (int j = 0; j < mMss.size(); j++) {
if (!mMss.get(j).isAvailable(mVip)) continue;
if (mMss.get(j).addSaledetail(mSaledetails.get(i))) break;
}
}
//判断
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).execute();
}
}
/** /**
* 统计订单信息 * 统计订单信息
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/DisAdapter.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.settle.adapter; package com.xingdata.zzdpos.ui.settle.adapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter; import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemSettleDisBinding; import com.xingdata.zzdpos.databinding.ItemSettleDisBinding;
...@@ -16,6 +17,19 @@ public class DisAdapter extends BaseAdapter<Saleorder.Dis, ItemSettleDisBinding> ...@@ -16,6 +17,19 @@ public class DisAdapter extends BaseAdapter<Saleorder.Dis, ItemSettleDisBinding>
@Override @Override
protected void convert(ItemSettleDisBinding mViewBinding, Saleorder.Dis item) { protected void convert(ItemSettleDisBinding mViewBinding, Saleorder.Dis item) {
mViewBinding.setAmt(item.getDisAmt()); mViewBinding.setAmt(item.getDisAmt());
mViewBinding.setType(item.getDisType()); switch (item.getDisType()) {
case C.DIS_TYPE.DIS:
mViewBinding.tvType.setText(R.string.ms_type_dis_abbr);
mViewBinding.tvType.setBackgroundResource(R.drawable.shape_red_oval);
break;
case C.DIS_TYPE.PROMOTION:
mViewBinding.tvType.setText(R.string.ms_type_promotion_abbr);
mViewBinding.tvType.setBackgroundResource(R.drawable.shape_orange_oval);
break;
case C.DIS_TYPE.MONEY_OFF:
mViewBinding.tvType.setText(R.string.ms_type_money_off_abbr);
mViewBinding.tvType.setBackgroundResource(R.drawable.shape_green_oval);
break;
}
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
View file @ e1a788e9
...@@ -104,8 +104,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle ...@@ -104,8 +104,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
//init d //init d
mDisAdapter = new DisAdapter(); mDisAdapter = new DisAdapter();
mViewBinding.rlDis.setAdapter(mDisAdapter); mViewBinding.rlDis.setAdapter(mDisAdapter);
mViewBinding.rlDis.setLayoutManager(new GridLayoutManager(mContext, 4)); mViewBinding.rlDis.setLayoutManager(new GridLayoutManager(mContext, 3));
mViewBinding.rlDis.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(4, getResources().getDimensionPixelOffset(R.dimen.all_margin), false));
//set other listener //set other listener
mViewBinding.llSaledetailHint.setOnClickListener(view -> mViewBinding.cbSaledetail.setChecked(!mViewBinding.cbSaledetail.isChecked())); mViewBinding.llSaledetailHint.setOnClickListener(view -> mViewBinding.cbSaledetail.setChecked(!mViewBinding.cbSaledetail.isChecked()));
...@@ -180,7 +179,11 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle ...@@ -180,7 +179,11 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
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()); if (mDisAdapter != null) {
mDisAdapter.setNewData(saleorder.getDisList());
mViewBinding.tvVipOffAmt.setText(ConvertUtil.fenToYuan(saleorder.getOrderVipOffAmt(), true));
mViewBinding.tvOrderCnt.setText(String.valueOf(saleorder.getOrderCnt()));
}
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @ e1a788e9
...@@ -6,6 +6,7 @@ import android.view.inputmethod.EditorInfo; ...@@ -6,6 +6,7 @@ import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -50,13 +51,17 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -50,13 +51,17 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
mViewBinding.ivCart.setOnClickListener(view -> mPresenter.clickCartLogo()); mViewBinding.ivCart.setOnClickListener(view -> mPresenter.clickCartLogo());
mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle()); mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> { mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH) { if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView); KeyboardUtils.hideSoftInput(textView);
mPresenter.searchSku(textView.getText().toString()); mPresenter.searchSku(textView.getText().toString());
} }
return false; return false;
}); });
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
mPresenter.searchBarFocusChanged(b);
});
} }
...@@ -82,7 +87,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -82,7 +87,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
@Override @Override
public <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh) { public <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh) {
mSearchFragment.loadSkus(skus, isRefresh);
} }
@Override @Override
...@@ -97,6 +102,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -97,6 +102,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
@Override @Override
public void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh) { public void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh) {
mStoreFragment.loadSaledetails(saledetails, isRefresh); mStoreFragment.loadSaledetails(saledetails, isRefresh);
mSearchFragment.loadSaledetails(saledetails, isRefresh);
} }
...@@ -130,4 +136,16 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -130,4 +136,16 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
ActivityUtils.startActivity(intent); ActivityUtils.startActivity(intent);
} }
@Override
public void showSearchFragment() {
if (!mSearchFragment.isAdded()) this.start(mSearchFragment);
}
@Override
public void resetSearchBar() {
mViewBinding.etSearch.setText("");
mViewBinding.clTitle.requestFocus();
mViewBinding.clTitle.requestFocusFromTouch();
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
View file @ e1a788e9
...@@ -77,7 +77,6 @@ interface StoreContract { ...@@ -77,7 +77,6 @@ interface StoreContract {
*/ */
void dismissLoadingDialog(); void dismissLoadingDialog();
/** /**
* 显示购物车 * 显示购物车
* *
...@@ -97,6 +96,16 @@ interface StoreContract { ...@@ -97,6 +96,16 @@ interface StoreContract {
* @param saledetails 购物车详情列表 * @param saledetails 购物车详情列表
*/ */
void showSettle(List<Saledetail> saledetails); void showSettle(List<Saledetail> saledetails);
/**
* 显示搜索页面
*/
void showSearchFragment();
/**
* 重置搜索栏
*/
void resetSearchBar();
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
...@@ -174,10 +183,23 @@ interface StoreContract { ...@@ -174,10 +183,23 @@ interface StoreContract {
*/ */
public abstract void onCartDialogCancel(); public abstract void onCartDialogCancel();
/**
* 搜索界面 - 关闭
*/
public abstract void onSearchFragmentCancel();
/** /**
* 购物车界面 - 清空购物车 * 购物车界面 - 清空购物车
*/ */
public abstract void clearCart(); public abstract void clearCart();
/**
* 主页面 - 搜索框焦点改变
*
* @param b 获取焦点
*/
public abstract void searchBarFocusChanged(boolean b);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java
View file @ e1a788e9
...@@ -31,6 +31,7 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -31,6 +31,7 @@ public class StorePresenter extends StoreContract.Presenter {
* 当前营销计划 * 当前营销计划
*/ */
private List<Ms> mMss; private List<Ms> mMss;
private Ms.OnApplyListener mOnApplyListener;
private int mStorePageNum; private int mStorePageNum;
private Long mSkuGrpId; private Long mSkuGrpId;
...@@ -45,6 +46,24 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -45,6 +46,24 @@ public class StorePresenter extends StoreContract.Presenter {
mVip = Vip.createDefault(); mVip = Vip.createDefault();
mSaledetails = new ArrayList<>(); mSaledetails = new ArrayList<>();
mSaleorder = new Saleorder(); mSaleorder = new Saleorder();
mOnApplyListener = new Ms.OnApplyListener() {
@Override
public void setDis(Ms ms) {
mSaleorder.addMsDis(ms);
}
@Override
public void addGift(Long msId, Long skuId, long addAmt) {
//这一版不做处理
}
@Override
public void removeGift(Long msId) {
//这一版不作处理
}
};
} }
@Override @Override
...@@ -125,6 +144,8 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -125,6 +144,8 @@ public class StorePresenter extends StoreContract.Presenter {
public void cartChanged() { public void cartChanged() {
//设置订单信息 //设置订单信息
mSaleorder.setSaledetails(mSaledetails); mSaleorder.setSaledetails(mSaledetails);
//处理营销活动
this.processMs();
//统计订单信息 //统计订单信息
this.reprice(); this.reprice();
} }
...@@ -135,14 +156,27 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -135,14 +156,27 @@ public class StorePresenter extends StoreContract.Presenter {
mView.loadSaledetails(mSaledetails, true); mView.loadSaledetails(mSaledetails, true);
} }
@Override
public void onSearchFragmentCancel() {
//发送购物车信息并刷新页面
mView.loadSaledetails(mSaledetails, true);
//充值搜索栏
mView.resetSearchBar();
}
@Override @Override
public void clearCart() { public void clearCart() {
//清空购物车 //清空购物车
this.mSaledetails = new ArrayList<>(); this.mSaledetails = new ArrayList<>();
//设置订单信息
mSaleorder.setSaledetails(mSaledetails); //购物车发生变
//统计订单信息 this.cartChanged();
this.reprice(); }
@Override
public void searchBarFocusChanged(boolean b) {
if (b) mView.showSearchFragment();
} }
...@@ -177,6 +211,9 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -177,6 +211,9 @@ public class StorePresenter extends StoreContract.Presenter {
mCompositeDisposable.add( mCompositeDisposable.add(
DBFactory.Store.queryMss().subscribe(ms -> { DBFactory.Store.queryMss().subscribe(ms -> {
mMss = ms; mMss = ms;
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).setOnApplyListener(mOnApplyListener);
}
mView.loadMss(mMss); mView.loadMss(mMss);
}, throwable -> { }, throwable -> {
}) })
...@@ -234,6 +271,28 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -234,6 +271,28 @@ public class StorePresenter extends StoreContract.Presenter {
} }
} }
/**
* 处理营销活动
*/
private void processMs() {
//重置商品
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).setSaledetailList(new ArrayList<>());
}
//添加商品
for (int i = 0; i < mSaledetails.size(); i++) {
for (int j = 0; j < mMss.size(); j++) {
if (!mMss.get(j).isAvailable(mVip)) continue;
if (mMss.get(j).addSaledetail(mSaledetails.get(i))) break;
}
}
//判断
for (int i = 0; i < mMss.size(); i++) {
mMss.get(i).execute();
}
}
/** /**
* 统计订单信息 * 统计订单信息
*/ */
......
app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/MsDialog.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.store.dialog; package com.xingdata.zzdpos.ui.store.dialog;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C; 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.db.DBFactory;
import com.xingdata.zzdpos.model.Ms; 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 com.xingdata.zzdpos.util.ConvertUtil;
...@@ -77,12 +79,11 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi ...@@ -77,12 +79,11 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi
strGroup = getString(R.string.ms_group_all_info); strGroup = getString(R.string.ms_group_all_info);
break; break;
case C.MS_GROUP.CATE: case C.MS_GROUP.CATE:
//TODO 获取分组名 strGroup = getString(R.string.ms_group_cate_info, ms.getCateName());
strGroup = getString(R.string.ms_group_cate_info, ms.getSpuCateId() + "");
break; break;
case C.MS_GROUP.SKU: case C.MS_GROUP.SKU:
//TODO 获取商品名 String spuName = DBFactory.Store.querySpuNameBySkuId(ms.getSkuId());
strGroup = getString(R.string.ms_group_sku_info, ms.getSkuId() + ""); strGroup = getString(R.string.ms_group_sku_info, !StringUtils.isEmpty(spuName) ? spuName : ms.getSkuId());
break; break;
} }
switch (ms.getMsTools()) { switch (ms.getMsTools()) {
...@@ -90,7 +91,7 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi ...@@ -90,7 +91,7 @@ public class MsDialog extends BaseSheetDialog<StorePresenter, DialogStoreMsBindi
strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10)); strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break; break;
case C.MS_TYPE.PROMOTION: case C.MS_TYPE.PROMOTION:
strType = getString(R.string.ms_type_promotion); strType = getString(R.string.ms_type_promotion_info);
break; break;
case C.MS_TYPE.SECOND: case C.MS_TYPE.SECOND:
strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10)); strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
......
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.store.fragment; package com.xingdata.zzdpos.ui.store.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; 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.databinding.FragmentStoreSearchBinding; import com.xingdata.zzdpos.databinding.FragmentStoreSearchBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter;
import java.util.List;
public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSearchBinding> { public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSearchBinding> {
private SkuAdapter mSkuAdapter;
private List<Saledetail> mSaledetails;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_store_search; return R.layout.fragment_store_search;
...@@ -14,5 +28,76 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe ...@@ -14,5 +28,76 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
@Override @Override
public void initView() { public void initView() {
// init sku
mSkuAdapter = new SkuAdapter<>();
mSkuAdapter.setSaledetails(mSaledetails);
mViewBinding.rlSku.setAdapter(mSkuAdapter);
mViewBinding.rlSku.setLayoutManager(new LinearLayoutManager(mContext));
// set sku listener
mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
mSkuAdapter.setOnCountChangeListener((sku, value) -> {
if (value > 0) mPresenter.clickAddSku(sku);
else mPresenter.clickRemoveSku(sku);
});
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false);
}
@Override
public boolean onBackPressedSupport() {
mPresenter.onSearchFragmentCancel();
return super.onBackPressedSupport();
}
/**
* 加载更多商品
*/
private void loadMoreSku() {
mPresenter.loadMoreSearchResult();
}
/**
* 加载商品
*
* @param skus 商品
* @param isRefresh 是否刷新
* @param <Sku> 商品类型
*/
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
/**
* 加载购物车信息
*
* @param saledetails 购物车信息
*/
public void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh) {
this.setSaledetails(saledetails);
if (!isAdded()) return;
mSkuAdapter.setSaledetails(saledetails);
if (isRefresh) mSkuAdapter.notifyDataSetChanged();
}
/**
* 设置购物车信息
*
* @param saledetails 购物车信息
*/
public void setSaledetails(List<Saledetail> saledetails) {
this.mSaledetails = saledetails;
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @ e1a788e9
...@@ -4,11 +4,13 @@ import android.annotation.SuppressLint; ...@@ -4,11 +4,13 @@ import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.view.View; import android.view.View;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; 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.db.DBFactory;
import com.xingdata.zzdpos.model.Ms; 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;
...@@ -129,7 +131,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -129,7 +131,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
} }
} }
/** /**
* 获取营销计划的文字描述 * 获取营销计划的文字描述
* *
...@@ -146,12 +147,11 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -146,12 +147,11 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
strGroup = getString(R.string.ms_group_all_info); strGroup = getString(R.string.ms_group_all_info);
break; break;
case C.MS_GROUP.CATE: case C.MS_GROUP.CATE:
//TODO 获取分组名 strGroup = getString(R.string.ms_group_cate_info, ms.getCateName());
strGroup = getString(R.string.ms_group_cate_info, ms.getSpuCateId() + "");
break; break;
case C.MS_GROUP.SKU: case C.MS_GROUP.SKU:
//TODO 获取商品名 String spuName = DBFactory.Store.querySpuNameBySkuId(ms.getSkuId());
strGroup = getString(R.string.ms_group_sku_info, ms.getSkuId() + ""); strGroup = getString(R.string.ms_group_sku_info, !StringUtils.isEmpty(spuName) ? spuName : ms.getSkuId());
break; break;
} }
switch (ms.getMsTools()) { switch (ms.getMsTools()) {
...@@ -159,7 +159,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -159,7 +159,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10)); strType = getString(R.string.ms_type_dis_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
break; break;
case C.MS_TYPE.PROMOTION: case C.MS_TYPE.PROMOTION:
strType = getString(R.string.ms_type_promotion); strType = getString(R.string.ms_type_promotion_info);
break; break;
case C.MS_TYPE.SECOND: case C.MS_TYPE.SECOND:
strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10)); strType = getString(R.string.ms_type_second_info, String.valueOf(Double.valueOf(ms.getPriceDiscount()) / 10));
...@@ -175,7 +175,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin ...@@ -175,7 +175,6 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
return strGroup + strType; return strGroup + strType;
} }
/** /**
* 加载商品 * 加载商品
* *
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ e1a788e9
package com.xingdata.zzdpos.ui.vip; package com.xingdata.zzdpos.ui.vip;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipBinding; import com.xingdata.zzdpos.databinding.ActivityVipBinding;
...@@ -13,10 +14,6 @@ import com.xingdata.zzdpos.ui.vip.fragment.VipTitleFragment; ...@@ -13,10 +14,6 @@ import com.xingdata.zzdpos.ui.vip.fragment.VipTitleFragment;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View { public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
private VipListFragment vipListFragment = new VipListFragment();
private VipLevleFragment vipLevleFragment = new VipLevleFragment();
private VipTitleFragment vipTitleFragment = new VipTitleFragment();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -26,9 +23,9 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> ...@@ -26,9 +23,9 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override @Override
public void initView() { public void initView() {
loadRootFragment(R.id.vip_list_frame, vipListFragment, false, false); loadRootFragment(R.id.vip_list_frame, mPresenter.vipListFragment, false, false);
loadRootFragment(R.id.vip_level_frame, vipLevleFragment, false, false); loadRootFragment(R.id.vip_level_frame, mPresenter.vipLevleFragment, false, false);
loadRootFragment(R.id.vip_title_frame, vipTitleFragment, false, false); loadRootFragment(R.id.vip_title_frame, mPresenter.vipTitleFragment, false, false);
} }
...@@ -44,12 +41,13 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> ...@@ -44,12 +41,13 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override @Override
public void getVipLevelSus(Pager<Level> levelPager) { public void getVipLevelSus(Pager<Level> levelPager) {
mPresenter.vipLevleFragment.getVipLevelSus(levelPager);
} }
@Override @Override
public void getVipListSus(Pager<Vip> vipPager) { public void getVipListSus(Pager<Vip> vipPager,int pageNumber) {
mPresenter.vipListFragment.getVipListSus(vipPager,pageNumber);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java
View file @ e1a788e9
...@@ -16,14 +16,14 @@ public interface VipContract { ...@@ -16,14 +16,14 @@ public interface VipContract {
void getVipLevelSus(Pager<Level> levelPager); void getVipLevelSus(Pager<Level> levelPager);
void getVipListSus(Pager<Vip> vipPager); void getVipListSus(Pager<Vip> vipPager,int pageNumber);
String getVipNumberSus(); String getVipNumberSus();
} }
abstract class Presenter extends BasePresenter<VipContract.View> { abstract class Presenter extends BasePresenter<VipContract.View> {
public abstract void getVipList( int pageNumber, int vipLevel); public abstract void getVipList( int pageNumber, String vipLevel);
public abstract void getVipLevel(int pageNum, int public abstract void getVipLevel(int pageNum, int
pageSize); pageSize);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ e1a788e9
...@@ -3,10 +3,17 @@ package com.xingdata.zzdpos.ui.vip; ...@@ -3,10 +3,17 @@ package com.xingdata.zzdpos.ui.vip;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment; import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipLevleFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipTitleFragment;
public class VipPresenter extends VipContract.Presenter { public class VipPresenter extends VipContract.Presenter {
public VipInfoFragment vipInfoFragment = new VipInfoFragment(); public VipInfoFragment vipInfoFragment = new VipInfoFragment();
public VipListFragment vipListFragment = new VipListFragment();
public VipLevleFragment vipLevleFragment = new VipLevleFragment();
public VipTitleFragment vipTitleFragment = new VipTitleFragment();
@Override @Override
public void onAttached() { public void onAttached() {
...@@ -14,9 +21,9 @@ public class VipPresenter extends VipContract.Presenter { ...@@ -14,9 +21,9 @@ public class VipPresenter extends VipContract.Presenter {
@Override @Override
public void getVipList(int pageNumber, int vipLevel) { public void getVipList(int pageNumber, String vipLevel) {
ApiFactory.User.getVipList(pageNumber).subscribe(vipPager -> { ApiFactory.User.getVipList(pageNumber,vipLevel).subscribe(vipPager -> {
mView.getVipListSus(vipPager); mView.getVipListSus(vipPager,pageNumber);
}, throwable -> { }, throwable -> {
ToastUtils.showShort(throwable.getMessage()); ToastUtils.showShort(throwable.getMessage());
}); });
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java
View file @ e1a788e9
...@@ -18,7 +18,6 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe ...@@ -18,7 +18,6 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
@Override @Override
public void initView() { public void initView() {
} }
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java 0 → 100644
View file @ e1a788e9
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechangeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import java.util.ArrayList;
import java.util.List;
/**
* 会员消费记录
*/
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding> {
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechangeOrder> orders = new ArrayList<>();
@Override
public int getLayoutId() {
return R.layout.fragment_vip_expense_list;
}
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("会员信息");
vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
}
private void onLoadMore() {
vipRechargeAdapter.addData(new VipRechangeOrder());
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.loadMoreComplete();
ToastUtils.showShort("刷新成功");
}
private void onRefresh() {
mViewBinding.rechargeRefresh.setRefreshing(false);
ToastUtils.showShort("刷新成功");
}
@Override
public boolean onBackPressedSupport() {
pop();
return true;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ e1a788e9
...@@ -4,17 +4,12 @@ package com.xingdata.zzdpos.ui.vip.fragment; ...@@ -4,17 +4,12 @@ package com.xingdata.zzdpos.ui.vip.fragment;
* Created by JM_DEV on 2017/12/21. * Created by JM_DEV on 2017/12/21.
*/ */
import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding; import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechargeOrder; import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter; import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter; import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -28,46 +23,36 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoB ...@@ -28,46 +23,36 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoB
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_vipinfo; return R.layout.fragment_vip_expense_list;
} }
@Override @Override
public void initView() { public void initView() {
for (int i=0;i<10;i++){
orders.add(new VipRechargeOrder());
}
vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
ToastUtils.showShort("aaaaaaaaaa");
});
}
private void onLoadMore() {
vipRechargeAdapter.addData(new VipRechargeOrder());
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.loadMoreComplete();
ToastUtils.showShort("刷新成功");
} }
private void onRefresh() {
mViewBinding.rechargeRefresh.setRefreshing(false);
ToastUtils.showShort("刷新成功");
}
@Override /**
public boolean onBackPressedSupport() { * 弹出门店择器
pop(); */
return true; private void ShowPickerViewStoreAddress() {// 弹出选择器
// OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
// OptionsPickerView.OnOptionsSelectListener() {
// @Override
// public void onOptionsSelect(int options1, int options2, int options3, View v) {
//// String tx = list.get(options1).getPickerViewText();
//// mViewBinding.tvSelectStore.setText(tx);
//// shops = list.get(options1);
// }
// }).setTitleText("门店选择")
// .setDividerColor(Color.BLACK)
// .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
// .setContentTextSize(20)
// .build();
//
// pvOptions.setPicker(list);
// pvOptions.show();
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java
View file @ e1a788e9
...@@ -13,6 +13,7 @@ import android.widget.LinearLayout; ...@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding; import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
...@@ -26,7 +27,7 @@ import com.xingdata.zzdpos.ui.vip.VipPresenter; ...@@ -26,7 +27,7 @@ import com.xingdata.zzdpos.ui.vip.VipPresenter;
/** /**
* 会员等级列表 * 会员等级列表
*/ */
public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> implements VipContract.View { public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_viplevel_title; return R.layout.fragment_viplevel_title;
...@@ -34,23 +35,26 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve ...@@ -34,23 +35,26 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
@Override @Override
public void initView() { public void initView() {
mPresenter.getVipLevel(0,200); mPresenter.getVipLevel(0, 200);
} }
/** /**
* 设置按钮选中 * 设置按钮选中
* *
* @param b * @param buttonID
* @param button
*/ */
private void setRadioButtonChecked(boolean b, RadioButton button) { private void setRadioButtonChecked(int buttonID) {
button.getPaint().setFakeBoldText(b);//字体加粗 RadioButton radioButton= ((RadioButton) mViewBinding.vipLevelRadioGroup.findViewById(buttonID));
if (b) { if (radioButton.isChecked()){
button.setTextSize(17); radioButton.getPaint().setFakeBoldText(true);
} else { radioButton.setTextSize(17);
button.setTextSize(15); mPresenter.vipListFragment.setEnableLoadMore();
mPresenter.getVipList(0, radioButton.getTag().toString());
}else {
radioButton.setTextSize(15);
} }
mPresenter.getVipList(0,Integer.parseInt(button.getTag().toString()));
} }
@SuppressLint("ResourceAsColor") @SuppressLint("ResourceAsColor")
...@@ -59,7 +63,6 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve ...@@ -59,7 +63,6 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
radioButton.setTextSize(15); radioButton.setTextSize(15);
radioButton.setText(level.getVipLevelName()); radioButton.setText(level.getVipLevelName());
radioButton.setTag(level.getVipLevel()); radioButton.setTag(level.getVipLevel());
setRadioButtonChecked(false, radioButton);
radioButton.setGravity(Gravity.CENTER); radioButton.setGravity(Gravity.CENTER);
radioButton.setButtonDrawable(null); radioButton.setButtonDrawable(null);
radioButton.getPaint().setFakeBoldText(true); radioButton.getPaint().setFakeBoldText(true);
...@@ -69,41 +72,32 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve ...@@ -69,41 +72,32 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
return radioButton; return radioButton;
} }
@Override
public void addVip() {
}
@Override
public String addVipSus() {
return null;
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) { public void getVipLevelSus(Pager<Level> levelPager) {
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
layoutParams.height = 120; layoutParams.height = 120;
layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
for (int i = 0; i < levelPager.getPageSize(); i++) { for (int i = 0; i < levelPager.getPageSize(); i++) {
mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams,levelPager.getList().get(i))); mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams, levelPager.getList().get(i)));
} }
((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> { mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, id) -> {
mPresenter.vipListFragment.setVipLevel(mViewBinding.vipLevelRadioGroup.findViewById(id).getTag().toString());
for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) { for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
//动态设置按钮颜色 //动态设置按钮颜色
setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i))); setRadioButtonChecked(id);
} }
}); });
if (levelPager.getList().size()!=0){
((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
mPresenter.getVipList(0, mViewBinding.vipLevelRadioGroup.getChildAt(0).getTag().toString());
} }
@Override
public void getVipListSus(Pager<Vip> vipPager) {
}
@Override
public String getVipNumberSus() {
return null;
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ e1a788e9
...@@ -6,6 +6,7 @@ package com.xingdata.zzdpos.ui.vip.fragment; ...@@ -6,6 +6,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
...@@ -23,11 +24,11 @@ import java.util.List; ...@@ -23,11 +24,11 @@ import java.util.List;
/** /**
* 会员列表 * 会员列表
*/ */
public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> implements VipContract.View { public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
private VipListAdapter vipListAdapter; private VipListAdapter vipListAdapter;
private List<Vip> vips = new ArrayList<>(); private List<Vip> vips = new ArrayList<>();
private int inViplevel=0; private String vipLevel;
private int pageNumber=0;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -41,55 +42,50 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB ...@@ -41,55 +42,50 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mViewBinding.vipRecyclerView.setAdapter(vipListAdapter); mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh); mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
vipListAdapter.setOnItemClickListener((adapter, view, position) -> { vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
((BaseActivity) getActivity()).start(new VipInfoFragment()); ((BaseActivity) getActivity()).start(new VipExpenseListFragment());
}); });
vipListAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.vipRecyclerView); vipListAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.vipRecyclerView);
vipListAdapter.setEnableLoadMore(true); vipListAdapter.setEnableLoadMore(true);
} }
//
// public void getVipList(String strViplevel){
// mPresenter.getVipList(0, strViplevel);
// }
private void onLoadMore() { private void onLoadMore() {
Vip vip = new Vip(); mPresenter.getVipList(pageNumber,this.vipLevel);
vip.setVipName("张山");
vip.setVipMobile(13311221212L);
vip.setVipDefDiscount(80);
vipListAdapter.addData(vip);
vipListAdapter.loadMoreComplete();
} }
private void onRefresh() { private void onRefresh() {
// mPresenter.getVipList(inViplevel,0); pageNumber = 0;
} mPresenter.getVipList(pageNumber,vipLevel);
@Override
public void addVip() {
} }
@Override
public String addVipSus() {
return null;
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
} public void getVipListSus(Pager<Vip> vipPager,int mPageNumber) {
vipListAdapter.loadMoreComplete();
@Override
public void getVipListSus(Pager<Vip> vipPager) {
mViewBinding.vipRefresh.setRefreshing(false); mViewBinding.vipRefresh.setRefreshing(false);
if (vipPager.isFirstPage()) { if (mPageNumber == 0) {
vips.clear(); vipListAdapter.getData().clear();
}
if (vipPager.isLastPage()) {
vipListAdapter.setEnableLoadMore(false);
vipListAdapter.notifyDataSetChanged(); vipListAdapter.notifyDataSetChanged();
}else { pageNumber=0;
ToastUtils.showShort("没有更多数据");
return;
}
vipListAdapter.addData(vipPager.getList()); vipListAdapter.addData(vipPager.getList());
pageNumber=vipPager.getPageNumber()+1;
} }
public void setVipLevel(String vipLevel) {
this.vipLevel = vipLevel;
} }
@Override public void setEnableLoadMore(){
public String getVipNumberSus() { vipListAdapter.setEnableLoadMore(true);
return null;
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTitleFragment.java
View file @ e1a788e9
...@@ -25,8 +25,15 @@ public class VipTitleFragment extends BaseFragment<VipPresenter, FragmentViptitl ...@@ -25,8 +25,15 @@ public class VipTitleFragment extends BaseFragment<VipPresenter, FragmentViptitl
@Override @Override
public void initView() { public void initView() {
mViewBinding.addButton.setOnClickListener(view -> { mViewBinding.setOnClickListener(view -> {
switch (view.getId()){
case R.id.addVip:
((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment); ((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
break;
}
});
mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
getActivity().finish();
}); });
} }
} }
app/src/main/res/drawable/selector_button_pop_background.xml 0 → 100644
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/blue_mawu" android:state_pressed="false" />
<item android:color="@color/black" android:state_pressed="true" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_blue_oval.xml 0 → 100644
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/blue_mawu" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_green_oval.xml 0 → 100644
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/green_chengyaojin" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_orange_oval.xml 0 → 100644
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/orange_shixiu" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_oval.xml 0 → 100644
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/red_guanyu" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_payment.xml
View file @ e1a788e9
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<ImageButton <ImageButton
android:id="@+id/btn_back" android:id="@+id/btn_back"
android:layout_width="@dimen/title_height" android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back" android:contentDescription="@string/all_go_back"
android:gravity="center" android:gravity="center"
android:padding="@dimen/all_margin" android:padding="@dimen/all_margin"
......
app/src/main/res/layout/activity_settle.xml
View file @ e1a788e9
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
<ImageButton <ImageButton
android:id="@+id/btn_back" android:id="@+id/btn_back"
android:layout_width="@dimen/title_height" android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back" android:contentDescription="@string/all_go_back"
android:gravity="center" android:gravity="center"
android:padding="@dimen/all_margin" android:padding="@dimen/all_margin"
......
app/src/main/res/layout/activity_store.xml
View file @ e1a788e9
...@@ -36,12 +36,14 @@ ...@@ -36,12 +36,14 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:focusable="true"
android:focusableInTouchMode="true"
app:layout_constraintBottom_toTopOf="@id/f_store" app:layout_constraintBottom_toTopOf="@id/f_store"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageButton <ImageButton
android:id="@+id/btn_back" android:id="@+id/btn_back"
android:layout_width="@dimen/title_height" android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground" android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back" android:contentDescription="@string/all_go_back"
......
app/src/main/res/layout/dialog_store_cart.xml
View file @ e1a788e9
...@@ -29,6 +29,41 @@ ...@@ -29,6 +29,41 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:id="@+id/fl_ms"
android:layout_width="0dp"
android:layout_height="@dimen/all_margin_big"
android:layout_marginBottom="@dimen/all_line_width"
android:alpha="0.87"
android:background="@color/cyan_sunquan"
android:gravity="center"
android:orientation="horizontal"
android:visibility="@{msDisAmt>0?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toTopOf="@id/ll_title"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/store_ms_dis"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{ConvertUtil.fenToYuan(msDisAmt)}"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/unit_rmb_yuan"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_title" android:id="@+id/ll_title"
......
app/src/main/res/layout/dialog_vip_menu.xml
View file @ e1a788e9
<?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">
<data>
<variable
name="onClick"
type="android.view.View.OnClickListener" />
</data>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -16,11 +23,15 @@ ...@@ -16,11 +23,15 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/editVip"
style="@style/default_bluetext_popbutton" style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5" android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white" android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClick="@{onClick}"
android:text="编辑会员" /> android:text="编辑会员" />
<View <View
...@@ -33,7 +44,10 @@ ...@@ -33,7 +44,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5" android:layout_margin="@dimen/dtail_hight_5"
android:id="@+id/rechargeVip"
android:background="@color/white" android:background="@color/white"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:text="充值会员" /> android:text="充值会员" />
<View <View
...@@ -43,10 +57,14 @@ ...@@ -43,10 +57,14 @@
<TextView <TextView
style="@style/default_bluetext_popbutton" style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content" android:id="@+id/consumeList"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5" android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white" android:background="@color/white"
android:gravity="center"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:text="消费记录" /> android:text="消费记录" />
...@@ -63,11 +81,14 @@ ...@@ -63,11 +81,14 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/cancelButton"
style="@style/default_bluetext_popbutton" style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5" android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white" android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:gravity="center"
android:text="取消" /> android:text="取消" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_binding_counter.xml
View file @ e1a788e9
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
<TextView <TextView
style="@style/textView_title" style="@style/textView_title"
android:text="@string/binding_counter_tv_nickname"/> android:text="@string/binding_counter_tv_nickname"
android:textSize="@dimen/et_textsize"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
android:gravity="center|left" android:gravity="center|left"
android:text="北京浙星信息技术有限公司" android:text="北京浙星信息技术有限公司"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/text_three_title"
android:textStyle="bold"/> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
...@@ -64,7 +65,8 @@ ...@@ -64,7 +65,8 @@
<TextView <TextView
style="@style/textView_title" style="@style/textView_title"
android:text="@string/binding_counter_tv_in_store"/> android:text="@string/binding_counter_tv_in_store"
android:textSize="@dimen/et_textsize"/>
<TextView <TextView
android:id="@+id/tv_in_storename" android:id="@+id/tv_in_storename"
...@@ -74,7 +76,7 @@ ...@@ -74,7 +76,7 @@
android:gravity="center|left" android:gravity="center|left"
android:text="丰台万达店" android:text="丰台万达店"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/text_three_title"
android:textStyle="bold"/> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
...@@ -87,17 +89,18 @@ ...@@ -87,17 +89,18 @@
<TextView <TextView
style="@style/textView_title" style="@style/textView_title"
android:text="@string/binding_counter_tv_store_address"/> android:text="@string/binding_counter_tv_store_address"
android:textSize="@dimen/et_textsize"/>
<TextView <TextView
android:id="@+id/tv_storetype" android:id="@+id/tv_store_address"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:layout_marginLeft="@dimen/all_margin_left" android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="北京市丰台区万达广场一区" android:text="北京市丰台区万达广场一区"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/text_three_title"
android:textStyle="bold"/> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
...@@ -118,7 +121,8 @@ ...@@ -118,7 +121,8 @@
<TextView <TextView
style="@style/textView_title" style="@style/textView_title"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:text="@string/binding_counter_tv_binding_counter"/> android:text="@string/binding_counter_tv_binding_counter"
android:textSize="@dimen/et_textsize"/>
<LinearLayout <LinearLayout
...@@ -153,14 +157,20 @@ ...@@ -153,14 +157,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"> android:layout_marginLeft="@dimen/all_margin_left">
<org.angmarch.views.NiceSpinner
android:id="@+id/counter_spinner" <TextView
android:id="@+id/tv_select_counter"
style="@style/editText_new"
android:layout_width="@dimen/et_width" android:layout_width="@dimen/et_width"
android:layout_height="@dimen/counter_input_height" android:layout_marginLeft="0dp"
android:background="@drawable/transparent_border" android:layout_marginTop="@dimen/all_padding"
android:gravity="center_vertical" android:drawablePadding="@dimen/all_padding"
android:text="" android:drawableRight="@mipmap/createstore_drop_down"
android:textSize="@dimen/et_textsize"/> android:ems="10"
android:hint="选择款台"
android:maxLength="11"
android:onClick="@{onClickListener}"
android:textSize="@dimen/text_three_title"/>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_choice_store.xml
View file @ e1a788e9
...@@ -104,15 +104,19 @@ ...@@ -104,15 +104,19 @@
android:layout_marginLeft="@dimen/all_margin_left" android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginTop="@dimen/all_padding"> android:layout_marginTop="@dimen/all_padding">
<org.angmarch.views.NiceSpinner <TextView
android:id="@+id/store_spinner" android:id="@+id/tv_select_store"
android:layout_width="@dimen/nicespinner_width" style="@style/editText_new"
android:layout_height="@dimen/counter_input_height" android:layout_width="@dimen/et_width"
android:background="@drawable/blue_border" android:layout_marginLeft="0dp"
android:gravity="center_vertical" android:layout_marginTop="@dimen/all_padding"
android:paddingLeft="@dimen/et_padding" android:drawablePadding="@dimen/all_padding"
android:text="123" android:drawableRight="@mipmap/createstore_drop_down"
android:textSize="@dimen/et_textsize"/> android:ems="10"
android:hint="请选择门店"
android:maxLength="11"
android:onClick="@{onClickListener}"/>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_create_store.xml
View file @ e1a788e9
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/white" android:textColor="@color/black_baozheng"
android:textColorHint="@color/hint" android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
android:visibility="gone"/> android:visibility="gone"/>
......
app/src/main/res/layout/fragment_settle.xml
View file @ e1a788e9
...@@ -212,6 +212,7 @@ ...@@ -212,6 +212,7 @@
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:checked="true"
android:foreground="?android:attr/actionBarItemBackground" /> android:foreground="?android:attr/actionBarItemBackground" />
</LinearLayout> </LinearLayout>
...@@ -220,7 +221,7 @@ ...@@ -220,7 +221,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rl_saledetail" android:id="@+id/rl_saledetail"
...@@ -306,6 +307,7 @@ ...@@ -306,6 +307,7 @@
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:checked="true"
android:foreground="?android:attr/actionBarItemBackground" /> android:foreground="?android:attr/actionBarItemBackground" />
</LinearLayout> </LinearLayout>
...@@ -314,7 +316,7 @@ ...@@ -314,7 +316,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -327,9 +329,9 @@ ...@@ -327,9 +329,9 @@
android:id="@+id/rl_dis" android:id="@+id/rl_dis"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin" android:background="@color/white_caocao"
android:layout_marginStart="@dimen/all_margin" android:paddingEnd="@dimen/all_margin"
android:background="@color/white_caocao" /> android:paddingStart="@dimen/all_margin" />
</LinearLayout> </LinearLayout>
<View <View
......
app/src/main/res/layout/fragment_store_search.xml
View file @ e1a788e9
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rl_sku" android:id="@+id/rl_sku"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:background="@color/blue_mawu" />
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vipinfo.xml → app/src/main/res/layout/fragment_vip_expense_list.xml
View file @ e1a788e9
...@@ -21,10 +21,16 @@ ...@@ -21,10 +21,16 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView
android:background="@mipmap/mk_grade01"
android:layout_width="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
app/src/main/res/layout/fragment_viptitle.xml
View file @ e1a788e9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout>
<data> <data>
<variable <variable
...@@ -11,6 +12,7 @@ ...@@ -11,6 +12,7 @@
type="android.widget.RadioGroup.OnCheckedChangeListener" /> type="android.widget.RadioGroup.OnCheckedChangeListener" />
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -24,6 +26,7 @@ ...@@ -24,6 +26,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<include <include
android:id="@+id/title_search"
layout="@layout/title_search" layout="@layout/title_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -99,24 +102,23 @@ ...@@ -99,24 +102,23 @@
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal"> android:gravity="center"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/addVip" android:id="@+id/addVip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/addButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
...@@ -131,7 +133,7 @@ ...@@ -131,7 +133,7 @@
android:textColor="@color/deep_red" android:textColor="@color/deep_red"
android:textSize="22sp" /> android:textSize="22sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/item_settle_dis.xml
View file @ e1a788e9
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
<import type="com.xingdata.zzdpos.util.ConvertUtil" /> <import type="com.xingdata.zzdpos.util.ConvertUtil" />
<import type="com.xingdata.zzdpos.C.DIS_TYPE" />
<variable
name="type"
type="int" />
<variable <variable
name="amt" name="amt"
type="long" /> type="long" />
...@@ -23,23 +17,12 @@ ...@@ -23,23 +17,12 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"> android:background="@color/white_caocao">
<com.facebook.drawee.view.SimpleDraweeView
android:layout_width="0dp"
android:layout_height="0dp"
app:backgroundImage="@color/green_chengyaojin"
app:layout_constraintBottom_toBottomOf="@id/tv_type"
app:layout_constraintLeft_toLeftOf="@id/tv_type"
app:layout_constraintRight_toRightOf="@id/tv_type"
app:layout_constraintTop_toTopOf="@id/tv_type"
app:roundAsCircle="true" />
<TextView <TextView
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:background="@drawable/shape_red_oval"
android:gravity="center" android:gravity="center"
android:text="满"
android:textColor="@color/white_caocao" android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
......
app/src/main/res/layout/title_search.xml
View file @ e1a788e9
...@@ -15,11 +15,13 @@ ...@@ -15,11 +15,13 @@
<ImageView <ImageView
android:layout_width="50dp" android:layout_width="50dp"
android:id="@+id/onBack"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/go_back" /> android:background="@mipmap/go_back" />
<EditText <EditText
style="@style/editText" style="@style/editText"
android:id="@+id/serchEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="0dp" android:layout_margin="0dp"
......
app/src/main/res/values/dimens.xml
View file @ e1a788e9
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<dimen name="all_text_size_big">22sp</dimen> <dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_big_big">30sp</dimen> <dimen name="all_text_size_big_big">30sp</dimen>
<dimen name="all_text_size_super_big">25sp</dimen> <dimen name="all_text_size_super_big">25sp</dimen>
<dimen name="all_margin_left">15dp</dimen> <dimen name="all_margin_left">17dp</dimen>
<dimen name="title_height">50dp</dimen> <dimen name="title_height">50dp</dimen>
<dimen name="small_text_size">13sp</dimen> <dimen name="small_text_size">13sp</dimen>
<dimen name="all_textview_width">120dp</dimen> <dimen name="all_textview_width">120dp</dimen>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<dimen name="et_height">44dp</dimen> <dimen name="et_height">44dp</dimen>
<dimen name="et_textsize">16sp</dimen> <dimen name="et_textsize">16sp</dimen>
<dimen name="et_padding">12dp</dimen> <dimen name="et_padding">12dp</dimen>
<dimen name="et_margin_logo">40dp</dimen> <dimen name="et_margin_logo">44dp</dimen>
<dimen name="et_margin_edittext">20dp</dimen> <dimen name="et_margin_edittext">20dp</dimen>
<dimen name="drop_down_margin_right_et">20dp</dimen> <dimen name="drop_down_margin_right_et">20dp</dimen>
<dimen name="smscodefragment_drop_get_sms_width">84dp</dimen> <dimen name="smscodefragment_drop_get_sms_width">84dp</dimen>
......
app/src/main/res/values/strings.xml
View file @ e1a788e9
...@@ -558,14 +558,19 @@ ...@@ -558,14 +558,19 @@
<string name="ms_group_sku_info">买%s</string> <string name="ms_group_sku_info">买%s</string>
<string name="ms_type_dis">打折</string> <string name="ms_type_dis">打折</string>
<string name="ms_type_dis_info">享受%s折优惠</string> <string name="ms_type_dis_info">享受%s折优惠</string>
<string name="ms_type_dis_abbr">折</string>
<string name="ms_type_promotion">促销</string> <string name="ms_type_promotion">促销</string>
<string name="ms_type_promotion_info">享受促销价</string> <string name="ms_type_promotion_info">享受促销价</string>
<string name="ms_type_promotion_abbr">促</string>
<string name="ms_type_money_off">满减</string> <string name="ms_type_money_off">满减</string>
<string name="ms_type_money_off_info">满%s元减%s元</string> <string name="ms_type_money_off_info">满%s元减%s元</string>
<string name="ms_type_money_off_abbr">满</string>
<string name="ms_type_second">打折</string> <string name="ms_type_second">打折</string>
<string name="ms_type_second_info">第二件享受%s折优惠</string> <string name="ms_type_second_info">第二件享受%s折优惠</string>
<string name="ms_type_second_abbr">折</string>
<string name="ms_type_gift">换购</string> <string name="ms_type_gift">换购</string>
<string name="ms_type_gift_info">满%s元加%s元换购%s一件</string> <string name="ms_type_gift_info">满%s元加%s元换购%s一件</string>
<string name="ms_type_gift_abbr">换</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