Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/modules.xml
#	app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java
parents aa5df7f2 122d580a
Show whitespace changes
Inline Side-by-side
Showing with 3981 additions and 230 deletions
.idea/modules.xml
View file @ 52b14f10
......@@ -3,6 +3,8 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
<module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
......
app/src/main/AndroidManifest.xml
View file @ 52b14f10
......@@ -11,7 +11,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_logo"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
......@@ -123,6 +123,11 @@
android:name=".ui.manage.inventory.InventoryActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name=".ui.manage.user.UserActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 52b14f10
......@@ -563,6 +563,7 @@ public class C {
public static final int GIFT = 4;
public static final int PKG = 5;
public static final int SKU_DETAIL = 6;
public static final int ADD_SKU = 7;
}
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ 52b14f10
......@@ -10,7 +10,6 @@ import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Category;
import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.NewSssku;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Ubound;
......@@ -477,6 +476,14 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<Trule>> truleQueryByVipId(long vipId) {
return Api.getInstance().service.truleQueryByVipId(vipId)
.onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
public static Observable<String> truleDetail(String id) {
return Api.getInstance().service.truleDetail(id).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
......@@ -582,8 +589,9 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> querySaleorderByVipId(Long vipId,int pageNumber ,int pageSize) {
return Api.getInstance().service.querySaleorderByVipId(vipId,pageNumber,pageSize)
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
return Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber, pageSize)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
......@@ -658,7 +666,7 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<com.xingdata.zzdpos.model.Sssku> update(NewSssku sssku) {
public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos.model.Sssku sssku) {
return Api.getInstance().service.updateSssku(sssku)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
......@@ -667,7 +675,7 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(NewSssku sssku) {
public static Observable<com.xingdata.zzdpos.model.Sssku> addSssku(com.xingdata.zzdpos.model.Sssku sssku) {
return Api.getInstance().service.addSssku(sssku)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
......@@ -811,11 +819,12 @@ public final class ApiFactory {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 查询充值记录
*/
public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId,int pageNum, int pageSize) {
return Api.getInstance().service.queryRecharge(vipId,pageNum, pageSize)
public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum, int pageSize) {
return Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
......@@ -961,6 +970,15 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword) {
return Api.getInstance().service.queryDetailByWD(keyword, 0, 200)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<Vip>> queryUserDetailByWD(String keyword, int pageNumber) {
return Api.getInstance().service.queryDetailByWD(keyword, pageNumber, 12)
.onErrorReturn(new ErrorFilter<>())
......@@ -971,6 +989,14 @@ public final class ApiFactory {
}
public static Observable<Pager<Vip>> getVipList(int pageNumber, String vipLevel) {
if (vipLevel == null) {
return Api.getInstance().service.getAllVipList(pageNumber, 12)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
} else {
return Api.getInstance().service.getVipList(vipLevel, pageNumber, 12)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
......@@ -979,6 +1005,8 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
}
public static Observable<Vip> addVip(Vip user) {
return Api.getInstance().service.addVip(user)
.onErrorReturn(new ErrorFilter<>())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 52b14f10
......@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.NewSssku;
import com.xingdata.zzdpos.model.Notice;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Ossku;
......@@ -197,7 +196,7 @@ interface ApiService {
("pageSize") int pageSize);
@POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,@Query("pageNumber") int pageNum, @Query
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId, @Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize);
@POST(C.URL.RCTRACE.query)
......@@ -314,6 +313,8 @@ interface ApiService {
@POST(C.URL.TRULE.truleQuery)
Observable<HttpMessage<Pager<Trule>>> truleQuery(@Query("startDate") String data);
@POST(C.URL.TRULE.truleQuery)
Observable<HttpMessage<Pager<Trule>>> truleQueryByVipId(@Query("vipId") long vipId);
@POST(C.URL.TRULE.truleDetail)
Observable<HttpMessage<String>> truleDetail(@Query("id") String id);
......@@ -386,13 +387,13 @@ interface ApiService {
Observable<HttpMessage<List<Cor>>> queryAllCor();
@POST(C.URL.SSSKU.add)
Observable<HttpMessage<Sssku>> addSssku(@Body NewSssku sssku);
Observable<HttpMessage<Sssku>> addSssku(@Body Sssku sssku);
@POST(C.URL.SSSKU.detail)
Observable<HttpMessage<Sssku>> detailSssku(@Query("id") Long id);
@POST(C.URL.SSSKU.update)
Observable<HttpMessage<Sssku>> updateSssku(@Body NewSssku sssku);
Observable<HttpMessage<Sssku>> updateSssku(@Body Sssku sssku);
@POST(C.URL.LEVEL.add)
Observable<HttpMessage<Level>> addVipLevel(@Body Level l);
......@@ -438,5 +439,9 @@ interface ApiService {
@Query("pageNumber") int pageNumber,
@Query("pageSize") int pageSize);
@POST(C.URL.VIP.query)
Observable<HttpMessage<Pager<Vip>>> getAllVipList(@Query("pageNumber") int pageNumber,
@Query("pageSize") int pageSize);
}
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ 52b14f10
......@@ -16,6 +16,7 @@ import com.xingdata.zzdpos.model.Ussku;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
......@@ -167,7 +168,21 @@ public class DBFactory {
.flatMap(ms -> Observable.just(getList(ms)));
}
}
public static class Vip {
/**
* 查询支付渠道
*
* @return 支付渠道
*/
public static Observable<List<Pay>> queryPays() {
RealmQuery<Pay> query = DB.getInstance().get(VipPresenter.class).where(Pay.class);
query.equalTo("payDispFlag", 1);
return Observable.just(query.findAllSorted("payType", Sort.ASCENDING))
.flatMap(pays -> Observable.just(getList(pays)));
}
}
public static class Settle {
/**
* 查询支付渠道
......@@ -182,6 +197,8 @@ public class DBFactory {
.flatMap(pays -> Observable.just(getList(pays)));
}
/**
* 查询营销活动
*
......
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
View file @ 52b14f10
......@@ -960,7 +960,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
@Override
public String getPayAmt() {
return ConvertUtil.fenToYuan(orderPayAmt);
return ConvertUtil.fenToYuan(orderPayAmt, true);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/model/Salepay.java
View file @ 52b14f10
......@@ -33,6 +33,9 @@ public class Salepay {
public String getPayName() {
String payName = "";
if (payType==null){
payType=999;
}
switch (payType) {
case C.PAY_CHANNEL.CASH:
payName = "现金";
......@@ -52,6 +55,8 @@ public class Salepay {
case C.PAY_CHANNEL.TALLY:
payName = "赊账";
break;
default:
payName = "--";
}
return payName;
}
......
app/src/main/java/com/xingdata/zzdpos/model/Sskugrp.java
View file @ 52b14f10
......@@ -11,7 +11,6 @@ import io.realm.annotations.PrimaryKey;
public class Sskugrp extends RealmObject implements BaseModel, BaseBean {
/**
* 创建默认分组
*
......@@ -116,4 +115,9 @@ public class Sskugrp extends RealmObject implements BaseModel, BaseBean {
public String getPrimaryKey() {
return "skuGrpId";
}
@Override
public String toString() {
return getSkuGrpName();
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/model/VipRechangeOrder.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.model;
import com.xingdata.api.print.entity.BaseGoodPrint;
import com.xingdata.api.print.entity.BaseOrderPrint;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
/**
* Created by Administrator on 2017/12/15.
*/
public class VipRechangeOrder implements BaseOrderPrint {
private Long cardAmtPay;
private Long cardAmtSend;
private Long rechangeBefore;
private Long rechangeAfter;
private String vipName;
private String rctraceNo;
private String vipMobile;
private Long createTime;
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public Long getCardAmtPay() {
return cardAmtPay;
}
public void setCardAmtPay(Long cardAmtPay) {
this.cardAmtPay = cardAmtPay;
}
public Long getCardAmtSend() {
return cardAmtSend;
}
public void setCardAmtSend(Long cardAmtSend) {
this.cardAmtSend = cardAmtSend;
}
public String getVipName() {
return vipName;
}
public void setVipName(String vipName) {
this.vipName = vipName;
}
public String getRctraceNo() {
return rctraceNo;
}
public void setRctraceNo(String rctraceNo) {
this.rctraceNo = rctraceNo;
}
public String getVipMobile() {
return vipMobile;
}
public void setVipMobile(String vipMobile) {
this.vipMobile = vipMobile;
}
public Long getRechangeBefore() {
return rechangeBefore;
}
public void setRechangeBefore(Long rechangeBefore) {
this.rechangeBefore = rechangeBefore;
}
public Long getRechangeAfter() {
return rechangeAfter;
}
public void setRechangeAfter(Long rechangeAfter) {
this.rechangeAfter = rechangeAfter;
}
public String getVipname() {
return vipName;
}
public void setVipname(String vipname) {
this.vipName = vipname;
}
@Override
public String getPayAmt() {
if (cardAmtSend!=null&&cardAmtSend!=0){
return ConvertUtil.fenToYuan(cardAmtPay,false)+"+"+ConvertUtil.fenToYuan(cardAmtSend,false);
}else {
return ConvertUtil.fenToYuan(cardAmtPay,false);
}
}
@Override
public String getVip_money() {
return ConvertUtil.fenToYuan(getRechangeAfter(),false);
}
@Override
public String getBalanceOld() {
return ConvertUtil.fenToYuan(getRechangeBefore(),false);
}
@Override
public String getTitle() {
return LoginPresenter.loginReturnBean.getMerNameAbcn();
}
@Override
public String getStore() {
return LoginPresenter.loginReturnBean.getShopNameAbcn();
}
@Override
public String getOrderNo() {
return rctraceNo;
}
@Override
public String getOrderTime() {
return com.blankj.utilcode.util.TimeUtils.millis2String(createTime);
}
@Override
public String getCasherName() {
return LoginPresenter.loginReturnBean.getOperName();
}
@Override
public String getUserName() {
return vipName+"("+vipMobile.substring(vipMobile.length()-4)+")";
}
@Override
public String getPayChannel() {
return null;
}
@Override
public String getPayChange() {
return null;
}
@Override
public String getGoodsCnt() {
return null;
}
@Override
public String getGoodsAmtSum() {
return null;
}
@Override
public String getGoodsReduPer() {
return null;
}
@Override
public String getGoodsReduAmt() {
return null;
}
@Override
public List<BaseGoodPrint> getGoodList() {
return null;
}
@Override
public String getDRAW_URL() {
return null;
}
@Override
public String getPrint_state() {
return null;
}
@Override
public String getOper_mobile() {
return null;
}
@Override
public String getStore_tel() {
return null;
}
@Override
public String getSupplier() {
return null;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 52b14f10
......@@ -42,6 +42,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
private HandoverDialog mHandoverDialog = new HandoverDialog();
LoadingDialog mLoadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.activity_main;
......@@ -49,7 +50,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void initView() {
mainActivity=this;
mainActivity = this;
mPresenter.initHandoverInfo();
List<BaseFragment> fragments = new ArrayList<>();
fragments.add(new CasherFragment());
......@@ -163,4 +164,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void showHandoverDialog() {
mHandoverDialog.show(this);
}
@Override
public void onBackPressedSupport() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ 52b14f10
package com.xingdata.zzdpos.ui.main.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.view.View;
......@@ -28,6 +29,8 @@ import java.util.List;
public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
private Bundle bundle;
private Intent intent;
@Override
public int getLayoutId() {
......@@ -55,11 +58,20 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int) adapter.getData().get(position)) {
case C.MENU.MENU_VIP://会员
ActivityUtils.startActivity(new Intent(getActivity(),
VipActivity.class));
bundle = new Bundle();
intent = new Intent(getActivity(),
VipActivity.class);
bundle.putInt("vipState", 0);
intent.putExtras(bundle);
ActivityUtils.startActivity(intent);
break;
case C.MENU.MENU_RECHARGE://充值
bundle = new Bundle();
intent = new Intent(getActivity(),
VipActivity.class);
bundle.putInt("vipState", 1);
intent.putExtras(bundle);
ActivityUtils.startActivity(intent);
break;
case C.MENU.MENU_MS://营销
ActivityUtils.startActivity(new Intent(getActivity(),
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java
View file @ 52b14f10
......@@ -11,16 +11,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
import com.xingdata.zzdpos.ui.manage.bale.BaleActivity;
import com.xingdata.zzdpos.ui.manage.inventory.InventoryActivity;
import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectActivity;
import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
......@@ -62,7 +57,7 @@ public class ManageMenuActivity extends AppCompatActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (marketingMenuAdapter.getData().get(position)) {
case C.MENU.MENU_MANAGER_OPER: {
ActivityUtils.startActivity(ManageMenuActivity.this, UserActivity.class);
}
break;
case C.MENU.MENU_MANAGER_GOODS: {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java
View file @ 52b14f10
......@@ -2,8 +2,10 @@ package com.xingdata.zzdpos.ui.manage.sssku;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
......@@ -12,6 +14,8 @@ import com.xingdata.zzdpos.model.Cor;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.EditorFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment;
......@@ -26,6 +30,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
private SearchFragment mSearchFragment = new SearchFragment();
private SkugrpFragment mSkugrpFragment = new SkugrpFragment();
private AddFragment mAddFragment = new AddFragment();
private EditorFragment mEditorFragment = new EditorFragment();
private DetailFragment mDetailFragment = new DetailFragment();
......@@ -52,7 +57,10 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
return false;
});
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
mPresenter.searchBarFocusChanged(b);
mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.SKU);
});
mViewBinding.btnMenu.setOnClickListener(view -> {
mPresenter.clickSkuMenu();
});
}
......@@ -60,6 +68,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
public void onBackPressedSupport() {
}
@Override
public void showMsg(String msg) {
ToastUtils.showShort(msg);
}
@Override
public void loadSkus(List<Sssku> skus, boolean isRefresh) {
mManagerFragment.loadSkus(skus, isRefresh);
......@@ -99,27 +112,51 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
mEditorFragment.loadCors(cors);
}
@Override
public void loadPkgSku(Sssku pkgSku) {
mEditorFragment.loadPkgSku(pkgSku);
}
@Override
public void loadCheckSkus(List<Sssku> ssskus) {
mAddFragment.loadCheckSkus(ssskus);
}
@Override
public void showSearchFragment(int searchType) {
if (mSearchFragment.isAdded()) return;
mViewBinding.etSearch.requestFocus();
this.showTitleBarByTitleMode(searchType);
this.start(mSearchFragment.setSearchType(searchType));
}
@Override
public void showEditorFragment(Sssku sku) {
public void showAddFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.sssku_update);
this.start(mEditorFragment.setSssku(sku));
mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mAddFragment);
}
@Override
public void showEditorFragment() {
public void showEditorFragment(Sssku sku, int editMode) {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
switch (editMode) {
case C.SKU_EDITOR_MODE.ADD:
mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mEditorFragment);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.ADD));
break;
case C.SKU_EDITOR_MODE.UNKNOWN:
mViewBinding.tvTitle.setText(R.string.sssku_add);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));
break;
case C.SKU_EDITOR_MODE.UPDATE:
mViewBinding.tvTitle.setText(R.string.sssku_update);
this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UPDATE));
break;
}
}
@Override
public void showDetailFragment(Sssku sku) {
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_DETAIL);
......@@ -134,17 +171,40 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
this.start(mSkugrpFragment);
}
@Override
public void showSkuMenuDialog() {
mDetailFragment.showSkuMenuDialog();
}
@Override
public void backToEditFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
mViewBinding.tvTitle.setText(R.string.sssku_update);
this.pop();
}
@Override
public void backToManagerFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
this.pop();
this.resetSearchBar();
this.pop();
}
@Override
public void backToDetailFragment() {
this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_DETAIL);
mViewBinding.tvTitle.setText(R.string.sssku_detail);
this.pop();
}
@Override
public void addSku(Sssku sssku) {
mManagerFragment.addSku(sssku);
}
@Override
public void updateSku(Sssku sssku) {
mManagerFragment.updateSku(sssku);
}
@Override
......@@ -157,6 +217,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
mLoadingDialog.dismiss();
}
@Override
public void startReplenishmentActivity() {
ActivityUtils.startActivity(this, ReplenishmentActivity.class);
}
/**
* 根据titleMode显示TitleBar
*
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java
View file @ 52b14f10
......@@ -12,6 +12,14 @@ import java.util.List;
public interface SsskuContract {
interface View extends BaseView {
/**
* 显示文字内容
*
* @param msg 要显示的内容
*/
void showMsg(String msg);
/**
* 加载商品
*
......@@ -61,22 +69,37 @@ public interface SsskuContract {
*/
void loadCors(List<Cor> cors);
/**
* 加载包装内的商品
*
* @param pkgSku 包装内商品
*/
void loadPkgSku(Sssku pkgSku);
/**
* 加载检查出来的商品列表
*
* @param ssskus 商品信息
*/
void loadCheckSkus(List<Sssku> ssskus);
/**
* 显示搜索页面
*/
void showSearchFragment(int searchType);
/**
* 显示编辑页面
*
* @param sku 要编辑的商品
* 显示添加检查页面
*/
void showEditorFragment(Sssku sku);
void showAddFragment();
/**
* 显示编辑页面
*
* @param sku 要编辑的商品
* @param editMode 编辑模式
*/
void showEditorFragment();
void showEditorFragment(Sssku sku, int editMode);
/**
* 显示详情页面
......@@ -90,6 +113,11 @@ public interface SsskuContract {
*/
void showSkugrpFragment();
/**
* 显示商品菜单对话框
*/
void showSkuMenuDialog();
/**
* 返回编辑页面
*/
......@@ -100,6 +128,25 @@ public interface SsskuContract {
*/
void backToManagerFragment();
/**
* 返回详情页面
*/
void backToDetailFragment();
/**
* 添加商品
*
* @param sssku 要添加的商品
*/
void addSku(Sssku sssku);
/**
* 更新商品
*
* @param sssku 更新商品
*/
void updateSku(Sssku sssku);
/**
* 显示读取对话框
*/
......@@ -115,6 +162,10 @@ public interface SsskuContract {
*/
void dismissAllDialog();
/**
* 跳转到补货界面
*/
void startReplenishmentActivity();
}
abstract class Presenter extends BasePresenter<View> {
......@@ -153,6 +204,7 @@ public interface SsskuContract {
*/
public abstract void clickAddSku();
/**
* 管理页面 - 点击添加分组
*/
......@@ -163,6 +215,11 @@ public interface SsskuContract {
*/
public abstract void clickReplenish();
/**
* 添加页面 - 检查条码
*/
public abstract void clickCheck(String barcode);
/**
* 搜索页面 - 点击搜索
*/
......@@ -188,6 +245,20 @@ public interface SsskuContract {
*/
public abstract void clickEditSku(Sssku sssku);
/**
* 详情页面 - 编辑商品价格
*
* @param sssku 要编辑的商品
*/
public abstract void clickEditPriceSku(Sssku sssku);
/**
* 详情页面 - 编辑商品会员信息
*
* @param sssku 要编辑的商品
*/
public abstract void clickEditVipSku(Sssku sssku);
/**
* 分组页面 - 添加分组
*
......@@ -209,11 +280,25 @@ public interface SsskuContract {
*/
public abstract void clickEditSkugrp(Sskugrp sskugrp);
/**
* 编辑页面 - 点击提交按钮
*
* @param sssku 商品
* @param editorMode 编辑模式
*/
public abstract void clickConfirm(Sssku sssku, int editorMode);
/**
* 主页面 - 搜索框焦点改变
*
* @param b 获取焦点
* @param searchMode 搜索模式
*/
public abstract void searchBarFocusChanged(boolean b, int searchMode);
/**
* 主页面 - 点击菜单按钮
*/
public abstract void searchBarFocusChanged(boolean b);
public abstract void clickSkuMenu();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.sssku;
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.util.ConvertUtil;
public class SsskuPresenter extends SsskuContract.Presenter {
......@@ -55,7 +57,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
@Override
public void clickAddSku() {
mView.showEditorFragment();
mView.showAddFragment();
}
@Override
......@@ -65,7 +67,29 @@ public class SsskuPresenter extends SsskuContract.Presenter {
@Override
public void clickReplenish() {
//TODO 跳转到补货界面
mView.startReplenishmentActivity();
}
@Override
public void clickCheck(String barcode) {
if (StringUtils.isEmpty(barcode)) return;
mView.showLoadingDialog();
mCompositeDisposable.add(
ApiFactory.Scsku.queryScsku(barcode)
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(
ssskuPager -> {
if (ssskuPager.getList().size() > 1) {
mView.loadCheckSkus(ssskuPager.getList());
} else if (ssskuPager.getList().size() == 1) {
mView.showEditorFragment(ssskuPager.getList().get(0), C.SKU_EDITOR_MODE.ADD);
} else {
Sssku sssku = new Sssku();
sssku.setSpuBarcode(ConvertUtil.stringToLong(barcode));
mView.showEditorFragment(sssku, C.SKU_EDITOR_MODE.UNKNOWN);
}
})
);
}
@Override
......@@ -98,13 +122,27 @@ public class SsskuPresenter extends SsskuContract.Presenter {
);
break;
case C.TITLE_MODE.PKG:
mView.loadPkgSku(sssku);
break;
case C.TITLE_MODE.ADD_SKU:
mView.showEditorFragment(sssku, C.SKU_EDITOR_MODE.ADD);
break;
}
}
@Override
public void clickEditSku(Sssku sssku) {
mView.showEditorFragment(sssku);
mView.showEditorFragment(sssku, C.SKU_EDITOR_MODE.UPDATE);
}
@Override
public void clickEditPriceSku(Sssku sssku) {
//TODO
}
@Override
public void clickEditVipSku(Sssku sssku) {
//TODO
}
@Override
......@@ -154,8 +192,54 @@ public class SsskuPresenter extends SsskuContract.Presenter {
}
@Override
public void searchBarFocusChanged(boolean b) {
if (b) mView.showSearchFragment(C.TITLE_MODE.SKU);
public void clickConfirm(Sssku sssku, int editorMode) {
switch (editorMode) {
case C.SKU_EDITOR_MODE.ADD:
ApiFactory.Sssku.addSssku(sssku).subscribe(
sssku1 -> {
mView.showMsg("添加成功");
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
mView.addSku(sssku1);
}
},
throwable -> mView.showMsg(throwable.getMessage()));
break;
case C.SKU_EDITOR_MODE.UPDATE:
ApiFactory.Sssku.update(sssku).subscribe(
sssku1 -> {
mView.showMsg("修改成功");
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
mView.updateSku(sssku1);
}
}, throwable -> mView.showMsg(throwable.getMessage()));
break;
case C.SKU_EDITOR_MODE.UNKNOWN:
ApiFactory.Sssku.addSssku(sssku).subscribe(
sssku1 -> {
mView.showMsg("添加成功");
mView.backToEditFragment();
mView.backToManagerFragment();
if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
mView.addSku(sssku1);
}
}, throwable -> mView.showMsg(throwable.getMessage()));
break;
}
}
@Override
public void searchBarFocusChanged(boolean b, int searchMode) {
if (b) mView.showSearchFragment(searchMode);
}
@Override
public void clickSkuMenu() {
mView.showSkuMenuDialog();
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/dialog/SsskuMenuDialog.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.sssku.dialog;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogSsskuMenuBinding;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
public class SsskuMenuDialog extends BaseSheetDialog<SsskuPresenter, DialogSsskuMenuBinding> {
private Sssku mSssku;
@Override
protected boolean isTransparentBackground() {
return true;
}
public SsskuMenuDialog setSssku(Sssku sssku) {
this.mSssku = sssku;
return this;
}
@Override
public int getLayoutId() {
return R.layout.dialog_sssku_menu;
}
@Override
public void initView() {
mViewBinding.tvCancel.setOnClickListener(view -> {
this.dismiss();
});
mViewBinding.tvUpdate.setOnClickListener(view -> {
this.dismiss();
mPresenter.clickEditSku(mSssku);
});
mViewBinding.tvUpdatePrice.setOnClickListener(view -> {
this.dismiss();
mPresenter.clickEditPriceSku(mSssku);
});
mViewBinding.tvUpdateVip.setOnClickListener(view -> {
this.dismiss();
mPresenter.clickEditVipSku(mSssku);
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.sssku.fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.KeyboardUtils;
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.databinding.FragmentSsskuAddBinding;
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.marketing.ms.adapter.SkuAdapter;
import java.util.List;
public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBinding> {
private SkuAdapter<Sssku> mSkuAdapter;
@Override
public int getLayoutId() {
return R.layout.fragment_sssku_add;
}
@Override
public void initView() {
mViewBinding.etBarcode.requestFocus();
mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
KeyboardUtils.hideSoftInput(textView);
mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString());
}
return false;
});
mViewBinding.tvCheck.setOnClickListener(view -> {
mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString());
});
// init sku
mSkuAdapter = new SkuAdapter<>();
mViewBinding.rlSku.setAdapter(mSkuAdapter);
mViewBinding.rlSku.setLayoutManager(new LinearLayoutManager(mContext));
// set sku listener
mSkuAdapter.setOnItemClickListener((adapter, view, position) -> {
((SsskuActivity) getActivity()).backToManagerFragment();
mPresenter.clickSku(mSkuAdapter.getData().get(position), C.TITLE_MODE.ADD_SKU);
});
}
public void loadCheckSkus(List<Sssku> ssskus) {
mSkuAdapter.setNewData(ssskus);
}
@Override
public boolean onBackPressedSupport() {
((SsskuActivity) getActivity()).backToManagerFragment();
return super.onBackPressedSupport();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/DetailFragment.java
View file @ 52b14f10
......@@ -9,6 +9,7 @@ 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.dialog.SsskuMenuDialog;
import java.util.ArrayList;
import java.util.List;
......@@ -42,9 +43,6 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
break;
}
}
if (mSssku.getSkuFlag() == 1) {
}
}
/**
......@@ -66,6 +64,13 @@ public class DetailFragment extends BaseFragment<SsskuPresenter, FragmentSsskuDe
this.mCors = cors;
}
/**
* 显示菜单
*/
public void showSkuMenuDialog() {
new SsskuMenuDialog().setSssku(mSssku).show((SsskuActivity) getActivity());
}
/**
* 设置商品
*
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/EditorFragment.java
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.sssku.fragment;
import android.annotation.SuppressLint;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.AdapterView;
import android.widget.EditText;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSsskuEditorBinding;
import com.xingdata.zzdpos.model.Category;
import com.xingdata.zzdpos.model.Cor;
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.util.ConvertUtil;
import com.xingdata.zzdpos.util.InputFilters;
import java.util.ArrayList;
import java.util.List;
......@@ -16,29 +28,317 @@ import java.util.List;
public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEditorBinding> {
private Sssku mSssku;
private Sssku mPackSssku;
private int mEditorMode;
private List<Sskugrp> mSskugrps;
private List<Cor> mCors;
private List<Category> mClas, mGrps, mCates;
private String[] idSet;
@Override
public int getLayoutId() {
return R.layout.fragment_sssku_editor;
}
private AdapterView.OnItemSelectedListener mOnItemSelectedListener;
private View.OnFocusChangeListener mOnFocusChangeListener;
public EditorFragment() {
mOnItemSelectedListener = new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
switch (adapterView.getId()) {
case R.id.ns_type_1:
loadGrp(mClas.get(i));
break;
case R.id.ns_type_2:
loadCate(mGrps.get(i));
break;
case R.id.ns_type_3:
loadUnit(mCates.get(i));
break;
case R.id.ns_unit:
mSssku.setSpuUnitName(idSet[i].trim());
break;
case R.id.ns_skugrp:
mSssku.setSkuGrpId(mSskugrps.get(i).getSkuGrpId());
break;
}
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
};
mOnFocusChangeListener = (view, b) -> {
if (view instanceof EditText) {
EditText editText = (EditText) view;
if (b && editText.getText().toString().equals("0.0")) {
editText.setText("");
} else if (!b && editText.getText().length() == 0) {
editText.setText("0.0");
}
}
};
}
@Override
public void initView() {
this.initInfoView();
this.initPriceView();
this.initVipView();
this.initPackView();
this.initSupplierView();
this.setInfoViewBySssku();
this.setPriceViewBySssku();
this.setVipViewBySssku();
this.setPackViewBySssku();
this.setSupplierViewBySssku();
this.setInfoViewByEditMode();
mViewBinding.btnConfirm.setOnClickListener(view -> {
this.processSssku();
mPresenter.clickConfirm(mSssku, mEditorMode);
});
}
/**
* 初始化基本信息
*/
private void initInfoView() {
mViewBinding.nsType1.setOnItemSelectedListener(mOnItemSelectedListener);
mViewBinding.nsType2.setOnItemSelectedListener(mOnItemSelectedListener);
mViewBinding.nsType3.setOnItemSelectedListener(mOnItemSelectedListener);
mViewBinding.nsUnit.setOnItemSelectedListener(mOnItemSelectedListener);
mViewBinding.nsSkugrp.setOnItemSelectedListener(mOnItemSelectedListener);
int margin = getResources().getDimensionPixelOffset(R.dimen.all_margin);
mViewBinding.nsType1.setPadding(0, 0, margin, 0);
mViewBinding.nsType2.setPadding(0, 0, margin, 0);
mViewBinding.nsType3.setPadding(0, 0, margin, 0);
mViewBinding.nsUnit.setPadding(0, 0, margin, 0);
mViewBinding.nsSkugrp.setPadding(0, 0, margin, 0);
}
/**
* 初始化价格
*/
private void initPriceView() {
mViewBinding.etPrice1.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etPrice2.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etPrice1.setOnFocusChangeListener(mOnFocusChangeListener);
mViewBinding.etPrice2.setOnFocusChangeListener(mOnFocusChangeListener);
}
/**
* 初始化会员
*/
private void initVipView() {
mViewBinding.etPoint.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etPoint.setOnFocusChangeListener(mOnFocusChangeListener);
}
/**
* 初始化包装
*/
private void initPackView() {
mViewBinding.rbPackOn.setOnCheckedChangeListener((compoundButton, b) -> mViewBinding.setIsSelected(b));
mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.PKG));
}
/**
* 初始化供应商
*/
private void initSupplierView() {
mViewBinding.etCost.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etCost.setOnFocusChangeListener(mOnFocusChangeListener);
if (mCors != null && mCors.size() > 0) mViewBinding.nsSupplier.attachDataSource(mCors);
mViewBinding.nsSupplier.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
mSssku.setChannelMapId(mCors.get(i).getChannelMapId());
}
@Override
public void onNothingSelected(AdapterView<?> adapterView) {
}
});
mViewBinding.etStockUpperLimit.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
if (ConvertUtil.stringToLong(mViewBinding.etStockUpperLimit.getText().toString()) <
ConvertUtil.stringToLong(mViewBinding.etStockLowLimit.getText().toString())) {
mViewBinding.etStockLowLimit.setText(mViewBinding.etStockUpperLimit.getText());
}
}
});
mViewBinding.etStockLowLimit.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
if (ConvertUtil.stringToLong(mViewBinding.etStockLowLimit.getText().toString()) >
ConvertUtil.stringToLong(mViewBinding.etStockUpperLimit.getText().toString())) {
mViewBinding.etStockUpperLimit.setText(mViewBinding.etStockLowLimit.getText());
}
}
});
}
/**
* 根据商品设置基本信息页面
*/
@SuppressLint("SetTextI18n")
private void setInfoViewBySssku() {
if (mEditorMode == C.SKU_EDITOR_MODE.UNKNOWN && mClas != null) {
loadCla();
} else {
mViewBinding.tvType.setText(mSssku.getSpuClaName() + " / " + mSssku.getSpuGrpName() + " / " + mSssku.getSpuCateName());
mViewBinding.tvUnit.setText(mSssku.getSpuUnitName());
}
if (mSssku.getSkuGrpId() == null) mSssku.setSkuGrpId(0L);
mViewBinding.nsSkugrp.attachDataSource(mSskugrps);
for (int i = 0; i < mSskugrps.size(); i++) {
if (mSskugrps.get(i).getSkuGrpId().longValue() == mSssku.getSkuGrpId()) {
mViewBinding.nsType1.setSelectedIndex(i);
}
}
mViewBinding.etBarcode.setText(ConvertUtil.longToString(mSssku.getSpuBarcode()));
mViewBinding.etName.setText(mSssku.getSpuName());
mViewBinding.ivPic.setImageURI(mSssku.getSpuImg());
}
/**
* 根据编辑模式设置基本信息页面
*/
private void setInfoViewByEditMode() {
switch (mEditorMode) {
case C.SKU_EDITOR_MODE.UNKNOWN:
mViewBinding.nsType1.setVisibility(View.VISIBLE);
mViewBinding.nsType2.setVisibility(View.VISIBLE);
mViewBinding.nsType3.setVisibility(View.VISIBLE);
mViewBinding.nsUnit.setVisibility(View.VISIBLE);
mViewBinding.tvType.setVisibility(View.GONE);
mViewBinding.tvUnit.setVisibility(View.GONE);
this.loadCla();
break;
default:
mViewBinding.nsType1.setVisibility(View.INVISIBLE);
mViewBinding.nsType2.setVisibility(View.INVISIBLE);
mViewBinding.nsType3.setVisibility(View.GONE);
mViewBinding.nsUnit.setVisibility(View.GONE);
mViewBinding.tvType.setVisibility(View.VISIBLE);
mViewBinding.tvUnit.setVisibility(View.VISIBLE);
break;
}
}
/**
* 根据商品设置价格页面
*/
private void setPriceViewBySssku() {
mViewBinding.etPrice1.setText(ConvertUtil.fenToYuan(mSssku.getSkuRetailPrice1()));
mViewBinding.etPrice2.setText(ConvertUtil.fenToYuan(mSssku.getSkuRetailPrice2()));
}
/**
* 根据商品设置价格页面
*/
private void setVipViewBySssku() {
mViewBinding.rgDis.check(mSssku.getSkuOffFlag() == null || mSssku.getSkuOffFlag() == 1 ? R.id.rb_dis_on : R.id.rb_dis_off);
if (mSssku.getSkuBoundAmt() == null) mSssku.setSkuBoundAmt(100L);
mViewBinding.etPoint.setText(ConvertUtil.fenToYuan(mSssku.getSkuBoundAmt()));
}
/**
* 根据商品设置包装信息
*/
private void setPackViewBySssku() {
if (mSssku.getSkuFlag() == null) {
mViewBinding.rgPack.check(R.id.rb_pack_off);
mViewBinding.setIsSelected(false);
} else if (mSssku.getSkuFlag() == 1) {
mViewBinding.rbPackOn.setChecked(true);
mViewBinding.setIsSelected(true);
} else {
mViewBinding.rbPackOff.setChecked(true);
mViewBinding.setIsSelected(false);
}
mViewBinding.tvUnit1.setText(getString(R.string.sssku_pack_unit, mSssku.getSpuUnitName() != null ? mSssku.getSpuUnitName() : getString(R.string.sssku_pack_default_unit)));
String mPackName = mPackSssku != null ? mPackSssku.getSpuName() : mSssku.getSpuDownBarcodeName() != null ? mSssku.getSpuDownBarcodeName() : "";
Long mPackPrice = mPackSssku != null ? mPackSssku.getSkuRetailPrice1() : mSssku.getSpuDownBarcodePrice1() != null ? mSssku.getSpuDownBarcodePrice1() : 0L;
String mPacUnit = mPackSssku != null ? mPackSssku.getSpuUnitName() : mSssku.getSpuDownBarUnitName() != null ? mSssku.getSpuDownBarUnitName() : getString(R.string.sssku_pack_default_unit);
mViewBinding.setPkgName(mPackName);
mViewBinding.setPkgPrice(mPackPrice);
mViewBinding.tvUnit2.setText(mPacUnit);
mViewBinding.etPackCount.setText(mSssku.getSpuDownNum() != null ? ConvertUtil.longToString(mSssku.getSpuDownNum()) : "");
}
/**
* 根据商品设置供应商信息
*/
private void setSupplierViewBySssku() {
mViewBinding.rbCostOff.setChecked(mSssku.getSkuSellFlag() == null || mSssku.getSkuSellFlag() == 0);
mViewBinding.etCost.setText(ConvertUtil.fenToYuan(mSssku.getSkuTradePrice()));
mViewBinding.etStockLowLimit.setText(ConvertUtil.longToString(mSssku.getSkuAltLow()));
mViewBinding.etStockUpperLimit.setText(ConvertUtil.longToString(mSssku.getSkuAltHigh()));
mViewBinding.etMinOder.setText(ConvertUtil.longToString(mSssku.getSkuSellUnit() == null ? 100 : mSssku.getSkuSellUnit()));
for (int i = 0; i < mCors.size(); i++) {
if (mSssku.getChannelMapId() == null || mCors.get(i).getChannelMapId().longValue() == mSssku.getChannelMapId()) {
mViewBinding.nsSupplier.setSelectedIndex(i);
break;
}
}
}
/**
* 加载商品分组
*
* @param sskugrps 分组信息
*/
public void loadSkugrps(List<Sskugrp> sskugrps) {
mSskugrps = new ArrayList<>();
mSskugrps.addAll(sskugrps);
Sskugrp sskugrp = new Sskugrp();
sskugrp.setSkuGrpId(0L);
sskugrp.setSkuGrpName("无");
sskugrp.setSelected(true);
List<Sskugrp> _sskugrps = new ArrayList<>();
_sskugrps.addAll(sskugrps);
_sskugrps.add(0, sskugrp);
mSskugrps = _sskugrps;
}
/**
......@@ -50,6 +350,22 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
this.mCors = cors;
}
/**
* 加载包装内商品
*
* @param pkgSku 包装内商品
*/
public void loadPkgSku(Sssku pkgSku) {
mPackSssku = pkgSku;
String mPackName = mPackSssku != null ? mPackSssku.getSpuName() : mSssku.getSpuDownBarcodeName() != null ? mSssku.getSpuDownBarcodeName() : "";
Long mPackPrice = mPackSssku != null ? mPackSssku.getSkuRetailPrice1() : mSssku.getSpuDownBarcodePrice1() != null ? mSssku.getSpuDownBarcodePrice1() : 0L;
String mPacUnit = mPackSssku != null ? mPackSssku.getSpuUnitName() : mSssku.getSpuDownBarUnitName() != null ? mSssku.getSpuDownBarUnitName() : getString(R.string.sssku_pack_default_unit);
mViewBinding.setPkgName(mPackName);
mViewBinding.setPkgPrice(mPackPrice);
mViewBinding.tvUnit2.setText(mPacUnit);
}
/**
* 设置商品
*
......@@ -60,9 +376,155 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
return this;
}
/**
* 设置编辑模式
*
* @param editorMode 编辑模式
*/
public EditorFragment setEditMode(int editorMode) {
this.mEditorMode = editorMode;
return this;
}
/**
* 加载大类
*/
private void loadCla() {
ApiFactory.Shop.queryAll().subscribe(
categories -> {
int mClaPosition = 0;
mClas = categories;
List<String> strClas = new ArrayList<>();
for (int i = 0; i < categories.size(); i++) {
if (mSssku.getSpuCateId() != null && mSssku.getSpuCateId() / 10000 == categories.get(i).getSpuCateId() / 10000)
mClaPosition = i;
strClas.add(categories.get(i).getSpuClaName());
}
mViewBinding.nsType1.attachDataSource(strClas);
mViewBinding.nsType1.setSelectedIndex(mClaPosition);
loadGrp(mClas.get(mClaPosition));
},
throwable -> {
});
}
/**
* 设置大类信息,加载中类
*
* @param cateCla 大类信息
*/
private void loadGrp(Category cateCla) {
mSssku.setSpuClaName(cateCla.getSpuClaName());
ApiFactory.Shop.queryAll(cateCla).subscribe(
categories -> {
int mGrpPosition = 0;
mGrps = categories;
List<String> strGrps = new ArrayList<>();
for (int j = 0; j < categories.size(); j++) {
if (mSssku.getSpuCateId() != null && mSssku.getSpuCateId() / 100 == categories.get(j).getSpuCateId() / 100)
mGrpPosition = j;
strGrps.add(categories.get(j).getSpuGrpName());
}
mViewBinding.nsType2.attachDataSource(strGrps);
mViewBinding.nsType2.setSelectedIndex(mGrpPosition);
loadCate(mGrps.get(mGrpPosition));
},
throwable -> {
});
}
/**
* 设置中类信息,加载小类
*
* @param cateGrp 中类信息
*/
private void loadCate(Category cateGrp) {
mSssku.setSpuGrpName(cateGrp.getSpuGrpName());
ApiFactory.Shop.queryAll(cateGrp).subscribe(
categories -> {
int mCatePosition = 0;
mCates = categories;
List<String> strCates = new ArrayList<>();
for (int j = 0; j < categories.size(); j++) {
if (mSssku.getSpuCateId() != null && mSssku.getSpuCateId().longValue() == categories.get(j).getSpuCateId().longValue())
mCatePosition = j;
strCates.add(categories.get(j).getSpuCateName());
}
mViewBinding.nsType3.attachDataSource(strCates);
mViewBinding.nsType3.setSelectedIndex(mCatePosition);
loadUnit(mCates.get(mCatePosition));
},
throwable -> {
});
}
/**
* 设置小类信息,加载单位
*
* @param cateCate 小类信息
*/
private void loadUnit(Category cateCate) {
mSssku.setSpuCateId(cateCate.getSpuCateId());
mSssku.setSpuCateName(cateCate.getSpuCateName());
int mUnitPosition = 0;
List<String> _nameList = new ArrayList<>();
String[] _units = cateCate.getSpuUnitNameSet().split(",");
for (int i = 0; i < _units.length; i++) {
if (mSssku.getSpuUnitName() != null && _units[i].equals(mSssku.getSpuUnitName()))
mUnitPosition = i;
_nameList.add(_units[i].trim());
}
mViewBinding.nsUnit.attachDataSource(_nameList);
mViewBinding.nsUnit.setSelectedIndex(mUnitPosition);
idSet = cateCate.getSpuUnitNameSet().split(",");
mSssku.setSpuUnitName(idSet[mUnitPosition].trim());
}
/**
* 处理商品
*/
private void processSssku() {
mSssku.setSpuBarcode(ConvertUtil.stringToLong(mViewBinding.etBarcode.getText().toString()));
mSssku.setSpuName(mViewBinding.etName.getText().toString());
mSssku.setSkuTradePrice(ConvertUtil.yuanToFen(mViewBinding.etCost.getText().toString()));
mSssku.setSkuRetailPrice1(ConvertUtil.yuanToFen(mViewBinding.etPrice1.getText().toString()));
mSssku.setSkuRetailPrice2(ConvertUtil.yuanToFen(mViewBinding.etPrice2.getText().toString()));
mSssku.setSkuOffFlag((byte) (mViewBinding.rbDisOff.isChecked() ? 0 : 1));
mSssku.setSkuBoundAmt(ConvertUtil.yuanToFen(mViewBinding.etPoint.getText().toString()));
mSssku.setSkuFlag((byte) (mViewBinding.rbPackOff.isChecked() ? 0 : 1));
if (mPackSssku != null) {
mSssku.setSpuDownSku(mPackSssku.getSkuId());
mSssku.setSpuDownBarcode(mPackSssku.getSpuBarcode());
mSssku.setSpuDownNum(ConvertUtil.stringToLong(mViewBinding.etPackCount.getText().toString()));
} else if (mSssku.getSpuDownSku() != null) {
mSssku.setSpuDownNum(ConvertUtil.stringToLong(mViewBinding.etPackCount.getText().toString()));
} else {
mSssku.setSkuFlag((byte) 0);
mSssku.setSpuDownNum(0L);
}
mSssku.setSkuSellFlag((byte) (mViewBinding.rbCostOff.isChecked() ? 0 : 1));
mSssku.setSkuTradePrice(ConvertUtil.yuanToFen(mViewBinding.etCost.getText().toString()));
mSssku.setSkuAltLow(ConvertUtil.stringToLong(mViewBinding.etStockLowLimit.getText().toString()));
mSssku.setSkuAltHigh(ConvertUtil.stringToLong(mViewBinding.etStockUpperLimit.getText().toString()));
mSssku.setSkuSellUnit(ConvertUtil.stringToLong(mViewBinding.etMinOder.getText().toString()));
mSssku.setCreateTime(null);
mSssku.setUpdateTime(null);
}
@Override
public boolean onBackPressedSupport() {
((SsskuActivity) getActivity()).backToManagerFragment();
((SsskuActivity) getActivity()).backToDetailFragment();
return super.onBackPressedSupport();
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/ManagerFragment.java
View file @ 52b14f10
......@@ -129,6 +129,31 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
mViewBinding.tvTotalCount.setText(String.valueOf(count));
}
/**
* 添加商品
*
* @param sssku 要添加的商品
*/
public void addSku(Sssku sssku) {
mSkuAdapter.setEnableLoadMore(false);
mViewBinding.rlSku.scrollToPosition(0);
mSkuAdapter.addData(0, sssku);
}
/**
* 更新商品
*
* @param sssku 要更新的商品
*/
public void updateSku(Sssku sssku) {
for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
if (mSkuAdapter.getData().get(i).getSkuId().longValue() == sssku.getSkuId().longValue()) {
mSkuAdapter.setData(i, sssku);
return;
}
}
}
/**
* 刷新商品
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/SearchFragment.java
View file @ 52b14f10
......@@ -35,7 +35,14 @@ public class SearchFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSe
// set sku listener
mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
mSkuAdapter.setOnItemClickListener((adapter, view, position) -> {
this.pop();
switch (mSearchType) {
case C.TITLE_MODE.SKU:
((SsskuActivity) getActivity()).backToManagerFragment();
break;
case C.TITLE_MODE.PKG:
((SsskuActivity) getActivity()).backToEditFragment();
break;
}
mPresenter.clickSku(mSkuAdapter.getData().get(position), mSearchType);
});
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.user;
import android.os.Bundle;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityUserBinding;
import com.xingdata.zzdpos.databinding.ActivityVipBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
import com.xingdata.zzdpos.ui.vip.VipContract;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.view.ViewTools;
import java.util.List;
public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements UserContract.View {
@Override
public int getLayoutId() {
return R.layout.activity_user;
}
@Override
public void initView() {
loadRootFragment(R.id.user_frame, mPresenter.userListFragment, true, false);
}
@Override
public void queryOperSus(Pager<Oper> operPager) {
mPresenter.userListFragment.queryOperSus(operPager);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserContract.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.user;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import java.util.List;
public interface UserContract {
interface View extends BaseView {
void queryOperSus(Pager<Oper> operPager);
}
abstract class Presenter extends BasePresenter<View> {
public abstract void getUserList(String wd);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.user;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
public class UserPresenter extends UserContract.Presenter {
public UserListFragment userListFragment = new UserListFragment();
@Override
public void onAttached() {
}
@Override
public void getUserList(String wd) {
ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
},throwable -> {
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/adapter/UserListAdapter.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.user.adapter;
import android.content.Context;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemUserListItemBinding;
import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.marketing.ms.model.User;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
/**
* Created by JM_DEV on 2017/12/25.
*/
public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding> {
private Context mContext;
public UserListAdapter(Context mContext, @Nullable List<Oper> data) {
super(R.layout.item_user_list_item, data);
this.mContext = mContext;
}
@Override
protected void convert(ItemUserListItemBinding mViewBinding, Oper item) {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.manage.user.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentUserListBinding;
import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
import com.xingdata.zzdpos.ui.manage.user.adapter.UserListAdapter;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.List;
/**
* 店员管理界面
*/
public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserListBinding> {
private UserListAdapter adapter;
private List<Oper> opers = new ArrayList<>();
private List<Level> levels = null;
@Override
public int getLayoutId() {
return R.layout.fragment_user_list;
}
@Override
public void initView() {
adapter = new UserListAdapter(getActivity(), opers);
mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.userRecyclerView.setAdapter(adapter);
adapter.setOnItemClickListener((adapter, view, position) -> {
});
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(true);
mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
getActivity().finish();
});
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.addUser:
break;
}
});
onRefresh();
}
private void onLoadMore(){
}
public void onRefresh() {
mPresenter.getUserList(null);
}
public void queryOperSus(Pager<Oper> operPager) {
adapter.setNewData(operPager.getList());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
View file @ 52b14f10
......@@ -213,11 +213,10 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
* 加载支付方式
*/
public void loadPays(List<Pay> pays) {
for (int i = 0; i < pays.size(); i++) {
pays.get(i).init();
}
mPays.addAll(pays);
mPayAdapter.setNewData(getAvlPays(Vip.createDefault()));
// for (int i = 0; i < pays.size(); i++) {
// pays.get(i).init();
// }
mPayAdapter.setNewData(pays);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 52b14f10
......@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.databinding.ViewVipRechargeBinding;
import com.xingdata.zzdpos.model.Cs;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Salepay;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
......@@ -34,6 +35,9 @@ import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
......@@ -121,7 +125,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, cs);
ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
mViewBinding.btnReturn.setEnabled(false);
mViewBinding.btnReturn.setText("已打印");
......@@ -233,7 +237,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, mSaleorder);
try {
ZX_PrintPOS.getInstance(StatisticsDetailActivity.this).print(1, mSaleorder);
} catch (Exception e) {
ToastUtils.showShort("打印异常");
}
mViewBinding.btnPrint.setEnabled(false);
mViewBinding.btnPrint.setText("已打印");
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 52b14f10
......@@ -39,9 +39,10 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
@Override
public void initView() {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
switch (fragmentMenu) {
case C.MENU.MENU_STATISTICS_ORDER:
mViewBinding.viewLine.setVisibility(View.GONE);
FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
......@@ -105,6 +106,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
break;
case C.MENU.MENU_STATISTICS_MS:
mViewBinding.viewLine.setVisibility(View.GONE);
FragmentUtils.add(getChildFragmentManager(), mMsMainFragment, mViewBinding.mainFrame.getId(), false, true);
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setText(R.string.menu_ms);
......@@ -123,6 +125,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mViewBinding.viewLine.setVisibility(View.GONE);
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
return;
......@@ -150,6 +153,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
}
public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
......@@ -163,6 +167,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
}
public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
......@@ -177,6 +182,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
}
public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
}
......@@ -191,6 +197,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
if (!mRechargeSearchFragment.isAdded()) {
mRechargeSearchFragment.setCreateData(vipRechargeOrderPager, start, end);
FragmentUtils.add(getChildFragmentManager(), mRechargeSearchFragment, mViewBinding.mainFrame.getId(), false, true);
......@@ -201,6 +208,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
}
public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
mViewBinding.viewLine.setVisibility(View.VISIBLE);
if (!mTicketSearchFragment.isAdded()) {
mTicketSearchFragment.setCreateData(ticketPager, start, end);
FragmentUtils.add(getChildFragmentManager(), mTicketSearchFragment, mViewBinding.mainFrame.getId(), false, true);
......@@ -212,6 +220,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
@Override
public boolean onBackPressedSupport() {
mViewBinding.viewLine.setVisibility(View.GONE);
if (mViewBinding.icTitle.edTitle.isFocused()) {
mViewBinding.icTitle.edTitle.clearFocus();
return true;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ 52b14f10
package com.xingdata.zzdpos.ui.vip;
import android.os.Bundle;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
import com.xingdata.zzdpos.view.ViewTools;
import java.util.List;
public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
private Bundle mBundle;
@Override
public int getLayoutId() {
return R.layout.activity_vip;
}
@Override
public void initView() {
mBundle = getIntent().getExtras();
mPresenter.vipListFragment.setVipState(mBundle.getInt("vipState"));
loadRootFragment(R.id.vip_frame, mPresenter.vipListFragment, true, false);
}
......@@ -53,9 +64,43 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
mPresenter.vipRechargeListFragment.getRechargeOrderSus(rechargeOrderPager);
}
@Override
public void getTruleSus(Pager<Trule> trulePager) {
mPresenter.vipMscardListFragment.getTruleSus(trulePager);
}
@Override
public void searchVipSus(Pager<Vip> vips) {
mPresenter.vipSearchFragment.searchVipSus(vips);
}
@Override
public void getMscardSus(Pager<Mscard> mscardPager) {
mPresenter.vipMscardListFragment.getMscardSus(mscardPager);
mPresenter.vipRechargeFragment.getMscardSus(mscardPager);
}
@Override
public void loadPays(List<Pay> pays) {
mPresenter.vipRechargeFragment.loadPays(pays);
}
@Override
public void rechangeSus(Vip v) {
ViewTools.toastSuss(this, "充值成功");
mPresenter.vipRechargeFragment.pop();
mPresenter.vipListFragment.onRefresh();
}
@Override
public void rechangeErr(Vip vip, Long amtPay, Long amtSend, String mes) {
PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_ERROR, "支付失败").setCustomButton("重新支付", new View.OnClickListener() {
@Override
public void onClick(View view) {
mPresenter.fullVip(vip, amtPay, amtSend);
promptDialog.dismiss();
}
}).show(this);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java
View file @ 52b14f10
......@@ -5,9 +5,11 @@ import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
......@@ -32,9 +34,14 @@ public interface VipContract {
void getSaleorderSus(Pager<Saleorder> saleorderPager);
void getRechargeOrderSus(Pager<VipRechargeOrder> rechargeOrderPager);
void getMscardSus(Pager<Mscard> rechargeOrderPager);
void getTruleSus(Pager<Trule> trulePager);
void searchVipSus(Pager<Vip> vips);
void getMscardSus(Pager<Mscard> mscardPager);
void loadPays(List<Pay> pays);
void rechangeSus(Vip v);
void rechangeErr(Vip v, Long amtPay, Long amtSend,String mes);
}
......@@ -54,6 +61,12 @@ public interface VipContract {
public abstract void rechargeorderQuery(Long vipID, int number);
public abstract void mscardQuery(Long vipID);
public abstract void truleQuery(Long vipID);
public abstract void searchVip(String keyword);
public abstract void getMscardList(long vipID);
public abstract void initSettle();
public abstract void fullVip(Vip vipOld, Long amtPay, Long amtSend);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ 52b14f10
package com.xingdata.zzdpos.ui.vip;
import android.annotation.SuppressLint;
import android.content.Context;
import android.view.Gravity;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.api.print.ZX_PrintPOS;
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.Mscard;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.fragment.VipMscardListFragment;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipSearchFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipTruleListFragment;
import java.util.ArrayList;
import java.util.List;
public class VipPresenter extends VipContract.Presenter {
public VipListFragment vipListFragment = new VipListFragment();
......@@ -17,10 +34,14 @@ public class VipPresenter extends VipContract.Presenter {
public VipInfoFragment vipInfoFragment = new VipInfoFragment();
public VipExpenseListFragment vipExpenseListFragment = new VipExpenseListFragment();
public VipRechargeListFragment vipRechargeListFragment = new VipRechargeListFragment();
public VipMscardListFragment vipMscardListFragment = new VipMscardListFragment();
public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
public VipSearchFragment vipSearchFragment = new VipSearchFragment();
public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
public int inVipState=0; //1 充值
@Override
public void onAttached() {
this.initRealm();
}
......@@ -92,7 +113,7 @@ public class VipPresenter extends VipContract.Presenter {
}
@Override
public void rechargeorderQuery(Long vipID,int number) {
public void rechargeorderQuery(Long vipID, int number) {
ApiFactory.Rctrace.queryRecharge(vipID, number, 10).subscribe(rechargeOrderPager -> {
mView.getRechargeOrderSus(rechargeOrderPager);
}, throwable -> {
......@@ -102,16 +123,94 @@ public class VipPresenter extends VipContract.Presenter {
}
@Override
public void mscardQuery(Long vipID) {
ApiFactory.MsCard.mscardQuery(vipID).subscribe(mscardPager -> {
mView.getMscardSus(mscardPager);
public void truleQuery(Long vipID) {
ApiFactory.TRULE.truleQueryByVipId(vipID).subscribe(trulePager -> {
mView.getTruleSus(trulePager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void searchVip(String keyword) {
ApiFactory.User.queryUserDetailByWD(keyword).subscribe(
vipPager -> {
mView.searchVipSus(vipPager);
},
throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void getMscardList(long vipID) {
ApiFactory.MsCard.mscardQuery(vipID).subscribe(
mscardPager -> {
mView.getMscardSus(mscardPager);
},
throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@SuppressLint("ResourceType")
public RadioButton addRadioButton(Context mContext, Mscard mscard) {
RadioButton radioButton = new RadioButton(mContext);
// ArrayList<RadioButton> radioButtons = new ArrayList<>();
radioButton.setTextSize(18);
radioButton.setTag(mscard.getCruleGradeNo());
radioButton.setText("充：" + mscard.getCruleChargeAmt() / 100);
radioButton.setButtonDrawable(null);
radioButton.setGravity(Gravity.CENTER);
radioButton.getPaint().setFakeBoldText(true);
radioButton.setBackgroundResource(R.drawable.selector_paymoney_radiobutton_bg);
radioButton.setTextColor(mContext.getResources().getColorStateList(R.drawable.selector_paymoney_textcolor_bg));
return radioButton;
}
public Mscard getMaxRechange(List<Mscard> realm, Long rechangeMoney) {
Mscard mMscard = null;
ArrayList<String> strings = new ArrayList<>();
long rechangeM = 0;
for (Mscard mscard : realm) {
if (rechangeMoney >= mscard.getCruleChargeAmt()) {
rechangeM = mscard.getCruleChargeAmt();
mMscard = mscard;
}
}
return mMscard;
}
@Override
public void initSettle() {
// Realm.getInstance(App.instance.mRealmConfig).
DBFactory.Vip.queryPays().subscribe(
pays -> mView.loadPays(pays),
throwable -> {
}
);
// mView.setSettleFragmentBySettleMode(mSettleMode);
}
@Override
public void fullVip(Vip vipOld, Long amtPay, Long amtSend) {
ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> {
VipRechargeOrder mVipRechangeOrdervip=vip.getRctrace();
mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime());
mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
try {
ZX_PrintPOS.getInstance(App.instance).printSave(1,mVipRechangeOrdervip);
}catch (Exception e){
ToastUtils.showShort("打印异常");
}
mView.rechangeSus(vip);
}, throwable -> {
mView.rechangeErr(vipOld, amtPay, amtSend,throwable.getMessage());
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipMscardAdapter.java → app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
View file @ 52b14f10
......@@ -3,14 +3,10 @@ package com.xingdata.zzdpos.ui.vip.adapter;
import android.content.Context;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemVipExpenseItemBinding;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.databinding.ItemVipMscardItemBinding;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
......@@ -21,18 +17,30 @@ import java.util.List;
* Created by JM_DEV on 2017/12/25.
*/
public class VipMscardAdapter extends BaseAdapter<Mscard, ItemVipExpenseItemBinding> {
public class VipTruleAdapter extends BaseAdapter<Trule, ItemVipMscardItemBinding> {
private Context mContext;
private String shopName;
public VipMscardAdapter(Context mContext, @Nullable List<Mscard> data) {
super(R.layout.item_vip_expense_item, data);
public VipTruleAdapter(Context mContext, @Nullable List<Trule> data) {
super(R.layout.item_vip_mscard_item, data);
this.mContext = mContext;
}
@Override
protected void convert(ItemVipExpenseItemBinding mViewBinding, Mscard item) {
protected void convert(ItemVipMscardItemBinding mViewBinding, Trule item) {
mViewBinding.truleName.setText(item.getTruleName());
mViewBinding.truleMoney.setText(ConvertUtil.fenToYuanNoZero(item.getTruleValAmt()));
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd")));
mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
if (item.getTruleStatus().toString().equals("0")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.return_ticket_one);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.return_ticket_two);
} else {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.bg_return_ticket03);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.bg_return_ticket04);
}
// mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getCardAmtPay()));
// mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
// //设置支付方式
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java
View file @ 52b14f10
......@@ -4,14 +4,11 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogVipMenuBinding;
import com.xingdata.zzdpos.databinding.FragmentVipInfoBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipContract;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipMscardListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipTruleListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeListFragment;
import java.util.List;
......@@ -49,7 +46,7 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
break;
//優惠券詳情
case R.id.voucherDetails:
mPresenter.vipMscardListFragment = new VipMscardListFragment();
mPresenter.vipMscardListFragment = new VipTruleListFragment();
mPresenter.vipMscardListFragment.setVip(mVip);
((BaseActivity) getActivity()).start(mPresenter.vipMscardListFragment);
break;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 52b14f10
......@@ -24,6 +24,7 @@ import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.List;
......@@ -37,6 +38,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
private List<Level> levels = null;
private int pageNumber = 0;
private String strVipLevle;
private int vipState = 0;//0 会员 1 充值
@Override
public int getLayoutId() {
......@@ -48,6 +50,11 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
vipListAdapter = new VipListAdapter(getActivity(), vips);
mViewBinding.vipRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
if (vipState != 0) {
mViewBinding.vipCountAddTodayTitle.setText("充值金额");
mViewBinding.vipCountTitle.setText("今日充值");
mViewBinding.addVipLinearLayout.setVisibility(View.GONE);
}
mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
toStartVipInfo(vipListAdapter.getData().get(position));
......@@ -66,12 +73,15 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
break;
}
});
// mViewBinding.titleSearch.serchEditText.setOnFocusChangeListener((View view, boolean b) -> {
// if (b){
// VipSearchFragment vipSearchFragment = new VipSearchFragment();
// vipSearchFragment.setBaseFragment(new VipInfoFragment());
// }
// });
mViewBinding.titleSearch.serchEditText.setOnClickListener(view -> {
mPresenter.vipSearchFragment.setLevel(levels);
if (vipState==0){
mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipInfoFragment);
}else {
mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipRechargeFragment);
}
start(mPresenter.vipSearchFragment);
});
mPresenter.getVipLevel(0, 200);
mPresenter.getVipNumber();
}
......@@ -86,7 +96,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
RadioButton radioButton = ((RadioButton) mViewBinding.vipLevelR.findViewById(buttonID));
if (radioButton.isChecked()) {
strVipLevle = radioButton.getTag().toString();
strVipLevle = radioButton.getTag()==null?null:radioButton.getTag().toString();
radioButton.getPaint().setFakeBoldText(true);
radioButton.setTextSize(17);
vipListAdapter.setEnableLoadMore(true);
......@@ -114,8 +124,9 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
public void getVipLevelSus(Pager<Level> levelPager) {
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
layoutParams.height = 120;
layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
Level allLevel = new Level();
allLevel.setVipLevelName("全部会员");
mViewBinding.vipLevelR.addView(addRadioButton(layoutParams, allLevel));
for (int i = 0; i < levelPager.getPageSize(); i++) {
mViewBinding.vipLevelR.addView(addRadioButton(layoutParams, levelPager.getList().get(i)));
}
......@@ -129,7 +140,8 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
});
if (levelPager.getList().size() != 0) {
((RadioButton) mViewBinding.vipLevelR.getChildAt(0)).setChecked(true);
mPresenter.getVipList(0, mViewBinding.vipLevelR.getChildAt(0).getTag().toString());
//如果是空查询全部会员
// mPresenter.getVipList(0,mViewBinding.vipLevelR.getChildAt(0).getTag()== null ? null : mViewBinding.vipLevelR.getChildAt(0).getTag().toString());
}
levels = levelPager.getList();
......@@ -139,7 +151,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mPresenter.getVipList(pageNumber, strVipLevle);
}
private void onRefresh() {
public void onRefresh() {
pageNumber = 0;
mPresenter.getVipList(pageNumber, strVipLevle);
mPresenter.getVipNumber();
......@@ -165,15 +177,21 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
public void toStartVipInfo(Vip vip) {
mPresenter.vipRechargeFragment.setVip(vip);
if (vip != null) {
if (vipState==0){
mPresenter.vipInfoFragment.setVip(vip);
mPresenter.vipInfoFragment.setLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
}else {
((BaseActivity) getActivity()).start(mPresenter.vipRechargeFragment);
}
} else {
mPresenter.vipInfoEditFragment.setVipLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
}
}
public void addVipSus(Vip vip) {
......@@ -183,7 +201,18 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
* @param sta
*/
public void getVipNumberSus(Sta sta) {
if (vipState!=0){
mViewBinding.vipCount.setText(sta.getCardCount()+ "");
mViewBinding.vipCountAddToday.setText("￥"+ConvertUtil.fenToYuan2(sta.getCardAmt()));
}else {
mViewBinding.vipCount.setText(sta.getVipCount() + "");
mViewBinding.vipCountAddToday.setText(sta.getVipAddCount() + "");
}
}
public void setVipState(int vipState) {
this.vipState = vipState;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java 0 → 100644
View file @ 52b14f10
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.annotation.SuppressLint;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.text.Editable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.SpannedString;
import android.text.TextWatcher;
import android.text.style.AbsoluteSizeSpan;
import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipRechargeBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.settle.adapter.PayAdapter;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.ArrayList;
import java.util.HashMap;
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<>();
private PayAdapter mPayAdapter;
private List<Pay> mPays = new ArrayList<>();
private int inWight;
@Override
public int getLayoutId() {
return R.layout.fragment_vip_recharge;
}
private Vip mVip;
@Override
public void initView() {
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.tvTitle.setText("充值");
mViewBinding.vipBalance.setText(getString(R.string.vip_balance_text, ConvertUtil.fenToYuan2(mVip.getAcctCbal())));
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
mPresenter.getMscardList(mVip.getVipId());
mPayAdapter = new PayAdapter();
mViewBinding.rlPay.setAdapter(mPayAdapter);
mViewBinding.rlPay.setLayoutManager(new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL));
mViewBinding.rlPay.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(3, 24, true));
mPayAdapter.setOnItemClickListener((adapter, view, position) -> {
if (mViewBinding.rechargAMT.getText() == null || ConvertUtil.yuanToFen(mViewBinding.rechargAMT.getText().toString().trim()) <= 0) {
ToastUtils.showShort("请选择充值金额");
return;
}
mPresenter.fullVip(mVip, ConvertUtil.yuanToFen(mViewBinding.rechargAMT.getText().toString()), ConvertUtil.yuanToFen(mViewBinding.sendAmt.getText().toString()));
});
mViewBinding.setOnCheckedChangeListener((radioGroup, i) -> {
if (radioGroup.getCheckedRadioButtonId() != -1) {
RadioButton radioButton = radioGroup.findViewById(radioGroup.getCheckedRadioButtonId());
Mscard mscard = mscardHashMap.get(radioButton.getTag().toString());
setMoney(ConvertUtil.fenToYuan2(mscard.getCruleChargeAmt()), ConvertUtil.fenToYuan2(mscard.getCruleSendAmt()));
mViewBinding.stealMoney.setText("");
}
});
ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
{
@Override
public void onGlobalLayout() {
mViewBinding.payMoneyLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
inWight = mViewBinding.payMoneyLayout.getWidth();
mPresenter.initSettle();
}
});
}
@Override
public boolean onBackPressedSupport() {
pop();
return true;
}
public void setVipLevel(List<Level> levels) {
this.levels = levels;
}
public void setVip(Vip mVip) {
this.mVip = mVip;
}
@SuppressLint("ResourceAsColor")
public void getMscardSus(Pager<Mscard> mscardPager) {
mscards.clear();
mscards.addAll(mscardPager.getList());
layoutParams = new LinearLayout.LayoutParams(inWight/3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
layoutParams.setMargins(0, 0, 20, 0);
int mscardLength = 0;
if (mscards.size() <= 3) {
mscardLength = mscards.size();
} else {
mscardLength = 3;
}
for (int i = 0; i < mscardLength; i++) {
Mscard mscard = mscards.get(i);
mscardHashMap.put(mscard.getCruleGradeNo().toString(), mscard);
RadioButton radioButton = mPresenter.addRadioButton(mContext, mscard);
radioButton.setLayoutParams(layoutParams);
mViewBinding.payMoneyLayout.addView(radioButton);
}
String hintStr = "自定义金额";
SpannableString ss = new SpannableString(hintStr);
AbsoluteSizeSpan ass = new AbsoluteSizeSpan(8, true);
mViewBinding.stealMoney.setHintTextColor(R.color.black_likui);
ss.setSpan(ass, 0, ss.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mViewBinding.stealMoney.setHint(new SpannedString(ss));
mViewBinding.stealMoney.setOnFocusChangeListener((mView1, b) ->
{
//如果点击输入框按钮都清空点击事件
if (b) {
mViewBinding.payMoneyLayout.clearCheck();
setMoney("0", "0");
}
});
//输入监听
mViewBinding.stealMoney.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
if (mViewBinding.stealMoney.getText().length() == 0)
return;
Mscard mscard = mPresenter.getMaxRechange(mscards, ConvertUtil.yuanToFen(mViewBinding.stealMoney.getText().toString()));
String strSend = "0";
if (mscard == null) {
strSend = "0";
} else {
strSend = ConvertUtil.fenToYuan2(mscard.getCruleSendAmt());
}
setMoney(mViewBinding.stealMoney.getText().toString(), strSend);
}
});
}
/**
* 设置左边金额
*
* @param rechangeMoney
* @param sendMoney
*/
private void setMoney(String rechangeMoney, String sendMoney) {
mViewBinding.sendAmt.setText(sendMoney);
mViewBinding.rechargAMT.setText(rechangeMoney);
// mViewBinding.rechangeMoney.setText(rechangeMoney);
mViewBinding.recargeAccount.setText(ConvertUtil.fenToYuan2(ConvertUtil.yuanToFen(sendMoney) + ConvertUtil.yuanToFen(rechangeMoney)));
}
/**
* 加载支付方式
*/
public void loadPays(List<Pay> pays) {
for (int i = 0; i < pays.size(); i++) {
pays.get(i).init();
}
mPays.clear();
mPays.addAll(pays);
mPayAdapter.setNewData(getAvlPays(Vip.createDefault()));
}
List<Pay> getAvlPays(Vip vip) {
List<Pay> _pays = new ArrayList<>();
for (int i = 0; i < mPays.size(); i++) {
if (!mPays.get(i).isNeedVip() || (!vip.isDefaultVip() && (mPays.get(i).getPayType() != C.PAY_CHANNEL.CARD)))
_pays.add(mPays.get(i));
}
return _pays;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java
View file @ 52b14f10
......@@ -7,6 +7,8 @@ package com.xingdata.zzdpos.ui.vip.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
......@@ -14,6 +16,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipRechargeListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
......@@ -23,6 +26,7 @@ import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
......@@ -34,6 +38,11 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
private List<VipRechargeOrder> orders = new ArrayList<>();
private int pageNumber = 0;
private List<Level> levels;
private LinearLayout.LayoutParams layoutParams = null;
private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
private ArrayList<Mscard> mscards = new ArrayList<>();
private ArrayList<String> strLevels = new ArrayList<>();
private EditText serchEditText;
@Override
......@@ -71,7 +80,7 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
vipRechargeAdapter.setEnableLoadMore(false);
}
private void onRefresh() {
public void onRefresh() {
pageNumber = 0;
mPresenter.rechargeorderQuery(mVip.getVipId(), pageNumber);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRecordFragment.java deleted 100644 → 0
View file @ aa5df7f2
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员消费充值记录
*/
public class VipRecordFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
}
@Override
public void initView() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipSearchFragment.java
View file @ 52b14f10
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
......@@ -10,10 +11,14 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
import com.xingdata.zzdpos.databinding.FragmentVipSerchBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.List;
......@@ -22,9 +27,10 @@ import java.util.List;
/**
* 会员搜索界面
*/
public class VipSearchFragment extends BaseFragment<SendTicketPresenter, FragmentSendTickerVipBinding> {
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;
......@@ -32,7 +38,7 @@ public class VipSearchFragment extends BaseFragment<SendTicketPresenter, Fragmen
@Override
public int getLayoutId() {
return R.layout.fragment_send_ticker_vip;
return R.layout.fragment_vip_serch;
}
@Override
......@@ -46,10 +52,13 @@ public class VipSearchFragment extends BaseFragment<SendTicketPresenter, Fragmen
((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string
.settle_vip_search_empty);
mVipAdapter.setEmptyView(emptyView);
((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));
}
startWithPop(baseFragment);
});
......@@ -60,6 +69,10 @@ public class VipSearchFragment extends BaseFragment<SendTicketPresenter, Fragmen
case R.id.btn_back: {
pop();
}
case R.id.search_ImageButton:
mPresenter.searchVip(mViewBinding.etSearch.getText().toString());
break;
default: {
......@@ -68,24 +81,14 @@ public class VipSearchFragment extends BaseFragment<SendTicketPresenter, Fragmen
}
}
});
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
KeyboardUtils.hideSoftInput(textView);
mPresenter.searchVip(textView.getText().toString());
return false;
});
// mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
// KeyboardUtils.hideSoftInput(textView);
// mPresenter.searchVip(textView.getText().toString());
// return false;
// });
}
/**
* 加载会员信息
*
* @param vips 会员列表
*/
public void loadVips(List<Vip> vips) {
mViewBinding.setEmpty(vips.size() == 0);
mVipAdapter.setNewData(vips);
}
@Override
public void onDestroyView() {
......@@ -94,4 +97,18 @@ public class VipSearchFragment extends BaseFragment<SendTicketPresenter, Fragmen
}
super.onDestroyView();
}
public void searchVipSus(Pager<Vip> vips) {
mVipAdapter.setNewData(vips.getList());
}
public void setLevel(List<Level> level) {
this.level = level;
}
@Override
public void onResume() {
super.onResume();
mViewBinding.etSearch.setText("");
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipMscardListFragment.java → app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTruleListFragment.java
View file @ 52b14f10
......@@ -12,16 +12,13 @@ import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipExpenseListBinding;
import com.xingdata.zzdpos.databinding.FragmentVipMscardListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipExpenseAdapter;
import com.xingdata.zzdpos.ui.vip.adapter.VipMscardAdapter;
import com.xingdata.zzdpos.ui.vip.adapter.VipTruleAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
......@@ -32,9 +29,9 @@ import java.util.List;
* 优惠券列表
*/
@SuppressLint("ValidFragment")
public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVipMscardListBinding> {
private VipMscardAdapter adapter;
private List<Mscard> mscards = new ArrayList<>();
public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVipMscardListBinding> {
private VipTruleAdapter adapter;
private List<Trule> trules = new ArrayList<>();
private int valid = 0;
private int inValid = 0;
......@@ -49,7 +46,7 @@ public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVi
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("优惠券详情");
adapter = new VipMscardAdapter(getActivity(), mscards);
adapter = new VipTruleAdapter(getActivity(), trules);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(adapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
......@@ -57,7 +54,6 @@ public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVi
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
adapter.setEnableLoadMore(true);
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
new VipEditMenuDialog().show((BaseActivity) getActivity());
......@@ -74,7 +70,7 @@ public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVi
}
private void onRefresh() {
mPresenter.mscardQuery(mVip.getVipId());
mPresenter.truleQuery(mVip.getVipId());
}
@Override
......@@ -89,31 +85,34 @@ public class VipMscardListFragment extends BaseFragment<VipPresenter, FragmentVi
}
public void getMscardSus(Pager<Mscard> mscardPager) {
public void getTruleSus(Pager<Trule> trulePager) {
if (mscardPager.isFirstPage()) {
mscards.clear();
if (trulePager.isFirstPage()) {
trules.clear();
}
if (mscardPager.getList().size() != 0) {
mscards.addAll(mscardPager.getList());
if (trulePager.getList().size() != 0) {
trules.addAll(trulePager.getList());
adapter.notifyDataSetChanged();
// pageNumber = mscardPager.getPageNumber() + 1;
}
getMscardValid();
if (mscardPager.isLastPage()) {
if (trulePager.isLastPage()) {
ToastUtils.showShort("没有更多数据");
}
mViewBinding.mscardValid.setText(valid+ "");
mViewBinding.macardInvalid.setText(inValid+"");
adapter.setEnableLoadMore(!mscardPager.isLastPage());
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
mViewBinding.rechargeRefresh.setRefreshing(false);
}
private void getMscardValid() {
for (Mscard m : mscards) {
if (m.getCruleStatus().toString().equals("0")) {
valid=0;
inValid=0;
for (Trule t : trules) {
if (t.getTruleStatus().toString().equals("0")) {
valid = valid + 1;
} else {
inValid = inValid + 1;
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ 52b14f10
......@@ -25,8 +25,8 @@ public final class SystemUtil {
* @return 设备型号
*/
public static String getDeviceModel() {
// return DeviceUtils.getModel();
return "AECRC10";
return DeviceUtils.getModel();
}
......
app/src/main/res/drawable/selector_paymoney_radiobutton_bg.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_black_layout" android:state_checked="false"/>
<item android:drawable="@drawable/shape_red_layout" android:state_checked="true"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_paymoney_textcolor_bg.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/darkgray" android:state_checked="false" />
<item android:color="@color/deep_red" android:state_checked="true"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_black_layout.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="0.1dp"
android:color="@color/black1" />
<solid android:color="@color/white" />
<corners
android:bottomLeftRadius="3dp"
android:bottomRightRadius="3dp"
android:topLeftRadius="3dp"
android:topRightRadius="3dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_layout.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="0.1dp"
android:color="@color/deep_red" />
<solid android:color="@color/white" />
<corners
android:bottomLeftRadius="3dp"
android:bottomRightRadius="3dp"
android:topLeftRadius="3dp"
android:topRightRadius="3dp" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_settle.xml
View file @ 52b14f10
......@@ -52,7 +52,6 @@
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<TextView
......
app/src/main/res/layout/activity_sssku.xml
View file @ 52b14f10
......@@ -20,7 +20,6 @@
android:id="@+id/cl_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:animateLayoutChanges="true"
android:background="@color/white_caocao"
android:focusable="true"
android:focusableInTouchMode="true">
......@@ -52,7 +51,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="number"
android:inputType="text"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
......@@ -72,6 +71,20 @@
app:layout_constraintLeft_toRightOf="parent"
app:layout_constraintRight_toLeftOf="parent" />
<ImageButton
android:id="@+id/btn_menu"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:padding="@dimen/all_margin"
android:src="@mipmap/click_down"
android:visibility="@{titleMode==6?0:8}"
app:layout_constraintRight_toRightOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
......
app/src/main/res/layout/activity_user.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/user_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_sssku_menu.xml 0 → 100644
View file @ 52b14f10
<?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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_r1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_update"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update"
android:textColor="@color/blue_mawu"
android:textSize="@dimen/all_text_size" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
android:visibility="gone" />
<TextView
android:id="@+id/tv_update_price"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update_price"
android:textColor="@color/blue_mawu"
android:textSize="@dimen/all_text_size"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
android:visibility="gone" />
<TextView
android:id="@+id/tv_update_vip"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/sku_update_vip"
android:textColor="@color/blue_mawu"
android:textSize="@dimen/all_text_size"
android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="@dimen/button3_height"
android:layout_marginTop="@dimen/all_margin"
android:background="@drawable/shape_white_r1"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:padding="@dimen/all_spacing"
android:text="@string/all_cancel"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_casher.xml
View file @ 52b14f10
......@@ -84,13 +84,13 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ms_main.xml
View file @ 52b14f10
......@@ -41,5 +41,10 @@
</android.support.v4.view.ViewPager>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_list.xml
View file @ 52b14f10
......@@ -80,7 +80,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ll_title"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
......
app/src/main/res/layout/fragment_order_main.xml
View file @ 52b14f10
......@@ -21,7 +21,7 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/white_caocao"
android:background="@drawable/singleline_white_gray"
app:layout_constraintTop_toTopOf="parent"
app:tabIndicatorHeight="0dp"
app:tabMinWidth="100dp"
......
app/src/main/res/layout/fragment_order_search.xml
View file @ 52b14f10
......@@ -11,12 +11,10 @@
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/fragment_sssku_add.xml 0 → 100644
View file @ 52b14f10
<?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">
<data>
<import type="android.view.View" />
<variable
name="dataCount"
type="int" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_spacing"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_barcode"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
<EditText
android:id="@+id/et_barcode"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:labelFor="@+id/et_barcode"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:text="@string/sku_check"
android:textColor="@color/white_caocao" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<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:visibility="@{dataCount>0?View.VISIBLE:View.GONE}" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_sku"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_sssku_detail.xml
View file @ 52b14f10
......@@ -397,6 +397,22 @@
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_pack"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
......@@ -420,7 +436,7 @@
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:text='@{sku.spuUnitName+" "+sku.spuDownNum}' />
android:text='@{ "1"+sku.spuUnitName+" = "+sku.spuDownNum + @string/sssku_pack_default_unit}' />
<TextView
android:id="@+id/tv_product_name"
......
app/src/main/res/layout/fragment_sssku_editor.xml
View file @ 52b14f10
......@@ -2,11 +2,966 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="com.xingdata.zzdpos.util.ConvertUtil" />
<import type="android.view.View" />
<variable
name="pkgName"
type="String" />
<variable
name="pkgPrice"
type="Long" />
<variable
name="isSelected"
type="boolean" />
</data>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_info"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="horizontal">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_barcode_hint"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_barcode"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/et_barcode"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_barcode"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:labelFor="@+id/et_barcode"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintHorizontal_weight="3"
app:layout_constraintLeft_toRightOf="@id/tv_barcode_hint"
app:layout_constraintRight_toRightOf="parent" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
app:layout_constraintLeft_toLeftOf="@id/tv_barcode_hint"
app:layout_constraintRight_toLeftOf="@id/iv_pic"
app:layout_constraintTop_toBottomOf="@id/tv_barcode_hint" />
<TextView
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_name"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toLeftOf="@id/tv_barcode_hint"
app:layout_constraintRight_toRightOf="@id/tv_barcode_hint"
app:layout_constraintTop_toBottomOf="@id/tv_barcode_hint" />
<EditText
android:id="@+id/et_name"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="text"
android:labelFor="@+id/et_name"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toLeftOf="@id/et_barcode"
app:layout_constraintRight_toRightOf="@id/et_barcode"
app:layout_constraintTop_toBottomOf="@id/et_barcode" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginEnd="@dimen/all_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/icon_goods_default" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_type_hint"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_type"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/ns_type_1" />
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toLeftOf="@id/ns_type_1"
app:layout_constraintRight_toRightOf="@id/ns_type_2" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_1"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintHorizontal_weight="1.5"
app:layout_constraintLeft_toRightOf="@id/tv_type_hint"
app:layout_constraintRight_toLeftOf="@id/ns_type_2" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_2"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintHorizontal_weight="1.5"
app:layout_constraintLeft_toRightOf="@id/ns_type_1"
app:layout_constraintRight_toRightOf="parent" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_type_3"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toLeftOf="@id/ns_type_1"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ns_type_1" />
</android.support.constraint.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_unit"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_unit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_unit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center_vertical"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
android:visibility="gone" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_skugrp"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_skugrp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_price1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_price1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_price1"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_price2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_price2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_price2"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_vip"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_vip_dis"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioGroup
android:id="@+id/rg_dis"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_dis_on"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:checked="true"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_yes"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioButton
android:id="@+id/rb_dis_off"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_no"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_point1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
<EditText
android:id="@+id/et_point"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_point"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/sku_point2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_pack"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_pack"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioGroup
android:id="@+id/rg_pack"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:orientation="horizontal"
android:saveEnabled="false">
<RadioButton
android:id="@+id/rb_pack_on"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:checked="true"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:saveEnabled="false"
android:text="@string/all_yes"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioButton
android:id="@+id/rb_pack_off"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:saveEnabled="false"
android:text="@string/all_no"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}" />
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing"
android:hint="@string/sssku_search_hint"
android:inputType="number"
android:labelFor="@+id/et_search"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}">
<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_margin="@dimen/all_margin"
app:placeholderImage="@mipmap/icon_goods_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical">
<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+pkgName}" />
<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+ConvertUtil.fenToYuan(pkgPrice)}" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}">
<TextView
android:id="@+id/tv_unit1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sssku_pack_unit"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
<EditText
android:id="@+id/et_pack_count"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@color/blue_mawu"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_point"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_unit2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/sssku_pack_default_unit"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_subtitle_supplier"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_supplier"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<org.angmarch.views.NiceSpinner
android:id="@+id/ns_supplier"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming"
android:visibility="@{isSelected?View.VISIBLE:View.GONE}" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_cost_on"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioGroup
android:id="@+id/rg_cost"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_margin"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_cost_on"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:checked="true"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_yes"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<RadioButton
android:id="@+id/rb_cost_off"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null"
android:text="@string/all_no"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_cost"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_cost"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="numberDecimal"
android:labelFor="@+id/et_cost"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_stock_low_limit"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_stock_low_limit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:labelFor="@+id/et_stock_low_limit"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_stock_upper_limit"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_stock_upper_limit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:labelFor="@+id/et_stock_upper_limit"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingEnd="@null"
android:paddingStart="@dimen/all_margin"
android:text="@string/sku_min_oder"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_min_oder"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:labelFor="@+id/et_min_oder"
android:saveEnabled="false"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<Button
android:id="@+id/btn_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_red_r1"
android:foreground="?android:attr/selectableItemBackground"
android:text="@string/all_confirm"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_statistics.xml
View file @ 52b14f10
......@@ -159,5 +159,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_statistics_date.xml
View file @ 52b14f10
......@@ -53,7 +53,7 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
......
app/src/main/res/layout/fragment_statistics_title.xml
View file @ 52b14f10
......@@ -22,6 +22,12 @@
layout="@layout/title_order"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="@id/ic_title" />
<FrameLayout
android:id="@+id/main_frame"
......
app/src/main/res/layout/fragment_user_list.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal">
<include
android:id="@+id/title_search"
layout="@layout/title_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/user_count_title"
style="@style/default_blacktext_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="店员数量" />
<TextView
android:id="@+id/vip_count_add_today_title"
style="@style/default_blacktext_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="今日新增" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/vip_count"
style="@style/default_blacktext_bigstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:id="@+id/vip_count_add_today"
style="@style/default_blacktext_bigstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textSize="22sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/addUser"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:background="@mipmap/add_bg" />
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加店员"
android:textColor="@color/deep_red"
android:textSize="22sp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin_left"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/user_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/userRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_list.xml
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener" />
......@@ -15,6 +17,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal">
<include
android:id="@+id/title_search"
layout="@layout/title_search"
......@@ -49,6 +52,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/vip_count_title"
style="@style/default_blacktext_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -57,6 +61,7 @@
android:text="本店会员" />
<TextView
android:id="@+id/vip_count_add_today_title"
style="@style/default_blacktext_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -93,7 +98,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
......
app/src/main/res/layout/fragment_vip_mscard_list.xml
View file @ 52b14f10
......@@ -114,7 +114,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="可用优惠卷" />
android:text="不可用优惠卷" />
<TextView
android:id="@+id/macard_invalid"
......
app/src/main/res/layout/fragment_vip_recharge.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
<variable
name="onCheckedChangeListener"
type="android.widget.RadioGroup.OnCheckedChangeListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg"
android:orientation="vertical">
<include
android:id="@+id/info_title"
layout="@layout/title_pop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:background="@mipmap/mk_grade01" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:id="@+id/vip_name"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/vip_mobile"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
android:textColor="@color/black" />
</LinearLayout>
<TextView
android:id="@+id/vip_balance"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/all_margin"
android:text="@string/vip_balance_text" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/all_margin_left"
android:gravity="center_vertical"
android:orientation="vertical">
<RadioGroup
android:id="@+id/pay_money_layout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="@dimen/all_margin"
android:gravity="center_vertical"
android:onCheckedChanged="@{onCheckedChangeListener}"
android:orientation="horizontal"></RadioGroup>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_weight="2"
android:id="@+id/stealLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/selector_paymoney_radiobutton_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充："
android:textSize="20sp" />
<EditText
android:id="@+id/steal_money"
android:singleLine="true"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
android:digits="1234567890."
android:inputType="phone"
android:maxLength="6"
android:onClick="@{onClickListener}"
android:textCursorDrawable="@null" />
</LinearLayout>
<View
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="1dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/line_bg"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:text="送:" />
<TextView
android:id="@+id/sendAmt"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/deep_red" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text="实际到帐:" />
<TextView
android:id="@+id/recargeAccount"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_weight="1"
android:text="充值金额:" />
<TextView
android:id="@+id/rechargAMT"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:textColor="@color/deep_red" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/gray_zhouyu"
android:textAppearance="@android:style/TextAppearance.Large" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_serch.xml 0 → 100644
View file @ 52b14f10
<?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">
<data>
<import type="android.view.View" />
<variable
name="empty"
type="boolean" />
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
<variable
name="titleMode"
type="int" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
<ImageButton
android:id="@+id/btn_back"
android:layout_width="@dimen/title_height"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/all_go_back"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:padding="@dimen/all_margin"
android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent">
<EditText
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
<TextView
style="@style/textView_body"
android:id="@+id/search_ImageButton"
android:layout_width="60dp"
android:layout_height="match_parent"
android:onClick="@{OnClickListener}"
android:text="搜索" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/gray_huanggai"
android:visibility="@{empty?View.GONE:View.VISIBLE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_vip"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_string_head.xml
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<View
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
android:layout_alignParentBottom="true" />
android:layout_height="wrap_content">
<TextView
......@@ -15,15 +11,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/singleline_zhouyu_huanggai"
android:gravity="left"
android:paddingTop="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/all_padding"
android:singleLine="true"
android:text="北京店"
android:textColor="@color/black"
android:textSize="14sp" />
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_user_list_item.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_margin="@dimen/all_margin"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/img_boss" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/user_name"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="张小萌" />
<TextView
android:id="@+id/user_mobile"
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="13311556556" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/today_income"
style="@style/default_gray_huanggaitext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Today_Income" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:orientation="vertical">
<TextView
android:id="@+id/vip_level_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="员工"
android:textColor="@color/black"
android:textSize="@dimen/detail_textview_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@color/deep_red" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_vip_mscard_item.xml
View file @ 52b14f10
......@@ -4,73 +4,94 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/all_margin"
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/imgLeft"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@mipmap/pay_rmb" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/trule_bg_left"
android:background="@mipmap/return_ticket_one"
android:orientation="vertical"
android:gravity="center_horizontal"
android:padding="5dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/expense_type"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="会员充值" />
android:layout_marginRight="5dp"
android:layout_width="35dp"
android:layout_height="35dp"
android:background="@drawable/shape_white_oval"
android:gravity="center"
android:text="券"
android:textColor="@color/blue_mawu" />
<TextView
android:id="@+id/expense_time"
style="@style/default_blacktext_smallstyle"
android:id="@+id/trule_name"
style="@style/default_bartext_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="08-09 10:10"
android:textColor="@color/black_likui" />
android:text="50元优惠券" />
</LinearLayout>
<TextView
android:id="@+id/trule_validity"
android:layout_weight="1"
android:gravity="center"
style="@style/textView_body_small"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_weight="1"
android:gravity="right"
android:id="@+id/trule_bg_right"
android:background="@mipmap/return_ticket_two"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/expense_money"
style="@style/default_blacktext_bigstyle"
android:id="@+id/trule_money"
android:layout_weight="1"
style="@style/default_bartext_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0" />
android:text="￥50" />
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/white" />
<TextView
android:id="@+id/expense_shop"
style="@style/default_blacktext_smallstyle"
android:layout_weight="1"
android:id="@+id/trule_condition"
style="@style/default_bartext_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="门店"
android:textColor="@color/black_likui" />
android:text="满500使用"
android:textSize="@dimen/detail_textview_size" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/recharge.xml 0 → 100644
View file @ 52b14f10
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical">
<LinearLayout
android:id="@+id/stealLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="@drawable/selector_paymoney_radiobutton_bg"
android:gravity="center"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dtail_width_20"
android:text="充："
android:textSize="25sp" />
<EditText
android:id="@+id/steal_money"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
android:digits="1234567890."
android:hint="自定义金额"
android:inputType="phone"
android:maxLength="6"
android:onClick="@{onClickListener}"
android:textCursorDrawable="@null" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 52b14f10
......@@ -135,7 +135,7 @@
<string name="vip_message_point_cr_hint">(100积分=1元)</string>
<string name="vip_message_ticket_none">不使用优惠券</string>
<string name="vip_info_discount">折扣：%s折</string>
<string name="vip_balance_text">余额：￥%s</string>
<!--抹零页面-->
<string name="dis_change_title">抹零</string>
......@@ -448,6 +448,8 @@
<string name="adv_plan"> 晋级标准：消费金额满 %s</string>
<string name="level_Number">共有 %s个会员等级</string>
<string name="vip_level_title">等级设置</string>
<string name="vip_mscard_period_of_validity">有效期：%s-%s</string>
<!--会员充值-->
<string name="vip_recharge_title">会员充值</string>
<!--店员管理-->
......@@ -464,6 +466,7 @@
<string name="casher_name"> 姓名：%s</string>
<string name="casher_mobile">手机：%s</string>
<string name="casher_hit">店员名称/手机号</string>
<string name="Today_Income">今日收入 ￥%s</string>
<string name="title_activity_restart_dialog">RestartDialog</string>
<!--升级dialog-->
<string name="upgrade_titile">系统升级</string>
......@@ -684,10 +687,14 @@
<string name="manage_inventory_add_end">盘库结束</string>
<!--商品维护-->
<string name="sku_check">检测</string>
<string name="sku_size">规格/</string>
<string name="skugrp_add_hint">请输入分组名称</string>
<string name="sku_subtitle_info">基本信息</string>
<string name="sku_barcode">条码</string>
<string name="sku_name">名称</string>
<string name="sku_skugrp">分组</string>
<string name="sku_type">类别</string>
<string name="sku_unit">单位</string>
<string name="sku_price1">售价</string>
<string name="sku_price2">促销价</string>
......@@ -696,6 +703,10 @@
<string name="sku_point1">消费每满</string>
<string name="sku_point2">元等于1积分</string>
<string name="sku_subtitle_pack">包装关系</string>
<string name="sku_pack">能否拆解</string>
<string name="sku_subtitle_supplier">供货方</string>
<string name="sku_supplier">供货商方</string>
<string name="sku_cost_on">按此包装进货</string>
......@@ -704,5 +715,9 @@
<string name="sku_stock_upper_limit">库存上限</string>
<string name="sku_min_oder">最小订货</string>
<string name="sku_update">编辑商品</string>
<string name="sku_update_price">调整价格</string>
<string name="sku_update_vip">调整会员</string>
</resources>
app/src/main/res/values/styles.xml
View file @ 52b14f10
......@@ -44,6 +44,16 @@
<item name="android:textSize">@dimen/detail_textview_size</item>
</style>
<style name="default_gray_huanggaitext_smallstyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:gravity">center_vertical</item>
<item name="android:singleLine">true</item>
<item name="android:padding">@dimen/sp_12</item>
<item name="android:textColor">@color/gray_huanggai</item>
<item name="android:textSize">@dimen/detail_textview_size</item>
</style>
<style name="default_blacktext_nopadding_smallstyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
......@@ -53,6 +63,7 @@
<item name="android:textColor">@color/black</item>
<item name="android:textSize">@dimen/detail_textview_size</item>
</style>
<style name="default_blacktext_margin_smallstyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
......@@ -396,6 +407,15 @@
</style>
<style name="searchBarEditor">
<item name="android:drawableStart">@mipmap/ic_search</item>
<item name="android:drawablePadding">@dimen/all_spacing</item>
<item name="android:maxLines">1</item>
<item name="android:maxLength">20</item>
<item name="android:background">@drawable/shape_gray_r1</item>
<item name="android:padding">@dimen/all_spacing</item>
<item name="android:imeOptions">actionSearch</item>
</style>
<style name="searchEditor">
<item name="android:drawablePadding">@dimen/all_spacing</item>
<item name="android:maxLines">1</item>
<item name="android:maxLength">20</item>
......
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