Skip to content

T
TangKuPos
Commit 00fffede authored by 姜敏's avatar 姜敏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 962b2213 f831f4d6
Hide whitespace changes
Inline Side-by-side
Showing with 495 additions and 788 deletions
.idea/modules.xml
View file @ 00fffede
......@@ -2,8 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" />
<module fileurl="file://$PROJECT_DIR$/TangKuPos2.iml" filepath="$PROJECT_DIR$/TangKuPos2.iml" />
<module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
......
app/build.gradle
View file @ 00fffede
......@@ -11,9 +11,6 @@ android {
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk{
abiFilters("armeabi", "armeabi-v7a","x86")
}
}
//解决问题的代码
dexOptions {
......@@ -47,7 +44,6 @@ android {
sourceSets {
main {
assets.srcDirs = ['src/main/assets', 'src/main/assets/']
jniLibs.srcDirs = ['libs']
}
}
}
......
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 00fffede
......@@ -531,6 +531,8 @@ public class C {
public static final int GIFT = 5;
//第二件促销
public static final int SECOND_PRO = 6;
//满送
public static final int TICKET = 7;
}
public final class DIS_TYPE {
......
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @ 00fffede
......@@ -207,7 +207,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
if (null != mDisp && (!mDisp.isDisposed())) {
mDisp.dispose();
}
super.dismiss();
}
}
......
app/src/main/java/com/xingdata/zzdpos/model/NewSssku.java deleted 100644 → 0
View file @ 962b2213
package com.xingdata.zzdpos.model;
import com.xingdata.zzdpos.base.BaseBean;
/**
* 商品详情
*/
public class NewSssku implements BaseBean {
private Long id;
private Long opMapId;
private Long channelMapId;
private Long merMapId;
private Long shopMapId;
private Long skuGrpId;
private Long skuId;
private Long spuId;
private Long spuBarcode;
private Long spuCateId;
private Long spuFactoryId;
private Long spuBrandId;
private Long spuPdepId;
private Long spuPclsId;
private Long spuPoptId;
private Long spuVarId;
private Long spuSpecId;
private Long spuModelId;
private Long spuOrigId;
private Long spuAgeId;
private Long spuDegreeId;
private Long spuSizeId;
private Long spuColorId;
private Long spuVolId;
private String spuName;
private String spuAb;
private String spuUnitName;
private String spuImg;
private Byte skuFlag;
private Long spuDownBarcode;
private Long spuDownNum;
private Long skuStock;
private Long skuSell;
private Long skuExp;
private Byte skuSellFlag;
private Long skuSellUnit;
private Long skuAltLow;
private Long skuAltHigh;
private Long skuTurnT;
private Long skuTradePrice;
private Long skuRetailPrice1;
private Long skuRetailPrice2;
private Long skuRetailPrice3;
private Byte skuNetFlag;
private Byte skuOffFlag;
private Long skuBoundAmt;
private Byte skuStatus;
private String spuDepName;
private String spuClaName;
private String spuGrpName;
private String spuCateName;
private Long spuDownBarcodeBar;
private String spuDownBarcodeName;
private Long spuDownBarcodePrice1;
private String spuDownBarUnitName;
private Long spuDownSku;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getOpMapId() {
return opMapId;
}
public void setOpMapId(Long opMapId) {
this.opMapId = opMapId;
}
public Long getChannelMapId() {
return channelMapId;
}
public void setChannelMapId(Long channelMapId) {
this.channelMapId = channelMapId;
}
public Long getMerMapId() {
return merMapId;
}
public void setMerMapId(Long merMapId) {
this.merMapId = merMapId;
}
public Long getShopMapId() {
return shopMapId;
}
public void setShopMapId(Long shopMapId) {
this.shopMapId = shopMapId;
}
public Long getSkuGrpId() {
return skuGrpId;
}
public void setSkuGrpId(Long skuGrpId) {
this.skuGrpId = skuGrpId;
}
public Long getSkuId() {
return skuId;
}
public void setSkuId(Long skuId) {
this.skuId = skuId;
}
public Long getSpuId() {
return spuId;
}
public void setSpuId(Long spuId) {
this.spuId = spuId;
}
public Long getSpuBarcode() {
return spuBarcode;
}
public void setSpuBarcode(Long spuBarcode) {
this.spuBarcode = spuBarcode;
}
public Long getSpuCateId() {
return spuCateId;
}
public void setSpuCateId(Long spuCateId) {
this.spuCateId = spuCateId;
}
public Long getSpuFactoryId() {
return spuFactoryId;
}
public void setSpuFactoryId(Long spuFactoryId) {
this.spuFactoryId = spuFactoryId;
}
public Long getSpuBrandId() {
return spuBrandId;
}
public void setSpuBrandId(Long spuBrandId) {
this.spuBrandId = spuBrandId;
}
public Long getSpuPdepId() {
return spuPdepId;
}
public void setSpuPdepId(Long spuPdepId) {
this.spuPdepId = spuPdepId;
}
public Long getSpuPclsId() {
return spuPclsId;
}
public void setSpuPclsId(Long spuPclsId) {
this.spuPclsId = spuPclsId;
}
public Long getSpuPoptId() {
return spuPoptId;
}
public void setSpuPoptId(Long spuPoptId) {
this.spuPoptId = spuPoptId;
}
public Long getSpuVarId() {
return spuVarId;
}
public void setSpuVarId(Long spuVarId) {
this.spuVarId = spuVarId;
}
public Long getSpuSpecId() {
return spuSpecId;
}
public void setSpuSpecId(Long spuSpecId) {
this.spuSpecId = spuSpecId;
}
public Long getSpuModelId() {
return spuModelId;
}
public void setSpuModelId(Long spuModelId) {
this.spuModelId = spuModelId;
}
public Long getSpuOrigId() {
return spuOrigId;
}
public void setSpuOrigId(Long spuOrigId) {
this.spuOrigId = spuOrigId;
}
public Long getSpuAgeId() {
return spuAgeId;
}
public void setSpuAgeId(Long spuAgeId) {
this.spuAgeId = spuAgeId;
}
public Long getSpuDegreeId() {
return spuDegreeId;
}
public void setSpuDegreeId(Long spuDegreeId) {
this.spuDegreeId = spuDegreeId;
}
public Long getSpuSizeId() {
return spuSizeId;
}
public void setSpuSizeId(Long spuSizeId) {
this.spuSizeId = spuSizeId;
}
public Long getSpuColorId() {
return spuColorId;
}
public void setSpuColorId(Long spuColorId) {
this.spuColorId = spuColorId;
}
public Long getSpuVolId() {
return spuVolId;
}
public void setSpuVolId(Long spuVolId) {
this.spuVolId = spuVolId;
}
public String getSpuName() {
return spuName;
}
public void setSpuName(String spuName) {
this.spuName = spuName;
}
public String getSpuAb() {
return spuAb;
}
public void setSpuAb(String spuAb) {
this.spuAb = spuAb;
}
public String getSpuUnitName() {
return spuUnitName;
}
public void setSpuUnitName(String spuUnitName) {
this.spuUnitName = spuUnitName;
}
public String getSpuImg() {
return spuImg;
}
public void setSpuImg(String spuImg) {
this.spuImg = spuImg;
}
public Byte getSkuFlag() {
return skuFlag;
}
public void setSkuFlag(Byte skuFlag) {
this.skuFlag = skuFlag;
}
public Long getSpuDownBarcode() {
return spuDownBarcode;
}
public void setSpuDownBarcode(Long spuDownBarcode) {
this.spuDownBarcode = spuDownBarcode;
}
public Long getSpuDownNum() {
return spuDownNum;
}
public void setSpuDownNum(Long spuDownNum) {
this.spuDownNum = spuDownNum;
}
public Long getSkuStock() {
return skuStock;
}
public void setSkuStock(Long skuStock) {
this.skuStock = skuStock;
}
public Long getSkuSell() {
return skuSell;
}
public void setSkuSell(Long skuSell) {
this.skuSell = skuSell;
}
public Long getSkuExp() {
return skuExp;
}
public void setSkuExp(Long skuExp) {
this.skuExp = skuExp;
}
public Byte getSkuSellFlag() {
return skuSellFlag;
}
public void setSkuSellFlag(Byte skuSellFlag) {
this.skuSellFlag = skuSellFlag;
}
public Long getSkuSellUnit() {
return skuSellUnit;
}
public void setSkuSellUnit(Long skuSellUnit) {
this.skuSellUnit = skuSellUnit;
}
public Long getSkuAltLow() {
return skuAltLow;
}
public void setSkuAltLow(Long skuAltLow) {
this.skuAltLow = skuAltLow;
}
public Long getSkuAltHigh() {
return skuAltHigh;
}
public void setSkuAltHigh(Long skuAltHigh) {
this.skuAltHigh = skuAltHigh;
}
public Long getSkuTurnT() {
return skuTurnT;
}
public void setSkuTurnT(Long skuTurnT) {
this.skuTurnT = skuTurnT;
}
public Long getSkuTradePrice() {
return skuTradePrice;
}
public void setSkuTradePrice(Long skuTradePrice) {
this.skuTradePrice = skuTradePrice;
}
public Long getSkuRetailPrice1() {
return skuRetailPrice1;
}
public void setSkuRetailPrice1(Long skuRetailPrice1) {
this.skuRetailPrice1 = skuRetailPrice1;
}
public Long getSkuRetailPrice2() {
return skuRetailPrice2;
}
public void setSkuRetailPrice2(Long skuRetailPrice2) {
this.skuRetailPrice2 = skuRetailPrice2;
}
public Long getSkuRetailPrice3() {
return skuRetailPrice3;
}
public void setSkuRetailPrice3(Long skuRetailPrice3) {
this.skuRetailPrice3 = skuRetailPrice3;
}
public Byte getSkuNetFlag() {
return skuNetFlag;
}
public void setSkuNetFlag(Byte skuNetFlag) {
this.skuNetFlag = skuNetFlag;
}
public Byte getSkuOffFlag() {
return skuOffFlag;
}
public void setSkuOffFlag(Byte skuOffFlag) {
this.skuOffFlag = skuOffFlag;
}
public Long getSkuBoundAmt() {
return skuBoundAmt;
}
public void setSkuBoundAmt(Long skuBoundAmt) {
this.skuBoundAmt = skuBoundAmt;
}
public Byte getSkuStatus() {
return skuStatus;
}
public void setSkuStatus(Byte skuStatus) {
this.skuStatus = skuStatus;
}
public String getSpuDepName() {
return spuDepName;
}
public void setSpuDepName(String spuDepName) {
this.spuDepName = spuDepName;
}
public String getSpuClaName() {
return spuClaName;
}
public void setSpuClaName(String spuClaName) {
this.spuClaName = spuClaName;
}
public String getSpuGrpName() {
return spuGrpName;
}
public void setSpuGrpName(String spuGrpName) {
this.spuGrpName = spuGrpName;
}
public String getSpuCateName() {
return spuCateName;
}
public void setSpuCateName(String spuCateName) {
this.spuCateName = spuCateName;
}
public Long getSpuDownBarcodeBar() {
return spuDownBarcodeBar;
}
public void setSpuDownBarcodeBar(Long spuDownBarcodeBar) {
this.spuDownBarcodeBar = spuDownBarcodeBar;
}
public String getSpuDownBarcodeName() {
return spuDownBarcodeName;
}
public void setSpuDownBarcodeName(String spuDownBarcodeName) {
this.spuDownBarcodeName = spuDownBarcodeName;
}
public Long getSpuDownBarcodePrice1() {
return spuDownBarcodePrice1;
}
public void setSpuDownBarcodePrice1(Long spuDownBarcodePrice1) {
this.spuDownBarcodePrice1 = spuDownBarcodePrice1;
}
public String getSpuDownBarUnitName() {
return spuDownBarUnitName;
}
public void setSpuDownBarUnitName(String spuDownBarUnitName) {
this.spuDownBarUnitName = spuDownBarUnitName;
}
public Long getSpuDownSku() {
return spuDownSku;
}
public void setSpuDownSku(Long spuDownSku) {
this.spuDownSku = spuDownSku;
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/model/Ossku.java
View file @ 00fffede
......@@ -566,6 +566,7 @@ public class Ossku implements BaseBean {
}
public String getSpuImg() {
if (spuImg.contains("ngoods.png")) return "";
return spuImg;
}
......
app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
View file @ 00fffede
......@@ -12,7 +12,7 @@ import com.xingdata.zzdpos.util.ConvertUtil;
/**
* 订单详情(购物车商品明细)
*/
public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
public boolean isDiscount() {
return skuPrice.longValue() != skuPricePay.longValue();
......@@ -676,6 +676,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
public String getSpuImg() {
if (spuImg.contains("ngoods.png")) return "";
return spuImg;
}
......
app/src/main/java/com/xingdata/zzdpos/model/Sspr.java
View file @ 00fffede
......@@ -138,6 +138,7 @@ public class Sspr extends RealmObject implements BaseModel, BaseBean {
}
public String getSpuImg() {
if (spuImg.contains("ngoods.png")) return "";
return spuImg;
}
......
app/src/main/java/com/xingdata/zzdpos/model/Sssku.java
View file @ 00fffede
......@@ -16,7 +16,7 @@ import io.realm.annotations.PrimaryKey;
/**
* 商品详情
*/
public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku,BaseGoodPrint {
public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku, BaseGoodPrint {
@JSONField(serialize = false)
@Ignore
private boolean isSelected;
......@@ -463,6 +463,7 @@ public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku,B
}
public String getSpuImg() {
if (spuImg.contains("ngoods.png")) return "";
return spuImg;
}
......@@ -766,7 +767,7 @@ public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku,B
@Override
public String getCnt() {
return getSkuCnt()+"";
return getSkuCnt() + "";
}
@Override
......@@ -776,13 +777,13 @@ public class Sssku extends RealmObject implements BaseModel, BaseBean, BaseSku,B
@Override
public String getPrice() {
return ConvertUtil.fenToYuan(getSkuCost(),false);
return ConvertUtil.fenToYuan(getSkuCost(), false);
}
@Override
public String getSubtotal() {
return ConvertUtil.fenToYuan(getSellSumAmt(),false);
return ConvertUtil.fenToYuan(getSellSumAmt(), false);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/model/Ussku.java
View file @ 00fffede
......@@ -290,6 +290,7 @@ public class Ussku extends RealmObject implements BaseModel, BaseBean, BaseSku {
}
public String getSpuImg() {
if (spuImg.contains("ngoods.png")) return "";
return spuImg;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ 00fffede
......@@ -163,7 +163,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
mScanFragment.setOnScanCompletedListener(new ScanFragment
.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
public void onScanCompleted(String barcode) {
pop();
mPresenter.mBaleSeachShopFragment.seachBarcode(barcode);
start(mPresenter.mBaleSeachShopFragment);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java
View file @ 00fffede
......@@ -82,7 +82,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
(new ScanFragment
.OnScanCompletedListener() {
@Override
public void OnScanCompleted
public void onScanCompleted
(String barcode) {
pop();
loadingDialog.show(
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 00fffede
......@@ -197,7 +197,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
public void onScanCompleted(String barcode) {
mPresenter.getProductByBarcode(barcode);
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryFragment.java
View file @ 00fffede
......@@ -27,6 +27,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryAdapter;
import com.xingdata.zzdpos.util.DensityUtil;
import com.xingdata.zzdpos.util.MyMenuItemDecoration;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
......@@ -71,7 +72,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
mInventoryAdapter.bindToRecyclerView( mViewBinding.recyclerInventory);
mViewBinding.recyclerInventory.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recyclerInventory.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), DensityUtil.dip2px(getActivity(),16), drawable));
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mInventoryAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerInventory);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java
View file @ 00fffede
......@@ -64,7 +64,7 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
public void onScanCompleted(String barcode) {
mOtherListFragment.search(barcode);
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java
View file @ 00fffede
......@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.model.Ossku;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectPresenter;
import com.xingdata.zzdpos.ui.manage.otherselect.adpter.OtherSelectAdapter;
import com.xingdata.zzdpos.util.DensityUtil;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
......@@ -46,7 +47,7 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
@Override
public void initView() {
drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), DensityUtil.dip2px(getActivity(), 16), drawable, 0);
mOtherSelectAdapter = new OtherSelectAdapter(new ArrayList<>());
mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select));
mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity()));
......@@ -111,9 +112,10 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
}
public void setKeyword(String s){
public void setKeyword(String s) {
mViewBinding.edTitle.setText(s);
}
private View getEmptyView(int resHint) {
View view = getLayoutInflater().inflate(R.layout.view_empty, null);
view.setBackgroundResource(R.color.gray_zhouyu);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java
View file @ 00fffede
......@@ -57,7 +57,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
mScanFragment = new ScanFragment();
mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
public void onScanCompleted(String barcode) {
mReplenishmentDetailFragment.scrollToItem(barcode);
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentListFragment.java
View file @ 00fffede
......@@ -24,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
import com.xingdata.zzdpos.util.DensityUtil;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.ArrayList;
......@@ -49,12 +50,12 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
mReplenishmentAdapter = new ReplenishmentAdapter(new ArrayList<>());
mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), DensityUtil.dip2px(getActivity(),16), drawable));
} else {
mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), DensityUtil.dip2px(getActivity(),16), drawable));
}
mReplenishmentAdapter.setOnItemClickListener((adapter, view, position) -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @ 00fffede
......@@ -28,8 +28,7 @@ import com.xingdata.zzdpos.util.Global;
import java.util.List;
public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements
SsskuContract.View {
public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements SsskuContract.View {
private ManagerFragment mManagerFragment = new ManagerFragment();
private SearchFragment mSearchFragment = new SearchFragment();
......@@ -127,6 +126,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
public void showSearchFragment(int searchType) {
if (mSearchFragment.isAdded()) return;
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
this.showTitleBarByTitleMode(searchType);
this.start(mSearchFragment.setSearchType(searchType));
}
......@@ -145,7 +145,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
mViewBinding.tvEditorHint.setText("已有");
mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_orange_r1);
mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.ADD));
break;
......@@ -221,6 +220,12 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.pop();
}
@Override
public void backToMenuActivity() {
mPresenter.doOnFinish();
this.finish();
}
@Override
public void addSku(Sssku sssku) {
mManagerFragment.addSku(sssku);
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @ 00fffede
......@@ -147,6 +147,11 @@ public interface SsskuContract {
*/
void backToDetailFragment();
/**
* 返回菜单页面
*/
void backToMenuActivity();
/**
* 添加商品
*
......@@ -326,5 +331,11 @@ public interface SsskuContract {
* 主页面 - 点击菜单按钮
*/
public abstract void clickSkuMenu();
/**
* 主页面 - 关闭
*/
public abstract void doOnFinish();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ 00fffede
package com.xingdata.zzdpos.ui.manage.sssku;
import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.ui.splash.SplashPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
public class SsskuPresenter extends SsskuContract.Presenter {
/**
* 是否需要同步
*/
private boolean isNeedSync = false;
private int mPageNum;
private Long mSkuGrpId;
......@@ -209,6 +217,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
ApiFactory.Sssku.addSssku(sssku).subscribe(
sssku1 -> {
mView.showMsg("添加成功");
isNeedSync = true;
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
......@@ -221,12 +230,13 @@ public class SsskuPresenter extends SsskuContract.Presenter {
ApiFactory.Sssku.update(sssku).subscribe(
sssku1 -> {
mView.showMsg("修改成功");
isNeedSync = true;
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId || mSkuGrpId == 0L) {
mView.updateSku(sssku1);
} else {
mView.deleteSku(sssku1.getSkuId());
mView.deleteSku(sssku1.getId());
}
}, throwable -> mView.showMsg(throwable.getMessage()));
break;
......@@ -234,6 +244,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
ApiFactory.Sssku.addSssku(sssku).subscribe(
sssku1 -> {
mView.showMsg("添加成功");
isNeedSync = true;
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
......@@ -255,6 +266,31 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mView.showSkuMenuDialog();
}
@Override
public void doOnFinish() {
if (!isNeedSync) return;
final double[] nowPro = {0.0};
mView.showLoadingDialog();
SPUtils.getInstance().put(SplashActivity.SYNCHRONOUSERRORCODE, "");
SPUtils.getInstance().put(SplashActivity.SYNCHRONOUSERRORMSG, "");
for (int i = 0; i < SplashPresenter.listSync.size(); i++) {
ApiFactory.Sync.allDownload(SplashPresenter.listSync.get(i), new SplashPresenter.SynchronousTask() {
@Override
public void getPro(double pro) {
nowPro[0] += pro;
if (nowPro[0] >= 100) {
mView.dismissLoadingDialog();
}
}
@Override
public void error(String table, String errCode, String errMsg) {
}
}, (100.00 / SplashPresenter.listSync.size()));
}
}
/**
* 获取商品
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/ManagerFragment.java
View file @ 00fffede
......@@ -2,9 +2,9 @@ package com.xingdata.zzdpos.ui.manage.sssku.fragment;
import android.annotation.SuppressLint;
import android.support.v4.app.ActivityCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
......@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSsskuManagerBinding;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
import com.xingdata.zzdpos.ui.manage.sssku.adapter.SkuAdapter;
import com.xingdata.zzdpos.ui.manage.sssku.adapter.SkugrpAdapter;
......@@ -60,6 +61,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) view.findViewById(R.id.tv_empty)).setText(R.string.sku_empty_hint);
mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false);
......@@ -80,7 +82,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
mViewBinding.srlSku.setRefreshing(false);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
else mSkuAdapter.loadMoreComplete();
}
......@@ -108,10 +110,13 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
public void loadSkugrpState(Long skugrpId) {
for (int i = 0; i < mSkugrpAdapter.getData().size(); i++) {
if (mSkugrpAdapter.getData().get(i).getSkuGrpId().longValue() == skugrpId) {
int oldSelected = mSkugrpAdapter.getSelectedPosition();
mSkugrpAdapter.setSelectedPosition(i);
mSkugrpAdapter.notifyItemChanged(oldSelected);
mSkugrpAdapter.notifyItemChanged(i);
break;
}
}
mSkugrpAdapter.notifyDataSetChanged();
}
/**
......@@ -151,7 +156,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
*/
public void updateSku(Sssku sssku) {
for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
if (mSkuAdapter.getData().get(i).getSkuId().longValue() == sssku.getSkuId().longValue()) {
if (mSkuAdapter.getData().get(i).getId().longValue() == sssku.getId().longValue()) {
mSkuAdapter.setData(i, sssku);
return;
}
......@@ -165,7 +170,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
*/
public void deleteSku(Long skuId) {
for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
if (mSkuAdapter.getData().get(i).getSkuId().longValue() == skuId) {
if (mSkuAdapter.getData().get(i).getId().longValue() == skuId) {
mSkuAdapter.remove(i);
return;
}
......@@ -189,7 +194,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
@Override
public boolean onBackPressedSupport() {
ActivityCompat.finishAfterTransition(getActivity());
((SsskuActivity) getActivity()).backToMenuActivity();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/SearchFragment.java
View file @ 00fffede
......@@ -71,7 +71,7 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
View file @ 00fffede
package com.xingdata.zzdpos.ui.marketing.ms;
import android.content.Context;
import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils;
......@@ -20,25 +16,24 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.ScanFragment;
import com.xingdata.zzdpos.ui.marketing.ms.fragment.SearchFragment;
import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
import com.xingdata.zzdpos.ui.marketing.ms.model.User;
import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List;
public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, ActivityMsBinding>
implements MsContract.View<Sku> {
public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, ActivityMsBinding> implements MsContract.View<Sku> {
private ManagerFragment mManagerFragment = new ManagerFragment();
private EditorFragment mEditorFragment = new EditorFragment();
private AddFragment mAddFragment = new AddFragment();
private SearchFragment<Sku> mSearchFragment = new SearchFragment<>();
private ScanFragment<Sku> mScanFragment = new ScanFragment<>();
private ScanFragment mScanFragment = new ScanFragment<>();
private LoadingDialog mLoadingDialog = new LoadingDialog();
......@@ -50,12 +45,8 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void initView() {
this.loadRootFragment(R.id.f_ms, mManagerFragment);
mViewBinding.setTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.btnBack.setOnClickListener(view -> {
getTopFragment().onBackPressedSupport();
onBackPressedSupport();
});
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH) {
KeyboardUtils.hideSoftInput(textView);
......@@ -65,6 +56,10 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
});
}
@Override
public void onBackPressedSupport() {
}
@Override
public void showMsg(String msg) {
ToastUtils.showShort(msg);
......@@ -82,11 +77,15 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void showEditorFragment(Ms ms) {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(getTitleRes(ms.getMsTools()));
start(mEditorFragment.setMs(ms).setEditMode(C.MS_EDITOR_MODE.UPDATE));
}
@Override
public void showEditorFragment(int msType) {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(getTitleRes(msType));
start(mEditorFragment.setMs(msType).setEditMode(C.MS_EDITOR_MODE.ADD));
}
......@@ -96,10 +95,20 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
this.start(mSearchFragment.setSearchType(searchType));
}
@Override
public void showSearchFragment(String keyword, int searchType) {
this.showTitleBarByTitleMode(searchType);
this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
}
@Override
public void showScanFragment(int searchType) {
this.showTitleBarByTitleMode(searchType);
this.start(mScanFragment.setSearchType(searchType));
mScanFragment.setOnScanCompletedListener(barcode -> {
mScanFragment.pop();
mPresenter.scanCompleted(barcode, searchType);
});
this.start(mScanFragment);
}
......@@ -150,13 +159,21 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void backToEditFragment() {
this.popTo(EditorFragment.class, false);
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
this.pop();
}
@Override
public void backToManagerFragment() {
this.popTo(ManagerFragment.class, false);
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.ms_title);
this.pop();
}
@Override
public void backToMenuActivity() {
mPresenter.doOnFinish();
this.finish();
}
@Override
......@@ -189,6 +206,29 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
}
}
/**
* 获取文字信息
*
* @param msType 营销计划类型
* @return 营销计划名称
*/
private int getTitleRes(int msType) {
switch (msType) {
case C.MS_TYPE.DIS:
return R.string.ms_type_dis;
case C.MS_TYPE.PROMOTION:
return R.string.ms_type_promotion;
case C.MS_TYPE.MONEY_OFF:
return R.string.ms_type_money_off;
case C.MS_TYPE.GIFT:
return R.string.ms_type_gift;
case C.MS_TYPE.SECOND:
return R.string.ms_type_dis;
default:
return R.string.ms_title;
}
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
Global.clickHideKeyboard(ev, this);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java
View file @ 00fffede
......@@ -47,9 +47,19 @@ interface MsContract {
/**
* 显示搜索页面
*
* @param searchType 搜索类型
*/
void showSearchFragment(int searchType);
/**
* 显示搜素页面
*
* @param keyword 关键字
* @param searchType 搜索类型
*/
void showSearchFragment(String keyword, int searchType);
/**
* 显示扫描页面
*
......@@ -131,6 +141,11 @@ interface MsContract {
*/
void backToManagerFragment();
/**
* 退回到菜单页面
*/
void backToMenuActivity();
/**
* 显示读取对话框
*/
......@@ -184,6 +199,11 @@ interface MsContract {
*/
public abstract void clickGroupSkuSearch();
/**
* 编辑页面 - 点击营销主体商品的扫描键
*/
public abstract void clickGroupSkuScan();
/**
* 编辑页面 - 点击营销类型商品的搜索框
*/
......@@ -218,9 +238,17 @@ interface MsContract {
public abstract void clickSku(Sku sku, int searchType);
/**
* 搜素页面 - 退出
* 扫描页面 - 扫描成功
*
* @param barcode 条码
* @param searchType 扫描类型
*/
public abstract void scanCompleted(String barcode, int searchType);
/**
* 主页面 - 退出
*/
public abstract void exitSearchFragment();
public abstract void doOnFinish();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ 00fffede
package com.xingdata.zzdpos.ui.marketing.ms;
import com.blankj.utilcode.util.SPUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.base.BaseSku;
......@@ -11,12 +12,18 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
import com.xingdata.zzdpos.ui.marketing.ms.model.User;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.ui.splash.SplashPresenter;
import java.util.ArrayList;
import java.util.List;
public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku> {
/**
* 是否需要同步
*/
private boolean isNeedSync = false;
/**
* 页码
*/
......@@ -106,6 +113,11 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
mView.showSearchFragment(C.TITLE_MODE.SKU);
}
@Override
public void clickGroupSkuScan() {
mView.showScanFragment(C.TITLE_MODE.SKU);
}
@Override
public void clickTypeSkuSearch() {
mView.showSearchFragment(C.TITLE_MODE.GIFT);
......@@ -128,6 +140,7 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
.doOnSubscribe(disposable -> mView.dismissLoadingDialog())
.subscribe(ms1 -> {
mView.showMsg("添加成功");
isNeedSync = true;
mView.backToManagerFragment();
mView.addMs(ms1);
}, throwable -> {
......@@ -139,6 +152,7 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
.doOnSubscribe(disposable -> mView.dismissLoadingDialog())
.subscribe(ms1 -> {
mView.showMsg("修改成功");
isNeedSync = true;
mView.backToManagerFragment();
mView.updateMs(ms1);
}, throwable -> {
......@@ -166,10 +180,34 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
}
}
@Override
public void scanCompleted(String barcode, int searchType) {
mView.showSearchFragment(barcode, searchType);
}
@Override
public void exitSearchFragment() {
mView.backToEditFragment();
public void doOnFinish() {
if (!isNeedSync) return;
final double[] nowPro = {0.0};
mView.showLoadingDialog();
SPUtils.getInstance().put(SplashActivity.SYNCHRONOUSERRORCODE, "");
SPUtils.getInstance().put(SplashActivity.SYNCHRONOUSERRORMSG, "");
for (int i = 0; i < SplashPresenter.listSync.size(); i++) {
ApiFactory.Sync.allDownload(SplashPresenter.listSync.get(i), new SplashPresenter.SynchronousTask() {
@Override
public void getPro(double pro) {
nowPro[0] += pro;
if (nowPro[0] >= 100) {
mView.dismissLoadingDialog();
}
}
@Override
public void error(String table, String errCode, String errMsg) {
}
}, (100.00 / SplashPresenter.listSync.size()));
}
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/MsAdapter.java
View file @ 00fffede
......@@ -95,7 +95,6 @@ public class MsAdapter extends BaseAdapter<Ms, ItemMsBinding> {
strType = mContext.getResources().getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), ms.getGiftSkuName());
break;
}
return strGroup + strType;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/AddFragment.java
View file @ 00fffede
......@@ -5,6 +5,7 @@ import android.support.v7.widget.GridLayoutManager;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsAddBinding;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.TypeAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
......@@ -48,4 +49,9 @@ public class AddFragment extends BaseFragment<MsPresenter, FragmentMsAddBinding>
mTypeAdapter.setNewData(types);
}
@Override
public boolean onBackPressedSupport() {
((MsActivity) getActivity()).backToManagerFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java
View file @ 00fffede
......@@ -21,6 +21,7 @@ import com.xingdata.zzdpos.databinding.FragmentMsEditorBinding;
import com.xingdata.zzdpos.databinding.ViewTimeDetailBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.BeanAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
......@@ -502,4 +503,10 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
mPresenter.clickEditorConfirm(mMs, mEditorMode);
}
@Override
public boolean onBackPressedSupport() {
((MsActivity) getActivity()).backToManagerFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
View file @ 00fffede
......@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.MsAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
......@@ -43,6 +44,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
refreshMs();
}
@Override
public boolean onBackPressedSupport() {
((MsActivity) getActivity()).backToMenuActivity();
return super.onBackPressedSupport();
}
/**
* 加载营销计划数据
*
......@@ -56,7 +63,7 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
mViewBinding.srlMs.setRefreshing(false);
mMsAdapter.setNewData(mss);
} else if (mss.size() > 0) mMsAdapter.addData(mss);
if (mss.size() < C.PRODUCT.PAGE_SIZE) mMsAdapter.loadMoreEnd(isRefresh);
if (mss.size() <= C.PRODUCT.PAGE_SIZE) mMsAdapter.loadMoreEnd(isRefresh);
else mMsAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ScanFragment.java deleted 100644 → 0
View file @ 962b2213
package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentMsScanBinding;
import com.xingdata.zzdpos.ui.store.StorePresenter;
public class ScanFragment<Sku extends BaseSku> extends BaseFragment<StorePresenter, FragmentMsScanBinding> {
private int mSearchType;
@Override
public int getLayoutId() {
return R.layout.fragment_ms_scan;
}
@Override
public void initView() {
}
/**
* 设置搜索类型
*
* @param searchType 搜索类型
* @return this
*/
public ScanFragment setSearchType(int searchType) {
this.mSearchType = searchType;
return this;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/SearchFragment.java
View file @ 00fffede
......@@ -3,19 +3,25 @@ package com.xingdata.zzdpos.ui.marketing.ms.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentMsSearchBinding;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.SkuAdapter;
import java.util.List;
public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresenter, FragmentMsSearchBinding> {
private int mSearchType;
private String mKeyword;
private SkuAdapter<Sku> mSkuAdapter;
@Override
......@@ -39,15 +45,12 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) view.findViewById(R.id.tv_empty)).setText(R.string.sku_empty_hint);
mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false);
}
@Override
public void onDestroyView() {
mPresenter.exitSearchFragment();
super.onDestroyView();
//init
if (!StringUtils.isEmpty(mKeyword)) mPresenter.clickSearchButton(mKeyword);
}
/**
......@@ -69,7 +72,7 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
......@@ -84,4 +87,20 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
this.mSearchType = searchType;
return this;
}
/**
* 设置搜索关键字
*
* @param keyword 关键字
*/
public SearchFragment setKeyword(String keyword) {
this.mKeyword = keyword;
return this;
}
@Override
public boolean onBackPressedSupport() {
((MsActivity) getActivity()).backToEditFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java
View file @ 00fffede
......@@ -29,6 +29,9 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
if (b) mPresenter.clickGroupSkuSearch();
});
mViewBinding.btnScan.setOnClickListener(view -> {
mPresenter.clickGroupSkuScan();
});
}
@SuppressLint("SetTextI18n")
......@@ -37,6 +40,7 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
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));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeMoneyOffView.java
View file @ 00fffede
......@@ -2,6 +2,8 @@ package com.xingdata.zzdpos.ui.marketing.ms.view;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
......@@ -11,11 +13,28 @@ import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.InputFilters;
/**
* 满减返现页面
*/
public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
private View.OnFocusChangeListener mOnFocusChangeListener;
public TypeMoneyOffView() {
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_money_off;
......@@ -44,7 +63,6 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
}
}
});
mViewBinding.etDisAmt.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
......@@ -62,6 +80,9 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
}
}
});
mViewBinding.etAmt.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.etDisAmt.setOnFocusChangeListener(mOnFocusChangeListener);
}
@Override
......@@ -77,11 +98,13 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
String strAmt = mViewBinding.etAmt.getText().toString();
if (StringUtils.isEmpty(strAmt)) return false;
if (ConvertUtil.yuanToFen(strAmt) <= 0) return false;
ms.setPayAmt(ConvertUtil.yuanToFen(strAmt));
String strDisAmt = mViewBinding.etDisAmt.getText().toString();
if (StringUtils.isEmpty(strDisAmt)) return false;
if (ConvertUtil.yuanToFen(strDisAmt) > ConvertUtil.yuanToFen(strAmt)) return false;
if (ConvertUtil.yuanToFen(strDisAmt) <= 0) return false;
ms.setGiftOffAmt(ConvertUtil.yuanToFen(strDisAmt));
return true;
......
app/src/main/java/com/xingdata/zzdpos/ui/scan/ScanFragment.java
View file @ 00fffede
......@@ -23,6 +23,7 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
}
private OnScanCompletedListener mOnScanCompletedListener;
private OnBackPressedListener mOnBackPressedListener;
public OnScanCompletedListener getOnScanCompletedListener() {
return mOnScanCompletedListener;
......@@ -32,8 +33,20 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
this.mOnScanCompletedListener = onScanCompletedListener;
}
public OnBackPressedListener getOnBackPressedListener() {
return mOnBackPressedListener;
}
public void setOnBackPressedListener(OnBackPressedListener onBackPressedListener) {
this.mOnBackPressedListener = onBackPressedListener;
}
public interface OnScanCompletedListener {
void OnScanCompleted(String barcode);
void onScanCompleted(String barcode);
}
public interface OnBackPressedListener {
void onBackPressed();
}
@Override
......@@ -44,14 +57,12 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
return new ScanFragment.CustomViewFinderView(context);
}
};
mResultHandler = result -> {
if (mOnScanCompletedListener != null) {
mOnScanCompletedListener.OnScanCompleted(result.getText());
mOnScanCompletedListener.onScanCompleted(result.getText());
}
resetScanner();
};
mScannerView.setResultHandler(mResultHandler);
mViewBinding.contentFrame.addView(mScannerView);
}
......@@ -75,6 +86,12 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
new Handler().postDelayed(() -> mScannerView.resumeCameraPreview(mResultHandler), 1000);
}
@Override
public boolean onBackPressedSupport() {
if (mOnBackPressedListener != null) mOnBackPressedListener.onBackPressed();
return super.onBackPressedSupport();
}
private static class CustomViewFinderView extends ViewFinderView {
public CustomViewFinderView(Context context) {
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 00fffede
......@@ -56,10 +56,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
public void initView() {
this.loadRootFragment(R.id.f_settle, mSettleFragment);
mViewBinding.setTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.btnBack.setOnClickListener(view -> {
getTopFragment().onBackPressedSupport();
onBackPressedSupport();
});
mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH) {
KeyboardUtils.hideSoftInput(textView);
......@@ -73,6 +70,10 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
});
}
@Override
public void onBackPressedSupport() {
}
@Override
public void showMsg(String msg) {
ToastUtils.showShort(msg);
......@@ -133,6 +134,8 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
public void showPayFragment(Saleorder saleorder) {
switch (saleorder.getPayType()) {
case C.PAY_CHANNEL.CASH:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.settle_channel_cash);
this.start(mCashPayFragment.setSaleorder(saleorder));
break;
case C.PAY_CHANNEL.TALLY:
......@@ -140,18 +143,25 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
mPasswordDialog.setSaleorder(saleorder).show(this);
break;
case C.PAY_CHANNEL.BANK:
break;
case C.PAY_CHANNEL.ALI:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.settle_channel_ali);
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mPresenter.payInAli(barcode);
});
mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment);
break;
case C.PAY_CHANNEL.WECHAT:
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.settle_channel_wechat);
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mPresenter.payInWechat(barcode);
});
mScanFragment.setOnBackPressedListener(this::backToSettleFragment);
this.start(mScanFragment);
break;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ 00fffede
package com.xingdata.zzdpos.ui.settle;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
......@@ -159,6 +157,7 @@ public class SettlePresenter extends SettleContract.Presenter {
mView.loadVips(vips);
},
throwable -> {
mView.loadVips(new ArrayList<>());
});
}
......@@ -387,9 +386,9 @@ public class SettlePresenter extends SettleContract.Presenter {
private void paySucc(Saleorder saleorder) {
mView.showPaySuccFragment(saleorder);
this.updateHandover(MainPresenter.handoverInfo);
try{
try {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
}catch (Exception e){
} catch (Exception e) {
ToastUtils.showShort("打印异常");
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/CashPayFragment.java
View file @ 00fffede
......@@ -4,6 +4,7 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentPayCashBinding;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.view.InputerView;
import com.xingdata.zzdpos.util.ConvertUtil;
......@@ -68,4 +69,9 @@ public class CashPayFragment extends BaseFragment<SettlePresenter, FragmentPayCa
}
}
@Override
public boolean onBackPressedSupport() {
((SettleActivity) getActivity()).backToSettleFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
View file @ 00fffede
......@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.settle.fragment;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.support.v4.app.ActivityCompat;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.StaggeredGridLayoutManager;
......@@ -80,8 +81,10 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
if (BottomSheetBehavior.from(mViewBinding.llSheet).getState() == BottomSheetBehavior.STATE_EXPANDED) {
BottomSheetBehavior.from(mViewBinding.llSheet).setState(BottomSheetBehavior.STATE_COLLAPSED);
return true;
} else {
ActivityCompat.finishAfterTransition(getActivity());
return super.onBackPressedSupport();
}
return super.onBackPressedSupport();
}
/**
......@@ -95,6 +98,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
mViewBinding.llStore.setVisibility(View.GONE);
mPresenter.initPaymentInfo();
BottomSheetBehavior.from(mViewBinding.llSheet).setState(BottomSheetBehavior.STATE_EXPANDED);
mViewBinding.tvSettle.setAlpha(0);
break;
case C.SETTLE_MODE.STORE:
mViewBinding.llStore.setVisibility(View.VISIBLE);
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/TicketFragment.java
View file @ 00fffede
......@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSettleTicketBinding;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.adapter.TicketAdapter;
......@@ -96,4 +97,10 @@ public class TicketFragment extends BaseFragment<SettlePresenter, FragmentSettle
mTicketAdapter.notifyDataSetChanged();
}
@Override
public boolean onBackPressedSupport() {
((SettleActivity) getActivity()).backToSettleFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/VipFragment.java
View file @ 00fffede
......@@ -9,6 +9,7 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSettleVipBinding;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.adapter.VipAdapter;
......@@ -48,6 +49,7 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
* @param vips 会员列表
*/
public void loadVips(List<Vip> vips) {
((TextView) mVipAdapter.getEmptyView().findViewById(R.id.tv_empty)).setText(R.string.settle_vip_search_none);
if (vips.size() == 1) {
mPresenter.selectVip(vips.get(0));
this.pop();
......@@ -59,8 +61,8 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
@Override
public void onDestroyView() {
mPresenter.exitVipFragment();
super.onDestroyView();
public boolean onBackPressedSupport() {
((SettleActivity) getActivity()).backToSettleFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsRechargeGroupAdapter.java
View file @ 00fffede
......@@ -38,7 +38,7 @@ public class StatisticsRechargeGroupAdapter extends BaseSectionQuickAdapter<VipR
helper.setText(R.id.tv_left_top,item.getUserName());
helper.setText(R.id.tv_left_bottom,com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
helper.setText(R.id.tv_right_top,"+"+ ConvertUtil.fenToYuan(item.getCardAmtPay(),false));
((ImageView)helper.getView(R.id.img_left)).setImageResource(R.mipmap.ic_text_recharge);
((ImageView)helper.getView(R.id.img_left)).setImageResource(R.mipmap.ic_filling);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsTicketGroupAdapter.java
View file @ 00fffede
......@@ -35,7 +35,7 @@ public class StatisticsTicketGroupAdapter extends BaseSectionQuickAdapter<Ticket
protected void convert(BaseViewHolder helper, Ticket item) {
helper.setText(R.id.tv_left_top, ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()) + "元优惠券");
helper.setText(R.id.tv_left_bottom, TimeUtils.date2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.ic_text_ticket);
((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_record);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @ 00fffede
......@@ -67,18 +67,20 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
return false;
});
mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA)
.callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
mPresenter.clickScan();
}
@Override
public void onDenied(List<String> permissionsDeniedForever, List<String> permissionsDenied) {
}
})
.request());
mViewBinding.btnScan.setOnClickListener(view ->
PermissionUtils.permission(PermissionConstants.CAMERA)
.callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
mPresenter.clickScan();
}
@Override
public void onDenied(List<String> permissionsDeniedForever, List<String> permissionsDenied) {
}
})
.request()
);
mScanFragment.setOnScanCompletedListener(barcode -> mPresenter.scanComplete(barcode));
}
......@@ -159,8 +161,10 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
public void showSearchFragment() {
if (!mSearchFragment.isAdded()) {
mViewBinding.setTitleMode(C.TITLE_MODE.SKU);
mViewBinding.etSearch.setVisibility(View.VISIBLE);
mViewBinding.etSearch.setText("");
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
this.start(mSearchFragment.setKeyword(""));
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/SearchFragment.java
View file @ 00fffede
......@@ -10,6 +10,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.view.animation.LinearInterpolator;
import android.widget.ImageView;
import android.widget.TextView;
import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.StringUtils;
......@@ -53,6 +54,7 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) view.findViewById(R.id.tv_empty)).setText(R.string.sku_empty_hint);
mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false);
......@@ -87,7 +89,7 @@ public class SearchFragment extends BaseFragment<StorePresenter, FragmentStoreSe
mSkuAdapter.setEnableLoadMore(true);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @ 00fffede
......@@ -10,6 +10,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.view.animation.LinearInterpolator;
import android.widget.ImageView;
import android.widget.TextView;
import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.StringUtils;
......@@ -64,6 +65,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
else mPresenter.clickRemoveSku(sku, value);
});
// set grp listener
mSkugrpAdapter.setOnItemClickListener((adapter, view, position) -> mPresenter.clickSkugrp(mSkugrpAdapter.getData().get(position)));
......@@ -72,11 +74,11 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mViewBinding.tvSearch.setOnClickListener(view -> mPresenter.searchBarFocusChanged(true));
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
mSkuAdapter.setEmptyView(view);
@SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string.sku_empty_hint);
mSkuAdapter.setEmptyView(emptyView);
mSkuAdapter.isUseEmpty(false);
// init data
mPresenter.initStore();
}
......@@ -114,10 +116,13 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
public void loadSkugrpState(Long skugrpId) {
for (int i = 0; i < mSkugrpAdapter.getData().size(); i++) {
if (mSkugrpAdapter.getData().get(i).getSkuGrpId().longValue() == skugrpId) {
int oldSelected = mSkugrpAdapter.getSelectedPosition();
mSkugrpAdapter.setSelectedPosition(i);
mSkugrpAdapter.notifyItemChanged(oldSelected);
mSkugrpAdapter.notifyItemChanged(i);
break;
}
}
mSkugrpAdapter.notifyDataSetChanged();
}
/**
......@@ -213,7 +218,7 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
mViewBinding.srlSku.setRefreshing(false);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(false);
else mSkuAdapter.loadMoreComplete();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 00fffede
......@@ -8,8 +8,6 @@ import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.Gravity;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RadioButton;
......@@ -71,7 +69,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
});
scanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
public void OnScanCompleted(String barcode) {
public void onScanCompleted(String barcode) {
ToastUtils.showShort(barcode);
scanFragment.pop();
}
......
app/src/main/res/layout/activity_store.xml
View file @ 00fffede
......@@ -67,7 +67,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:hint="@string/store_search_hint"
android:inputType="text"
......@@ -223,7 +222,7 @@
android:id="@+id/fl_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin_big"
android:layout_marginStart="@dimen/all_margin"
android:animateLayoutChanges="true"
app:layout_constraintBottom_toBottomOf="@id/tv_settle"
app:layout_constraintLeft_toLeftOf="@id/fl_cart">
......
app/src/main/res/layout/dialog_sssku_menu.xml
View file @ 00fffede
......@@ -19,7 +19,7 @@
<TextView
android:id="@+id/tv_update"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:layout_height="@dimen/list1_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update"
......@@ -36,7 +36,7 @@
<TextView
android:id="@+id/tv_update_price"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:layout_height="@dimen/list1_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update_price"
......@@ -53,7 +53,7 @@
<TextView
android:id="@+id/tv_update_vip"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:layout_height="@dimen/list1_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update_vip"
......@@ -64,7 +64,7 @@
<TextView
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:layout_height="@dimen/list1_height"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_white_r1"
android:foreground="?android:attr/selectableItemBackground"
......
app/src/main/res/layout/dialog_store_cart.xml
View file @ 00fffede
......@@ -71,7 +71,7 @@
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical|end"
android:paddingEnd="@dimen/all_margin"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
app:layout_constraintBottom_toTopOf="@id/rl_cart"
app:layout_constraintLeft_toLeftOf="parent"
......@@ -80,12 +80,10 @@
<TextView
android:id="@+id/tv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:layout_height="match_parent"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/store_clear_all"
android:textColor="@color/black_baozheng" />
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ 00fffede
......@@ -27,7 +27,6 @@
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
......@@ -35,6 +34,7 @@
android:drawablePadding="@dimen/all_padding"
android:hint="@string/other_select_edit_hint"
android:imeOptions="actionSearch"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/fragment_ms_editor.xml
View file @ 00fffede
......@@ -56,7 +56,13 @@
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
android:paddingStart="@null">
<ImageView
android:layout_width="@dimen/all_margin"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@mipmap/point" />
<TextView
android:layout_width="wrap_content"
......@@ -75,9 +81,10 @@
android:hint="@string/ms_editor_name_hint"
android:inputType="text"
android:lines="1"
android:maxLength="16"
android:text="@{name}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
......@@ -147,7 +154,7 @@
android:gravity="center_vertical"
android:text="@{dateStart}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
......@@ -184,7 +191,7 @@
android:gravity="center_vertical"
android:text="@{dateEnd}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<ViewStub
......@@ -239,7 +246,7 @@
android:gravity="center_vertical"
android:text="@{user}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<View
......@@ -275,7 +282,7 @@
android:gravity="center_vertical"
android:text="@{area}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_settle.xml
View file @ 00fffede
......@@ -94,9 +94,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:placeholderImage="@mipmap/img_number01"
app:roundAsCircle="true"
app:roundingBorderColor="@color/gray_huanggai"
app:roundingBorderWidth="@dimen/all_line_width" />
app:roundAsCircle="true" />
<com.facebook.drawee.view.SimpleDraweeView
......@@ -122,7 +120,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{name}"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
......@@ -150,7 +148,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
android:textColor="@color/black_zhangfei"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_caption_size"
android:visibility="@{defualtVip?View.INVISIBLE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf="parent"
......
app/src/main/res/layout/fragment_sssku_detail.xml
View file @ 00fffede
......@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:background="@drawable/shape_black_b2"
android:padding="@dimen/all_spacing"
android:text="@{@string/sku_size+sku.spuUnitName}"
android:textSize="@dimen/all_caption_size"
......
app/src/main/res/layout/fragment_sssku_editor.xml
View file @ 00fffede
......@@ -134,6 +134,7 @@
android:hint="@string/sku_name_hint"
android:inputType="text"
android:labelFor="@+id/et_name"
android:maxLength="16"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"
......
app/src/main/res/layout/fragment_sssku_manager.xml
View file @ 00fffede
......@@ -28,8 +28,8 @@
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:textColor="@color/black_likui"
android:text="@string/store_search_hint" />
android:text="@string/store_search_hint"
android:textColor="@color/black_likui" />
</LinearLayout>
<View
......@@ -45,7 +45,8 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_margin"
android:paddingTop="@dimen/all_margin">
android:paddingTop="@dimen/all_margin"
android:visibility="gone">
<LinearLayout
android:layout_width="0dp"
......@@ -163,32 +164,36 @@
android:layout_height="match_parent"
android:baselineAligned="false">
<LinearLayout
<android.support.v4.widget.NestedScrollView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_skugrp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_weight="1">
<FrameLayout
android:id="@+id/ll_skugrp_add"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:foreground="?android:attr/selectableItemBackground">
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_skugrp"
android:layout_width="match_parent"
android:layout_height="@dimen/all_sub_title_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@mipmap/grp_add" />
</FrameLayout>
android:layout_height="wrap_content" />
</LinearLayout>
<FrameLayout
android:id="@+id/ll_skugrp_add"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:foreground="?android:attr/selectableItemBackground">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/all_sub_title_size"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@mipmap/grp_add" />
</FrameLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_sku"
......
app/src/main/res/layout/fragment_sssku_price.xml
View file @ 00fffede
......@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:background="@drawable/shape_black_b2"
android:padding="@dimen/all_spacing"
android:text="@{@string/sku_size+sku.spuUnitName}"
android:textSize="@dimen/all_caption_size"
......
app/src/main/res/layout/fragment_sssku_vip.xml
View file @ 00fffede
......@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:background="@drawable/shape_black_b2"
android:padding="@dimen/all_spacing"
android:text="@{@string/sku_size+sku.spuUnitName}"
android:textSize="@dimen/all_caption_size"
......
app/src/main/res/layout/fragment_store.xml
View file @ 00fffede
......@@ -42,20 +42,20 @@
android:background="@color/gray_huanggai" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_ms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="@dimen/all_spacing"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing"
android:background="@drawable/shape_black_b1"
android:foreground="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:padding="@dimen/all_spacing"
android:visibility="@{msCount>0 ?View.VISIBLE:View.GONE}">
android:visibility="@{msCount>0?View.VISIBLE:View.GONE}">
<TextView
android:id="@+id/tv_ms_type"
......@@ -89,9 +89,9 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_huanggai" />
android:visibility="@{msCount>0?View.GONE:View.VISIBLE}" />
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_store"
......@@ -124,6 +124,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_huanggai" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
......
app/src/main/res/layout/item_ms_sku.xml
View file @ 00fffede
......@@ -22,8 +22,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="64dp"
android:layout_height="64dp"
app:failureImage="@mipmap/icon_goods_default"
app:placeholderImage="@mipmap/icon_goods_default"
app:roundedCornerRadius="@dimen/all_shape_radius" />
......@@ -42,7 +42,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_name">
......
app/src/main/res/layout/item_replenishment.xml
View file @ 00fffede
......@@ -40,8 +40,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/singleline_white_gray">
android:background="@color/white_caocao"
android:foreground="?attr/selectableItemBackground">
<LinearLayout
......
app/src/main/res/layout/item_sssku_sku.xml
View file @ 00fffede
......@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_gray_r1"
android:background="@drawable/shape_black_b2"
android:padding="@dimen/all_spacing"
android:text="@{@string/sku_size+spuUnitName}"
android:textSize="@dimen/all_caption_size"
......
app/src/main/res/layout/item_store_sku.xml
View file @ 00fffede
......@@ -15,14 +15,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingEnd="@dimen/all_margin"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="80dp"
android:layout_height="80dp"
app:failureImage="@mipmap/icon_goods_default"
app:placeholderImage="@mipmap/icon_goods_default"
app:roundedCornerRadius="@dimen/all_shape_radius" />
......@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:contentDescription="@string/store_reduce"
android:foreground="?android:attr/actionBarItemBackground"
android:padding="@dimen/all_spacing"
android:padding="@dimen/all_margin"
android:src="@mipmap/but_reduce"
android:visibility="gone" />
......@@ -89,7 +89,7 @@
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:text='@{count+""}'
android:textColor="@color/black_likui"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
android:visibility="gone" />
......@@ -99,14 +99,13 @@
android:layout_height="wrap_content"
android:contentDescription="@string/store_increase"
android:foreground="?android:attr/actionBarItemBackground"
android:padding="@dimen/all_spacing"
android:padding="@dimen/all_margin"
android:src="@mipmap/but_increase02" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
......
app/src/main/res/layout/view_type_dis.xml
View file @ 00fffede
......@@ -59,7 +59,13 @@
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
android:paddingStart="@null">
<ImageView
android:layout_width="@dimen/all_margin"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@mipmap/point" />
<TextView
android:layout_width="wrap_content"
......@@ -79,7 +85,7 @@
android:inputType="number"
android:maxLength="2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
......
app/src/main/res/layout/view_type_money_off.xml
View file @ 00fffede
......@@ -33,7 +33,8 @@
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_amt"
android:saveEnabled="false" />
android:saveEnabled="false"
android:textSize="@dimen/all_body_size" />
<TextView
android:layout_width="wrap_content"
......@@ -75,7 +76,8 @@
android:layout_weight="1"
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_dis_amt" />
android:labelFor="@+id/et_dis_amt"
android:textSize="@dimen/all_body_size" />
<TextView
android:layout_width="wrap_content"
......
app/src/main/res/values/dimens.xml
View file @ 00fffede
......@@ -230,9 +230,9 @@
<dimen name="button1_marginHorizontal">24dp</dimen>
<dimen name="button1_width">120dp</dimen>
<dimen name="button2_height">35dp</dimen>
<dimen name="button2_marginHorizontal">16dp</dimen>
<dimen name="button2_width">105dp</dimen>
<dimen name="button2_height">@dimen/button1_height</dimen>
<dimen name="button2_marginHorizontal">@dimen/button1_marginHorizontal</dimen>
<dimen name="button2_width">@dimen/button1_width</dimen>
<dimen name="button3_height">44dp</dimen>
<dimen name="button3_marginHorizontal">16dp</dimen>
......
app/src/main/res/values/strings.xml
View file @ 00fffede
......@@ -162,15 +162,15 @@
<string name="card_num_hint">请输入储值卡卡号</string>
<!--结算页面 <WHERE>_<DESCRIPTION>-->
<string name="settle_channel_hint">请选择支付方式</string>
<string name="settle_channel_cash">现金</string>
<string name="settle_channel_cash">现金支付</string>
<string name="settle_channel_cash_not_enough">金额不足,无法支付</string>
<string name="settle_channel_wechat">微信</string>
<string name="settle_channel_wechat">微信支付</string>
<string name="settle_channel_wechat_hint">正在进行微信支付…</string>
<string name="settle_channel_ali">支付宝</string>
<string name="settle_channel_ali">支付宝支付</string>
<string name="settle_channel_ali_hint">正在进行支付宝支付…</string>
<string name="settle_channel_bank">银行卡</string>
<string name="settle_channel_bank">银行卡支付</string>
<string name="settle_channel_bank_hint">正在POS机上完成刷卡支付…</string>
<string name="settle_channel_card">会员卡</string>
<string name="settle_channel_card">会员卡支付</string>
<string name="settle_channel_card_hint">请提醒客户在副屏输入密码</string>
<string name="settle_channel_card_reset_hint">【在副屏连击三次确认按钮，则重置密码】</string>
<string name="settle_channel_balance">余额</string>
......@@ -581,6 +581,7 @@
<!--支付里的Vip-->
<string name="settle_vip_search_hint">请输入会员手机号</string>
<string name="settle_vip_search_empty">请输入会员手机号进行搜索~</string>
<string name="settle_vip_search_none">没有搜到此会员~</string>
<string name="settle_vip_none">不需要会员</string>
<!--支付里的优惠券-->
......@@ -707,7 +708,7 @@
<string name="sku_subtitle_price">调整价格</string>
<string name="sku_price1">售价:</string>
<string name="sku_price2">促销价:</string>
<string name="sku_subtitle_vip">会员信息</string>
<string name="sku_subtitle_vip">折扣信息</string>
<string name="sku_vip_dis">会员折扣</string>
<string name="sku_point1">消费每满</string>
<string name="sku_point2">元等于1积分</string>
......@@ -726,8 +727,10 @@
<string name="sku_update">编辑商品</string>
<string name="sku_update_price">调整价格</string>
<string name="sku_update_vip">调整会员</string>
<string name="sku_update_vip">调整积分</string>
<string name="sku_name_hint">请输入商品名称</string>
<string name="sku_empty_hint">没有找到对应商品~</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment