Skip to content

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

修改国际化文件;

parent bfb3b8bc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1737 additions and 1505 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ ddd1dbb9
......@@ -71,7 +71,7 @@ public class App extends Application {
.start();
// 初始化异常处理
initEx();
// initEx();
//初始化Fragment框架
initFragment();
......
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ ddd1dbb9
......@@ -45,9 +45,9 @@ public class C {
public static final String USER_AGENT = "UrlConnection - ZZDHttpClient V1.0";
public static final String CONNECTION = "Keep-Alive";
public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
public static final String CONTENT_LANGUAGE = "zh-cn";
public static final String CONTENT_LANGUAGE = "en";
public static final String CACHE_CONTROL = "no-cache";
public static final String ACCEPT_LANGUAGE = "zh-cn";
public static final String ACCEPT_LANGUAGE = "en";
}
public final class API_BUILDER {
......@@ -670,7 +670,7 @@ public class C {
/**
* 当前支付系统
*/
public static final int CURRENT = PAX.API;
public static final int CURRENT = PAX.APP;
/**
* 浙星
......
app/src/main/java/com/xingdata/zzdpos/base/BasePresenter.java
View file @ ddd1dbb9
......@@ -68,4 +68,8 @@ public abstract class BasePresenter<V> {
public void dispatchKeyEvent(KeyEvent event) {
}
protected String getString(int resId) {
return App.instance.getString(resId);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ ddd1dbb9
......@@ -42,59 +42,25 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
@Override
public void initView() {
// Bundle bundle = getIntent().getExtras();
// if (bundle != null) {
// mPresenter.signInFragment.setErrorMsg(bundle.getString
// ("tableName"), bundle.getString
// ("errCode"), bundle.getString
// ("errMsg"));
//
// }
getSyatemMessage();
LogUtils.e("LoginActivity + initView");
this.getSyatemMessage();
loadRootFragment(R.id.fra, mPresenter.signInFragment);
mViewBinding.setText1(": 400 - 800 - 9406");
mViewBinding.setOnClickListener(v -> {
switch (v.getId()) {
case R.id.tv_company_info: {
LogUtils.e("浙星信息");
// ToastUtils.showLong("浙星信息");
}
break;
default: {
}
break;
}
});
}
@Override
public void openDownList(View view, List<?> date, int flag) {
KeyboardUtils.hideSoftInput(LoginActivity.this);
new PopupWindowDownList(LoginActivity.this, date, new PopupWindowDownList
.OnDownClickListener() {
new PopupWindowDownList(LoginActivity.this, date, new PopupWindowDownList.OnDownClickListener() {
@Override
public void onOutType(String name) {
// TODO Auto-generated method stub
}
@Override
public void onCall(String phone) {
// TODO Auto-generated method stub
mPresenter.signInFragment.setPhone(phone);
}
}, view, view.getWidth(), PopupWindowDownList.CLERK_LOGIN);
}
@Override
......@@ -167,22 +133,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
start(mPresenter.choiceStoreFragment);
}
break;
// case LoginReturnBean.OPER_LEVEL_SHOPMANAGER: {
// //店长
// start(mPresenter.bindingCounterFragment);
// }
// break;
// case LoginReturnBean.OPER_LEVEL_MANAGER: {
// //主管
// start(mPresenter.bindingCounterFragment);
// }
// break;
// case LoginReturnBean.OPER_LEVEL_EMPLOYEES: {
// //店员
// startActivity(new Intent(LoginActivity.this, MainActivity.class));
// LoginActivity.this.finish();
// }
// break;
default: {
ToastUtils.showLong("请使用老板账户登录激活设备");
LogUtils.e("getOperLevel：->" + LoginPresenter.loginReturnBean.getOperLevel());
......@@ -322,7 +272,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
if (getTopFragment() instanceof SignInFragment || getSupportFragmentManager()
.getFragments().size() <= 1) {
if ((System.currentTimeMillis() - mExitTime) > 2000) {
ToastUtils.showShort("再按一次退出程序");
ToastUtils.showShort(R.string.all_exit);
mExitTime = System.currentTimeMillis();
} else {
AppUtils.exitApp();
......@@ -378,12 +328,11 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
}
private void getSyatemMessage() {
String str = "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" +
SystemUtil
.getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n " +
"程序版本号：" +
SystemUtil.getVersionName();
mViewBinding.tvSn.setText(str);
String str = "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" +
"设备型号" + SystemUtil.getDeviceModel() + "\n\n" +
"设备SN：" + SystemUtil.getDeviceSN() + "\n\n " +
"程序版本号：" + SystemUtil.getVersionName();
mViewBinding.tvSn.setOnClickListener(v -> LogUtils.d(str));
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java
View file @ ddd1dbb9
......@@ -109,7 +109,7 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
} else {
ToastUtils.showLong("门店数据不能为空");
ToastUtils.showLong(R.string.login_valid_data);
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/InputPasswordFragment.java
View file @ ddd1dbb9
......@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentInputPasswordBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -35,7 +34,7 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("输入密码");
mViewBinding.icTitle.tvTitle.setText(R.string.title_input_password_hint);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -54,7 +53,7 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
case R.id.btn_next: {
switch (startway) {
case 1: {
ToastUtils.showLong("修改密码");
ToastUtils.showLong(R.string.change_password_title);
if (checkPwd()) {
if (checkLenth()) {
mPresenter.getLoginBean().setNew_Pwd(mViewBinding.etOnePassword
......@@ -64,10 +63,10 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
mPresenter.getLoginBean().getNew_Pwd(), mPresenter
.getLoginBean().getSmsCode(), mLoadingDialog);
} else {
ToastUtils.showLong("密码必须为6位的数字");
ToastUtils.showLong(R.string.login_valid_data);
}
} else {
ToastUtils.showLong("密码输入为空，或者两次密码输入不一致");
ToastUtils.showLong(R.string.login_valid_data);
}
}
......@@ -81,12 +80,11 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
mPresenter.createStoreFragment.setStartway(1);
start(mPresenter.createStoreFragment);
} else {
ToastUtils.showLong("密码必须为6位的数字");
ToastUtils.showLong(R.string.login_valid_data);
}
} else {
ToastUtils.showLong("密码输入为空，或者两次密码输入不一致");
ToastUtils.showLong(R.string.login_valid_data);
}
}
break;
default: {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SelectIndustryFragment.java
View file @ ddd1dbb9
......@@ -4,12 +4,10 @@ import android.support.v7.widget.GridLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSelectIndustryBinding;
import com.xingdata.zzdpos.model.Industry;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.adapter.SelectIndustryAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -26,8 +24,7 @@ import java.util.List;
*/
public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
FragmentSelectIndustryBinding> {
public static String[] industryName = new String[]{
"超市", "鲜花", "鞋服", "药店", "熟食", "生鲜", "便利店", "夫妻店", "烟酒", "母婴", "茶叶", "书店", "美妆", "其他"};
public String[] industryName;
List<Industry> list = new ArrayList<>();
SelectIndustryAdapter selectIndustryAdapter;
long mExitTime;
......@@ -41,6 +38,7 @@ public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
industryName = mContext.getResources().getStringArray(R.array.business_group);
list.clear();
addData();
selectIndustryAdapter = new SelectIndustryAdapter(list);
......@@ -52,7 +50,7 @@ public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
selectIndustryAdapter.setOnLoadMoreListener(this::loadMoreProduct, mViewBinding.rvSelect);
selectIndustryAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
(selectIndustryAdapter.getData().get(position)));
mViewBinding.icTitle.tvTitle.setText("选择行业");
mViewBinding.icTitle.tvTitle.setText(R.string.select_business);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -104,10 +102,6 @@ public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
industry.setSelect(true);
nowId = industry.getId();
selectIndustryAdapter.notifyDataSetChanged();
// ToastUtils.showLong(industry.getIndustryName());
} else {
ToastUtils.showLong("您操作太快了");
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ ddd1dbb9
......@@ -87,7 +87,7 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
case R.id.btn_login: {
if (mViewBinding.etPwd.getText().toString().isEmpty() ||
mViewBinding.etPhone.getText().toString().isEmpty()) {
ToastUtils.showLong("账号密码不能为空");
ToastUtils.showLong(R.string.login_valid_data);
} else {
promptDialog = new PromptDialog().setDialogType(PromptDialog.PROMPTDIALOG_ING, "正在登录");
mLoadingDialog.show((BaseActivity) getActivity());
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ ddd1dbb9
......@@ -144,7 +144,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
}
} else {
ToastUtils.showLong("数据不能为空");
ToastUtils.showLong(R.string.login_valid_data);
}
}
break;
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
View file @ ddd1dbb9
......@@ -15,7 +15,6 @@ import com.xingdata.zzdpos.databinding.FragmentUserInfoEditBinding;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -56,20 +55,20 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
Oper mOper = new Oper();
if (mViewBinding.userName.getText().length() == 0) {
ToastUtils.showShort("店员名称不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.userPhone.getText().length() == 0) {
ToastUtils.showShort("店员帐号不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.userPhone.getText().length() != 11) {
ToastUtils.showShort("店员帐号长度必须11位");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.userLevel.getText().length() == 0) {
ToastUtils.showShort("店员等级不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
......@@ -109,7 +108,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
public void onOptionsSelect(int options1, int options2, int options3, View v) {
mViewBinding.userLevel.setText(strLevels.get(options1));
}
}).setTitleText("请选择")
}).setTitleText(getString(R.string.all_select))
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralExchangeAdapter.java
View file @ ddd1dbb9
......@@ -21,14 +21,14 @@ public class IntegralExchangeAdapter extends BaseAdapter<Ubound, ItemIntegralBin
@Override
protected void convert(ItemIntegralBinding mViewBinding, Ubound item) {
mViewBinding.tvVipTitle.setText("积分面值");
mViewBinding.tvSourceTitle.setText("兑换规则");
mViewBinding.tvVipTitle.setText(R.string.points_points_value);
mViewBinding.tvSourceTitle.setText(R.string.points_rule);
mViewBinding.tvVip.setText(item.getBoundValAmt() + "个积分=1元");
mViewBinding.tvVip.setText(item.getBoundValAmt() + mContext.getString(R.string.points_points_value_hint));
//兑换规则
if (item.getBoundOrderAmt() != null && item.getBoundUseNum() != null) {
mViewBinding.tvSource.setText("订单实收金额满" + ConvertUtil.fenToYuan(item.getBoundOrderAmt()) + "元\n最多使用" + item.getBoundUseNum() + "积分");
mViewBinding.tvSource.setText(mContext.getString(R.string.points_c1) + " " + ConvertUtil.fenToYuan(item.getBoundOrderAmt()) + " " + mContext.getString(R.string.points_c3) + " " + item.getBoundUseNum() + " " + mContext.getString(R.string.points_c4));
}
//备注
mViewBinding.tvGet.setText(mViewBinding.tvVip.getText().toString());
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java
View file @ ddd1dbb9
......@@ -9,7 +9,6 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.DialogIntegralExchangeSettingBinding;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -30,7 +29,7 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
mViewBinding.icTitle.tvTitle.setText(R.string.integral_exchange_title);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
View file @ ddd1dbb9
......@@ -63,7 +63,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("获取积分规则");
mViewBinding.icTitle.tvTitle.setText(R.string.integral_get_title);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
View file @ ddd1dbb9
package com.xingdata.zzdpos.ui.marketing.integral.fragment;
import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
......@@ -24,6 +25,7 @@ import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/**
* 绑定款台界面
......@@ -126,6 +128,12 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
mPresenter.integralGetFragment.setCategoryDate(list, nowCategory);
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
public void querySucc(@Nullable Pager<Gbound> pager, Boolean isLoadMore, int queryType,
LoadingDialog loadingDialog) {
if (loadingDialog != null) {
......@@ -133,7 +141,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
}
this.isLoadMore = isLoadMore;
if (pager == null || pager.getList() == null || pager.getList().size() <= 0) {
integralAdapter.setEmptyView(getEmptyView("没有积分规则~"));
integralAdapter.setEmptyView(getEmptyView(isZh(mContext) ? "没有积分规则~" : "Not find points rule~"));
}
if (pager.getList() != null) {
switch (queryType) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @ ddd1dbb9
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.marketing.ms;
import com.blankj.utilcode.util.SPUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.db.DBFactory;
......@@ -84,17 +85,17 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
@Override
public void initEditor() {
List<Group> groups = new ArrayList<>();
groups.add(new Group(C.MS_GROUP.ALL, "全场"));
groups.add(new Group(C.MS_GROUP.CATE, "指定品类"));
groups.add(new Group(C.MS_GROUP.SKU, "指定商品"));
groups.add(new Group(C.MS_GROUP.ALL, getString(R.string.ms_group_all)));
groups.add(new Group(C.MS_GROUP.CATE, getString(R.string.ms_group_cate)));
groups.add(new Group(C.MS_GROUP.SKU, getString(R.string.ms_group_sku)));
List<Area> areas = new ArrayList<>();
areas.add(new Area(C.MS_AREA.MER, "所有门店", LoginPresenter.loginReturnBean.getMerMapId()));
areas.add(new Area(C.MS_AREA.LOCAL, "本店", LoginPresenter.loginReturnBean.getMerMapId()));
areas.add(new Area(C.MS_AREA.MER, getString(R.string.ms_all_store), LoginPresenter.loginReturnBean.getMerMapId()));
areas.add(new Area(C.MS_AREA.LOCAL, getString(R.string.ms_local_store), LoginPresenter.loginReturnBean.getMerMapId()));
List<User> users = new ArrayList<>();
users.add(new User(C.MS_USER.ALL, "所有顾客", 0));
users.add(new User(C.MS_USER.VIP, "所有会员", 0));
users.add(new User(C.MS_USER.ALL, getString(R.string.ms_all_member), 0));
users.add(new User(C.MS_USER.VIP, getString(R.string.ms_all_vip), 0));
DBFactory.Marketing.Ms.queryLevel()
.doFinally(() -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java
View file @ ddd1dbb9
......@@ -195,8 +195,8 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
private void setViewByMs() {
mViewBinding.setName(mMs.getMsName());
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());
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());
mUserAdapter.setBean(new User(mMs.getMsCoustomTag().intValue(), mMs.getVipLevel().longValue()));
mAreaAdapter.setBean(new Area(mMs.getMsRangeTag().intValue(), mMs.getMerMapId()));
......@@ -376,7 +376,7 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
String m = String.valueOf(month + 1).length() >= 2 ? String.valueOf(month + 1) : "0" + String.valueOf(month + 1);
String d = String.valueOf(day).length() >= 2 ? String.valueOf(day) : "0" + String.valueOf(day);
mViewBinding.setDateStart(year + "年" + m + "月" + d + "日");
mViewBinding.setDateStart(year + "-" + m + "-" + d + "-");
mMs.setMsDateBegin(ConvertUtil.stringToLong(year + m + d));
if (mMs.getMsDateBegin() > mMs.getMsDateEnd()) {
......@@ -395,7 +395,7 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
String m = String.valueOf(month + 1).length() >= 2 ? String.valueOf(month + 1) : "0" + String.valueOf(month + 1);
String d = String.valueOf(day).length() >= 2 ? String.valueOf(day) : "0" + String.valueOf(day);
mViewBinding.setDateEnd(year + "年" + m + "月" + d + "日");
mViewBinding.setDateEnd(year + "-" + m + "-" + d + "-");
mMs.setMsDateEnd(ConvertUtil.stringToLong(year + m + d));
if (mMs.getMsDateBegin() > mMs.getMsDateEnd()) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java
View file @ ddd1dbb9
......@@ -16,15 +16,11 @@ 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.Ms;
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.ArrayList;
import java.util.Calendar;
import java.util.Date;
......@@ -83,27 +79,27 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
}
if (mViewBinding.rechargAmt.getText().length() == 0) {
ToastUtils.showShort("充值金额不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (Long.parseLong(mViewBinding.rechargAmt.getText().toString()) <= 0) {
ToastUtils.showShort("充值金额必须大于0");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.sendAmt.getText().length() == 0) {
ToastUtils.showShort("赠送金额不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) <= 0) {
ToastUtils.showShort("赠送金额必须大于0");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) > Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
ToastUtils.showShort("充值金额必须大于或者等于赠送金额");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >= StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
ToastUtils.showShort("开始时间不能大于或者等于结束日期");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
mscard.setCruleChargeAmt(ConvertUtil.yuanToFen(mViewBinding.rechargAmt.getText().toString()));
......@@ -190,7 +186,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
public void onOptionsSelect(int options1, int options2, int options3, View v) {
mViewBinding.rechargNo.setText(mScards.get(options1));
}
}).setTitleText("请选择")
}).setTitleText(getString(R.string.all_select))
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
.setContentTextSize(20)
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/VipLevelEditFragment.java
View file @ ddd1dbb9
......@@ -33,11 +33,11 @@ public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentV
pop();
});
if (mLevel != null) {
mViewBinding.infoTitle.tvTitle.setText("等级编辑");
mViewBinding.infoTitle.tvTitle.setText(R.string.level_update);
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.updateMoney.setText(ConvertUtil.fenToYuanNoZero(mLevel.getVipUpgradeAmtTp()));
mViewBinding.updateDay.setText(mLevel.getVipUpgradeDay() + "");
}
mViewBinding.setOnClickListener(view -> {
......@@ -48,23 +48,23 @@ public class VipLevelEditFragment extends BaseFragment<LevelPresenter, FragmentV
level.setId(mLevel.getId());
}
if (mViewBinding.levelName.getText().length() == 0) {
ToastUtils.showShort("等级名称不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.levelDiscont.getText().length() == 0) {
ToastUtils.showShort("折扣不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (Integer.parseInt(mViewBinding.levelDiscont.getText().toString())>100||Integer.parseInt(mViewBinding.levelDiscont.getText().toString())<1) {
ToastUtils.showShort("折扣必须为1到100之间");
if (Integer.parseInt(mViewBinding.levelDiscont.getText().toString()) > 100 || Integer.parseInt(mViewBinding.levelDiscont.getText().toString()) < 1) {
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.updateDay.length() == 0) {
ToastUtils.showShort("最近多少天不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
if (mViewBinding.updateMoney.getText().length() == 0) {
ToastUtils.showShort("消费金额不能为空");
ToastUtils.showShort(R.string.login_valid_data);
return;
}
level.setVipLevelName(mViewBinding.levelName.getText().toString());
......
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/MsAdapter.java
View file @ ddd1dbb9
......@@ -93,7 +93,7 @@ public class MsAdapter extends BaseAdapter<Ms, ItemStoreMsBinding> {
SimpleDateFormat df1 = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
SimpleDateFormat df2 = new SimpleDateFormat("yyyy年M月d日", Locale.getDefault());
SimpleDateFormat df2 = new SimpleDateFormat("yyyy-M-d-", Locale.getDefault());
SimpleDateFormat df3 = new SimpleDateFormat("HHmmss", Locale.getDefault());
SimpleDateFormat df4 = new SimpleDateFormat("HH:mm", Locale.getDefault());
......
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkugrpAdapter.java
View file @ ddd1dbb9
......@@ -21,7 +21,7 @@ public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemSelectorBind
if (item.getSkuGrpId() == 0) {
name = mContext.getString(R.string.sku_default_grpName);
} else if (item.getSkuGrpId() < 0) {
name = mContext.getString(R.string.sku_default_grpName);
name = mContext.getString(R.string.sku_u_grpName);
}
mViewBinding.tvName.setText(name);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ ddd1dbb9
......@@ -3,9 +3,7 @@ package com.xingdata.zzdpos.ui.vip;
import android.os.Bundle;
import android.view.MotionEvent;
import android.view.View;
import android.widget.EditText;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipBinding;
......@@ -20,7 +18,6 @@ import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.vip.fragment.VipAddSucceedFragment;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.view.ViewTools;
......@@ -103,7 +100,7 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void rechangeSus(Vip v) {
ViewTools.toastSuss(this, "充值成功");
ViewTools.toastSuss(this, getString(R.string.all_succ));
if (mPresenter.vipSearchFragment != null) pop();
// if ( mPresenter.vipRechargeFragment!=null)pop();
popTo(mPresenter.vipListFragment.getClass(), false);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipListAdapter.java
View file @ ddd1dbb9
......@@ -2,16 +2,16 @@ package com.xingdata.zzdpos.ui.vip.adapter;
import android.content.Context;
import android.support.annotation.Nullable;
import android.util.TypedValue;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.List;
import java.util.Locale;
/**
* Created by JM_DEV on 2017/12/25.
......@@ -22,19 +22,26 @@ public class VipListAdapter extends BaseAdapter<Vip, ItemVipListItemBinding> {
public VipListAdapter(Context mContext, @Nullable List<Vip> data) {
super(R.layout.item_vip_list_item, data);
this.mContext=mContext;
this.mContext = mContext;
}
@Override
protected void convert(ItemVipListItemBinding mViewBinding, Vip item) {
mViewBinding.vipName.setText(item.getVipName());
mViewBinding.vipMobile.setText(String.valueOf(item.getVipMobile()));
if(item.getVipDefDiscount()==100){
mViewBinding.vipDiscount.setText("无折扣");
mViewBinding.vipDiscount. setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, mContext.getResources().getDimensionPixelOffset(R.dimen.all_text_size));
}else {
mViewBinding.vipDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount())+"折");
if (item.getVipDefDiscount() == 100) {
mViewBinding.vipDiscount.setVisibility(View.INVISIBLE);
mViewBinding.vipDiscount.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, mContext.getResources().getDimensionPixelOffset(R.dimen.all_text_size));
} else {
mViewBinding.vipDiscount.setVisibility(View.VISIBLE);
mViewBinding.vipDiscount.setText(isZh(mContext) ? ConvertUtil.discount(item.getVipDefDiscount()) + "折" : item.getVipDefDiscount() + "% OFF");
mViewBinding.vipDiscount.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, mContext.getResources().getDimensionPixelOffset(R.dimen.big_text_size));
}
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
View file @ ddd1dbb9
......@@ -7,12 +7,12 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemVipMscardItemBinding;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.Date;
import java.util.List;
import java.util.Locale;
/**
* Created by JM_DEV on 2017/12/25.
......@@ -23,7 +23,6 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
private String shopName;
public VipTruleAdapter(Context mContext, @Nullable List<Ticket> data) {
super(R.layout.item_vip_mscard_item, data);
this.mContext = mContext;
......@@ -32,9 +31,10 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
@Override
protected void convert(ItemVipMscardItemBinding mViewBinding, Ticket item) {
mViewBinding.truleName.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()));
mViewBinding.truleMoney.setText("满" + ConvertUtil.fenToYuanNoZero(item.getTruleOrderAmt()) + "元使用");
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd")));
// mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
String str = isZh(mContext) ? ("满" + mContext.getString(R.string.money_rmb) + ConvertUtil.fenToYuanNoZero(item.getTruleOrderAmt()) + "元使用") : ("Can be used after " + mContext.getString(R.string.money_rmb) + ConvertUtil.fenToYuanNoZero(item.getTruleOrderAmt()));
mViewBinding.truleMoney.setText(str);
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd")));
if (item.getTruleStatus() != null && item.getUsedFlag() != null && item.getTruleStatus().toString().equals("0") && item.getUsedFlag().toString().equals("1")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.bg_return_ticket01);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.bg_return_ticket02);
......@@ -43,12 +43,12 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.bg_return_ticket04);
}
// mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getCardAmtPay()));
// mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
// //设置支付方式
//// mViewBinding.expenseType.setText(item.getPayName());
//// mViewBinding.imgLeft.setBackgroundResource(getPayName(item));
// mViewBinding.expenseTime.setText(StringUtil.format(new Date(item.getCreateTime()),StringUtil.mmddhhmmmDatePattern));
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java
View file @ ddd1dbb9
......@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
* Created by JM_DEV on 2017/12/21.
*/
import android.content.Context;
import android.view.View;
import com.xingdata.zzdpos.R;
......@@ -13,6 +14,8 @@ import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.Locale;
/**
* 会员信息界面
*/
......@@ -27,17 +30,16 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
@Override
public void initView() {
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.infoTitle.tvTitle.setText("添加成功");
mViewBinding.infoTitle.tvTitle.setText(R.string.all_succ);
mViewBinding.vipName.setText(mVip.getVipName());
mViewBinding.vipMobile.setText(mVip.getVipMobile() + "");
if (String.valueOf(mVip.getVipTag()).equals("1")) {
mViewBinding.vipLevel.setText("超级会员" + " " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
mViewBinding.vipLevel.setText(getString(R.string.vip_svip) + " " + (isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100 - mVip.getVipDefDiscount() + "% OFF"));
} else {
mViewBinding.vipLevel.setText(mVip.getVipLevelName() + " " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
mViewBinding.vipLevel.setText(mVip.getVipLevelName() + " " + (isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100 - mVip.getVipDefDiscount() + "% OFF"));
}
//继续添加
mViewBinding.vipAdd.setOnClickListener(view -> {
// mPresenter.vipInfoEditFragment.setVip(null);
startWithPop(new VipInfoEditFragment());
});
......@@ -48,18 +50,23 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
});
mViewBinding.vipSure.setOnClickListener(view -> {
popTo(mPresenter.vipListFragment.getClass(),false);
popTo(mPresenter.vipListFragment.getClass(), false);
mPresenter.vipListFragment.updateVipSus(null);
});
//返回强制出堆栈
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
popTo(mPresenter.vipListFragment.getClass(),false);
popTo(mPresenter.vipListFragment.getClass(), false);
});
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
public void setmVip(Vip mVip) {
this.mVip = mVip;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java
View file @ ddd1dbb9
......@@ -5,10 +5,10 @@ package com.xingdata.zzdpos.ui.vip.fragment;
*/
import android.annotation.SuppressLint;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -17,7 +17,6 @@ import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipExpenseAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
......@@ -25,6 +24,7 @@ import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/**
* 会员消费记录
......@@ -36,6 +36,11 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
private List<Level> levels = null;
private int pageNumber = 1;
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
@Override
public int getLayoutId() {
......@@ -46,7 +51,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("消费记录");
mViewBinding.infoTitle.tvTitle.setText(R.string.vip_consumption);
vipRechargeAdapter = new VipExpenseAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
......@@ -55,7 +60,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
mViewBinding.vipDiscount.setText((isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100-mVip.getVipDefDiscount() + "% OFF"));
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
......@@ -100,8 +105,8 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
vipRechargeAdapter.notifyDataSetChanged();
pageNumber = saleorderPager.getPageNumber() + 1;
}
if (saleorderPager.getPageNumber()!=1&&saleorderPager.isLastPage()) {
ToastUtils.showShort("没有更多数据");
if (saleorderPager.getPageNumber() != 1 && saleorderPager.isLastPage()) {
}
mViewBinding.expenseCount.setText(saleorderPager.getTotalRow() + "");
vipRechargeAdapter.setEnableLoadMore(!saleorderPager.isLastPage());
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ ddd1dbb9
package com.xingdata.zzdpos.ui.vip.fragment;
import android.content.Context;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipInfoBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
......@@ -16,6 +18,7 @@ import com.xingdata.zzdpos.util.StringUtil;
import java.util.Date;
import java.util.List;
import java.util.Locale;
/**
* Created by JM_DEV on 2018/1/4.
......@@ -23,7 +26,7 @@ import java.util.List;
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
private Vip mVip;
private List<Trule>trules ;
private List<Trule> trules;
private List<Ticket> tickets;
......@@ -34,7 +37,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("会员信息");
mViewBinding.infoTitle.tvTitle.setText(R.string.member_info);
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
......@@ -46,38 +49,51 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
dialog.show((BaseActivity) getActivity());
});
if (mVip != null) {
mViewBinding.Totalpamt.setText("￥"+ConvertUtil.fenToYuanNoZero(mVip.getVipTotalpamt()));
mViewBinding.Totalpamt.setText(getString(R.string.money_rmb) + ConvertUtil.fenToYuanNoZero(mVip.getVipTotalpamt()));
mViewBinding.BoundCbal.setText(String.valueOf(mVip.getBoundCbal()));
mViewBinding.AcctCbal.setText("￥"+ConvertUtil.fenToYuanNoZero(mVip.getAcctCbal()));
if (String.valueOf(mVip.getVipTag()).equals("1")){
mViewBinding.vipLevel.setText("超级会员");
}else {
mViewBinding.AcctCbal.setText(getString(R.string.money_rmb) + ConvertUtil.fenToYuanNoZero(mVip.getAcctCbal()));
if (String.valueOf(mVip.getVipTag()).equals("1")) {
mViewBinding.vipLevel.setText(getString(R.string.vip_svip));
} else {
mViewBinding.vipLevel.setText(mVip.getVipLevelName());
}
String strDate=String.valueOf(mVip.getVipBirthday());
if (strDate.length()==8){
mViewBinding.vipBirthday.setText(strDate.substring(0, 4)+"-"+strDate.substring(4, 6)+"-"+strDate.substring(6, 8));
}else {
String strDate = String.valueOf(mVip.getVipBirthday());
if (strDate.length() == 8) {
mViewBinding.vipBirthday.setText(strDate.substring(0, 4) + "-" + strDate.substring(4, 6) + "-" + strDate.substring(6, 8));
} else {
mViewBinding.vipBirthday.setText(strDate);
}
mViewBinding.vipName.setText(mVip.getVipName());
mViewBinding.vipMoble.setText(mVip.getVipMobile() + "");
mViewBinding.crtTime.setText(StringUtil.format(new Date(mVip.getCreateTime())));
mViewBinding.vipSex.setText(getVipSex(mVip.getVipSex()));
mViewBinding.vipDiscounts.setText(mVip.getVipDefDiscount()==100?getString(R.string.ticket_default_noDiscount):ConvertUtil.discount(mVip.getVipDefDiscount())+"折");
if (mVip.getVipDefDiscount() == 100) {
mViewBinding.vipDiscounts.setVisibility(View.INVISIBLE);
} else {
mViewBinding.vipDiscounts.setVisibility(View.VISIBLE);
mViewBinding.vipDiscounts.setText(isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100-mVip.getVipDefDiscount() + "% OFF");
}
mPresenter.ticketQuery(mVip.getVipId());
// mPresenter.truleQuery(mVip.getVipId());
}
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
private String getVipSex(Byte vipSex) {
if (vipSex.toString().equals("1")) {
return "男";
return isZh(mContext) ? "男" : "Male";
} else if (vipSex.toString().equals("0")) {
return "女";
return isZh(mContext) ? "女" : "Female";
}
return "未知";
return isZh(mContext) ? "未知" : "Unknown";
}
public void setVip(Vip vip) {
......@@ -87,29 +103,28 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
public void addVipSus(Vip vip) {
mVip = vip;
// mPresenter.vipInfoEditFragment.pop();
mViewBinding.Totalpamt.setText(String.valueOf(vip.getVipTotalpamt()));
mViewBinding.BoundCbal.setText(String.valueOf(vip.getBoundCbal()));
mViewBinding.AcctCbal.setText(String.valueOf(vip.getAcctCbal()));
if (String.valueOf(vip.getVipTag()).equals("1")){
mViewBinding.vipLevel.setText("超级会员");
}else {
if (String.valueOf(vip.getVipTag()).equals("1")) {
mViewBinding.vipLevel.setText(getString(R.string.vip_svip));
} else {
mViewBinding.vipLevel.setText(vip.getVipLevelName());
}
mViewBinding.vipBirthday.setText(vip.getVipBirthday() + "");
mViewBinding.vipBirthday.setText(vip.getVipBirthday());
mViewBinding.vipName.setText(vip.getVipName());
mViewBinding.vipMoble.setText(vip.getVipMobile() + "");
mViewBinding.vipMoble.setText(String.valueOf(vip.getVipMobile()));
mViewBinding.vipSex.setText(getVipSex(vip.getVipSex()));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, vip.getVipDefDiscount() + ""));
// initView();
mViewBinding.vipDiscounts.setText(isZh(mContext) ? ConvertUtil.discount(vip.getVipDefDiscount()) + "折" : 100-vip.getVipDefDiscount() + "% OFF");
}
public void ticketQuerySus(List<Ticket> ticketPager) {
this.tickets=ticketPager;
this.tickets = ticketPager;
mViewBinding.ticketCount.setText(String.valueOf(ticketPager.size()));
}
public void getTruleSus(Pager<Trule> trulePager) {
this.trules=trulePager.getList();
mViewBinding.ticketCount.setText(String.valueOf(trulePager.getList().size()+""));
this.trules = trulePager.getList();
mViewBinding.ticketCount.setText(String.valueOf(trulePager.getList().size() + ""));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ ddd1dbb9
......@@ -189,7 +189,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
}
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
Level allLevel = new Level();
allLevel.setVipLevelName("全部会员");
allLevel.setVipLevelName(getString(R.string.ticket_title_allVip));
mViewBinding.vipLevelR.addView(addRadioButton(layoutParams, allLevel));
for (int i = 0; i < levelPager.getPageSize(); i++) {
mViewBinding.vipLevelR.addView(addRadioButton(layoutParams, levelPager.getList().get(i)));
......@@ -211,7 +211,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mPresenter.levels.clear();
mPresenter.levels.addAll(levelPager.getList());
Level level = new Level();
level.setVipLevelName("超级会员");
level.setVipLevelName(getString(R.string.vip_svip));
level.setVipDefDiscount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount());
mPresenter.levels.add(level);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java
View file @ ddd1dbb9
......@@ -5,6 +5,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
*/
import android.annotation.SuppressLint;
import android.content.Context;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.text.Editable;
import android.text.SpannableString;
......@@ -23,7 +24,6 @@ import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipRechargeBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Pay;
......@@ -36,6 +36,7 @@ import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
/**
* 会员充值界面
......@@ -63,7 +64,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.tvTitle.setText("充值");
mViewBinding.infoTitle.tvTitle.setText(R.string.menu_recharge);
mViewBinding.vipBalance.setText(getString(R.string.vip_balance_text, ConvertUtil.fenToYuan2(mVip.getAcctCbal())));
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
// pop();
......@@ -79,7 +80,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
ToastUtils.showShort("请选择充值金额");
return;
}
if (position!=0){
if (position != 0) {
ToastUtils.showShort("暂未开通该支付方式");
return;
}
......@@ -98,9 +99,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
});
ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
{
observer.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
mViewBinding.payMoneyLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
......@@ -127,13 +126,19 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
@SuppressLint("ResourceAsColor")
public void getMscardSus(Pager<Mscard> mscardPager) {
mscards.clear();
mscards.addAll(mscardPager.getList());
layoutParams = new RadioGroup.LayoutParams(inWight / 4, LinearLayout.LayoutParams.MATCH_PARENT,1);
layoutParams.setMargins(12,10, 12, 10);
layoutParams = new RadioGroup.LayoutParams(inWight / 4, LinearLayout.LayoutParams.MATCH_PARENT, 1);
layoutParams.setMargins(12, 10, 12, 10);
int mscardLength = 0;
if (mscards.size() <= 3) {
mscardLength = mscards.size();
......@@ -154,7 +159,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mViewBinding.payMoneyLayout.setVisibility(View.GONE);
}
String hintStr = "自定义金额";
String hintStr = isZh(mContext) ? "自定义金额" : "Custom amount";
SpannableString ss = new SpannableString(hintStr);
AbsoluteSizeSpan ass = new AbsoluteSizeSpan(8, true);
mViewBinding.stealMoney.setHintTextColor(R.color.black_likui);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java
View file @ ddd1dbb9
......@@ -5,18 +5,14 @@ package com.xingdata.zzdpos.ui.vip.fragment;
*/
import android.annotation.SuppressLint;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipRechargeListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder;
......@@ -26,8 +22,8 @@ import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
/**
* 会员充值记录
......@@ -38,6 +34,11 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
private List<VipRechargeOrder> orders = new ArrayList<>();
private int pageNumber = 0;
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
@Override
public int getLayoutId() {
......@@ -48,7 +49,7 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("充值记录");
mViewBinding.infoTitle.tvTitle.setText(R.string.statistics_vip_recharge_hint);
vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
......@@ -58,7 +59,7 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
mViewBinding.vipDiscount.setText(isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100-mVip.getVipDefDiscount() + "% OFF");
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
......@@ -80,21 +81,13 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
mPresenter.rechargeorderQuery(mVip.getVipId(), pageNumber);
}
// @Override
// public boolean onBackPressedSupport() {
// pop();
// return true;
// }
public void setVip(Vip mVip) {
this.mVip = mVip;
}
public void getRechargeOrderSus(Pager<VipRechargeOrder> rechargeOrderPager) {
if (rechargeOrderPager.isFirstPage())
{
if (rechargeOrderPager.isFirstPage()) {
orders.clear();
}
if (rechargeOrderPager.getList().size() != 0) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipSearchFragment.java
View file @ ddd1dbb9
......@@ -25,10 +25,11 @@ import com.xingdata.zzdpos.ui.vip.VipPresenter;
public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSerchBinding> {
private VipAdapter mVipAdapter;
private BaseFragment baseFragment;
private int inType=0;
private int inType = 0;
/**
* 0 會員详情 1 充值
*
* @param inType
*/
public void setInType(int inType) {
......@@ -53,27 +54,27 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
mVipAdapter.setEmptyView(emptyView);
((EditText) mViewBinding.etSearch).requestFocus();
mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
switch (inType){
switch (inType) {
case 0:
mPresenter.vipInfoFragment = new VipInfoFragment();
mPresenter.vipInfoFragment.setVip(mVipAdapter.getData().get(position));
startWithPop(mPresenter.vipInfoFragment);
break;
case 1:
mPresenter.vipRechargeFragment= new VipRechargeFragment();
mPresenter.vipRechargeFragment = new VipRechargeFragment();
mPresenter.vipRechargeFragment.setVip(mVipAdapter.getData().get(position));
startWithPop( mPresenter.vipRechargeFragment);
startWithPop(mPresenter.vipRechargeFragment);
break;
}
});
mViewBinding.setOnClickListener(view -> {
switch (view.getId()){
switch (view.getId()) {
case R.id.btn_back:
pop();
break;
case R.id.search_ImageButton:
if (mViewBinding.etSearch.getText().toString().length()==0){
ToastUtils.showShort("搜索条件不能为空");
if (mViewBinding.etSearch.getText().toString().length() == 0) {
ToastUtils.showShort(R.string.login_valid_data);
return;
}
mPresenter.searchVip(mViewBinding.etSearch.getText().toString());
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTruleListFragment.java
View file @ ddd1dbb9
......@@ -5,17 +5,15 @@ package com.xingdata.zzdpos.ui.vip.fragment;
*/
import android.annotation.SuppressLint;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
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.FragmentVipMscardListBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipTruleAdapter;
......@@ -23,6 +21,7 @@ import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
import java.util.Locale;
/**
* 优惠券列表
......@@ -30,8 +29,8 @@ import java.util.List;
@SuppressLint("ValidFragment")
public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVipMscardListBinding> {
private VipTruleAdapter adapter;
// private List<Trule> trules;
private List <Ticket> tickets;
// private List<Trule> trules;
private List<Ticket> tickets;
private int valid = 0;
private int inValid = 0;
......@@ -43,9 +42,15 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
private Vip mVip;
private boolean isZh(Context context) {
Locale locale = context.getResources().getConfiguration().locale;
String language = locale.getLanguage();
return language.endsWith("zh");
}
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("优惠券详情");
mViewBinding.infoTitle.tvTitle.setText(R.string.vip_coupon);
adapter = new VipTruleAdapter(getActivity(), tickets);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(adapter);
......@@ -53,7 +58,7 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
mViewBinding.vipDiscount.setText(getString(R.string.vip_info_discount, ConvertUtil.discount(mVip.getVipDefDiscount())));
mViewBinding.vipDiscount.setText((isZh(mContext) ? ConvertUtil.discount(mVip.getVipDefDiscount()) + "折" : 100-mVip.getVipDefDiscount() + "% OFF"));
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
new VipEditMenuDialog().show((BaseActivity) getActivity());
......@@ -112,18 +117,18 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
// }
private void getMscardValid() {
valid=0;
inValid=0;
valid = 0;
inValid = 0;
for (Ticket t : tickets) {
if (t.getUsedFlag().toString().equals("1")&&t.getTruleStatus().toString().equals("0")) {
if (t.getUsedFlag().toString().equals("1") && t.getTruleStatus().toString().equals("0")) {
valid = valid + 1;
} else {
inValid = inValid + 1;
}
}
mViewBinding.mscardValid.setText(valid+ "");
mViewBinding.macardInvalid.setText(inValid+"");
mViewBinding.mscardValid.setText(valid + "");
mViewBinding.macardInvalid.setText(inValid + "");
}
// public void setTrules(List<Trule> trules) {
......
app/src/main/java/com/xingdata/zzdpos/view/SearchBar.java
View file @ ddd1dbb9
......@@ -14,6 +14,7 @@ import android.view.inputmethod.EditorInfo;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ViewSearchBarBinding;
import com.xingdata.zzdpos.util.Global;
......@@ -86,7 +87,7 @@ public class SearchBar extends ConstraintLayout {
if (i == EditorInfo.IME_ACTION_SEARCH) {
String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
ToastUtils.showShort(App.instance.getString(R.string.replenishment_toast_seachText));
return true;
}
KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
......@@ -97,7 +98,7 @@ public class SearchBar extends ConstraintLayout {
mViewBinding.tvSearch.setOnClickListener(view -> {
String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
ToastUtils.showShort(App.instance.getString(R.string.replenishment_toast_seachText));
this.showSoftInput();
return;
}
......
app/src/main/res/drawable/selector_checkbox_bg.xml
View file @ ddd1dbb9
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/radio_select_bg" android:state_checked="true"/>
<item android:drawable="@mipmap/radio_normal_bg" android:state_checked="false"/>
<item android:drawable="@mipmap/radio_select_bg" android:state_checked="true" />
<item android:drawable="@mipmap/radio_normal_bg" android:state_checked="false" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_paymoney_radiobutton_bg.xml
View file @ ddd1dbb9
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_black_layout" android:state_checked="false"/>
<item android:drawable="@drawable/shape_red_layout" android:state_checked="true"/>
<item android:drawable="@drawable/shape_black_layout" android:state_checked="false" />
<item android:drawable="@drawable/shape_red_layout" android:state_checked="true" />
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_login.xml
View file @ ddd1dbb9
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="text1"
type="String"/>
type="String" />
<variable
name="text2"
type="String"/>
type="String" />
<variable
name="text3"
type="String"/>
type="String" />
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
<variable
name="pic"
type="android.net.Uri"/>
type="android.net.Uri" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
......@@ -41,30 +41,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/appBack"/>
android:background="@color/appBack" />
<ScrollView
android:id="@+id/sv_message"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:focusable="false"
android:visibility="visible">
<TextView
android:id="@+id/tv_sn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:focusable="false"
android:gravity="right|bottom"
android:text="忘记密码 ？"
android:textColor="@color/black_baozheng"/>
android:textColor="@color/black_baozheng" />
</ScrollView>
</RelativeLayout>
<LinearLayout
......@@ -83,7 +81,7 @@
android:onClick="@{onClickListener}"
android:padding="16dp"
android:text="@string/login_tv_about"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
......@@ -94,7 +92,7 @@
android:onClick="@{onClickListener}"
android:padding="16dp"
android:text="@{text1}"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
......
app/src/main/res/layout/activity_splash.xml
View file @ ddd1dbb9
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
......@@ -9,14 +10,13 @@
type="String" />
</data>
<android.support.constraint.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/splash"
android:orientation="vertical"
tools:context="com.xingdata.zzdpos.ui.splash.SplashActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -29,13 +29,12 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin">
<com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
<com.github.ybq.android.spinkit.SpinKitView
android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle"
android:layout_width="wrap_content"
......@@ -48,59 +47,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="0 %"
android:textColor="@color/black_zhangfei" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/all_padding"
android:gravity="center"
android:text="正在加载数据..."
android:text="@string/splash_loading"
android:textColor="@color/black_zhangfei" />
</LinearLayout>
<!--<LinearLayout-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:gravity="center"-->
<!--android:orientation="horizontal"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toEndOf="parent"-->
<!--app:layout_constraintLeft_toLeftOf="parent"-->
<!--app:layout_constraintRight_toRightOf="parent"-->
<!--app:layout_constraintStart_toStartOf="parent">-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:drawableStart="@mipmap/logo_welcome_zzd"-->
<!--android:gravity="center"-->
<!--android:drawablePadding="@dimen/all_margin"-->
<!--android:text="@string/splash_info"-->
<!--android:textColor="@color/white" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginStart="@dimen/all_margin"-->
<!--android:drawableStart="@mipmap/login_phone"-->
<!--android:text="@string/login_phone"-->
<!--android:textColor="@color/white" />-->
<!--</LinearLayout>-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_small"
android:text="@{version}"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small"
android:layout_margin="@dimen/padding_small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_prompt.xml
View file @ ddd1dbb9
......@@ -5,7 +5,7 @@
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
......@@ -38,8 +38,8 @@
android:layout_alignParentBottom="true"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white_top"
android:paddingBottom="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding">
android:paddingTop="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_bounced_padding">
<Button
......@@ -48,15 +48,15 @@
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:layout_centerInParent="true"
android:text="重新获取"/>
android:text="重新获取" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_above="@+id/rl_btn"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:gravity="center"
android:orientation="vertical">
<com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -66,7 +66,7 @@
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_bounced_padding"
android:visibility="gone"
app:SpinKit_Color="@color/black"/>
app:SpinKit_Color="@color/black" />
<ImageView
android:id="@+id/iv_logo"
......@@ -74,7 +74,7 @@
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/all_bounced_padding"
android:src="@mipmap/prompt_dialog_success"/>
android:src="@mipmap/prompt_dialog_success" />
<ScrollView
android:layout_width="match_parent"
......@@ -88,7 +88,7 @@
android:gravity="center"
android:text="正在处理，请稍后."
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"/>
android:textSize="@dimen/all_text_size" />
</ScrollView>
</LinearLayout>
......@@ -112,24 +112,24 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btn_ok"
style="@style/button_positive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="确认"
android:text="@string/all_confirm"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
......
app/src/main/res/layout/dialog_vip_menu.xml
View file @ ddd1dbb9
......@@ -32,7 +32,7 @@
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClick="@{onClick}"
android:text="编辑会员" />
android:text="@string/vip_update" />
<View
android:layout_width="match_parent"
......@@ -40,15 +40,15 @@
android:background="@color/line_bg" />
<TextView
android:id="@+id/rechargeList"
style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:id="@+id/rechargeList"
android:background="@color/white"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:text="充值明细" />
android:text="@string/vip_recharge" />
<View
android:layout_width="match_parent"
......@@ -56,32 +56,33 @@
android:background="@color/line_bg" />
<TextView
style="@style/default_bluetext_popbutton"
android:id="@+id/consumeList"
style="@style/default_bluetext_popbutton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white"
android:gravity="center"
android:foreground="?android:attr/actionBarItemBackground"
android:gravity="center"
android:onClick="@{onClick}"
android:text="消费记录" />
android:text="@string/vip_consumption" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<TextView
style="@style/default_bluetext_popbutton"
android:id="@+id/voucherDetails"
style="@style/default_bluetext_popbutton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white"
android:gravity="center"
android:foreground="?android:attr/actionBarItemBackground"
android:gravity="center"
android:onClick="@{onClick}"
android:text="优惠券详情" />
android:text="@string/vip_coupon" />
</LinearLayout>
......@@ -103,9 +104,9 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:gravity="center"
android:text="取消" />
android:onClick="@{onClick}"
android:text="@string/all_cancel" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_input_password.xml
View file @ ddd1dbb9
......@@ -5,7 +5,7 @@
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
......@@ -18,7 +18,7 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
layout="@layout/title" />
<LinearLayout
android:layout_width="match_parent"
......@@ -30,7 +30,7 @@
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
android:src="@mipmap/login_logo" />
<EditText
......@@ -43,8 +43,7 @@
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
android:maxLength="8" />
<EditText
android:id="@+id/et_two_password"
......@@ -56,8 +55,7 @@
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
android:maxLength="8" />
<Button
......@@ -65,8 +63,7 @@
style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
/>
android:text="@string/login_smscodefragment_btn_next" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -80,8 +77,8 @@
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/black_baozheng"/>
android:text="@string/login_back_login"
android:textColor="@color/black_baozheng" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_recharge_rule_edit.xml
View file @ ddd1dbb9
......@@ -32,7 +32,7 @@
android:text="@string/all_baseinfo" />
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -59,7 +59,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="活动名称：" />
android:text="@string/recharge_r1" />
<EditText
style="@style/dialog_edit"
......@@ -70,7 +70,8 @@
android:enabled="false" />
</LinearLayout>
<include layout="@layout/line_layout_margin"/>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -82,7 +83,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="充值档位：" />
android:text="@string/recharge_r2" />
<TextView
android:id="@+id/recharg_No"
......@@ -94,7 +95,7 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<include layout="@layout/line_layout_margin"/>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -127,7 +128,7 @@
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:tag="1"
android:text="暂停" />
android:text="@string/all_state_close" />
<RadioButton
android:layout_width="match_parent"
......@@ -144,7 +145,7 @@
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -157,10 +158,10 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="优惠规则" />
android:text="@string/recharge_r3" />
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -173,7 +174,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="充值每满：" />
android:text="@string/recharge_r4" />
<EditText
android:id="@+id/recharg_amt"
......@@ -191,10 +192,10 @@
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
android:text="@string/recharge_r5" />
</LinearLayout>
<include layout="@layout/line_layout_margin"/>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -207,7 +208,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="送：" />
android:text="@string/recharge_r6" />
<EditText
android:id="@+id/send_amt"
......@@ -225,10 +226,10 @@
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
android:text="@string/recharge_r7" />
</LinearLayout>
<include layout="@layout/line_layout_margin"/>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -241,7 +242,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="开始日期：" />
android:text="@string/recharge_r8" />
<TextView
android:id="@+id/rule_begin_time"
......@@ -252,7 +253,8 @@
android:gravity="center"
android:onClick="@{onClickListener}" />
</LinearLayout>
<include layout="@layout/line_layout_margin"/>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -265,7 +267,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="结束日期：" />
android:text="@string/recharge_r9" />
<TextView
android:id="@+id/rule_end_time"
......@@ -277,7 +279,7 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -291,7 +293,7 @@
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
android:text="@string/all_confirm" />
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_select_industry.xml
View file @ ddd1dbb9
......@@ -4,7 +4,7 @@
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
......@@ -15,31 +15,19 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="@dimen/list1_height"
android:layout_below="@+id/ic_title"
android:layout_marginLeft="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white_bottom"
android:gravity="center_vertical"
android:text="请选择零售行业"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
layout="@layout/title" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/sl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/tv_title">
android:layout_below="@+id/ic_title">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_select"
android:layout_width="match_parent"
android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
......@@ -56,11 +44,9 @@
android:layout_margin="@dimen/all_bounced_padding"
android:background="@drawable/red_border"
android:onClick="@{onClickListener}"
android:text="确定"
android:text="@string/all_confirm"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/et_textsize" />
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_settle.xml
View file @ ddd1dbb9
......@@ -453,7 +453,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + pointDisAmt +@string/unit_rmb_yuan}"
android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + @string/money_rmb + pointDisAmt}"
android:textColor="@color/black_likui" />
<CheckBox
......
app/src/main/res/layout/fragment_user_info_edit.xml
View file @ ddd1dbb9
......@@ -145,7 +145,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
android:text="@string/all_confirm" />
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_user_list.xml
View file @ ddd1dbb9
......@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="今日新增" />
android:text="@string/member_today_cnt" />
</LinearLayout>
<LinearLayout
......
app/src/main/res/layout/fragment_vip_add_succeed.xml
View file @ ddd1dbb9
......@@ -42,7 +42,7 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加成功" />
android:text="@string/all_succ" />
</LinearLayout>
......@@ -56,7 +56,7 @@
<TextView
style="@style/default_blacktext_no_margin_smallstyle"
android:text="会员姓名" />
android:text="@string/vip_name" />
<TextView
android:id="@+id/vip_name"
......@@ -77,7 +77,7 @@
<TextView
style="@style/default_blacktext_no_margin_smallstyle"
android:text="会员手机" />
android:text="@string/vip_phone" />
<TextView
android:id="@+id/vip_mobile"
......@@ -91,9 +91,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin_left"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_marginBottom="@dimen/all_margin_left"
android:background="@color/white"
android:orientation="horizontal">
......@@ -127,20 +127,20 @@
style="@style/button_positive_noradius"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/all_margin_left"
android:text="完成" />
android:text="@string/all_confirm" />
<Button
android:id="@+id/vip_recharge"
style="@style/button_positive_white"
android:layout_alignParentBottom="true"
android:text="充值" />
android:text="@string/menu_recharge" />
<Button
android:id="@+id/vip_add"
android:visibility="gone"
style="@style/button_positive_white"
android:layout_alignParentBottom="true"
android:text="继续添加" />
android:text="继续添加"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_expense_list.xml
View file @ ddd1dbb9
......@@ -61,8 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/all_margin"
android:text="@string/vip_info_discount" />
android:layout_margin="@dimen/all_margin" />
</LinearLayout>
<View
......@@ -88,7 +87,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="消费总额" />
android:text="@string/total_consumption" />
<TextView
android:id="@+id/expense_AMT"
......@@ -115,7 +114,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="消费次数" />
android:text="@string/total_consumption_cnt" />
<TextView
android:id="@+id/expense_Count"
......
app/src/main/res/layout/fragment_vip_info.xml
View file @ ddd1dbb9
......@@ -67,8 +67,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/vip_info_discount" />
android:layout_gravity="center_vertical" />
</LinearLayout>
<include layout="@layout/line_layout" />
......@@ -97,7 +96,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="积分" />
android:text="@string/vip_points" />
<TextView
android:id="@+id/BoundCbal"
......@@ -118,7 +117,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠券" />
android:text="@string/vip_ticket" />
<TextView
android:id="@+id/ticket_Count"
......@@ -139,7 +138,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="余额" />
android:text="@string/vip_balance" />
<TextView
android:id="@+id/AcctCbal"
......@@ -161,7 +160,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="消费" />
android:text="@string/vip_spent" />
<TextView
android:id="@+id/Totalpamt"
......@@ -184,7 +183,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="74dp"
android:text="级别：" />
android:text="@string/vip_level" />
<TextView
android:id="@+id/vipLevel"
......@@ -206,7 +205,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="74dp"
android:text="性别：" />
android:text="@string/vip_sex" />
<TextView
android:id="@+id/vipSex"
......@@ -228,7 +227,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="110dp"
android:text="出生年月：" />
android:text="@string/vip_birthday" />
<TextView
android:id="@+id/vip_birthday"
......@@ -248,7 +247,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="110dp"
android:text="注册日期：" />
android:text="@string/vip_record_date" />
<TextView
android:id="@+id/crt_time"
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ ddd1dbb9
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
......@@ -8,7 +8,7 @@
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg"
......@@ -47,7 +47,7 @@
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:text="姓名：" />
android:text="@string/vip_name" />
<EditText
android:id="@+id/vip_name"
......@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入姓名" />
android:hint="@string/vip_name_hint" />
</LinearLayout>
<include layout="@layout/line_layout_margin_right"></include>
......@@ -78,7 +78,7 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:maxLength="11"
android:text="手机：" />
android:text="@string/vip_phone" />
<EditText
android:id="@+id/vip_phone"
......@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:background="@null"
android:digits="0123456789"
android:hint="请输入手机号"
android:hint="@string/vip_phone_hint"
android:inputType="phone"
android:maxLength="11" />
......@@ -114,15 +114,15 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin_left"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginTop="@dimen/all_margin_left"
android:layout_marginBottom="@dimen/all_margin_left"
android:background="@mipmap/point" />
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:text="性别：" />
android:text="@string/vip_sex" />
<RadioGroup
android:id="@+id/vip_sex"
......@@ -134,21 +134,23 @@
android:orientation="horizontal">
<RadioButton
android:layout_width="50dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:paddingEnd="30dp"
android:tag="1"
android:text="男" />
android:text="@string/vip_sex_male" />
<RadioButton
android:layout_width="50dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="45dp"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:paddingEnd="30dp"
android:tag="0"
android:text="女" />
android:text="@string/vip_sex_female" />
</RadioGroup>
</LinearLayout>
......@@ -171,17 +173,17 @@
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:text="级别：" />
android:text="@string/vip_level" />
<TextView
android:id="@+id/vip_discounts"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:layout_marginRight="100dp"
android:onClick="@{onClickListener}"
android:layout_marginRight="@dimen/all_margin"
android:drawableRight="@mipmap/ic_expand"
android:gravity="center_vertical" />
android:gravity="center_vertical"
android:onClick="@{onClickListener}" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
......@@ -197,7 +199,7 @@
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="110dp"
android:layout_marginLeft="13dp"
android:text="出生年月：" />
android:text="@string/vip_birthday" />
<!--<TextView-->
<!--android:id="@+id/vip_birthday"-->
......@@ -212,10 +214,10 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:onClick="@{onClickListener}"
android:layout_marginRight="100dp"
android:layout_marginRight="@dimen/all_margin"
android:drawableRight="@mipmap/ic_expand"
android:gravity="center_vertical" />
android:gravity="center_vertical"
android:onClick="@{onClickListener}" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
......@@ -232,7 +234,7 @@
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
android:text="@string/all_confirm" />
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ ddd1dbb9
......@@ -31,6 +31,7 @@
android:layout_height="wrap_content"
android:text="@string/all_baseinfo" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
<LinearLayout
......@@ -62,7 +63,7 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="等级名称：" />
android:text="@string/level_name" />
<EditText
android:id="@+id/level_name"
......@@ -71,8 +72,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入等级名称" />
android:hint="@string/level_name_hint" />
</LinearLayout>
<include layout="@layout/line_layout_margin"></include>
<LinearLayout
......@@ -93,7 +95,7 @@
android:layout_width="90dp"
android:layout_height="wrap_content"
android:maxLength="11"
android:text="折扣设置：" />
android:text="@string/level_dis" />
<EditText
android:id="@+id/level_discont"
......@@ -125,7 +127,7 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="本级标准" />
android:text="@string/level_promotion" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
......@@ -141,25 +143,25 @@
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="最近：" />
android:text="@string/level_pro_date" />
<EditText
android:id="@+id/update_day"
style="@style/dialog_edit"
android:text=""
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:digits="0123456789"
android:inputType="phone"
android:maxLength="3" />
android:maxLength="3"
android:text="" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="天" />
android:text="@string/level_pro_day" />
</LinearLayout>
<include layout="@layout/line_layout_margin"></include>
......@@ -181,8 +183,7 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="消费金额：" />
android:text="@string/level_pro_amt" />
<EditText
android:id="@+id/update_money"
......@@ -199,9 +200,10 @@
style="@style/default_blacktext_margin_smallstyle"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="元" />
android:text="@string/unit_rmb_yuan" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
<include layout="@layout/line_layout" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -214,8 +216,7 @@
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
android:text="@string/all_confirm" />
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_list.xml
View file @ ddd1dbb9
......@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="本店会员" />
android:text="@string/member_total_cnt" />
<TextView
android:id="@+id/vip_count_add_today_title"
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="今日新增" />
android:text="@string/member_today_cnt" />
</LinearLayout>
<LinearLayout
......@@ -133,11 +133,12 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加会员"
android:text="@string/vip_add_title"
android:textColor="@color/deep_red"
android:textSize="22sp" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/line_layout" />
<LinearLayout
......
app/src/main/res/layout/fragment_vip_mscard_list.xml
View file @ ddd1dbb9
......@@ -61,11 +61,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/all_margin"
android:text="@string/vip_info_discount" />
android:layout_margin="@dimen/all_margin" />
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -85,7 +84,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="可用优惠卷" />
android:text="@string/usable_coupon" />
<TextView
android:id="@+id/mscard_valid"
......@@ -111,7 +110,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="不可用优惠卷" />
android:text="@string/usable_coupon" />
<TextView
android:id="@+id/macard_invalid"
......@@ -122,13 +121,13 @@
</LinearLayout>
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<android.support.v4.widget.SwipeRefreshLayout
android:layout_marginTop="@dimen/all_margin"
android:id="@+id/recharge_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin">
<android.support.v7.widget.RecyclerView
android:id="@+id/rechargeRecyclerView"
......
app/src/main/res/layout/fragment_vip_recharge.xml
View file @ ddd1dbb9
......@@ -103,12 +103,11 @@
android:orientation="horizontal">
<LinearLayout
android:layout_marginLeft="8dp"
android:id="@+id/stealLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="10dp"
android:layout_weight="2"
android:background="@drawable/selector_paymoney_radiobutton_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -117,13 +116,13 @@
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充："
android:text="@string/menu_recharge"
android:textSize="20sp" />
<EditText
android:id="@+id/steal_money"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@null"
......@@ -162,7 +161,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:text="送:" />
android:text="@string/bonus" />
<TextView
android:id="@+id/sendAmt"
......@@ -183,7 +182,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text="实际到帐:" />
android:text="@string/total_money" />
<TextView
android:id="@+id/recargeAccount"
......@@ -215,7 +214,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_weight="1"
android:text="充值金额:" />
android:text="@string/menu_recharge" />
<TextView
android:id="@+id/rechargAMT"
......
app/src/main/res/layout/fragment_vip_recharge_list.xml
View file @ ddd1dbb9
......@@ -85,7 +85,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="可用余额" />
android:text="@string/vip_balance" />
<TextView
android:id="@+id/balance_AMT"
......@@ -112,7 +112,7 @@
style="@style/default_blacktext_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="累计充值" />
android:text="@string/total_recharge" />
<TextView
android:id="@+id/recharge_amt"
......
app/src/main/res/layout/item_recharge_rulel_list_item.xml
View file @ ddd1dbb9
......@@ -5,34 +5,30 @@
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_marginTop="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
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:layout_margin="@dimen/all_margin"
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_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:drawableStart="@mipmap/ic_filling"
android:drawablePadding="@dimen/all_margin"
android:singleLine="false"
android:text="@string/recharge_send" />
</RelativeLayout>
......
app/src/main/res/layout/item_replenishment.xml
View file @ ddd1dbb9
......@@ -277,7 +277,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_4"
android:text="￥"
android:text="@string/money_rmb"
android:textColor="@color/reddeep" />
<TextView
......
app/src/main/res/layout/item_select_industry.xml
View file @ ddd1dbb9
<?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"
>
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
type="com.xingdata.zzdpos.util.OnClickListener" />
</data>
......@@ -26,16 +25,14 @@
android:drawableLeft="@mipmap/industry_market"
android:gravity="center"
android:maxEms="4"
android:maxLength="4"
android:padding="@dimen/all_padding"
android:singleLine="true"
android:text="超市"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_item_select"
......@@ -44,19 +41,15 @@
android:background="@drawable/black_border_zhouyu_02"
android:drawableLeft="@mipmap/industry_market"
android:gravity="center"
android:maxEms="4"
android:maxLength="4"
android:padding="@dimen/all_padding"
android:singleLine="true"
android:text="超市"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</layout>
......
app/src/main/res/layout/item_settle_ticket.xml
View file @ ddd1dbb9
......@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing_min"
android:text="￥"
android:text="@string/money_rmb"
android:textColor="@color/white"
android:textSize="@dimen/all_text_size_low"
android:textStyle="bold" />
......
app/src/main/res/layout/item_vip_expense_item.xml
View file @ ddd1dbb9
......@@ -34,7 +34,7 @@
style="@style/default_blacktext_no_margin_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="现金" />
android:text="@string/settle_channel_cash" />
<TextView
android:id="@+id/expense_time"
......
app/src/main/res/layout/item_vip_mscard_item.xml
View file @ ddd1dbb9
......@@ -30,7 +30,7 @@
style="@style/default_whitetext_no_margin_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="￥"
android:text="@string/money_rmb"
android:textSize="@dimen/all_text_size_low" />
<TextView
......
app/src/main/res/layout/title_search.xml
View file @ ddd1dbb9
......@@ -19,10 +19,10 @@
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:imeOptions="actionSearch"
android:layout_marginEnd="@dimen/all_padding"
android:drawablePadding="@dimen/all_padding"
android:hint="请输入手机号或会员姓名"
android:hint="@string/member_add_hint"
android:imeOptions="actionSearch"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low" />
......
app/src/main/res/layout/view_type_dis.xml
View file @ ddd1dbb9
......@@ -10,14 +10,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
android:layout_height="wrap_content"
android:paddingStart="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:text="@string/ms_editor_user"
android:textColor="@color/black_baozheng"
......@@ -29,20 +28,19 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="vertical">
<RadioButton
android:id="@+id/rb_dis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="?attr/actionBarSize"
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:layout_height="?attr/actionBarSize"
android:text="@string/ms_type_second" />
</RadioGroup>
</LinearLayout>
......@@ -50,16 +48,16 @@
<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:layout_marginEnd="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@null">
android:paddingStart="@null"
android:paddingEnd="@dimen/all_margin">
<ImageView
android:layout_width="@dimen/all_margin"
......
app/src/main/res/layout/view_type_promotion.xml
View file @ ddd1dbb9
......@@ -11,14 +11,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
android:layout_height="wrap_content"
android:paddingStart="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:text="@string/ms_editor_user"
android:textColor="@color/black_baozheng"
......@@ -30,20 +29,19 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="vertical">
<RadioButton
android:id="@+id/rb_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="?attr/actionBarSize"
android:checked="true"
android:text="@string/ms_type_promotion" />
<RadioButton
android:id="@+id/rb_second_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:layout_height="?attr/actionBarSize"
android:text="@string/ms_type_second_pro" />
</RadioGroup>
</LinearLayout>
......@@ -51,17 +49,17 @@
<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:layout_marginEnd="@dimen/all_margin"
android:background="@color/gray_kongming" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:gravity="center_vertical"
android:text="@string/ms_editor_type_promotion_text1"
android:textColor="@color/black_baozheng"
......@@ -70,10 +68,10 @@
<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:layout_marginEnd="@dimen/all_margin"
android:layout_marginBottom="@dimen/all_margin"
android:gravity="center_vertical"
android:text="@string/ms_editor_type_promotion_text2"
android:textSize="@dimen/all_caption_size" />
......
app/src/main/res/values-en/strings.xml
View file @ ddd1dbb9
......@@ -29,9 +29,15 @@
<string name="all_unexpand">Collapse</string>
<!--金额单位-->
<string name="unit_rmb_yuan">元</string>
<string name="unit_rmb_jiao">角</string>
<string name="unit_rmb_fen">分</string>
<string name="unit_rmb_yuan">
</string>
<string name="unit_rmb_jiao">
</string>
<string name="unit_rmb_fen">
</string>
<!--登录页面 <WHERE>_<DESCRIPTION>-->
<string name="login_title">Login Page</string>
......@@ -362,7 +368,7 @@
<string name="ms_editor_group">Promotion owner:</string>
<string name="ms_editor_user">Promotion target:</string>
<string name="ms_editor_area">Promotion scale:</string>
<string name="ms_editor_buy">Buy</string>
<string name="ms_editor_buy">Buy </string>
<string name="ms_editor_group_all_hint">Any products</string>
<string name="ms_editor_group_skugrp_hint">Any products of the above category</string>
<string name="ms_editor_group_brand_hint">Any products of the above brand</string>
......@@ -449,8 +455,8 @@
<!--空视图-->
<string name="empty_other_select">Search by product‘s name/barcode/scan barcode</string>
<!--积分管理-->
<string name="integral_get_title">VIP Points Rules</string>
<string name="integral_exchange_title">Points Redemption Rules</string>
<string name="integral_get_title">Points Rules</string>
<string name="integral_exchange_title">Redemption Rules</string>
<!--优惠券-->
<string name="return_ticket_title">Add new Coupon</string>
<string name="ticket_hint">1 month free for Coupon functions</string>
......@@ -477,7 +483,7 @@
<string name="casher_manager_title">Employee Management</string>
<!--充值优惠-->
<string name="recharge_discounts_title">Recharge for discount</string>
<string name="recharge_send">Recharge%sdollar and get%sdollar free</string>
<string name="recharge_send">Recharge $%s \nand get$%s free</string>
<string name="recharge_discounts_number">Total%scoupon(s)</string>
<!--店员管理-->
<string name="casher_titile">Management-Employee Management</string>
......@@ -588,8 +594,8 @@
<string name="settle_ticket">Coupon</string>
<string name="settle_ticket_text">piece(s) available</string>
<string name="settle_point">Points deduct</string>
<string name="settle_point_vip_text">Available points</string>
<string name="settle_point_amt_text"> , 可抵用</string>
<string name="settle_point_vip_text">Available points </string>
<string name="settle_point_amt_text"> , deduct</string>
<string name="settle_balance">Balance</string>
<string name="settle_saledetail_hint">Product Info</string>
<string name="settle_dis_hint">Discount</string>
......@@ -623,12 +629,12 @@
<!--优惠-->
<string name="ms_dialog_title">Promotions</string>
<string name="ms_group_all"></string>
<string name="ms_group_all">All</string>
<string name="ms_group_all_info">Whole Store</string>
<string name="ms_group_brand">Brand</string>
<string name="ms_group_brand_info">Buy%s</string>
<string name="ms_group_brand_info">Buy %s</string>
<string name="ms_group_cate">category</string>
<string name="ms_group_cate_info">Buy%s</string>
<string name="ms_group_cate_info">Buy %s</string>
<string name="ms_group_sku">specific product</string>
<string name="ms_group_sku_info">Buy%s</string>
<string name="ms_type_dis">discount</string>
......
app/src/main/res/values-en/stringzz.xml
View file @ ddd1dbb9
......@@ -34,5 +34,104 @@
<string name="recharge_dis_empty">Not find the Recharge Plan</string>
<string name="sku_u_grpName">Package sku </string>
<string name="splash_loading">Loading…</string>
<string name="all_exit">Press again to exit</string>
<string name="all_succ">Success</string>
<string name="login_valid_data">Please enter valid data</string>
<string name="select_business">Select business</string>
<string-array name="business_group">
<item>Supermarket</item>
<item>Flower</item>
<item>Clothing</item>
<item>Drugstore</item>
<item>Deli</item>
<item>Fresh</item>
<item>Convenience</item>
<item>Family-run</item>
<item>Tobacco&amp;Wine</item>
<item>Baby&amp;Mother</item>
<item>Tea</item>
<item>Book</item>
<item>Cosmetics</item>
<item>Other</item>
</string-array>
<string name="member_info">Member info</string>
<string name="vip_spent">Spent:</string>
<string name="vip_birthday">Birthday:</string>
<string name="vip_record_date">Join date:</string>
<string name="vip_update">Update</string>
<string name="vip_recharge">Recharge detail</string>
<string name="vip_consumption">Consumption detail</string>
<string name="vip_coupon">Coupon detail</string>
<string name="all_select">Select</string>
<string name="total_recharge">Total recharge</string>
<string name="total_consumption">Total consumption</string>
<string name="total_consumption_cnt">Total count</string>
<string name="usable_coupon">Usable coupon</string>
<string name="unusable_coupon">Unusable coupon</string>
<string name="bonus">bonus:</string>
<string name="total_money">Total money</string>
<string name="ms_all_member">All member</string>
<string name="ms_all_vip">All vip</string>
<string name="ms_all_store">All store</string>
<string name="ms_local_store">Local store</string>
<string name="level_update">Level update</string>
<string name="level_name">Name</string>
<string name="level_name_hint">Enter level name</string>
<string name="level_dis">Discount</string>
<string name="level_promotion">Promotion </string>
<string name="level_pro_date">Last</string>
<string name="level_pro_day">day</string>
<string name="level_pro_amt">Amount</string>
<string name="rule_setting">Rule setting</string>
<string name="points_access">Access</string>
<string name="points_name">Name</string>
<string name="points_access_all">All</string>
<string name="points_access_cate">Cate</string>
<string name="points_access_sku">Sku</string>
<string name="points_ratio">Ratio</string>
<string name="points_ratio_per">per point</string>
<string name="points_shelf_life">Shelf life</string>
<string name="points_points_value">Point value</string>
<string name="points_points_value_hint">point = $1</string>
<string name="points_conditions">Conditions</string>
<string name="points_c1">Full</string>
<string name="points_c2">
</string>
<string name="points_c3">Can use</string>
<string name="points_c4">point</string>
<string name="points_rule">Rule</string>
<string name="ticket_r0">Name</string>
<string name="ticket_r1">Ticket value</string>
<string name="ticket_r2"> </string>
<string name="ticket_r3">Expire</string>
<string name="ticket_r4">Full</string>
<string name="ticket_r5">available</string>
<string name="ticket_r6">Can use</string>
<string name="ticket_r7"> </string>
<string name="recharge_r1">Name</string>
<string name="recharge_r2">Level</string>
<string name="recharge_r3">Rule</string>
<string name="recharge_r4">Recharge</string>
<string name="recharge_r5"> </string>
<string name="recharge_r6">Bonus</string>
<string name="recharge_r7"> </string>
<string name="recharge_r8">Start date</string>
<string name="recharge_r9">End date</string>
</resources>
app/src/main/res/values-zh/stringzz.xml
View file @ ddd1dbb9
......@@ -34,4 +34,103 @@
<string name="recharge_dis_empty">还没有充值优惠，请添加充值优惠~</string>
<string name="sku_u_grpName">组合商品</string>
<string name="splash_loading">正在加载中…</string>
<string name="all_exit">再按一次退出程序</string>
<string name="all_succ">成功</string>
<string name="login_valid_data">请输入有效数据</string>
<string name="select_business">选择行业</string>
<string-array name="business_group">
<item>超市</item>
<item>鲜花</item>
<item>鞋服</item>
<item>药店</item>
<item>熟食</item>
<item>生鲜</item>
<item>便利店</item>
<item>夫妻店</item>
<item>烟酒</item>
<item>母婴</item>
<item>茶叶</item>
<item>书店</item>
<item>美妆</item>
<item>其他</item>
</string-array>
<string name="member_info">会员信息</string>
<string name="vip_spent">消费</string>
<string name="vip_birthday">生日</string>
<string name="vip_record_date">注册日期</string>
<string name="vip_update">编辑会员</string>
<string name="vip_recharge">充值明细</string>
<string name="vip_consumption">消费记录</string>
<string name="vip_coupon">优惠券详情</string>
<string name="all_select">请选择</string>
<string name="total_recharge">累计充值</string>
<string name="total_consumption">消费总额</string>
<string name="total_consumption_cnt">消费次数</string>
<string name="usable_coupon">可用优惠券</string>
<string name="unusable_coupon">不可用优惠券</string>
<string name="bonus">送:</string>
<string name="total_money">实际到账</string>
<string name="ms_all_member">实际到账</string>
<string name="ms_all_vip">实际到账</string>
<string name="ms_all_store">所有门店</string>
<string name="ms_local_store">本店</string>
<string name="level_update">等级编辑</string>
<string name="level_name">等级名称</string>
<string name="level_name_hint">输入等级名称</string>
<string name="level_dis">折扣设置</string>
<string name="level_promotion">本级标准</string>
<string name="level_pro_date">最近</string>
<string name="level_pro_day">天</string>
<string name="level_pro_amt">消费金额</string>
<string name="rule_setting">规则设置</string>
<string name="points_name">规则名称</string>
<string name="points_access">获取方式</string>
<string name="points_access_all">通用</string>
<string name="points_access_cate">品类定义</string>
<string name="points_access_sku">商品定义</string>
<string name="points_ratio">积分比例</string>
<string name="points_ratio_per">元一个积分</string>
<string name="points_shelf_life">有效期限</string>
<string name="points_points_value">积分面值</string>
<string name="points_points_value_hint">个积分=1元</string>
<string name="points_conditions">兑换条件</string>
<string name="points_c1">实收满</string>
<string name="points_c2">元</string>
<string name="points_c3">可以使用</string>
<string name="points_c4">积分</string>
<string name="points_rule">兑换规则</string>
<string name="ticket_r0">名称</string>
<string name="ticket_r1">优惠券面值</string>
<string name="ticket_r2">元</string>
<string name="ticket_r3">券有效期</string>
<string name="ticket_r4">订单金额满</string>
<string name="ticket_r5">元可用</string>
<string name="ticket_r6">每单使用</string>
<string name="ticket_r7">张</string>
<string name="recharge_r1">活动名称</string>
<string name="recharge_r2">充值档位</string>
<string name="recharge_r3">优惠规则</string>
<string name="recharge_r4">充值每满</string>
<string name="recharge_r5">元</string>
<string name="recharge_r6">送</string>
<string name="recharge_r7">元</string>
<string name="recharge_r8">开始日期</string>
<string name="recharge_r9">结束日期</string>
</resources>
app/src/main/res/values/strings.xml
View file @ ddd1dbb9
......@@ -386,7 +386,7 @@
<string name="ms_editor_type_gift_name">品名:</string>
<string name="ms_editor_type_gift_price">售价:</string>
<string name="ms_editor_type_gift_search_hint">请输入商品名称/条码</string>
<string name="ms_editor_date_format">%s年%s月%s日</string>
<string name="ms_editor_date_format">%s-%s-%s-</string>
<string name="ms_editor_time_format">%s:%s</string>
......@@ -446,8 +446,8 @@
<!--空视图-->
<string name="empty_other_select">请输入商品名称/条码/或扫描条码进行搜索</string>
<!--积分管理-->
<string name="integral_get_title">积分获取规则</string>
<string name="integral_exchange_title">积分兑换规则</string>
<string name="integral_get_title">获取规则</string>
<string name="integral_exchange_title">兑换规则</string>
<!--优惠券-->
<string name="return_ticket_title">新增优惠券</string>
<string name="ticket_hint">优惠券规则功能限时免费使用 1 个月</string>
......
app/src/main/res/values/stringzz.xml
View file @ ddd1dbb9
......@@ -35,5 +35,109 @@
<string name="sku_u_grpName">组合商品</string>
<string name="splash_loading">正在加载中…</string>
<string name="all_exit">再按一次退出程序</string>
<string name="all_succ">成功</string>
<string name="login_valid_data">请输入有效数据</string>
<string name="select_business">选择行业</string>
<string-array name="business_group">
<item>超市</item>
<item>鲜花</item>
<item>鞋服</item>
<item>药店</item>
<item>熟食</item>
<item>生鲜</item>
<item>便利店</item>
<item>夫妻店</item>
<item>烟酒</item>
<item>母婴</item>
<item>茶叶</item>
<item>书店</item>
<item>美妆</item>
<item>其他</item>
</string-array>
<string name="member_info">会员信息</string>
<string name="vip_spent">消费</string>
<string name="vip_birthday">生日</string>
<string name="vip_record_date">注册日期</string>
<string name="vip_update">编辑会员</string>
<string name="vip_recharge">充值明细</string>
<string name="vip_consumption">消费记录</string>
<string name="vip_coupon">优惠券详情</string>
<string name="all_select">请选择</string>
<string name="total_recharge">累计充值</string>
<string name="total_consumption">消费总额</string>
<string name="total_consumption_cnt">消费次数</string>
<string name="usable_coupon">可用优惠券</string>
<string name="unusable_coupon">不可用优惠券</string>
<string name="bonus">送:</string>
<string name="total_money">实际到账</string>
<string name="ms_all_member">实际到账</string>
<string name="ms_all_vip">实际到账</string>
<string name="ms_all_store">所有门店</string>
<string name="ms_local_store">本店</string>
<string name="level_update">等级编辑</string>
<string name="level_name">等级名称</string>
<string name="level_name_hint">输入等级名称</string>
<string name="level_dis">折扣设置</string>
<string name="level_promotion">本级标准</string>
<string name="level_pro_date">最近</string>
<string name="level_pro_day">天</string>
<string name="level_pro_amt">消费金额</string>
<string name="rule_setting">规则设置</string>
<string name="points_access">获取方式</string>
<string name="points_name">规则名称</string>
<string name="points_access_all">通用</string>
<string name="points_access_cate">品类定义</string>
<string name="points_access_sku">商品定义</string>
<string name="points_ratio">积分比例</string>
<string name="points_ratio_per">元一个积分</string>
<string name="points_shelf_life">有效期限</string>
<string name="points_points_value">积分面值</string>
<string name="points_points_value_hint">个积分=1元</string>
<string name="points_conditions">兑换条件</string>
<string name="points_c1">实收满</string>
<string name="points_c2">元</string>
<string name="points_c3">可以使用</string>
<string name="points_c4">积分</string>
<string name="points_rule">兑换规则</string>
<string name="ticket_r0">名称</string>
<string name="ticket_r1">优惠券面值</string>
<string name="ticket_r2">元</string>
<string name="ticket_r3">券有效期</string>
<string name="ticket_r4">订单金额满</string>
<string name="ticket_r5">元可用</string>
<string name="ticket_r6">每单使用</string>
<string name="ticket_r7">张</string>
<string name="recharge_r1">活动名称</string>
<string name="recharge_r2">充值档位</string>
<string name="recharge_r3">优惠规则</string>
<string name="recharge_r4">充值每满</string>
<string name="recharge_r5">元</string>
<string name="recharge_r6">送</string>
<string name="recharge_r7">元</string>
<string name="recharge_r8">开始日期</string>
<string name="recharge_r9">结束日期</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment