Skip to content

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

营销计划修改; 

优化开单和收款的流程和结构;
parent 21217e8f
Hide whitespace changes
Inline Side-by-side
Showing with 564 additions and 42 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 574b62b8
......@@ -536,6 +536,16 @@ public class C {
public static final int SKU = 4;
}
public final class MS_AREA {
public static final int MER = 3;
public static final int LOCAL = 4;
}
public final class MS_USER {
public static final int ALL = 0;
public static final int VIP = 1;
}
public final class SETTLE_MODE {
public static final int PAYMENT = 1;
public static final int STORE = 2;
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java
View file @ 574b62b8
......@@ -4,7 +4,6 @@ package com.xingdata.zzdpos.ui.marketing.ms;
import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
......@@ -70,13 +69,11 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override
public void showEditorFragment(Ms ms) {
LogUtils.e("编辑 " + ms.getMsName());
start(mEditorFragment);
start(mEditorFragment.setMs(ms));
}
@Override
public void showEditorFragment(int msType) {
LogUtils.e("添加 " + msType);
start(mEditorFragment);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ 574b62b8
......@@ -6,6 +6,7 @@ import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
......@@ -73,12 +74,12 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
groups.add(new Group(C.MS_GROUP.SKU, "指定商品"));
List<Area> areas = new ArrayList<>();
areas.add(new Area(0, "所有门店"));
areas.add(new Area(1, "本店"));
areas.add(new Area(C.MS_AREA.MER, "所有门店", LoginPresenter.loginReturnBean.getMerMapId()));
areas.add(new Area(C.MS_AREA.LOCAL, "本店", LoginPresenter.loginReturnBean.getMerMapId()));
List<User> users = new ArrayList<>();
users.add(new User(0, "所有顾客", 0));
users.add(new User(0, "所有会员", 0));
users.add(new User(C.MS_USER.ALL, "所有顾客", 0));
users.add(new User(C.MS_USER.VIP, "所有会员", 0));
DBFactory.Marketing.Ms.queryLevel()
.doFinally(() -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/BeanAdapter.java
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.adapter;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSelectedAdapter;
import com.xingdata.zzdpos.base.BaseViewHolder;
......@@ -7,21 +9,41 @@ import com.xingdata.zzdpos.databinding.ItemSelectorBinding;
import com.xingdata.zzdpos.ui.marketing.ms.model.BaseBean;
import java.util.ArrayList;
import java.util.List;
public class BeanAdapter<T extends BaseBean> extends BaseSelectedAdapter<T, ItemSelectorBinding> {
public class BeanAdapter<B extends BaseBean> extends BaseSelectedAdapter<B, ItemSelectorBinding> {
public BeanAdapter() {
super(R.layout.item_selector, new ArrayList<>(), true);
}
public interface OnItemSelectedListener {
void onItemSelected(String item);
}
private OnItemSelectedListener mOnItemSelectedListener;
@Override
protected void convert(BaseViewHolder helper, ItemSelectorBinding mViewBinding, T item) {
protected void convert(BaseViewHolder helper, ItemSelectorBinding mViewBinding, B item) {
mViewBinding.setSelected(getSelectedPosition() == helper.getAdapterPosition());
mViewBinding.tvName.getPaint().setFakeBoldText(getSelectedPosition() == helper.getAdapterPosition());
mViewBinding.tvName.setText(item.getName());
}
public void setNewData(@Nullable List<B> data) {
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());
this.setSelectedPosition(i);
}
}
}
super.setNewData(data);
}
public String[] getStrs() {
String[] strs = new String[getData().size()];
for (int i = 0; i < getData().size(); i++) {
......@@ -30,8 +52,17 @@ public class BeanAdapter<T extends BaseBean> extends BaseSelectedAdapter<T, Item
return strs;
}
public <B extends BaseBean> void setItemId(B b) {
private B b;
public void setBean(B b) {
this.b = b;
}
public void setOnItemSelectedListener(OnItemSelectedListener onItemSelectedListener) {
this.mOnItemSelectedListener = onItemSelectedListener;
}
public OnItemSelectedListener getOnItemSelectedListener() {
return mOnItemSelectedListener;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java
View file @ 574b62b8
......@@ -23,9 +23,13 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.User;
import com.xingdata.zzdpos.ui.marketing.ms.view.BaseGroupView;
import com.xingdata.zzdpos.ui.marketing.ms.view.BaseTypeView;
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.TypeMoneyOffView;
import com.xingdata.zzdpos.ui.marketing.ms.view.TypePromotionView;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
......@@ -44,11 +48,16 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
private ViewTimeDetailBinding mTimeDetailBinding;
private BaseGroupView mGroupView;
private BaseTypeView mTypeView;
private GroupAllView mGroupAllView = new GroupAllView();
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() {
return R.layout.fragment_ms_editor;
......@@ -56,19 +65,12 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
@Override
public void initView() {
{//TODO DELETE
mMs = new Ms();
mMs.setMsDateBegin(20170105L);
mMs.setMsDateEnd(20170115L);
mMs.setMsTimeBegin(000000L);
mMs.setMsTimeEnd(235959L);
mMs.setMsWeekPlan("1,2,3,5");
}
initInfoViews();
initTimeViews();
initMsViews();
setViewByMs();
mPresenter.initEditor();
}
......@@ -118,12 +120,11 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
}
/**
* TODO 加载换购的商品
* 加载换购的商品
*
* @param sssku 商品
*/
public <Sku extends BaseSku> void loadTypeSku(Sku sssku) {
// if (mTypeView instanceof TypeGiftView) ((TypeGiftView) mTypeView).loadSssku(sssku);
}
/**
......@@ -138,7 +139,8 @@ 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()));
}
/**
......@@ -216,28 +218,28 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
* 初始化活动信息界面
*/
private void initMsViews() {
// group
mGroupAdapter = new BeanAdapter<>();
mViewBinding.rlGroup.setAdapter(mGroupAdapter);
mViewBinding.rlGroup.setLayoutManager(new LinearLayoutManager(mContext));
// area
mAreaAdapter = new BeanAdapter<>();
mAreaAdapter.setOnItemSelectedListener(item -> mViewBinding.setArea(item));
// user
mUserAdapter = new BeanAdapter<>();
mUserAdapter.setOnItemSelectedListener(item -> mViewBinding.setUser(item));
// group
mGroupAdapter = new BeanAdapter<>();
mViewBinding.rlGroup.setAdapter(mGroupAdapter);
mViewBinding.rlGroup.setLayoutManager(new LinearLayoutManager(mContext));
// listener
mGroupAdapter.setOnItemClickListener((adapter, view, position) -> {
});
mViewBinding.llArea.setOnClickListener(view -> showSelectorDialog(R.string.ms_editor_area, mAreaAdapter, (dialog, which) -> {
mViewBinding.setArea(mAreaAdapter.getStrs()[which]);
mAreaAdapter.getOnItemSelectedListener().onItemSelected(mAreaAdapter.getStrs()[which]);
mAreaAdapter.setSelectedPosition(which);
dialog.dismiss();
})
);
mViewBinding.llUser.setOnClickListener(view -> showSelectorDialog(R.string.ms_editor_user, mUserAdapter, (dialog, which) -> {
mViewBinding.setUser(mUserAdapter.getStrs()[which]);
mUserAdapter.getOnItemSelectedListener().onItemSelected(mUserAdapter.getStrs()[which]);
mUserAdapter.setSelectedPosition(which);
dialog.dismiss();
})
......@@ -261,6 +263,9 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
FragmentUtils.replace(getChildFragmentManager(), mGroupView, R.id.f_group);
}
});
//type
loadRootFragment(R.id.f_type, mTypeDisView);
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/model/Area.java
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.model;
public class Area extends BaseBean {
public Area(int id, String name) {
public Area(int id, String name, Long merId) {
setId(id);
setName(name);
setInfo(merId);
}
public Area(int id, long merId) {
setId(id);
setInfo(merId);
}
public void setMerId(int merId) {
setInfo(merId);
}
public long getMerId() {
return getInfo();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/model/BaseBean.java
View file @ 574b62b8
......@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.marketing.ms.model;
public class BaseBean {
private int id;
private String name;
private long info;
public int getId() {
return id;
......@@ -20,4 +21,12 @@ public class BaseBean {
public void setName(String name) {
this.name = name;
}
public long getInfo() {
return info;
}
public void setInfo(long info) {
this.info = info;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/model/User.java
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.model;
public class User extends BaseBean {
public User(int id, String name, int levelId) {
public User(int id, String name, long levelId) {
setId(id);
setName(name);
setLevelId(levelId);
setInfo(levelId);
}
private int levelId;
public User(int id, long levelId) {
setId(id);
setInfo(levelId);
}
public int getLevelId() {
return levelId;
public void setLevelId(long levelId) {
setInfo(levelId);
}
public void setLevelId(int levelId) {
this.levelId = levelId;
public long getLevelId() {
return getInfo();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/BaseGroupView.java
View file @ 574b62b8
......@@ -10,7 +10,6 @@ public abstract class BaseGroupView<B extends ViewDataBinding> extends BaseFragm
public Ms mMs;
@Override
public void initView() {
if (mMs != null) setViewByMs();
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/BaseTypeView.java 0 → 100644
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.view;
import android.databinding.ViewDataBinding;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
public abstract class BaseTypeView<B extends ViewDataBinding> extends BaseFragment<MsPresenter, B> {
public Ms mMs;
@Override
public void initView() {
if (mMs != null) setViewByMs();
}
protected abstract void setViewByMs();
/**
* 设置营销计划
*
* @param ms 营销计划实体
* @return this
*/
public BaseTypeView setMs(Ms ms) {
this.mMs = ms;
return this;
}
/**
* 获取当前页面的属性赋给营销计划实体
*
* @param ms 要编辑的营销计划
* @return 是否成功赋值
*/
public abstract boolean processMs(Ms ms);
@Override
public void onDestroyView() {
if (mMs != null) processMs(mMs);
super.onDestroyView();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeDisView.java 0 → 100644
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.view;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ViewTypeDisBinding;
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));
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.DIS);
String strDis = mViewBinding.etDis.getText().toString();
if (StringUtils.isEmpty(strDis)) return false;
ms.setPriceDiscount((byte) (Double.valueOf(strDis) * 10));
return true;
}
@Override
public int getLayoutId() {
return R.layout.view_type_dis;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeMoneyOffView.java 0 → 100644
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.view;
import android.text.Editable;
import android.text.TextWatcher;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ViewTypeMoneyOffBinding;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.InputFilters;
/**
* 满减返现页面
*/
public class TypeMoneyOffView extends BaseTypeView<ViewTypeMoneyOffBinding> {
@Override
public int getLayoutId() {
return R.layout.view_type_money_off;
}
@Override
public void initView() {
super.initView();
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) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
if (ConvertUtil.yuanToFen(mViewBinding.etAmt.getText().toString()) <
ConvertUtil.yuanToFen(mViewBinding.etDisAmt.getText().toString())) {
mViewBinding.etDisAmt.setText(mViewBinding.etAmt.getText());
}
}
});
mViewBinding.etDisAmt.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
if (ConvertUtil.yuanToFen(mViewBinding.etDisAmt.getText().toString()) >
ConvertUtil.yuanToFen(mViewBinding.etAmt.getText().toString())) {
mViewBinding.etAmt.setText(mViewBinding.etDisAmt.getText());
}
}
});
}
@Override
protected void setViewByMs() {
if (mMs.getMsTools() == null || mMs.getMsTools() != C.MS_TYPE.MONEY_OFF) return;
mViewBinding.etAmt.setText(ConvertUtil.fenToYuan(mMs.getPayAmt()));
mViewBinding.etDisAmt.setText(ConvertUtil.fenToYuan(mMs.getGiftOffAmt()));
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.MONEY_OFF);
String strAmt = mViewBinding.etAmt.getText().toString();
if (StringUtils.isEmpty(strAmt)) return false;
ms.setPayAmt(ConvertUtil.yuanToFen(strAmt));
String strDisAmt = mViewBinding.etDisAmt.getText().toString();
if (StringUtils.isEmpty(strDisAmt)) return false;
if (ConvertUtil.yuanToFen(strDisAmt) > ConvertUtil.yuanToFen(strAmt)) return false;
ms.setGiftOffAmt(ConvertUtil.yuanToFen(strDisAmt));
return true;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypePromotionView.java 0 → 100644
View file @ 574b62b8
package com.xingdata.zzdpos.ui.marketing.ms.view;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ViewTypePromotionBinding;
import com.xingdata.zzdpos.model.Ms;
/**
* 促销页面
*/
public class TypePromotionView extends BaseTypeView<ViewTypePromotionBinding> {
@Override
public int getLayoutId() {
return R.layout.view_type_promotion;
}
@Override
protected void setViewByMs() {
}
@Override
public boolean processMs(Ms ms) {
ms.setMsTools(C.MS_TYPE.PROMOTION);
return true;
}
}
app/src/main/res/layout/view_type_dis.xml 0 → 100644
View file @ 574b62b8
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="disRate"
type="String" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
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" />
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_dis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/ms_type_dis" />
<RadioButton
android:id="@+id/rb_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:text="@string/ms_type_second" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
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>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_type_money_off.xml 0 → 100644
View file @ 574b62b8
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="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: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: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" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_type_promotion.xml 0 → 100644
View file @ 574b62b8
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="disRate"
type="String" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
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" />
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_dis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/ms_type_dis" />
<RadioButton
android:id="@+id/rb_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:text="@string/ms_type_second" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
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>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 574b62b8
......@@ -13,6 +13,7 @@
<string name="visible">visible</string>
<string name="gone">gone</string>
<string name="password">＊</string>
<string name="rate">%</string>
<!--返回-->
<string name="all_go_back">返回</string>
......@@ -594,13 +595,14 @@
<string name="ms_type_dis">打折</string>
<string name="ms_type_dis_info">享受%s折优惠</string>
<string name="ms_type_dis_abbr">折</string>
<string name="ms_type_dis_hint">请输入折扣比例(%)</string>
<string name="ms_type_promotion">促销</string>
<string name="ms_type_promotion_info">享受促销价</string>
<string name="ms_type_promotion_abbr">促</string>
<string name="ms_type_money_off">满减</string>
<string name="ms_type_money_off_info">满%s元减%s元</string>
<string name="ms_type_money_off_abbr">满</string>
<string name="ms_type_second">打折</string>
<string name="ms_type_second">第二件折</string>
<string name="ms_type_second_info">第二件享受%s折优惠</string>
<string name="ms_type_second_abbr">折</string>
<string name="ms_type_gift">换购</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