Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 9e915da7 6edc34a3
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 104 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java
View file @ 651f74ab
......@@ -28,10 +28,6 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
@Override
public void initView() {
mViewBinding.etBarcode.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etBarcode);
mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView);
......@@ -57,6 +53,12 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
});
}
@Override
public void onStart() {
super.onStart();
KeyboardUtils.showSoftInput(mViewBinding.etBarcode);
}
public void loadCheckSkus(List<Sssku> ssskus) {
mSkuAdapter.setNewData(ssskus);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java
View file @ 651f74ab
......@@ -209,6 +209,11 @@ interface MsContract {
*/
public abstract void clickTypeSkuSearch();
/**
* 编辑页面 - 点击营销类型商品的扫描键
*/
public abstract void clickTypeSkuScan();
/**
* 编辑页面 - 点击搜索按钮
*
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ 651f74ab
......@@ -123,6 +123,11 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
mView.showSearchFragment(C.TITLE_MODE.GIFT);
}
@Override
public void clickTypeSkuScan() {
mView.showScanFragment(C.TITLE_MODE.GIFT);
}
@Override
public void clickSearchButton(String keyword) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/MsAdapter.java
View file @ 651f74ab
......@@ -96,7 +96,8 @@ public class MsAdapter extends BaseAdapter<Ms, ItemMsBinding> {
strType = mContext.getResources().getString(R.string.ms_type_money_off_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftOffAmt()));
break;
case C.MS_TYPE.GIFT:
strType = mContext.getResources().getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), ms.getGiftSkuName());
String spuName = DBFactory.Marketing.Ms.querySpuNameBySkuId(ms.getGiftSkuId());
strType = mContext.getResources().getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), spuName);
break;
}
return strGroup + strType;
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java
View file @ 651f74ab
......@@ -176,7 +176,6 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
*/
public <Sku extends BaseSku> void loadGroupSku(Sku sssku) {
if (mGroupView instanceof GroupSkuView) ((GroupSkuView) mGroupView).loadSssku(sssku);
}
/**
......@@ -185,6 +184,7 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
* @param sssku 商品
*/
public <Sku extends BaseSku> void loadTypeSku(Sku sssku) {
if (mTypeView instanceof TypeGiftView) ((TypeGiftView) mTypeView).loadSssku(sssku);
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/SearchFragment.java
View file @ 651f74ab
......@@ -40,7 +40,7 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
mSkuAdapter.setOnItemClickListener((adapter, view, position) -> {
mPresenter.clickSku(mSkuAdapter.getData().get(position), mSearchType);
this.pop();
((MsActivity) getActivity()).backToEditFragment();
});
// set empty
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java
View file @ 651f74ab
......@@ -29,9 +29,7 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
if (b) mPresenter.clickGroupSkuSearch();
});
mViewBinding.btnScan.setOnClickListener(view -> {
mPresenter.clickGroupSkuScan();
});
mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickGroupSkuScan());
}
@SuppressLint("SetTextI18n")
......@@ -39,8 +37,6 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
protected void setViewByMs() {
if (mMs.getMsTouchTag2() == null || mMs.getMsTouchTag2() != C.MS_GROUP.SKU) return;
mViewBinding.llProduct.setVisibility(View.VISIBLE);
mViewBinding.etSearch.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
mViewBinding.setName(mMs.getSkuName());
mViewBinding.setPrice(ConvertUtil.fenToYuan(mMs.getSkuPrice1(), true));
}
......@@ -57,7 +53,6 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
public void loadSssku(Sku sku) {
this.mSku = sku;
if (sku != null) {
mViewBinding.etSearch.setText(ConvertUtil.longToString(sku.getSpuBarcode()));
mViewBinding.setName(sku.getSpuName());
mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
mViewBinding.llProduct.setVisibility(View.VISIBLE);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeGiftView.java
View file @ 651f74ab
package com.xingdata.zzdpos.ui.marketing.ms.view;
import android.annotation.SuppressLint;
import android.view.View;
import android.widget.EditText;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ViewTypeGiftBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.InputFilters;
/**
* 促销页面
*/
public class TypeGiftView extends BaseTypeView<ViewTypeGiftBinding> {
public class TypeGiftView<Sku extends BaseSku> extends BaseTypeView<ViewTypeGiftBinding> {
private Sku mSssku;
private View.OnFocusChangeListener mOnFocusChangeListener;
public TypeGiftView() {
mOnFocusChangeListener = (view, b) -> {
if (view instanceof EditText) {
EditText editText = (EditText) view;
if (b && editText.getText().toString().equals("0.00")) {
editText.setText("");
} else if (!b && editText.getText().length() == 0) {
editText.setText("0.00");
}
}
};
}
@Override
public int getLayoutId() {
return R.layout.view_type_gift;
}
@Override
public void initView() {
super.initView();
mViewBinding.etAmt.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etAddAmt.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etAmt.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.etAddAmt.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
if (b) mPresenter.clickTypeSkuSearch();
});
mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickTypeSkuScan());
}
@SuppressLint("SetTextI18n")
@Override
protected void setViewByMs() {
if (mMs.getMsTools() == null || mMs.getMsTools() != C.MS_TYPE.GIFT) return;
mViewBinding.etAmt.setText(ConvertUtil.fenToYuan(mMs.getPayAmt()));
mViewBinding.etAddAmt.setText(ConvertUtil.fenToYuan(mMs.getGiftSkuPrice()));
mViewBinding.llProduct.setVisibility(View.VISIBLE);
mViewBinding.setName(mMs.getGiftSkuName());
mViewBinding.setPrice(ConvertUtil.fenToYuan(mMs.getGiftSkuPrice1(), true));
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.GIFT);
String strAmt = mViewBinding.etAmt.getText().toString();
if (StringUtils.isEmpty(strAmt)) return false;
ms.setPayAmt(ConvertUtil.yuanToFen(strAmt));
String strAddAmt = mViewBinding.etAddAmt.getText().toString();
if (StringUtils.isEmpty(strAddAmt)) return false;
ms.setGiftSkuPrice(ConvertUtil.yuanToFen(strAddAmt));
if (mSssku == null && ms.getGiftSkuId() == null) return false;
if (mSssku != null) ms.setGiftSkuId(mSssku.getSkuId());
return true;
}
@SuppressLint("SetTextI18n")
public void loadSssku(Sku sku) {
this.mSssku = sku;
if (sku != null) {
mViewBinding.setName(sku.getSpuName());
mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
mViewBinding.llProduct.setVisibility(View.VISIBLE);
} else {
mViewBinding.llProduct.setVisibility(View.GONE);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ 651f74ab
......@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
......@@ -39,7 +40,7 @@ public class VipPresenter extends VipContract.Presenter {
public VipSearchFragment vipSearchFragment = new VipSearchFragment();
public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
public VipAddSucceedFragment vipAddSucceedFragment =new VipAddSucceedFragment();
public int inVipState = 0; //1 充值
public ArrayList<Level> levels = new ArrayList<>();
@Override
public void onAttached() {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java
View file @ 651f74ab
......@@ -34,14 +34,12 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
case R.id.editVip:
mPresenter.vipInfoEditFragment = new VipInfoEditFragment();
mPresenter.vipInfoEditFragment.setVip(mVip);
mPresenter.vipInfoEditFragment.setVipLevel(mLevel);
((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
break;
//充值記錄
case R.id.rechargeList:
mPresenter.vipRechargeListFragment = new VipRechargeListFragment();
mPresenter.vipRechargeListFragment.setVip(mVip);
mPresenter.vipRechargeListFragment.setVipLevel(mLevel);
((BaseActivity) getActivity()).start(mPresenter.vipRechargeListFragment);
break;
//優惠券詳情
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java
View file @ 651f74ab
......@@ -6,14 +6,12 @@ package com.xingdata.zzdpos.ui.vip.fragment;
import android.view.View;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipAddSucceedBinding;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
/**
* 会员信息界面
......@@ -38,29 +36,22 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
mViewBinding.vipLevel.setText(mVip.getVipLevelName() + " " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
}
mViewBinding.onAdd.setOnClickListener(view -> {
ToastUtils.showShort("111");
mViewBinding.vipAdd.setOnClickListener(view -> {
this.pop();
});
mViewBinding.vipRecharge.setOnClickListener(view -> {
this.pop();
mPresenter.vipRechargeFragment.setVip(mVip);
start(mPresenter.vipRechargeFragment);
});
mViewBinding.vipSure.setOnClickListener(view -> {
pop();
mPresenter.vipListFragment.updateVipSus(null);
});
// mViewBinding.setOnClickListener(view -> {
// switch (view.getId()) {
// case R.id.onSure:
//
// break;
//
// case R.id.onAdd;
//
// break;
//
// case R.id.
// }
// });
mViewBinding.infoTitle.ivBack.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
mPresenter.vipListFragment.updateVipSus(null);
}
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java
View file @ 651f74ab
......@@ -35,7 +35,6 @@ import java.util.List;
* 会员信息界面
*/
public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipInfoEditBinding> {
private List<Level> levels;
private ArrayList<Level> mLevels = new ArrayList<>();
private Vip vip;
private Byte vipTag;
......@@ -48,6 +47,10 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
@Override
public void initView() {
mLevels.clear();
mLevels.add(mPresenter.levels.get(0));
mLevels.add(mPresenter.levels.get(mPresenter.levels.size() - 1));
mLevels.get(mLevels.size() - 1).setVipLevelName("超级会员");
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
if (vip != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员");
......@@ -69,8 +72,8 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
} else {
mViewBinding.infoTitle.tvTitle.setText("添加会员");
mViewBinding.vipDiscounts.setEnabled(true);
mViewBinding.vipDiscounts.setText(levels.get(0).getVipLevelName() + " " + ConvertUtil.discount(levels.get(0).getVipDefDiscount()) + "折");
vipDiscounts = levels.get(0).getVipDefDiscount();
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(0).getVipLevelName() + " " + ConvertUtil.discount(mPresenter.levels.get(0).getVipDefDiscount()) + "折");
vipDiscounts = mPresenter.levels.get(0).getVipDefDiscount();
mViewBinding.vipBirthday.setText(StringUtil.format(new Date(System.currentTimeMillis())));
((RadioButton) mViewBinding.vipSex.getChildAt(0)).setChecked(true);
}
......@@ -110,7 +113,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
mVip.setVipLevelName("超级会员");
} else {
mVip.setVipTag(Byte.parseByte("0"));
mVip.setVipLevelName(levels.get(0).getVipLevelName());
mVip.setVipLevelName(mPresenter.levels.get(0).getVipLevelName());
}
mVip.setVipDefDiscount(vipDiscounts);
int sexId = mViewBinding.vipSex.getCheckedRadioButtonId();
......@@ -141,11 +144,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
@Override
public void onOptionsSelect(int options1, int options2, int options3, View v) {
if (options1 == 0) {
mViewBinding.vipDiscounts.setText(levels.get(options1).getPickerViewText() + " " + ConvertUtil.discount(levels.get(options1).getVipDefDiscount()) + "折");
vipDiscounts = levels.get(options1).getVipDefDiscount();
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(options1).getPickerViewText() + " " + ConvertUtil.discount(mPresenter.levels.get(options1).getVipDefDiscount()) + "折");
vipDiscounts = mPresenter.levels.get(options1).getVipDefDiscount();
} else {
mViewBinding.vipDiscounts.setText(levels.get(levels.size() - 1).getVipLevelName() + " " + ConvertUtil.discount(levels.get(levels.size() - 1).getVipDefDiscount()) + "折");
vipDiscounts = levels.get(levels.size() - 1).getVipDefDiscount();
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipLevelName() + " " + ConvertUtil.discount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount()) + "折");
vipDiscounts = mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount();
}
vipTag = Byte.parseByte(options1 + "");
}
......@@ -159,14 +162,6 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
pvOptions.show();
}
public void setVipLevel(List<Level> levels) {
this.levels = levels;
mLevels.clear();
mLevels.add(levels.get(0));
mLevels.add(levels.get(levels.size() - 1));
mLevels.get(mLevels.size() - 1).setVipLevelName("超级会员");
}
public void setVip(Vip mVip) {
this.vip = mVip;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ 651f74ab
......@@ -20,7 +20,6 @@ import java.util.List;
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
private Vip mVip;
private List<Level> level;
@Override
......@@ -36,7 +35,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
});
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
VipEditMenuDialog dialog = new VipEditMenuDialog();
dialog.setLevel(level);
dialog.setLevel(mPresenter.levels);
dialog.setVip(mVip);
dialog.show((BaseActivity) getActivity());
});
......@@ -72,9 +71,6 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
this.mVip = vip;
}
public void setLevel(List<Level> level) {
this.level = level;
}
public void addVipSus(Vip vip) {
mVip = vip;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 651f74ab
......@@ -36,7 +36,6 @@ import java.util.List;
public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
private VipListAdapter vipListAdapter;
private List<Vip> vips = new ArrayList<>();
private List<Level> levels = null;
private int pageNumber = 0;
private String strVipLevle;
private int vipState = 0;//0 会员 1 充值
......@@ -92,7 +91,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.addVip:
if (levels == null || levels.size() == 0) {
if (mPresenter.levels== null || mPresenter.levels.size() == 0) {
ToastUtils.showShort("缺少会员等级");
return;
}
......@@ -117,7 +116,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
}
});
mViewBinding.titleSearch.serchEditText.setOnClickListener(view -> {
mPresenter.vipSearchFragment.setLevel(levels);
if (vipState == 0) {
mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipInfoFragment);
} else {
......@@ -191,11 +189,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
// mPresenter.getVipList(0,mViewBinding.vipLevelR.getChildAt(0).getTag()== null ? null : mViewBinding.vipLevelR.getChildAt(0).getTag().toString());
}
levels = levelPager.getList();
mPresenter.levels.clear();
mPresenter.levels.addAll(levelPager.getList());
Level level = new Level();
level.setVipLevelName("超级会员");
level.setVipDefDiscount(levels.get(levels.size()-1).getVipDefDiscount());
levels.add(level);
level.setVipDefDiscount(mPresenter.levels.get(mPresenter.levels.size()-1).getVipDefDiscount());
mPresenter.levels.add(level);
}
private void onLoadMore() {
......@@ -232,7 +231,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
if (vip != null) {
if (vipState == 0) {
mPresenter.vipInfoFragment.setVip(vip);
mPresenter.vipInfoFragment.setLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
} else {
mPresenter.vipInfoFragment.setVip(vip);
......@@ -241,7 +239,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
} else {
mPresenter.vipInfoEditFragment.setVip(null);
mPresenter.vipInfoEditFragment.setVipLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java
View file @ 651f74ab
......@@ -12,6 +12,7 @@ import android.text.Spanned;
import android.text.SpannedString;
import android.text.TextWatcher;
import android.text.style.AbsoluteSizeSpan;
import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.RadioButton;
......@@ -40,7 +41,6 @@ import java.util.List;
*/
@SuppressLint("ValidFragment")
public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipRechargeBinding> {
private List<Level> levels;
private List<Mscard> mscards = new ArrayList<>();
private LinearLayout.LayoutParams layoutParams = null;
private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
......@@ -57,6 +57,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
@Override
public void initView() {
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.tvTitle.setText("充值");
......@@ -110,9 +111,6 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
return true;
}
public void setVipLevel(List<Level> levels) {
this.levels = levels;
}
public void setVip(Vip mVip) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java
View file @ 651f74ab
......@@ -37,7 +37,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechargeOrder> orders = new ArrayList<>();
private int pageNumber = 0;
private List<Level> levels;
@Override
......@@ -87,9 +86,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
return true;
}
public void setVipLevel(List<Level> levels) {
this.levels = levels;
}
public void setVip(Vip mVip) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipSearchFragment.java
View file @ 651f74ab
......@@ -30,7 +30,6 @@ import java.util.List;
public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSerchBinding> {
private VipAdapter mVipAdapter;
private BaseFragment baseFragment;
private List<Level> level;
public void setBaseFragment(BaseFragment baseFragment) {
this.baseFragment = baseFragment;
......@@ -55,7 +54,6 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
((EditText) mViewBinding.etSearch).requestFocus();
mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
if (baseFragment instanceof VipInfoFragment) {
((VipInfoFragment) baseFragment).setLevel(this.level);
((VipInfoFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
}else if (baseFragment instanceof VipRechargeFragment){
((VipRechargeFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
......@@ -102,9 +100,6 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
mVipAdapter.setNewData(vips.getList());
}
public void setLevel(List<Level> level) {
this.level = level;
}
@Override
public void onResume() {
......
app/src/main/res/layout/activity_ms.xml
View file @ 651f74ab
......@@ -48,6 +48,7 @@
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search" />
</LinearLayout>
......
app/src/main/res/layout/fragment_pay_cash.xml
View file @ 651f74ab
......@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settle_pay_amt"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
......@@ -72,7 +72,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
</LinearLayout>
......@@ -96,7 +96,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settle_pay_change"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
......@@ -104,7 +104,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
</LinearLayout>
......
app/src/main/res/layout/fragment_settle.xml
View file @ 651f74ab
......@@ -136,7 +136,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:text="@string/settle_select_vip"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
android:visibility="@{defualtVip?View.VISIBLE:View.INVISIBLE}"
app:layout_constraintBottom_toTopOf="parent"
......
app/src/main/res/layout/fragment_sssku_add.xml
View file @ 651f74ab
......@@ -53,6 +53,7 @@
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical"
android:imeOptions="actionSearch"
android:inputType="number"
android:labelFor="@+id/et_barcode"
android:saveEnabled="false"
......
app/src/main/res/layout/fragment_vip_add_succeed.xml
View file @ 651f74ab
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......@@ -122,26 +120,21 @@
android:orientation="vertical">
<Button
android:id="@+id/onSure"
android:id="@+id/vip_Sure"
style="@style/button_positive_noradius"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="完成" />
<Button
android:id="@+id/onRecharge"
android:id="@+id/vip_recharge"
style="@style/button_positive_white"
android:layout_alignBottom="@id/onRecharge"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="充值" />
<Button
android:id="@+id/onAdd"
android:id="@+id/vip_add"
style="@style/button_positive_white"
android:layout_alignBottom="@id/onRecharge"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="继续添加" />
</LinearLayout>
</RelativeLayout>
......
app/src/main/res/layout/view_type_gift.xml
View file @ 651f74ab
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<layout>
<LinearLayout
<data>
<import type="android.view.View" />
<variable
name="name"
type="String" />
<variable
name="price"
type="String" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@color/white_caocao"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_gift_text1"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_amt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_amt"
android:saveEnabled="false"
android:textSize="@dimen/all_body_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_gift_text2"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_gift_text3"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_add_amt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_add_amt"
android:textSize="@dimen/all_body_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_gift_text2"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin">
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_weight="1"
android:hint="@string/ms_editor_type_gift_search_hint"
android:inputType="text"
android:labelFor="@+id/et_search"
android:saveEnabled="false" />
<ImageButton
android:id="@+id/btn_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:contentDescription="@string/store_scan"
android:foreground="?android:attr/actionBarItemBackground"
android:src="@mipmap/but_sweep_yard" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_product"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="@{name.length()>0?View.VISIBLE:View.GONE }">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/tv_product_pic"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/all_margin"
app:placeholderImage="@mipmap/icon_goods_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:orientation="vertical"
android:padding="@dimen/all_margin">
<TextView
android:id="@+id/tv_product_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{@string/ms_editor_group_sku_name+name}" />
<TextView
android:id="@+id/tv_product_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:text="@{@string/ms_editor_group_sku_price+price}" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 651f74ab
......@@ -366,8 +366,8 @@
<string name="ms_editor_type_money_off_text2">减</string>
<string name="ms_editor_type_money_off_text3">元</string>
<string name="ms_editor_type_gift_text1">满</string>
<string name="ms_editor_type_gift_text2">元，加</string>
<string name="ms_editor_type_gift_text3">元换购</string>
<string name="ms_editor_type_gift_text2">元</string>
<string name="ms_editor_type_gift_text3">加</string>
<string name="ms_editor_type_gift_text4">1件</string>
<string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
<string name="ms_editor_type_gift_name">品名:</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