Skip to content

T
TangKuPos
Commit 459a64d2 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 283a867e 47cc1a85
Show whitespace changes
Inline Side-by-side
Showing with 2434 additions and 297 deletions
app/src/main/AndroidManifest.xml
View file @ 459a64d2
...@@ -130,6 +130,14 @@ ...@@ -130,6 +130,14 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name=".ui.marketing.recharge.RechargeRuleActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name=".ui.marketing.viplevel.LevelActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application> </application>
</manifest> </manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ 459a64d2
...@@ -1230,6 +1230,14 @@ public final class ApiFactory { ...@@ -1230,6 +1230,14 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
} }
public static Observable<Pager<Mscard>> mscardQuery() {
return Api.getInstance().service.mscardQuery()
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
} }
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 459a64d2
...@@ -431,6 +431,9 @@ interface ApiService { ...@@ -431,6 +431,9 @@ interface ApiService {
@POST(C.URL.MSCARD.query) @POST(C.URL.MSCARD.query)
Observable<HttpMessage<Pager<Mscard>>> mscardQuery(@Query("vipId") Long vipId); Observable<HttpMessage<Pager<Mscard>>> mscardQuery(@Query("vipId") Long vipId);
@POST(C.URL.MSCARD.query)
Observable<HttpMessage<Pager<Mscard>>> mscardQuery();
@POST(C.URL.MSCARD.add) @POST(C.URL.MSCARD.add)
Observable<HttpMessage<Mscard>> addMscard(@Body Mscard m); Observable<HttpMessage<Mscard>> addMscard(@Body Mscard m);
......
app/src/main/java/com/xingdata/zzdpos/ui/dialog/PromptDialog.java
View file @ 459a64d2
...@@ -183,7 +183,7 @@ public class PromptDialog extends BaseDialog<LoginPresenter, DialogPromptBinding ...@@ -183,7 +183,7 @@ public class PromptDialog extends BaseDialog<LoginPresenter, DialogPromptBinding
case PROMPTDIALOG_SELECT: { case PROMPTDIALOG_SELECT: {
mViewBinding.spinKit.setVisibility(View.GONE); mViewBinding.spinKit.setVisibility(View.GONE);
mViewBinding.ivLogo.setVisibility(View.GONE); mViewBinding.ivLogo.setVisibility(View.GONE);
mViewBinding.tvText.setTextColor(getResources().getColor(R.color.succ)); mViewBinding.tvText.setTextColor(getResources().getColor(R.color.black_baozheng));
} }
break; break;
default: { default: {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
View file @ 459a64d2
...@@ -38,6 +38,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -38,6 +38,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
private List<Sssku> topCsList = new ArrayList<>(); private List<Sssku> topCsList = new ArrayList<>();
private InventoryGoodsAdapter mInventoryGoodsAdapter; private InventoryGoodsAdapter mInventoryGoodsAdapter;
private CsCartDialog mCartDialog = new CsCartDialog(); private CsCartDialog mCartDialog = new CsCartDialog();
/** /**
* 当前购物车信息 * 当前购物车信息
*/ */
...@@ -56,12 +57,15 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -56,12 +57,15 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
initRecycler(); initRecycler();
mViewBinding.setCartCount(0); mViewBinding.setCartCount(0);
mViewBinding.icTitle.edTitle.setHint(R.string.inventory_add_et_hint); mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() { mViewBinding.icTitle.tvTitle.setText("商品盘点");
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) { public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
if (i == EditorInfo.IME_ACTION_SEARCH) { if (i == EditorInfo.IME_ACTION_SEARCH) {
mPresenter.getProductByBarcode(mViewBinding.icTitle.edTitle.getText().toString()); mPresenter.getProductByBarcode(mViewBinding.edTitle.getText().toString());
hideSoftInput(); hideSoftInput();
} }
return false; return false;
...@@ -106,20 +110,21 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -106,20 +110,21 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList); mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
mInventoryGoodsAdapter.setEmptyView(getEmptyView()); mInventoryGoodsAdapter.setEmptyView(getEmptyView());
mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> { mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
PromptDialog delDialog = new PromptDialog(); if (bottomCsList.size() == 0) {
delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() { mPresenter.cancelInventoryAdd(mCs);
@Override } else {
public void onClick(View view) { PromptDialog promptDialog = new PromptDialog();
adapter.getData().remove(position); promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
adapter.notifyDataSetChanged(); mPresenter.cancelInventoryAdd(mCs);
delDialog.dismiss(); promptDialog.dismiss();
}
}, new View.OnClickListener() { }, view1 -> {
@Override promptDialog.dismiss();
public void onClick(View view) { pop();
delDialog.dismiss();
}
}).setCancelables(false).show((BaseActivity) mContext); }).setCancelables(false).show((BaseActivity) mContext);
}
return false; return false;
}); });
mInventoryGoodsAdapter.setOnItemChildClickListener((adapter, view, position) -> { mInventoryGoodsAdapter.setOnItemChildClickListener((adapter, view, position) -> {
...@@ -138,8 +143,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -138,8 +143,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
} }
}); });
Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
mViewBinding.recyclerView.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter); mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter);
} }
...@@ -157,9 +161,14 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -157,9 +161,14 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
} }
} }
} }
mInventoryGoodsAdapter.notifyDataSetChanged();
updateRecycler();
} }
private void updateRecycler() {
mInventoryGoodsAdapter.notifyDataSetChanged();
}
public void addInventoryGoodsItem(Sssku sssku) { public void addInventoryGoodsItem(Sssku sssku) {
if (!topCsList.contains(sssku)) { if (!topCsList.contains(sssku)) {
...@@ -174,7 +183,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -174,7 +183,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
} }
mInventoryGoodsAdapter.notifyDataSetChanged(); updateRecycler();
} }
public void addInventoryDetailItem(CsDetail csDetail, Sssku sssku) { public void addInventoryDetailItem(CsDetail csDetail, Sssku sssku) {
...@@ -210,6 +219,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -210,6 +219,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
@Override @Override
public boolean onBackPressedSupport() { public boolean onBackPressedSupport() {
if (bottomCsList.size() == 0) {
mPresenter.cancelInventoryAdd(mCs);
} else {
PromptDialog promptDialog = new PromptDialog(); PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> { promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
mPresenter.cancelInventoryAdd(mCs); mPresenter.cancelInventoryAdd(mCs);
...@@ -220,6 +232,8 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm ...@@ -220,6 +232,8 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
pop(); pop();
}).setCancelables(false).show((BaseActivity) mContext); }).setCancelables(false).show((BaseActivity) mContext);
}
return true; return true;
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java
View file @ 459a64d2
...@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.ui.manage.otherselect; ...@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.ui.manage.otherselect;
import android.text.InputType; import android.text.InputType;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
import com.blankj.utilcode.util.FragmentUtils; import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -31,12 +33,19 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti ...@@ -31,12 +33,19 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
@Override @Override
public void initView() { public void initView() {
mViewBinding.lyTitle.ivRight.setVisibility(View.GONE); mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
mViewBinding.lyTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT); mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
mViewBinding.lyTitle.tvTitle.setText("邻库查询");
mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding.fragmentContainer.getId(), false, true); FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding.fragmentContainer.getId(), false, true);
mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER) mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
search(mViewBinding.lyTitle.edTitle.getText().toString().trim()); @Override
return false; public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
if (i == EditorInfo.IME_ACTION_SEARCH) {
search(mViewBinding.edTitle.getText().toString().trim());
}
return true;
}
}); });
mViewBinding.lyTitle.setOnClickListener(new OnClickListener() { mViewBinding.lyTitle.setOnClickListener(new OnClickListener() {
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/adpter/OtherSelectAdapter.java
View file @ 459a64d2
...@@ -31,7 +31,10 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin ...@@ -31,7 +31,10 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName()); mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
mViewBinding.imgGoods.setImageURI(item.getSpuImg()); mViewBinding.imgGoods.setImageURI(item.getSpuImg());
// mViewBinding.tvNum.setText(item.getSkuStock() + "个"); // mViewBinding.tvNum.setText(item.getSkuStock() + "个");
mViewBinding.tvShop.setText(item.getShopName()); mViewBinding.setShopName(item.getShopName());
mViewBinding.setStock("库存:" +item.getSkuStock()+item.getSpuUnitName());
mViewBinding.setAddress(item.getCityProvName()+item.getCityName()+item.getCityCountyName()+item.getCityAddress());
mViewBinding.setPhone(item.getContactTel());
// mViewBinding.tvAddress.setText(item.getCityAddress()); // mViewBinding.tvAddress.setText(item.getCityAddress());
// mViewBinding.tvTel.setText(item.getContactTel()); // mViewBinding.tvTel.setText(item.getContactTel());
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java
View file @ 459a64d2
...@@ -33,6 +33,8 @@ import java.util.List; ...@@ -33,6 +33,8 @@ import java.util.List;
public class OtherListFragment extends BaseFragment<OtherSelectPresenter, FragmentOtherListBinding> { public class OtherListFragment extends BaseFragment<OtherSelectPresenter, FragmentOtherListBinding> {
private OtherSelectAdapter mOtherSelectAdapter; private OtherSelectAdapter mOtherSelectAdapter;
private Drawable drawable;
private RecyclerViewUtil.ListCardItemDecoration listItemDecoration;
@Override @Override
...@@ -42,21 +44,20 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme ...@@ -42,21 +44,20 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
@Override @Override
public void initView() { public void initView() {
drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
mOtherSelectAdapter = new OtherSelectAdapter(new ArrayList<>()); mOtherSelectAdapter = new OtherSelectAdapter(new ArrayList<>());
mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select)); mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select));
mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity())); mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.recyclerOtherSelcet.setAdapter(mOtherSelectAdapter); mViewBinding.recyclerOtherSelcet.setAdapter(mOtherSelectAdapter);
Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
mViewBinding.recyclerOtherSelcet.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override // mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { // @Override
mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position)); // public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
} // mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position));
}); // }
// });
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh); mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mOtherSelectAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerOtherSelcet); mOtherSelectAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerOtherSelcet);
...@@ -83,15 +84,21 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme ...@@ -83,15 +84,21 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
mOtherSelectAdapter.setEnableLoadMore(true); mOtherSelectAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false); mViewBinding.srlProduct.setRefreshing(false);
} }
if (isRefresh) mOtherSelectAdapter.setNewData(pager.getList()); if (isRefresh) {
else if (pager.getList().size() > 0) mOtherSelectAdapter.addData(pager.getList()); mOtherSelectAdapter.setNewData(pager.getList());
if (pager.getList().size() == 0) {
mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
} else {
mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.addItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
}
} else if (pager.getList().size() > 0) mOtherSelectAdapter.addData(pager.getList());
if (pager.isLastPage()) mOtherSelectAdapter.loadMoreEnd(isRefresh); if (pager.isLastPage()) mOtherSelectAdapter.loadMoreEnd(isRefresh);
else mOtherSelectAdapter.loadMoreComplete(); else mOtherSelectAdapter.loadMoreComplete();
// if (mOtherSelectAdapter.getData().size() == 0) {
// mViewBinding.viewLine.setVisibility(View.GONE);
// } else {
// mViewBinding.viewLine.setVisibility(View.VISIBLE);
// }
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java
View file @ 459a64d2
...@@ -46,9 +46,10 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish ...@@ -46,9 +46,10 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
if (!isTouch) { if (!isTouch) {
mViewBinding.etCount.setEnabled(false); mViewBinding.etCount.setEnabled(false);
mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.white_cargo)); mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.red_lvzhi));
mViewBinding.btnDown.setVisibility(View.GONE); mViewBinding.btnDown.setVisibility(View.GONE);
mViewBinding.btnUp.setVisibility(View.GONE); mViewBinding.btnUp.setVisibility(View.GONE);
mViewBinding.tvFinallyCount.setVisibility(View.VISIBLE);
} }
} }
...@@ -108,7 +109,6 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish ...@@ -108,7 +109,6 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
} }
public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) { public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) {
this.mUpdatePriceListener = updatePriceListener; this.mUpdatePriceListener = updatePriceListener;
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentDetailFragment.java
View file @ 459a64d2
...@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager; ...@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.text.InputType; import android.text.InputType;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.TextView; import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -53,8 +54,11 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -53,8 +54,11 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
@Override @Override
public void initView() { public void initView() {
mViewBinding.lyTitle.edTitle.setHint(R.string.inventory_add_et_hint); mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
mViewBinding.lyTitle.edTitle.setText(""); mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.lyTitle.tvTitle.setText("定货详情");
mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
mViewBinding.edTitle.setText("");
Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled); Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled);
Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up); Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up);
drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10); drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
...@@ -93,10 +97,15 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -93,10 +97,15 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
} }
}); });
mViewBinding.lyTitle.ivRight.setVisibility(View.GONE); mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER) mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
scrollToItem(mViewBinding.lyTitle.edTitle.getText().toString().trim()); @Override
return false; public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
if (i == EditorInfo.IME_ACTION_SEARCH) {
scrollToItem(mViewBinding.edTitle.getText().toString().trim());
}
return true;
}
}); });
mViewBinding.lyTitle.ivBack.setOnClickListener(view -> { mViewBinding.lyTitle.ivBack.setOnClickListener(view -> {
this.pop(); this.pop();
...@@ -137,7 +146,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -137,7 +146,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true); mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
break; break;
case 1: case 1:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true); mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
break; break;
case 0: case 0:
mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false); mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
...@@ -205,15 +214,12 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -205,15 +214,12 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
switch (mPsb.getPsbStatus()) { switch (mPsb.getPsbStatus()) {
case 3: case 3:
mViewBinding.btnOk.setText("修改订单"); mViewBinding.btnOk.setText("修改订单");
break; break;
case 1: case 1:
mViewBinding.btnOk.setText("确认收货"); mViewBinding.btnOk.setText("确认收货");
break; break;
case 0: case 0:
mViewBinding.llBottom.setVisibility(View.GONE); mViewBinding.llBottom.setVisibility(View.GONE);
break; break;
default: default:
break; break;
...@@ -296,5 +302,6 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -296,5 +302,6 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
} }
ToastUtils.showShort("没有找到相关货品"); ToastUtils.showShort("没有找到相关货品");
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentFragment.java
View file @ 459a64d2
...@@ -65,6 +65,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -65,6 +65,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
mViewBinding.btnAdd.setOnClickListener(view -> { mViewBinding.btnAdd.setOnClickListener(view -> {
mPresenter.clickAdd(); mPresenter.clickAdd();
}); });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setText("补货订货");
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
...@@ -72,23 +75,23 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -72,23 +75,23 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
} }
}); });
mViewBinding.icTitle.ivRight.setVisibility(View.GONE); mViewBinding.icTitle.ivRight.setVisibility(View.GONE);
mViewBinding.icTitle.edTitle.setHint("请输入供货商名称"); mViewBinding.edTitle.setHint("请输入供货商名称");
mViewBinding.icTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT); mViewBinding.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
mViewBinding.icTitle.edTitle.setOnClickListener(view -> { mViewBinding.edTitle.setOnClickListener(view -> {
if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) { if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
ToastUtils.showShort("请输入供货商名称"); ToastUtils.showShort("请输入供货商名称");
return; return;
} }
switch (mViewBinding.tab.getSelectedTabPosition()) { switch (mViewBinding.tab.getSelectedTabPosition()) {
case 0: case 0:
mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0)); mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
break; break;
case 1: case 1:
mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1)); mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
break; break;
case 2: case 2:
mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2)); mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
break; break;
} }
...@@ -160,15 +163,15 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, ...@@ -160,15 +163,15 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
} }
public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C,boolean isFrist) { public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C, boolean isFrist) {
if (isFrist){ if (isFrist) {
this.psbA = A; this.psbA = A;
this.psbB = B; this.psbB = B;
this.psbC = C; this.psbC = C;
}else { } else {
((ReplenishmentListFragment) fragments.get(0)).setData(psbA,true); ((ReplenishmentListFragment) fragments.get(0)).setData(psbA, true);
((ReplenishmentListFragment) fragments.get(1)).setData(psbB,true); ((ReplenishmentListFragment) fragments.get(1)).setData(psbB, true);
((ReplenishmentListFragment) fragments.get(2)).setData(psbC,true); ((ReplenishmentListFragment) fragments.get(2)).setData(psbC, true);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentListFragment.java
View file @ 459a64d2
...@@ -138,6 +138,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent ...@@ -138,6 +138,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
public void run() { public void run() {
if (psbs.size() == 0) { if (psbs.size() == 0) {
mViewBinding.llEmpty.setVisibility(View.VISIBLE); mViewBinding.llEmpty.setVisibility(View.VISIBLE);
hideSoftInput();
} else { } else {
mReplenishmentAdapter.setNewData(psbs); mReplenishmentAdapter.setNewData(psbs);
mReplenishmentAdapter.loadMoreEnd(); mReplenishmentAdapter.loadMoreEnd();
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java
View file @ 459a64d2
...@@ -56,7 +56,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi ...@@ -56,7 +56,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
}); });
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView); adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(false); adapter.setEnableLoadMore(false);
mViewBinding.titleSearch.onBack.setOnClickListener(view -> { mViewBinding.searchLayout.onBack.setOnClickListener(view -> {
getActivity().finish(); getActivity().finish();
}); });
mViewBinding.setOnClickListener(view -> { mViewBinding.setOnClickListener(view -> {
...@@ -70,7 +70,10 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi ...@@ -70,7 +70,10 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
ToastUtils.showShort("搜索条件不能为空"); ToastUtils.showShort("搜索条件不能为空");
return; return;
} }
mPresenter.queryUser(mViewBinding.userSearch.getText().toString()); mPresenter.queryUser( mViewBinding.searchLayout.serchEditText.getText().toString().trim());
break;
case R.id.onBack:
getActivity().finish();
break; break;
} }
}); });
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/fragment/VipPresenter.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.fragment;
import android.annotation.SuppressLint;
import android.content.Context;
import android.view.Gravity;
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.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.VipContract;
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();
public VipInfoEditFragment vipInfoEditFragment = new VipInfoEditFragment();
public VipInfoFragment vipInfoFragment = new VipInfoFragment();
public VipExpenseListFragment vipExpenseListFragment = new VipExpenseListFragment();
public VipRechargeListFragment vipRechargeListFragment = new VipRechargeListFragment();
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();
}
@Override
public void getVipList(int pageNumber, String vipLevel) {
ApiFactory.User.getVipList(pageNumber, vipLevel).subscribe(vipPager -> {
mView.getVipListSus(vipPager, pageNumber);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void getVipLevel(int pageNum, int
pageSize) {
ApiFactory.Level.getVipLevelList(pageNum, pageSize).subscribe(vipPager -> {
mView.getVipLevelSus(vipPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void getVipNumber() {
ApiFactory.Sta.querySta().subscribe(sta -> {
mView.getVipNumberSus(sta);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void addVip(Vip vip) {
if (vip.getVipId() == null) {
ApiFactory.User.addVip(vip).subscribe(mVip -> {
mView.addVipSus(mVip);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
} else {
ApiFactory.User.updateVip(vip).subscribe(mVip -> {
mView.addVipSus(mVip);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
}
@Override
public void ticketQuery(Long vipID) {
ApiFactory.Ticket.query(vipID).subscribe(ticketList -> {
mView.ticketQuerySus(ticketList);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void saleorderQuery(Long vipID, int pageNumber) {
ApiFactory.Saleorder.querySaleorderByVipId(vipID, pageNumber, 5).subscribe(saleorder -> {
mView.getSaleorderSus(saleorder);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void rechargeorderQuery(Long vipID, int number) {
ApiFactory.Rctrace.queryRecharge(vipID, number, 10).subscribe(rechargeOrderPager -> {
mView.getRechargeOrderSus(rechargeOrderPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
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/marketing/marketingMenu/MarketingMenuActivity.java
View file @ 459a64d2
...@@ -15,7 +15,9 @@ import com.xingdata.zzdpos.model.MarketingMenuModel; ...@@ -15,7 +15,9 @@ import com.xingdata.zzdpos.model.MarketingMenuModel;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity; import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter; import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.MsActivity; import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRuleActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity; import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.viplevel.LevelActivity;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil; import com.xingdata.zzdpos.util.RecyclerViewUtil;
...@@ -58,6 +60,7 @@ public class MarketingMenuActivity extends AppCompatActivity { ...@@ -58,6 +60,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
switch (marketingMenuAdapter.getData().get(position)) { switch (marketingMenuAdapter.getData().get(position)) {
case C.MENU.MENU_MS_VIP_LEVEL: { case C.MENU.MENU_MS_VIP_LEVEL: {
//会员等级 //会员等级
ActivityUtils.startActivity(LevelActivity.class);
} }
break; break;
case C.MENU.MENU_MS_INTEGRAL: { case C.MENU.MENU_MS_INTEGRAL: {
...@@ -72,6 +75,7 @@ public class MarketingMenuActivity extends AppCompatActivity { ...@@ -72,6 +75,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
break; break;
case C.MENU.MENU_MS_RECHARGE: { case C.MENU.MENU_MS_RECHARGE: {
//充值优惠 //充值优惠
ActivityUtils.startActivity(RechargeRuleActivity.class);
} }
break; break;
case C.MENU.MENU_MS_MS: { case C.MENU.MENU_MS_MS: {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/RechargeRuleActivity.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge;
import android.os.Bundle;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, ActivityVipLevelBinding> implements RechargeRuleContract.View {
private Bundle mBundle;
@Override
public int getLayoutId() {
return R.layout.activity_vip_level;
}
@Override
public void initView() {
mBundle = getIntent().getExtras();
loadRootFragment(R.id.vip_level_frame, mPresenter.rechargeListFragment, true, false);
}
@Override
public void mscardQuerySus(Pager<Mscard> mscardPager) {
mPresenter.rechargeListFragment.mscardQuerySus(mscardPager);
}
@Override
public void addMscardSus(Mscard mscard) {
mPresenter.rechargeRuleEditFragment.pop();
mPresenter.mscardQuery();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/RechargeRuleContract.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge;
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.Pager;
public interface RechargeRuleContract {
interface View extends BaseView {
void mscardQuerySus(Pager<Mscard> mscardPager);
void addMscardSus(Mscard mscard);
}
abstract class Presenter extends BasePresenter<View> {
public abstract void mscardQuery();
public abstract void addMsCard(Mscard mscard);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/RechargeRulePresenter.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.ui.marketing.recharge.fragment.RechargeRuleEditFragment;
import com.xingdata.zzdpos.ui.marketing.recharge.fragment.RechargeRuleListFragment;
public class RechargeRulePresenter extends RechargeRuleContract.Presenter {
public RechargeRuleListFragment rechargeListFragment = new RechargeRuleListFragment();
public RechargeRuleEditFragment rechargeRuleEditFragment = new RechargeRuleEditFragment();
@Override
public void onAttached() {
mscardQuery();
}
@Override
public void mscardQuery() {
ApiFactory.MsCard.mscardQuery().subscribe(mscardPager -> {
mView.mscardQuerySus(mscardPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void addMsCard(Mscard mscard) {
if (mscard.getId() != null) {
ApiFactory.MsCard.updteMsCard(mscard).subscribe(m -> {
mView.addMscardSus(m);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
} else {
ApiFactory.MsCard.addMsCard(mscard).subscribe(m -> {
mView.addMscardSus(m);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/adapter/RechargeRuleListAdapter.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge.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.ItemRechargeRulelListItemBinding;
import com.xingdata.zzdpos.databinding.ItemVipLevelListItemBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
/**
* Created by JM_DEV on 2017/12/25.
*/
public class RechargeRuleListAdapter extends BaseAdapter<Mscard, ItemRechargeRulelListItemBinding> {
private Context mContext;
public RechargeRuleListAdapter(Context mContext, @Nullable List<Mscard> data) {
super(R.layout.item_recharge_rulel_list_item, data);
this.mContext = mContext;
}
@Override
protected void convert(ItemRechargeRulelListItemBinding mViewBinding, Mscard item) {
mViewBinding.ruleName.setText(mContext.getString(R.string.recharge_send, ConvertUtil.fenToYuanNoZero(item.getCruleChargeAmt()), ConvertUtil.fenToYuanNoZero(item.getCruleSendAmt())));
mViewBinding.ruleValidity.setText(StringUtil.format(new Date(item.getDateBegin())) + "~" + StringUtil.format(new Date(item.getDateEnd())));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.app.DatePickerDialog;
import android.view.View;
import android.widget.DatePicker;
import android.widget.RadioButton;
import android.widget.TextView;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentRechargeRuleEditBinding;
import com.xingdata.zzdpos.databinding.FragmentVipLevelEditBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRulePresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
/**
* 会员等级编辑界面
*/
public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter, FragmentRechargeRuleEditBinding> {
private Mscard mMscard;
@Override
public int getLayoutId() {
return R.layout.fragment_recharge_rule_edit;
}
@Override
public void initView() {
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
if (mMscard != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员");
mViewBinding.ruleNameLayout.setVisibility(View.GONE);
mViewBinding.ruleName.setText("充" + ConvertUtil.fenToYuanNoZero(mMscard.getCruleChargeAmt()) + "送" + ConvertUtil.fenToYuanNoZero(mMscard.getCruleSendAmt()) + "元");
mViewBinding.rechargAmt.setText(ConvertUtil.fenToYuanNoZero(mMscard.getCruleChargeAmt()));
mViewBinding.sendAmt.setText(ConvertUtil.fenToYuanNoZero(mMscard.getCruleSendAmt()));
mViewBinding.ruleBeginTime.setText(StringUtil.format(new Date(mMscard.getDateBegin())));
mViewBinding.ruleEndTime.setText(StringUtil.format(new Date(mMscard.getDateEnd())));
RadioButton radioButton = mViewBinding.ruleState.findViewWithTag(mMscard.getCruleStatus().toString());
if (radioButton != null) {
radioButton.setChecked(true);
}
} else {
mViewBinding.ruleNameLayout.setVisibility(View.GONE);
mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
mViewBinding.ruleNameLayout.setVisibility(View.VISIBLE);
}
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.onSure:
Mscard mscard = new Mscard();
if (mMscard != null) {
mscard.setId(mMscard.getId());
mscard.setCruleGradeNo(mMscard.getCruleGradeNo());
mscard.setIssuerMapId(mMscard.getIssuerMapId());
}
if (mViewBinding.rechargAmt.getText().length() == 0) {
ToastUtils.showShort("充值金额不能为空");
return;
}
if (Long.parseLong(mViewBinding.rechargAmt.getText().toString())<=0) {
ToastUtils.showShort("充值金额必须大于0");
return;
}
if (mViewBinding.sendAmt.getText().length() == 0) {
ToastUtils.showShort("赠送金额不能为空");
return;
}
if (Long.parseLong(mViewBinding.sendAmt.getText().toString())<=0) {
ToastUtils.showShort("赠送金额必须大于0");
return;
}
if (Long.parseLong(mViewBinding.sendAmt.getText().toString())>Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
ToastUtils.showShort("充值金额必须大于或者等于赠送金额");
return;
}
if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >=StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
ToastUtils.showShort("开始时间不能大于或者等于结束日期");
return;
}
mscard.setCruleChargeAmt(ConvertUtil.yuanToFen( mViewBinding.rechargAmt.getText().toString()));
mscard.setCruleSendAmt(ConvertUtil.yuanToFen( mViewBinding.sendAmt.getText().toString()));
mscard.setCruleStatus(Byte.parseByte(mViewBinding.ruleState.findViewById(mViewBinding.ruleState.getCheckedRadioButtonId()).getTag().toString()));
mscard.setDateBegin(StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()));
mscard.setDateEnd(StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString()));
mPresenter.addMsCard(mscard);
break;
case R.id.rule_begin_time:
showDialogPick(mViewBinding.ruleBeginTime);
break;
case R.id.rule_end_time:
showDialogPick(mViewBinding.ruleEndTime);
break;
}
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
}
@Override
public boolean onBackPressedSupport() {
return false;
}
//将两个选择时间的dialog放在该函数中
private void showDialogPick(final View btn) {
//获取Calendar对象，用于获取当前时间
final Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH);
int day = calendar.get(Calendar.DAY_OF_MONTH);
//实例化DatePickerDialog对象
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new
DatePickerDialog.OnDateSetListener() {
//选择完日期后会调用该回调函数
@Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int
dayOfMonth) {
//因为monthOfYear会比实际月份少一月所以这边要加1
((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth);
}
}, year, month, day);
//弹出选择日期对话框
datePickerDialog.show();
}
public void setmMscard(Mscard mMscard) {
this.mMscard = mMscard;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.recharge.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentRechargeRuleEditBinding;
import com.xingdata.zzdpos.databinding.FragmentRechargeRuleListBinding;
import com.xingdata.zzdpos.databinding.FragmentVipLevelListBinding;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRulePresenter;
import com.xingdata.zzdpos.ui.marketing.recharge.adapter.RechargeRuleListAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
/**
* 会员等级界面
*/
public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter, FragmentRechargeRuleListBinding> {
private RechargeRuleListAdapter adapter;
private int pageNumber = 0;
private String strVipLevle;
private int vipState = 0;//0 会员 1 充值
@Override
public int getLayoutId() {
return R.layout.fragment_recharge_rule_list;
}
@Override
public void initView() {
adapter = new RechargeRuleListAdapter(getActivity(), new ArrayList<Mscard>());
mViewBinding.noRultBg.setVisibility(View.VISIBLE);
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
mViewBinding.levelRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.levelRecyclerView.setAdapter(adapter);
mViewBinding.titleLayout.tvTitle.setText("充值优惠");
adapter.setOnItemClickListener((mAdapter, view, position) -> {
mPresenter.rechargeRuleEditFragment.setmMscard(adapter.getData().get(position));
start( mPresenter.rechargeRuleEditFragment);
});
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
adapter.setEnableLoadMore(false);
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.addRule:
mPresenter.rechargeRuleEditFragment.setmMscard(null);
start( mPresenter.rechargeRuleEditFragment);
break;
}
});
}
private void onLoadMore() {
}
public void mscardQuerySus(Pager<Mscard> mscardPager) {
adapter.setNewData(mscardPager.getList());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/LevelActivity.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel;
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.databinding.ActivityVipLevelBinding;
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.VipContract;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.view.ViewTools;
import java.util.List;
public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevelBinding> implements LevelContract.View {
private Bundle mBundle;
@Override
public int getLayoutId() {
return R.layout.activity_vip_level;
}
@Override
public void initView() {
mBundle = getIntent().getExtras();
loadRootFragment(R.id.vip_level_frame, mPresenter.levelListFragment, true, false);
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
mPresenter.levelListFragment.getVipLevelSus(levelPager);
}
@Override
public void updateVipLevelSus(Level level) {
mPresenter.vipLevelEditFragment.pop();
mPresenter.getVipLevel(0,200);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/LevelContract.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel;
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.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 LevelContract {
interface View extends BaseView {
void getVipLevelSus(Pager<Level> levelPager);
void updateVipLevelSus(Level level);
}
abstract class Presenter extends BasePresenter<View> {
public abstract void getVipLevel(int pageNum, int
pageSize);
public abstract void updateVipLevel(Level level);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/LevelPresenter.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel;
import android.annotation.SuppressLint;
import android.content.Context;
import android.view.Gravity;
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.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.marketing.viplevel.fragment.LevelListFragment;
import com.xingdata.zzdpos.ui.marketing.viplevel.fragment.VipLevelEditFragment;
import com.xingdata.zzdpos.ui.vip.VipContract;
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 LevelPresenter extends LevelContract.Presenter {
public LevelListFragment levelListFragment = new LevelListFragment();
public VipLevelEditFragment vipLevelEditFragment = new VipLevelEditFragment();
@Override
public void onAttached() {
getVipLevel(0,200);
}
@Override
public void getVipLevel(int pageNum, int
pageSize) {
ApiFactory.Level.getVipLevelList(pageNum, pageSize).subscribe(vipPager -> {
mView.getVipLevelSus(vipPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
public void updateVipLevel(Level level) {
if (level.getId()!=null){
ApiFactory.Level.updateVipLevel(level).subscribe(mLevel -> {
mView.updateVipLevelSus(mLevel);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}else {
ApiFactory.Level.addVipLevel(level).subscribe(mLevel -> {
mView.updateVipLevelSus(mLevel);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/adapter/VipLevelListAdapter.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel.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.ItemVipLevelListItemBinding;
import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.HashMap;
import java.util.List;
/**
* Created by JM_DEV on 2017/12/25.
*/
public class VipLevelListAdapter extends BaseAdapter<Level, ItemVipLevelListItemBinding> {
private Context mContext;
private HashMap<String, Integer> bgMap = new HashMap<>();
public VipLevelListAdapter(Context mContext, @Nullable List<Level> data) {
super(R.layout.item_vip_level_list_item, data);
this.mContext = mContext;
}
public void initBG(List<Level> data) {
bgMap.clear();
for (int i = 0; i < data.size(); i++) {
if ((i + 1) % 3 == 0) {
bgMap.put(data.get(i).getVipLevel().toString(), R.mipmap.bg_grade03);
} else if ((i + 1) % 2 == 0) {
bgMap.put(data.get(i).getVipLevel().toString(), R.mipmap.bg_grade02);
} else {
bgMap.put(data.get(i).getVipLevel().toString(), R.mipmap.bg_grade01);
}
}
}
@Override
protected void convert(ItemVipLevelListItemBinding mViewBinding, Level item) {
mViewBinding.levelName.setText(item.getVipLevelName());
mViewBinding.levelDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount()) + "折");
mViewBinding.levelCondition.setText(mContext.getString(R.string.adv_plan, ConvertUtil.fenToYuanNoZero(item.getVipUpgradeAmtTp())));
mViewBinding.levelBg.setBackgroundResource(bgMap.get(item.getVipLevel().toString()));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/LevelListFragment.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel.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.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.FragmentVipLevelListBinding;
import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.marketing.viplevel.LevelPresenter;
import com.xingdata.zzdpos.ui.marketing.viplevel.adapter.VipLevelListAdapter;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
/**
* 会员等级界面
*/
public class LevelListFragment extends BaseFragment<LevelPresenter, FragmentVipLevelListBinding> {
private VipLevelListAdapter adapter;
private int pageNumber = 0;
private String strVipLevle;
private int vipState = 0;//0 会员 1 充值
@Override
public int getLayoutId() {
return R.layout.fragment_vip_level_list;
}
@Override
public void initView() {
adapter = new VipLevelListAdapter(getActivity(), new ArrayList<Level>());
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
mViewBinding.noRultBg.setVisibility(View.VISIBLE);
mViewBinding.levelRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.levelRecyclerView.setAdapter(adapter);
mViewBinding.titleLayout.tvTitle.setText("会员等级");
adapter.setOnItemClickListener((mAdapter, view, position) -> {
mPresenter.vipLevelEditFragment.setmLevel((Level) mAdapter.getData().get(position));
start(mPresenter.vipLevelEditFragment);
});
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
adapter.setEnableLoadMore(false);
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.addVip:
mPresenter.vipLevelEditFragment.setmLevel(null);
start(mPresenter.vipLevelEditFragment);
break;
}
});
}
private void onLoadMore() {
}
public void getVipLevelSus(Pager<Level> levelPager) {
adapter.initBG(levelPager.getList());
adapter.setNewData(levelPager.getList());
if (levelPager.getList().size() != 0) {
mViewBinding.noRultBg.setVisibility(View.GONE);
} else {
mViewBinding.noRultBg.setVisibility(View.VISIBLE);
}
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/VipLevelEditFragment.java 0 → 100644
View file @ 459a64d2
package com.xingdata.zzdpos.ui.marketing.viplevel.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.view.View;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipLevelEditBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.ui.marketing.viplevel.LevelPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
/**
* 会员等级编辑界面
*/
public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentVipLevelEditBinding> {
private Level mLevel;
@Override
public int getLayoutId() {
return R.layout.fragment_vip_level_edit;
}
@Override
public void initView() {
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.infoTitle.tvTitle.setText("等级设置");
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
if (mLevel != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员");
mViewBinding.levelName.setText(mLevel.getVipLevelName());
mViewBinding.levelDiscont.setText(String.valueOf(mLevel.getVipDefDiscount()));
mViewBinding.updateMoney.setText( ConvertUtil.fenToYuanNoZero(mLevel.getVipUpgradeAmtTp()));
mViewBinding.updateDay.setText(mLevel.getVipUpgradeDay()+"");
}
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.onSure:
Level level = new Level();
if (mLevel != null) {
level.setId(mLevel.getId());
}
if (mViewBinding.levelName.getText().length() == 0) {
ToastUtils.showShort("等级名称不能为空");
return;
}
if (mViewBinding.levelDiscont.getText().length() == 0) {
ToastUtils.showShort("折扣不能为空");
return;
}
if (mViewBinding.updateDay.length() == 0) {
ToastUtils.showShort("最近多少天不能为空");
return;
}
if (mViewBinding.updateMoney.getText().length() == 0) {
ToastUtils.showShort("消费金额不能为空");
return;
}
level.setVipLevelName(mViewBinding.levelName.getText().toString());
level.setVipDefDiscount(Integer.parseInt(mViewBinding.levelDiscont.getText().toString()));
level.setVipUpgradeDay(Integer.parseInt(mViewBinding.updateDay.getText().toString()));
level.setVipUpgradeAmtTp(ConvertUtil.yuanToFen(mViewBinding.updateMoney.getText().toString()));
mPresenter.updateVipLevel(level);
break;
}
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
}
@Override
public boolean onBackPressedSupport() {
return false;
}
public void setmLevel(Level mLevel) {
this.mLevel = mLevel;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 459a64d2
...@@ -45,60 +45,60 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F ...@@ -45,60 +45,60 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
mViewBinding.viewLine.setVisibility(View.GONE); mViewBinding.viewLine.setVisibility(View.GONE);
FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true); FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() { // mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override // @Override
public void onFocusChange(View view, boolean b) { // public void onFocusChange(View view, boolean b) {
if (b) { // if (b) {
if (mViewBinding.viewStub.isInflated()) { // if (mViewBinding.viewStub.isInflated()) {
mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE); // mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
} else { // } else {
mViewBinding.viewStub.getViewStub().inflate(); // mViewBinding.viewStub.getViewStub().inflate();
ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot()); // ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() { // viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
@Override // @Override
protected void myOnClickListener(View v) { // protected void myOnClickListener(View v) {
switch (v.getId()) { // switch (v.getId()) {
case R.id.pay_cash: // case R.id.pay_cash:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
break; // break;
case R.id.pay_alipay: // case R.id.pay_alipay:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
break; // break;
case R.id.pay_wechat: // case R.id.pay_wechat:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
break; // break;
case R.id.pay_bank: // case R.id.pay_bank:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
break; // break;
case R.id.pay_vipcard: // case R.id.pay_vipcard:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
break; // break;
case R.id.pay_tally: // case R.id.pay_tally:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY); // mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
break; // break;
} // }
//
//
} // }
}); // });
} // }
//
} else { // } else {
mViewBinding.viewStub.getRoot().setVisibility(View.GONE); // mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
} // }
} // }
}); // });
mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> { // mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) { // if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString()); // mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
hideSoftInput(); // hideSoftInput();
} // }
//
return false; // return false;
}); // });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE); mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE); mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单记录"); mViewBinding.icTitle.tvTitle.setText("订单列表");
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ 459a64d2
...@@ -2,7 +2,13 @@ package com.xingdata.zzdpos.ui.statistics.fragment.order; ...@@ -2,7 +2,13 @@ package com.xingdata.zzdpos.ui.statistics.fragment.order;
import android.content.Intent; import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.graphics.Typeface;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
...@@ -11,7 +17,9 @@ import com.xingdata.zzdpos.base.BaseFragment; ...@@ -11,7 +17,9 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding; import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
import com.xingdata.zzdpos.databinding.ItemStringBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter; import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter; import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
import com.xingdata.zzdpos.util.StringUtil; import com.xingdata.zzdpos.util.StringUtil;
...@@ -31,7 +39,7 @@ import io.reactivex.functions.Function; ...@@ -31,7 +39,7 @@ import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrderMainBinding> { public class OrderMainFragment extends BaseFragment<StatisticsPresenter, FragmentOrderMainBinding> {
private FragmentStateAdapter mFragmentStateAdapter; private FragmentStateAdapter mFragmentStateAdapter;
private List<Long> dateLongs = new ArrayList<>(); private List<Long> dateLongs = new ArrayList<>();
...@@ -48,6 +56,15 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder ...@@ -48,6 +56,15 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1 //获得当前时间的月份，月份从0开始所以结果要加1
month = calendar.get(Calendar.MONTH) + 1; month = calendar.get(Calendar.MONTH) + 1;
mViewBinding.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
mPresenter.getSaleOrderList(1, mViewBinding.edTitle.getText().toString());
hideSoftInput();
}
return false;
});
initViewPager(); initViewPager();
...@@ -104,36 +121,65 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder ...@@ -104,36 +121,65 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
for (int i = 0; i < dateLongs.size() - 1; i++) { for (int i = 0; i < dateLongs.size() - 1; i++) {
fragments.add(new OrderListFragment().setDate(dateLongs.get(i), dateLongs.get(i + 1))); fragments.add(new OrderListFragment().setDate(dateLongs.get(i), dateLongs.get(i + 1)));
} }
initTab();
}
});
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager()); } else {
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter); initTab();
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
month--;
} }
} }
});
} else { private void initTab() {
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager()); mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter); mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData); mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
if (mViewBinding.tabLayout.getSelectedTabPosition() != 0) {
new android.os.Handler().postDelayed(new Runnable() { new android.os.Handler().postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
mViewBinding.viewPagerData.setCurrentItem(0, false); mViewBinding.viewPagerData.setCurrentItem(0, false);
} }
}, 1); }, 1);
}
for (int i = 0; i < fragments.size(); i++) { for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12; if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
View view = getLayoutInflater().inflate(R.layout.item_string, null);
ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
if (i == 0) {
itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
itemMenuBottomBinding.itemTv.setText(month + "月");
itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
month--; month--;
} }
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
} }
@Override
public void onTabUnselected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java
View file @ 459a64d2
...@@ -13,6 +13,7 @@ import android.widget.RadioButton; ...@@ -13,6 +13,7 @@ import android.widget.RadioButton;
import android.widget.TextView; import android.widget.TextView;
import com.bigkoo.pickerview.OptionsPickerView; import com.bigkoo.pickerview.OptionsPickerView;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
...@@ -43,6 +44,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI ...@@ -43,6 +44,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
@Override @Override
public void initView() { public void initView() {
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
if (mVip != null) { if (mVip != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员"); mViewBinding.infoTitle.tvTitle.setText("修改会员");
mViewBinding.vipDiscounts.setText(mVip.getVipLevelName() + mVip.getVipDefDiscount() + "折"); mViewBinding.vipDiscounts.setText(mVip.getVipLevelName() + mVip.getVipDefDiscount() + "折");
...@@ -72,6 +74,16 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI ...@@ -72,6 +74,16 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
break; break;
case R.id.onSure: case R.id.onSure:
if (mViewBinding.vipName.getText().length()==0){
ToastUtils.showShort("会员名称不能为空");
return;
}
if (mViewBinding.vipPhone.getText().length()==0){
ToastUtils.showShort("会员手机号不能为空");
return;
}
if (mVip == null) { if (mVip == null) {
mVip = new Vip(); mVip = new Vip();
} }
......
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
View file @ 459a64d2
...@@ -17,6 +17,7 @@ public class RecyclerViewUtil { ...@@ -17,6 +17,7 @@ public class RecyclerViewUtil {
private int spacing; private int spacing;
private boolean includeEdge; private boolean includeEdge;
public GridSpacingItemDecoration(int spanCount, int spacing, boolean includeEdge) { public GridSpacingItemDecoration(int spanCount, int spacing, boolean includeEdge) {
this.spanCount = spanCount; this.spanCount = spanCount;
this.spacing = spacing; this.spacing = spacing;
...@@ -50,7 +51,7 @@ public class RecyclerViewUtil { ...@@ -50,7 +51,7 @@ public class RecyclerViewUtil {
private Drawable mDividerDarwable; private Drawable mDividerDarwable;
private int mDividerHight = 1; private int mDividerHight = 1;
private Paint mColorPaint; private Paint mColorPaint;
private int noNum;
public final int[] ATRRS = new int[]{android.R.attr.listDivider}; public final int[] ATRRS = new int[]{android.R.attr.listDivider};
...@@ -81,11 +82,16 @@ public class RecyclerViewUtil { ...@@ -81,11 +82,16 @@ public class RecyclerViewUtil {
mDividerHight = dividerHight; mDividerHight = dividerHight;
mDividerDarwable = dividerDrawable; mDividerDarwable = dividerDrawable;
} }
public ListCardItemDecoration(Context context, int dividerHight, Drawable dividerDrawable,int noNum) {
this(context);
mDividerHight = dividerHight;
mDividerDarwable = dividerDrawable;
this. noNum=noNum;
}
@Override @Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state); super.getItemOffsets(outRect, view, parent, state);
outRect.top = mDividerHight + 1; outRect.top = mDividerHight;
} }
@Override @Override
...@@ -99,7 +105,7 @@ public class RecyclerViewUtil { ...@@ -99,7 +105,7 @@ public class RecyclerViewUtil {
public void drawHorizontalDivider(Canvas c, RecyclerView parent) { public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount(); final int childCount = parent.getChildCount();
for (int i = 0; i < childCount - 1; i++) { for (int i = noNum; i < childCount; i++) {
final View child = parent.getChildAt(i); final View child = parent.getChildAt(i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
...@@ -109,8 +115,8 @@ public class RecyclerViewUtil { ...@@ -109,8 +115,8 @@ public class RecyclerViewUtil {
int bottom = 0; int bottom = 0;
top = child.getTop() - params.topMargin; bottom = child.getTop() - params.topMargin;
bottom = top + mDividerHight; top = bottom - mDividerHight;
//画分割线 //画分割线
mDividerDarwable.setBounds(left, top, right, bottom); mDividerDarwable.setBounds(left, top, right, bottom);
mDividerDarwable.draw(c); mDividerDarwable.draw(c);
......
app/src/main/java/com/xingdata/zzdpos/util/StringUtil.java
View file @ 459a64d2
...@@ -107,7 +107,7 @@ public class StringUtil { ...@@ -107,7 +107,7 @@ public class StringUtil {
* @return * @return
*/ */
public static Long getTimeMillis(String strDate) { public static Long getTimeMillis(String strDate) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat formatter = new SimpleDateFormat(defaultDatePattern);
ParsePosition pos = new ParsePosition(0); ParsePosition pos = new ParsePosition(0);
Date strtodate = formatter.parse(strDate, pos); Date strtodate = formatter.parse(strDate, pos);
return strtodate.getTime(); return strtodate.getTime();
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ 459a64d2
...@@ -61,7 +61,6 @@ public final class SystemUtil { ...@@ -61,7 +61,6 @@ public final class SystemUtil {
return "548496"; return "548496";
} }
/** /**
* 获取应用名称 * 获取应用名称
* *
......
app/src/main/res/drawable/selector_edit_frame_blue_background.xml
View file @ 459a64d2
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/all_transparent" android:state_enabled="false" /> <item android:drawable="@drawable/shape_white_round_rectangle_dark" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" /> <item android:drawable="@drawable/shape_white_round_rectangle_dark" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" /> <item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" /> <item android:drawable="@drawable/shape_white_round_rectangle_dark" />
......
app/src/main/res/layout/activity_other_select.xml
View file @ 459a64d2
...@@ -5,25 +5,50 @@ ...@@ -5,25 +5,50 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/white_caocao"
android:orientation="vertical"> android:orientation="vertical">
<include <include
android:id="@+id/ly_title" android:id="@+id/ly_title"
layout="@layout/title_order" /> layout="@layout/title_order" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_below="@id/ly_title"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/other_select_edit_hint"
android:textColor="@color/black_likui"
android:inputType="text"
android:imeOptions="actionSearch"
android:textSize="@dimen/all_text_size_low"
/>
<FrameLayout <FrameLayout
android:id="@+id/fragment_container" android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/ly_title"> android:layout_below="@id/ed_title"
</FrameLayout> android:background="@color/gray_zhouyu"></FrameLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ed_title"
android:background="@color/gray_huanggai" />
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/activity_vip_level.xml 0 → 100644
View file @ 459a64d2
<?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/vip_level_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_base.xml
View file @ 459a64d2
...@@ -6,17 +6,18 @@ ...@@ -6,17 +6,18 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/lyt_main_bg"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
style="@style/dialog_title" style="@style/dialog_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
<View android:layout_marginBottom="@dimen/all_padding" />
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_kongming" />
<ViewStub <ViewStub
android:id="@+id/vs_center" android:id="@+id/vs_center"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/dialog_handover.xml
View file @ 459a64d2
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
......
app/src/main/res/layout/dialog_prompt.xml
View file @ 459a64d2
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View <View
android:layout_width="@dimen/view_line_L050" android:layout_width="@dimen/view_line_L050"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_huanggai" android:background="@color/gray_kongming"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ 459a64d2
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/white_caocao"
android:orientation="vertical"> android:orientation="vertical">
<include <include
...@@ -32,37 +32,48 @@ ...@@ -32,37 +32,48 @@
android:background="@color/gray_huanggai" android:background="@color/gray_huanggai"
app:layout_constraintTop_toBottomOf="@id/ic_title" /> app:layout_constraintTop_toBottomOf="@id/ic_title" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/other_select_edit_hint"
android:imeOptions="actionSearch"
android:inputType="text"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintTop_toBottomOf="@id/ic_title" />
<RelativeLayout <RelativeLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="@dimen/padding_small"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/fl_cart" app:layout_constraintBottom_toTopOf="@id/fl_cart"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ic_title"> app:layout_constraintTop_toBottomOf="@id/ed_title">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/tv_title_small"
android:layout_marginTop="@dimen/Minus_padding_left_right"
android:background="@color/gray_zhouyu"> android:background="@color/gray_zhouyu">
</android.support.v7.widget.RecyclerView> </android.support.v7.widget.RecyclerView>
<TextView <View
android:id="@+id/tv_title_small"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/view_line_L050"
android:background="@drawable/singleline_zhouyu_huanggai" android:layout_alignParentTop="true"
android:paddingBottom="@dimen/all_padding" android:background="@color/gray_huanggai" />
android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"
android:text="@string/manage_inventory_add_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title"
android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
......
app/src/main/res/layout/fragment_order_main.xml
View file @ 459a64d2
...@@ -9,31 +9,33 @@ ...@@ -9,31 +9,33 @@
tools:context="com.example.administrator.tangkupos.CasherFragment"> tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout --> <!-- TODO: Update blank fragmfragment_integral_indexyout -->
<EditText <EditText
android:id="@+id/ed_title" android:id="@+id/ed_title"
style="@style/searchBarEditor" style="@style/searchBarEditor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small" android:layout_marginTop="@dimen/padding_small"
android:layout_marginBottom="@dimen/padding_small"
android:layout_height="30dp"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint" android:hint="@string/statistics_order_edit_hint"
android:inputType="number" android:inputType="number"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
android:layout_below="@id/tab_layout"
/> />
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_below="@id/ed_title"
android:background="@color/white_caocao" android:background="@color/white_caocao"
app:tabMinWidth="100dp" app:tabMaxWidth="100dp"
app:tabMode="scrollable" app:tabMode="scrollable"
app:tabSelectedTextColor="#ff7a61" app:tabSelectedTextColor="@color/black_baozheng"
app:tabTextColor="@color/gray_kongming" /> app:tabTextColor="@color/gray_kongming" />
...@@ -41,7 +43,7 @@ ...@@ -41,7 +43,7 @@
android:id="@+id/viewPager_data" android:id="@+id/viewPager_data"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/ed_title" android:layout_below="@id/tab_layout"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:background="@color/gray"> android:background="@color/gray">
...@@ -53,10 +55,13 @@ ...@@ -53,10 +55,13 @@
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/viewPager_data" android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/ed_title" android:layout_alignParentTop="true"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_recharge_rule_edit.xml 0 → 100644
View file @ 459a64d2
<?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: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:layout_marginLeft="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="基本信息" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:id="@+id/rule_name_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/rule_name"
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="活动名称" />
<EditText
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:enabled="false" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:maxLength="11"
android:text="启用状态" />
<RadioGroup
android:id="@+id/rule_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12sp"
android:gravity="center_vertical"
android:orientation="horizontal">
<RadioButton
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:tag="1"
android:text="暂停" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:tag="0"
android:text="启用" />
</RadioGroup>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="优惠规则" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="充值每满" />
<EditText
android:id="@+id/recharg_amt"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:digits="0123456789"
android:gravity="center"
android:inputType="phone"
android:maxLength="8" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="送" />
<EditText
android:id="@+id/send_amt"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:digits="0123456789"
android:gravity="center"
android:inputType="phone"
android:maxLength="8" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="开始日期" />
<TextView
android:id="@+id/rule_begin_time"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@mipmap/ic_expand_left"
android:gravity="center"
android:onClick="@{onClickListener}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="结束日期" />
<TextView
android:id="@+id/rule_end_time"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@mipmap/ic_expand_left"
android:gravity="center"
android:onClick="@{onClickListener}" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<Button
android:id="@+id/onSure"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:onClick="@{onClickListener}"
android:text="确认" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_recharge_rule_list.xml 0 → 100644
View file @ 459a64d2
<?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_layout"
layout="@layout/title"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</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/addRule"
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" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<RelativeLayout
android:id="@+id/RecyclerView_Layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin_left">
<LinearLayout
android:id="@+id/noRultBg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_things_null" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="还没有会员等级，请添加会员等级~"
android:textColor="@color/gray_huanggai"
android:textSize="22sp" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/levelRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_replenishement.xml
View file @ 459a64d2
...@@ -22,7 +22,27 @@ ...@@ -22,7 +22,27 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
<LinearLayout <LinearLayout
android:id="@+id/btn_add" android:id="@+id/btn_add"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 459a64d2
...@@ -57,9 +57,10 @@ ...@@ -57,9 +57,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/white_caocao"
android:splitMotionEvents="false"> android:splitMotionEvents="false">
<include <include
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
android:id="@+id/cl_default" android:id="@+id/cl_default"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/ly_title" android:layout_below="@id/ed_title"
android:layout_marginTop="@dimen/all_bounced_padding" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white_caocao"> android:background="@color/white_caocao">
...@@ -410,14 +411,11 @@ ...@@ -410,14 +411,11 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_result" android:id="@+id/ll_result"
android:layout_width="0dp" android:layout_width="180dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/ll_num"
app:layout_constraintTop_toBottomOf="@id/tv_result_hint"> app:layout_constraintTop_toBottomOf="@id/tv_result_hint">
<TextView <TextView
...@@ -494,7 +492,7 @@ ...@@ -494,7 +492,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:padding="@dimen/all_bounced_padding" android:padding="@dimen/all_padding"
android:text="定货明细" android:text="定货明细"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title" android:textSize="@dimen/all_text_size_small_title"
...@@ -503,25 +501,44 @@ ...@@ -503,25 +501,44 @@
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<View
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="30dp"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:background="@color/gray_huanggai" /> android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title" android:layout_above="@id/ed_title"
android:layout_marginTop="@dimen/all_bounced_padding" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:layout_below="@id/ed_title"
android:background="@drawable/singleline_zhouyu_huanggai" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_above="@id/ll_bottom" android:layout_above="@id/ll_bottom"
android:layout_below="@id/cl_default"> android:layout_below="@id/cl_default"
android:background="@color/gray_zhouyu">
</android.support.v7.widget.RecyclerView> </android.support.v7.widget.RecyclerView>
......
app/src/main/res/layout/fragment_user_list.xml
View file @ 459a64d2
...@@ -15,26 +15,26 @@ ...@@ -15,26 +15,26 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:gravity="center_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<include <include
android:id="@+id/title_search" android:id="@+id/search_layout"
layout="@layout/title_search" layout="@layout/title_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
<TextView <TextView
style="@style/textView_body_small"
android:id="@+id/userSearch" android:id="@+id/userSearch"
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="搜索"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:layout_width="wrap_content" android:text="搜索" />
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
...@@ -124,8 +124,7 @@ ...@@ -124,8 +124,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="添加店员" android:text="添加店员"
android:textColor="@color/deep_red" android:textColor="@color/deep_red" />
android:textSize="22sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_vip_level_edit.xml 0 → 100644
View file @ 459a64d2
<?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: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:layout_marginLeft="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="基本信息" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="等级名称" />
<EditText
android:id="@+id/level_name"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入等级名称" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:maxLength="11"
android:text="折扣设置" />
<EditText
android:id="@+id/level_discont"
android:maxLength="3"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:digits="0123456789"
android:hint="%"
android:inputType="numberSigned" />
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@mipmap/img_grade" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="晋级标准" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="最近" />
<EditText
android:id="@+id/update_day"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:maxLength="3"
android:digits="0123456789"
android:inputType="phone" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="天" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="消费金额" />
<EditText
android:id="@+id/update_money"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLength="8"
android:background="@null"
android:digits="0123456789"
android:inputType="phone" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<Button
android:id="@+id/onSure"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:onClick="@{onClickListener}"
android:text="确认" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_level_list.xml 0 → 100644
View file @ 459a64d2
<?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_layout"
layout="@layout/title"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</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/addVip"
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" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<RelativeLayout
android:id="@+id/RecyclerView_Layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin_left">
<LinearLayout
android:id="@+id/noRultBg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_things_null" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="还没有会员等级，请添加会员等级~"
android:textColor="@color/gray_huanggai"
android:textSize="22sp" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/levelRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_inventory_goods.xml
View file @ 459a64d2
...@@ -6,7 +6,15 @@ ...@@ -6,7 +6,15 @@
<data> <data>
</data> </data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:background="@drawable/singleline_zhouyu_huanggai"
/>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -206,6 +214,6 @@ ...@@ -206,6 +214,6 @@
app:layout_constraintTop_toTopOf="@id/linearLayout" /> app:layout_constraintTop_toTopOf="@id/linearLayout" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/item_other_select.xml
View file @ 459a64d2
...@@ -5,6 +5,21 @@ ...@@ -5,6 +5,21 @@
<data> <data>
<variable
name="shopName"
type="String" />
<variable
name="address"
type="String" />
<variable
name="phone"
type="String" />
<variable
name="stock"
type="String" />
</data> </data>
...@@ -33,6 +48,7 @@ ...@@ -33,6 +48,7 @@
android:layout_marginEnd="@dimen/all_bounced_padding" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" /> app:layout_constraintTop_toTopOf="@id/img_goods" />
...@@ -69,17 +85,64 @@ ...@@ -69,17 +85,64 @@
app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint" app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" /> app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
<TextView <TextView
android:id="@+id/tv_shop" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding" android:layout_marginEnd="@dimen/all_bounced_padding"
android:drawableStart="@mipmap/icon_stores" android:layout_weight="1"
android:padding="@dimen/dp_4" android:gravity="right"
android:textColor="@color/black_baozheng" android:text="@{stock}"
android:textSize="@dimen/all_text_size_small" android:textColor="@color/red_lvzhi"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" /> app:layout_constraintTop_toTopOf="@id/tv_goods_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_goods_size"
app:layout_constraintTop_toBottomOf="@id/tv_goods_size">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_stores"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{shopName}"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_address"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{address}"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_telephone"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{phone}"
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
......
app/src/main/res/layout/item_recharge_rulel_list_item.xml 0 → 100644
View file @ 459a64d2
<?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:layout_margin="@dimen/all_margin"
android:background="@mipmap/recharge_rule"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
android:layout_margin="@dimen/all_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="@dimen/all_margin"
android:background="@mipmap/ic_filling" />
<TextView
android:id="@+id/rule_name"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/recharge_send" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_marginBottom="35dp"
android:background="@mipmap/rule_time"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/rule_validity"
style="@style/textView_body_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="2017-2017"
android:textColor="@color/white"
android:textSize="@dimen/small_text_size" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_replenishment_detail.xml
View file @ 459a64d2
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/singleline_white_gray" android:background="@drawable/singleline_white_gray"
android:padding="@dimen/all_padding"> android:foreground="?attr/selectableItemBackground"
android:padding="@dimen/all_bounced_padding">
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/img_goods" android:id="@+id/img_goods"
...@@ -59,11 +59,11 @@ ...@@ -59,11 +59,11 @@
android:id="@+id/tv_goods_size" android:id="@+id/tv_goods_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/frame_frame_zhouyu_bg" android:background="@drawable/frame_frame_zhouyu_bg"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="规格" android:text="规格"
android:textSize="@dimen/all_text_size_small" android:textSize="@dimen/all_text_size_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code" app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" /> app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
...@@ -72,19 +72,20 @@ ...@@ -72,19 +72,20 @@
android:id="@+id/tv_goods_price" android:id="@+id/tv_goods_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="999" android:text="999"
android:textColor="@color/store_product_price" android:textColor="@color/store_product_price"
android:textSize="@dimen/big_text_size" android:textSize="@dimen/big_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_rmb" app:layout_constraintBottom_toBottomOf="@id/tv_rmb"
app:layout_constraintStart_toEndOf="@id/tv_rmb" app:layout_constraintStart_toEndOf="@id/tv_rmb"
app:layout_constraintTop_toTopOf="@id/tv_price_hint" /> app:layout_constraintTop_toTopOf="@id/tv_rmb" />
<TextView <TextView
android:id="@+id/tv_rmb" android:id="@+id/tv_rmb"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="@string/money_rmb" android:text="@string/money_rmb"
android:textColor="@color/store_product_price" android:textColor="@color/store_product_price"
android:textSize="@dimen/all_text_size_small" android:textSize="@dimen/all_text_size_small"
...@@ -101,7 +102,10 @@ ...@@ -101,7 +102,10 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint" app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_price_hint"
>
<ImageButton <ImageButton
android:id="@+id/btn_down" android:id="@+id/btn_down"
...@@ -112,6 +116,15 @@ ...@@ -112,6 +116,15 @@
android:background="@color/white" android:background="@color/white"
android:src="@mipmap/but_reduce" /> android:src="@mipmap/but_reduce" />
<TextView
android:id="@+id/tv_finally_count"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="进货数量："
android:textStyle="bold"
android:visibility="gone" />
<EditText <EditText
android:id="@+id/et_count" android:id="@+id/et_count"
android:layout_width="50dp" android:layout_width="50dp"
...@@ -124,7 +137,7 @@ ...@@ -124,7 +137,7 @@
android:hint="1" android:hint="1"
android:inputType="number" android:inputType="number"
android:maxLength="4" android:maxLength="4"
android:saveEnabled="false" android:saveEnabled="true"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<ImageButton <ImageButton
......
app/src/main/res/layout/item_vip_level_list_item.xml 0 → 100644
View file @ 459a64d2
<?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:gravity="center_horizontal"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/level_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/bg_grade01"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginTop="25dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/bg_grade04" />
<TextView
android:id="@+id/level_name"
style="@style/textView_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="钻石会员"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="18dp"
android:layout_marginRight="@dimen/dtail_width_20"
android:layout_marginTop="25dp"
android:layout_weight="1"
android:gravity="left"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/level_Discount"
style="@style/textView_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="8折"
android:textColor="@color/white" />
</LinearLayout>
<TextView
android:id="@+id/level_condition"
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginBottom="15dp"
android:gravity="bottom"
android:text="@string/adv_plan"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title_search.xml
View file @ 459a64d2
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
android:layout_marginEnd="@dimen/all_padding" android:layout_marginEnd="@dimen/all_padding"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:hint="请输入手机号或会员姓名" android:hint="请输入手机号或会员姓名"
android:inputType="number"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
......
app/src/main/res/layout/view_inventory_detail.xml
View file @ 459a64d2
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="件" android:text=" 件"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/small_text_size" /> android:textSize="@dimen/small_text_size" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/view_order_detail.xml
View file @ 459a64d2
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" /> android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
......
app/src/main/res/layout/view_ticket.xml
View file @ 459a64d2
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_low"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_low"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_low"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ 459a64d2
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
android:weightSum="3"> android:weightSum="3">
<TextView <TextView
android:layout_weight="1" android:layout_weight="1"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
style="@style/textView_body_small" style="@style/dialog_textView_body_small"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
......
app/src/main/res/values/strings.xml
View file @ 459a64d2
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
<!--邻库查询界面--> <!--邻库查询界面-->
<string name="other_selcet_meun">邻库查询</string> <string name="other_selcet_meun">邻库查询</string>
<string name="other_selcet_edit_hint">商品名称/商品条码/商品助记码</string> <string name="other_select_edit_hint">请输入商品名称/商品条码</string>
<string name="other_selcet_shop">共%s个门店库存</string> <string name="other_selcet_shop">共%s个门店库存</string>
<!--补货界面--> <!--补货界面-->
...@@ -459,7 +459,7 @@ ...@@ -459,7 +459,7 @@
<string name="casher_manager_title">店员管理</string> <string name="casher_manager_title">店员管理</string>
<!--充值优惠--> <!--充值优惠-->
<string name="recharge_discounts_title">充值优惠</string> <string name="recharge_discounts_title">充值优惠</string>
<string name="recharge_send">充%s送%s元</string> <string name="recharge_send">充%s元送%s元</string>
<string name="recharge_discounts_number">共%s个优惠</string> <string name="recharge_discounts_number">共%s个优惠</string>
<!--店员管理--> <!--店员管理-->
<string name="casher_titile">管理-店员管理</string> <string name="casher_titile">管理-店员管理</string>
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
<!-- 菜单POS --> <!-- 菜单POS -->
<string name="menu_cashier">收银</string> <string name="menu_cashier">收银</string>
<string name="menu_service">服务</string> <string name="menu_service">服务</string>
<string name="menu_myself">个人</string> <string name="menu_myself">我的</string>
<string name="menu_billing">开单</string> <string name="menu_billing">开单</string>
<string name="menu_receivables">收款</string> <string name="menu_receivables">收款</string>
<string name="menu_vip">会员</string> <string name="menu_vip">会员</string>
......
app/src/main/res/values/styles.xml
View file @ 459a64d2
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<item name="android:layout_marginLeft">@dimen/all_margin_left</item> <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:textSize">@dimen/text_three_title</item> <item name="android:textSize">@dimen/text_three_title</item>
<item name="android:background">@color/transparent</item> <item name="android:background">@color/transparent</item>
<item name=" android:textColor">@color/gary</item> <item name="android:textColor">@color/gary</item>
<item name="android:gravity">center|left</item> <item name="android:gravity">center|left</item>
</style> </style>
...@@ -403,11 +403,23 @@ ...@@ -403,11 +403,23 @@
</style> </style>
<style name="textView_body_small"> <style name="textView_body_small">
<item name="android:padding">@dimen/dp_4</item> <item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_small</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="dialog_textView_body_small">
<item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_small</item> <item name="android:textSize">@dimen/all_text_size_small</item>
<item name="android:textColor">@color/black_baozheng</item> <item name="android:textColor">@color/black_baozheng</item>
</style> </style>
<style name="dialog_textView_body_low">
<item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_low</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="searchBarEditor"> <style name="searchBarEditor">
<item name="android:drawableStart">@mipmap/ic_search</item> <item name="android:drawableStart">@mipmap/ic_search</item>
<item name="android:drawablePadding">@dimen/all_spacing</item> <item name="android:drawablePadding">@dimen/all_spacing</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