Skip to content

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

提交代码;

parent f07ddeaf
Hide whitespace changes
Inline Side-by-side
Showing with 417 additions and 123 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ c435df0c
......@@ -512,8 +512,8 @@ public class C {
public static final int MONEY_OFF = 4;
//换购
public static final int GIFT = 5;
//会员折扣
public static final int VIP = 6;
//第二件促销
public static final int SECOND_PRO = 6;
}
public final class DIS_TYPE {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
View file @ c435df0c
......@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.marketing.ms;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
......@@ -57,6 +58,11 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
});
}
@Override
public void showMsg(String msg) {
ToastUtils.showShort(msg);
}
@Override
public void loadMss(List<Ms> mss, boolean isRefresh) {
mManagerFragment.loadMss(mss, isRefresh);
......@@ -69,12 +75,12 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void showEditorFragment(Ms ms) {
start(mEditorFragment.setMs(ms));
start(mEditorFragment.setMs(ms).setEditMode(C.MS_EDITOR_MODE.UPDATE));
}
@Override
public void showEditorFragment(int msType) {
start(mEditorFragment);
start(mEditorFragment.setMs(msType).setEditMode(C.MS_EDITOR_MODE.UPDATE));
}
@Override
......@@ -125,12 +131,27 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
mEditorFragment.loadTypeSku(sku);
}
@Override
public void addMs(Ms ms) {
mManagerFragment.addMs(ms);
}
@Override
public void updateMs(Ms ms) {
mManagerFragment.updateMs(ms);
}
@Override
public void backToEditFragment() {
this.popTo(EditorFragment.class, false);
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
}
@Override
public void backToManagerFragment() {
this.popTo(ManagerFragment.class, false);
}
@Override
public void showLoadingDialog() {
mLoadingDialog.show(this);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java
View file @ c435df0c
......@@ -14,6 +14,12 @@ import java.util.List;
interface MsContract {
interface View<Sku extends BaseSku> extends BaseView {
/**
* 显示文字内容
*
* @param msg 要显示的内容
*/
void showMsg(String msg);
/**
* 加载营销计划数据
......@@ -101,11 +107,30 @@ interface MsContract {
*/
void loadTypeGift(Sku sku);
/**
* 添加营销
*
* @param ms 要添加的营销实体
*/
void addMs(Ms ms);
/**
* 更新营销
*
* @param ms 更新营销实体
*/
void updateMs(Ms ms);
/**
* 返回编辑页面
*/
void backToEditFragment();
/**
* 返回管理页面
*/
void backToManagerFragment();
/**
* 显示读取对话框
*/
......@@ -171,6 +196,14 @@ interface MsContract {
*/
public abstract void clickSearchButton(String keyword);
/**
* 编辑页面 - 点击编辑器的确定
*
* @param ms 要保存的营销计划
* @param editMode 编辑模式
*/
public abstract void clickEditorConfirm(Ms ms, Integer editMode);
/**
* 搜索页面 - 加载更多搜索信息
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ c435df0c
......@@ -48,7 +48,13 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
@Override
public void clickMsItem(Ms ms) {
mView.showEditorFragment(ms);
mView.showLoadingDialog();
ApiFactory.Ms.detail(ms.getId())
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(
ms1 -> mView.showEditorFragment(ms1),
throwable -> mView.dismissLoadingDialog()
);
}
@Override
......@@ -113,8 +119,38 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
}
@Override
public void loadMoreSearchResult() {
public void clickEditorConfirm(Ms ms, Integer editMode) {
mView.showLoadingDialog();
switch (editMode) {
case C.MS_EDITOR_MODE.ADD:
ApiFactory.Ms.add(ms)
.doOnSubscribe(disposable -> mView.dismissLoadingDialog())
.subscribe(ms1 -> {
mView.showMsg("添加成功");
mView.backToManagerFragment();
mView.addMs(ms1);
}, throwable -> {
mView.showMsg("添加失败");
});
break;
case C.MS_EDITOR_MODE.UPDATE:
ApiFactory.Ms.update(ms)
.doOnSubscribe(disposable -> mView.dismissLoadingDialog())
.subscribe(ms1 -> {
mView.showMsg("修改成功");
mView.backToManagerFragment();
mView.updateMs(ms1);
}, throwable -> {
mView.showMsg("修改失败");
});
break;
}
}
@Override
public void loadMoreSearchResult() {
this.mSkuPageNum++;
this.getSearchSku();
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/BeanAdapter.java
View file @ c435df0c
......@@ -35,7 +35,9 @@ public class BeanAdapter<B extends BaseBean> extends BaseSelectedAdapter<B, Item
if (b != null && data != null) {
for (int i = 0; i < data.size(); i++) {
if (data.get(i).getId() == b.getId() && data.get(i).getInfo() == b.getInfo()) {
this.mOnItemSelectedListener.onItemSelected(data.get(i).getName());
if (mOnItemSelectedListener != null) {
this.mOnItemSelectedListener.onItemSelected(data.get(i).getName());
}
this.setSelectedPosition(i);
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java
View file @ c435df0c
......@@ -10,6 +10,9 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -17,6 +20,7 @@ import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentMsEditorBinding;
import com.xingdata.zzdpos.databinding.ViewTimeDetailBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.adapter.BeanAdapter;
import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
......@@ -28,15 +32,19 @@ import com.xingdata.zzdpos.ui.marketing.ms.view.GroupAllView;
import com.xingdata.zzdpos.ui.marketing.ms.view.GroupCateView;
import com.xingdata.zzdpos.ui.marketing.ms.view.GroupSkuView;
import com.xingdata.zzdpos.ui.marketing.ms.view.TypeDisView;
import com.xingdata.zzdpos.ui.marketing.ms.view.TypeGiftView;
import com.xingdata.zzdpos.ui.marketing.ms.view.TypeMoneyOffView;
import com.xingdata.zzdpos.ui.marketing.ms.view.TypePromotionView;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Locale;
public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBinding> {
private Ms mMs;
private Integer mEditorMode;
private BeanAdapter<Group> mGroupAdapter;
private BeanAdapter<Area> mAreaAdapter;
......@@ -54,9 +62,6 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
private GroupCateView mGroupCateView = new GroupCateView();
private GroupSkuView mGroupSkuView = new GroupSkuView();
private TypeDisView mTypeDisView = new TypeDisView();
private TypeMoneyOffView mMoneyOffView = new TypeMoneyOffView();
private TypePromotionView mPromotionView = new TypePromotionView();
@Override
public int getLayoutId() {
......@@ -68,20 +73,74 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
initInfoViews();
initTimeViews();
initMsViews();
setViewByMs();
mViewBinding.btnConfirm.setOnClickListener(view -> processMs());
mPresenter.initEditor();
}
/**
* 营销方案
* 设置营销方案
*
* @param ms 营销计划
* @return this
*/
public EditorFragment setMs(Ms ms) {
this.mMs = ms;
return this;
}
/**
* 设置营销方案
*
* @param msType 营销计划类型
* @return this
*/
public EditorFragment setMs(int msType) {
mMs = new Ms();
//类型 - 在addFragment选择的类型
mMs.setMsTools(msType);
//日期 - 当天
long now = ConvertUtil.stringToLong(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
mMs.setMsDateBegin(now);
mMs.setMsDateEnd(now);
//时间 - 00:00 ~ 23:59
mMs.setMsTimeBegin(0L);
mMs.setMsTimeEnd(235959L);
//星期 - 全选
mMs.setMsWeekPlan("1,2,3,4,5,6,7");
//会员 - 全部
mMs.setMsCoustomTag((byte) C.MS_USER.ALL);
mMs.setVipLevel((byte) 0);
//范围 - 本渠道下所有门店
mMs.setMsRangeTag((byte) C.MS_AREA.MER);
mMs.setMerMapId(LoginPresenter.loginReturnBean.getMerMapId());
//主体 - 全场商品
mMs.setMsTouchTag2((byte) C.MS_GROUP.ALL);
return this;
}
/**
* 设置编辑类型
*
* @param editMode 编辑类型
* @return this
*/
public EditorFragment setEditMode(int editMode) {
this.mEditorMode = editMode;
return this;
}
/**
* 加载主体对象
*
......@@ -139,8 +198,9 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
mViewBinding.setDateStart(new StringBuffer(mMs.getMsDateBegin().toString()).insert(8, "日").insert(6, "月").insert(4, "年").toString());
mViewBinding.setDateEnd(new StringBuffer(mMs.getMsDateEnd().toString()).insert(8, "日").insert(6, "月").insert(4, "年").toString());
mAreaAdapter.setBean(new Area(mMs.getMsRangeTag().intValue(), mMs.getMerMapId()));
mUserAdapter.setBean(new User(mMs.getMsCoustomTag().intValue(), mMs.getVipLevel().longValue()));
mAreaAdapter.setBean(new Area(mMs.getMsRangeTag().intValue(), mMs.getMerMapId()));
mGroupAdapter.setBean(new Group(mMs.getMsTouchTag2()));
}
/**
......@@ -158,7 +218,6 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
mDateStartDialog.show();
});
mViewBinding.llDateEnd.setOnClickListener(view -> {
if (mDateEndDialog == null) initDateEndDialog();
mDateEndDialog.show();
});
......@@ -265,7 +324,27 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
});
//type
loadRootFragment(R.id.f_type, mTypeDisView);
switch (mMs.getMsTools()) {
case C.MS_TYPE.DIS:
mTypeView = new TypeDisView();
break;
case C.MS_TYPE.PROMOTION:
mTypeView = new TypePromotionView();
break;
case C.MS_TYPE.MONEY_OFF:
mTypeView = new TypeMoneyOffView();
break;
case C.MS_TYPE.GIFT:
mTypeView = new TypeGiftView();
break;
case C.MS_TYPE.SECOND:
mTypeView = new TypeDisView();
break;
case C.MS_TYPE.SECOND_PRO:
mTypeView = new TypePromotionView();
break;
}
this.loadRootFragment(R.id.f_type, mTypeView.setMs(mMs));
}
/**
......@@ -363,4 +442,43 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
.setSingleChoiceItems(adapter.getStrs(), adapter.getSelectedPosition(), onClickListener)
.create().show();
}
/**
* 处理数据
*/
private void processMs() {
if (StringUtils.isEmpty(mViewBinding.etName.getText().toString())) {
ToastUtils.showShort("请输入营销计划名");
mViewBinding.etName.requestFocus();
return;
}
if (!mTypeView.processMs(mMs) || !mGroupView.processMs(mMs)) {
ToastUtils.showShort("请确认输入内容是否正确");
return;
}
mMs.setMsName(mViewBinding.getName());
mMs.setMsDateBegin(ConvertUtil.stringToLong(mViewBinding.getDateStart().replaceAll("[\\u4e00-\\u9fa5]+", "")));
mMs.setMsDateEnd(ConvertUtil.stringToLong(mViewBinding.getDateEnd().replaceAll("[\\u4e00-\\u9fa5]+", "")));
if (mTimeDetailBinding != null) {
mMs.setMsTimeBegin(ConvertUtil.stringToLong(mTimeDetailBinding.getTimeStart().replace(":", "") + "00"));
mMs.setMsTimeEnd(ConvertUtil.stringToLong(mTimeDetailBinding.getTimeEnd().replace(":", "") + "59"));
String weekPlan = "";
if (mTimeDetailBinding.cbSun.isChecked()) weekPlan += "1,";
if (mTimeDetailBinding.cbMon.isChecked()) weekPlan += "2,";
if (mTimeDetailBinding.cbTue.isChecked()) weekPlan += "3,";
if (mTimeDetailBinding.cbWed.isChecked()) weekPlan += "4,";
if (mTimeDetailBinding.cbThu.isChecked()) weekPlan += "5,";
if (mTimeDetailBinding.cbFri.isChecked()) weekPlan += "6,";
if (mTimeDetailBinding.cbSat.isChecked()) weekPlan += "7,";
if (weekPlan.length() > 0) weekPlan = weekPlan.substring(0, weekPlan.lastIndexOf(","));
mMs.setMsWeekPlan(weekPlan);
}
mMs.setMsToolsType(mMs.getMsTools());
mMs.setGiftTag(mMs.getMsTools().byteValue());
mMs.setCreateTime(null);
mMs.setUpdateTime(null);
mPresenter.clickEditorConfirm(mMs, mEditorMode);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java
View file @ c435df0c
......@@ -61,6 +61,31 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
}
/**
* 添加营销计划
*
* @param ms 要添加的营销计划
*/
public void addMs(Ms ms) {
mMsAdapter.setEnableLoadMore(false);
mViewBinding.rlMs.scrollToPosition(0);
mMsAdapter.addData(0, ms);
}
/**
* 更新营销计划
*
* @param ms 要更新的营销计划
*/
public void updateMs(Ms ms) {
for (int i = 0; i < mMsAdapter.getData().size(); i++) {
if (mMsAdapter.getData().get(i).getId().longValue() == ms.getId().longValue()) {
mMsAdapter.setData(i, ms);
return;
}
}
}
/**
* 刷新营销计划
*/
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/model/Group.java
View file @ c435df0c
......@@ -5,4 +5,8 @@ public class Group extends BaseBean {
setId(id);
setName(name);
}
public Group(int id) {
setId(id);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupCateView.java
View file @ c435df0c
......@@ -80,6 +80,9 @@ public class GroupCateView extends BaseGroupView<ViewGroupCateBinding> {
@Override
public void initView() {
super.initView();
cateId = mMs.getSpuCateId();
loadCla();
mViewBinding.nsType1.setOnItemSelectedListener(mOnItemSelectedListener);
......@@ -115,7 +118,7 @@ public class GroupCateView extends BaseGroupView<ViewGroupCateBinding> {
mViewBinding.nsType1.attachDataSource(strClas);
mViewBinding.nsType1.setSelectedIndex(mClaPosition);
cateId = mClas.get(0).getSpuCateId();
if (cateId == 0) cateId = mClas.get(0).getSpuCateId();
loadGrp(mClas.get(mClaPosition));
},
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeDisView.java
View file @ c435df0c
......@@ -9,20 +9,21 @@ import com.xingdata.zzdpos.model.Ms;
public class TypeDisView extends BaseTypeView<ViewTypeDisBinding> {
@Override
protected void setViewByMs() {
if (mMs.getMsTools() == null || mMs.getMsTools() != C.MS_TYPE.DIS) return;
mViewBinding.etDis.setText(String.valueOf(Double.valueOf(mMs.getPriceDiscount()) / 10));
if (mMs.getMsTools() == null) return;
if (mMs.getMsTools() == C.MS_TYPE.DIS) mViewBinding.rbDis.setChecked(true);
if (mMs.getMsTools() == C.MS_TYPE.SECOND) mViewBinding.rbSecond.setChecked(true);
mViewBinding.etDis.setText(String.valueOf(mMs.getPriceDiscount()));
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.DIS);
ms.setMsTools(mViewBinding.rbDis.isChecked() ? C.MS_TYPE.DIS : C.MS_TYPE.SECOND);
String strDis = mViewBinding.etDis.getText().toString();
if (StringUtils.isEmpty(strDis)) return false;
ms.setPriceDiscount((byte) (Double.valueOf(strDis) * 10));
ms.setPriceDiscount(Byte.valueOf(strDis));
return true;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeGiftView.java 0 → 100644
View file @ c435df0c
package com.xingdata.zzdpos.ui.marketing.ms.view;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ViewTypeGiftBinding;
import com.xingdata.zzdpos.model.Ms;
/**
* 促销页面
*/
public class TypeGiftView extends BaseTypeView<ViewTypeGiftBinding> {
@Override
public int getLayoutId() {
return R.layout.view_type_gift;
}
@Override
protected void setViewByMs() {
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.GIFT);
return true;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeMoneyOffView.java
View file @ c435df0c
......@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.util.InputFilters;
* 满减返现页面
*/
public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
@Override
public int getLayoutId() {
return R.layout.view_type_money_off;
......@@ -26,7 +27,6 @@ public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
mViewBinding.etAmt.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etDisAmt.setFilters(InputFilters.getMoneyFilter(6));
mViewBinding.etAmt.requestFocus();
mViewBinding.etAmt.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypePromotionView.java
View file @ c435df0c
......@@ -9,6 +9,7 @@ import com.xingdata.zzdpos.model.Ms;
* 促销页面
*/
public class TypePromotionView extends BaseTypeView<ViewTypePromotionBinding> {
@Override
public int getLayoutId() {
return R.layout.view_type_promotion;
......@@ -16,12 +17,14 @@ public class TypePromotionView extends BaseTypeView<ViewTypePromotionBinding> {
@Override
protected void setViewByMs() {
if (mMs.getMsTools() == null) return;
if (mMs.getMsTools() == C.MS_TYPE.PROMOTION) mViewBinding.rbPro.setChecked(true);
if (mMs.getMsTools() == C.MS_TYPE.SECOND_PRO) mViewBinding.rbSecondPro.setChecked(true);
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.PROMOTION);
ms.setMsTools(mViewBinding.rbPro.isChecked() ? C.MS_TYPE.PROMOTION : C.MS_TYPE.SECOND_PRO);
return true;
}
}
app/src/main/res/layout/fragment_ms_editor.xml
View file @ c435df0c
......@@ -67,11 +67,14 @@
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/transparent"
android:hint="@string/ms_editor_name_hint"
android:inputType="text"
android:lines="1"
android:text="@{name}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
......
app/src/main/res/layout/view_type_dis.xml
View file @ c435df0c
......@@ -2,15 +2,6 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="disRate"
type="String" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -20,7 +11,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
......@@ -67,7 +57,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
......
app/src/main/res/layout/view_type_gift.xml 0 → 100644
View file @ c435df0c
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_type_money_off.xml
View file @ c435df0c
......@@ -5,55 +5,87 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text1"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_amt"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text1"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_amt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_amt"
android:saveEnabled="false" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text3"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:inputType="numberDecimal"
android:labelFor="@+id/et_amt"
android:minWidth="100dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text2"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_dis_amt"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:inputType="numberDecimal"
android:labelFor="@+id/et_dis_amt"
android:minWidth="100dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text3"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text2"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
<EditText
android:id="@+id/et_dis_amt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/transparent"
android:inputType="numberDecimal"
android:labelFor="@+id/et_dis_amt" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/ms_editor_type_money_off_text3"
android:textColor="@color/black"
android:textSize="@dimen/big_text_size" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/view_type_promotion.xml
View file @ c435df0c
......@@ -2,14 +2,6 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="disRate"
type="String" />
</data>
<LinearLayout
android:layout_width="match_parent"
......@@ -20,7 +12,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
......@@ -42,18 +33,18 @@
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_dis"
android:id="@+id/rb_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/ms_type_dis" />
android:text="@string/ms_type_promotion" />
<RadioButton
android:id="@+id/rb_second"
android:id="@+id/rb_second_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:text="@string/ms_type_second" />
android:text="@string/ms_type_second_pro" />
</RadioGroup>
</LinearLayout>
......@@ -64,35 +55,28 @@
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/ms_editor_user"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<EditText
android:id="@+id/et_dis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/transparent"
android:hint="@string/ms_type_dis_hint"
android:inputType="number"
android:maxLength="2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
android:text="@string/ms_editor_type_promotion_text1"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_spacing"
android:gravity="center_vertical"
android:text="@string/ms_editor_type_promotion_text2"
android:textSize="@dimen/all_caption_size" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ c435df0c
......@@ -352,13 +352,13 @@
<string name="ms_editor_type_dis_hint">折扣比例</string>
<string name="ms_editor_type_dis_text2">折优惠</string>
<string name="ms_editor_type_promotion_text1">按选定商品的促销价销售</string>
<string name="ms_editor_type_promotion_text2">【商品管理中调整促销价】</string>
<string name="ms_editor_type_promotion_text2">促销价为商品维护中的促销价</string>
<string name="ms_editor_type_second_text1">第二件享受</string>
<string name="ms_editor_type_second_hint">折扣比例</string>
<string name="ms_editor_type_second_text2">折优惠</string>
<string name="ms_editor_type_money_off_text1">满</string>
<string name="ms_editor_type_money_off_text2">元，减</string>
<string name="ms_editor_type_money_off_text3">元</string>g>
<string name="ms_editor_type_money_off_text2">减</string>
<string name="ms_editor_type_money_off_text3">元</string>
<string name="ms_editor_type_gift_text1">满</string>
<string name="ms_editor_type_gift_text2">元，加</string>
<string name="ms_editor_type_gift_text3">元换购</string>
......@@ -608,6 +608,7 @@
<string name="ms_type_gift">换购</string>
<string name="ms_type_gift_info">满%s元加%s元换购%s一件</string>
<string name="ms_type_gift_abbr">换</string>
<string name="ms_type_second_pro">第二件促销</string>
<!--帮助POS-->
<string name="help_hint">帮助</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment