Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java

@@ -42,7 +42,7 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("发送验证码");
+        mViewBinding.icTitle.tvTitle.setText(R.string.login_vya);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralAdapter.java

@@ -35,9 +35,9 @@ public class IntegralAdapter extends BaseAdapter<Gbound, ItemIntegralBinding> {
         mViewBinding.tvGet.setText(item.getTruleName());
         //开通启用状态 0：正常 1 暂停 默认 0
         if (item.getBoundGetStatus() == 0) {
-            mViewBinding.tvStatus.setText("启用");
+            mViewBinding.tvStatus.setText(mContext.getString(R.string.all_state_open));
         } else {
-            mViewBinding.tvStatus.setText("未启用");
+            mViewBinding.tvStatus.setText(mContext.getString(R.string.all_state_close));
         }
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralExchangeAdapter.java

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.marketing.integral.adapter;
 
 import android.support.annotation.Nullable;
 
+import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.databinding.ItemIntegralBinding;
 import com.xingdata.zzdpos.model.Ubound;
@@ -24,21 +25,19 @@ public class IntegralExchangeAdapter extends BaseAdapter<Ubound, ItemIntegralBin
         mViewBinding.tvSourceTitle.setText("兑换规则");
 
 
-
         mViewBinding.tvVip.setText(item.getBoundValAmt() + "个积分=1元");
         //兑换规则
         if (item.getBoundOrderAmt() != null && item.getBoundUseNum() != null) {
-            mViewBinding.tvSource.setText("订单实收金额满" + ConvertUtil.fenToYuan(item.getBoundOrderAmt
-                    ()) + "元\n最多使用" + item.getBoundUseNum() + "积分");
+            mViewBinding.tvSource.setText("订单实收金额满" + ConvertUtil.fenToYuan(item.getBoundOrderAmt()) + "元\n最多使用" + item.getBoundUseNum() + "积分");
         }
         //备注
         mViewBinding.tvGet.setText(mViewBinding.tvVip.getText().toString());
         if (item.getBoundUseStatus() != null) {
             //开通启用状态 0：正常 1 暂停 默认 0
             if (item.getBoundUseStatus() == 0) {
-                mViewBinding.tvStatus.setText("启用");
+                mViewBinding.tvStatus.setText(mContext.getString(R.string.all_state_open));
             } else {
-                mViewBinding.tvStatus.setText("未启用");
+                mViewBinding.tvStatus.setText(mContext.getString(R.string.all_state_close));
             }
         }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -48,7 +48,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("获取积分规则");
+        mViewBinding.icTitle.tvTitle.setText(R.string.menu_ms_integral);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -88,7 +88,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
                 case R.id.rb_get: {
                     mViewBinding.rbGet.getPaint().setFakeBoldText(true);
                     mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
-                    mViewBinding.icTitle.tvTitle.setText("获取积分规则");
                     showView(v.getId());
                     mPresenter.query(1, NORMAL_TYPE, null);
                 }
@@ -96,7 +95,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
                 case R.id.rb_exchange: {
                     mViewBinding.rbGet.getPaint().setFakeBoldText(false);
                     mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
-                    mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
                     showView(v.getId());
                     mLoadingDialog.show((BaseActivity) getActivity());
                     mPresenter.exchangeQuery(mLoadingDialog);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java

@@ -49,7 +49,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
         iniMscard();
         if (mMscard != null) {
-            mViewBinding.infoTitle.tvTitle.setText("修改充值优惠");
+            mViewBinding.infoTitle.tvTitle.setText(R.string.recharge_dis_update);
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
             mViewBinding.ruleName.setText("充" + ConvertUtil.fenToYuanNoZero(mMscard.getCruleChargeAmt()) + "送" + ConvertUtil.fenToYuanNoZero(mMscard.getCruleSendAmt()) + "元");
             mViewBinding.rechargAmt.setText(ConvertUtil.fenToYuanNoZero(mMscard.getCruleChargeAmt()));
@@ -65,7 +65,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         } else {
             mViewBinding.rechargNo.setEnabled(true);
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
-            mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
+            mViewBinding.infoTitle.tvTitle.setText(R.string.recharge_dis_add);
             ((RadioButton) mViewBinding.ruleState.getChildAt(1)).setChecked(true);
             mViewBinding.rechargNo.setText(mScards.get(0));
         }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java

@@ -9,9 +9,7 @@ import android.view.View;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
-import com.xingdata.zzdpos.databinding.FragmentRechargeRuleEditBinding;
 import com.xingdata.zzdpos.databinding.FragmentRechargeRuleListBinding;
-import com.xingdata.zzdpos.databinding.FragmentVipLevelListBinding;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRulePresenter;
@@ -47,11 +45,11 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
 
         mViewBinding.levelRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.levelRecyclerView.setAdapter(adapter);
-        mViewBinding.titleLayout.tvTitle.setText("充值优惠");
+        mViewBinding.titleLayout.tvTitle.setText(getString(R.string.recharge_dis_title));
         adapter.setOnItemClickListener((mAdapter, view, position) -> {
             mPresenter.rechargeRuleEditFragment.setmMscard(adapter.getData().get(position));
             mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
-            start( mPresenter.rechargeRuleEditFragment);
+            start(mPresenter.rechargeRuleEditFragment);
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
         adapter.setEnableLoadMore(false);
@@ -60,7 +58,7 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
                 case R.id.addRule:
                     mPresenter.rechargeRuleEditFragment.setmMscard(null);
                     mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
-                    start( mPresenter.rechargeRuleEditFragment);
+                    start(mPresenter.rechargeRuleEditFragment);
                     break;
             }
         });

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java

@@ -43,7 +43,7 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitles.tvTitle.setText("新增优惠券");
+        mViewBinding.icTitles.tvTitle.setText(getString(R.string.ticket_add_ticket));
         mViewBinding.icTitles.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java

@@ -30,7 +30,7 @@ public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("优惠券规则");
+        mViewBinding.icTitle.tvTitle.setText(R.string.ticket_title);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -73,7 +73,7 @@ public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
         if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
                 0) {
 //            mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
-            returnTicketAdapter.setEmptyView(getEmptyView("没有优惠券~"));
+            returnTicketAdapter.setEmptyView(getEmptyView(getString(R.string.ticket_empty)));
         }
         if (trulePager != null && trulePager.getList() != null) {
             mViewBinding.tvEmpty.setVisibility(View.GONE);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/fragment/LevelListFragment.java

@@ -4,32 +4,19 @@ package com.xingdata.zzdpos.ui.marketing.viplevel.fragment;
  * Created by JM_DEV on 2017/12/21.
  */
 
-import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
-import android.view.Gravity;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
 
-import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
-import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipLevelListBinding;
-import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
 import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.model.Sta;
-import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.marketing.viplevel.LevelPresenter;
 import com.xingdata.zzdpos.ui.marketing.viplevel.adapter.VipLevelListAdapter;
-import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
-import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 会员等级界面
@@ -57,7 +44,7 @@ public class LevelListFragment extends BaseFragment<LevelPresenter, FragmentVipL
         mViewBinding.noRultBg.setVisibility(View.VISIBLE);
         mViewBinding.levelRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.levelRecyclerView.setAdapter(adapter);
-        mViewBinding.titleLayout.tvTitle.setText("会员等级");
+        mViewBinding.titleLayout.tvTitle.setText(R.string.menu_ms_vip_level);
         adapter.setOnItemClickListener((mAdapter, view, position) -> {
             mPresenter.vipLevelEditFragment.setmLevel((Level) mAdapter.getData().get(position));
             start(mPresenter.vipLevelEditFragment);

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java

@@ -7,7 +7,6 @@ package com.xingdata.zzdpos.ui.vip.fragment;
 import android.app.DatePickerDialog;
 import android.graphics.Color;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.RadioButton;
 import android.widget.TextView;
@@ -20,7 +19,6 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipInfoEditBinding;
 import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.ui.vip.VipContract;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
 import com.xingdata.zzdpos.util.ConvertUtil;
@@ -29,7 +27,6 @@ import com.xingdata.zzdpos.util.StringUtil;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 会员信息界面
@@ -79,7 +76,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
                 radioButton.setChecked(true);
             }
         } else {
-            mViewBinding.infoTitle.tvTitle.setText("添加会员");
+            mViewBinding.infoTitle.tvTitle.setText(R.string.vip_add_title);
             mViewBinding.vipPhone.setEnabled(true);
             mViewBinding.vipDiscounts.setEnabled(true);
             mViewBinding.vipDiscounts.setText(mPresenter.levels.get(0).getVipLevelName() + "    " + ConvertUtil.discount(mPresenter.levels.get(0).getVipDefDiscount()) + "折");

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -15,7 +15,6 @@ import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.PermissionUtils;
 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.FragmentVipListBinding;
 import com.xingdata.zzdpos.model.Level;
@@ -53,12 +52,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         mViewBinding.vipRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
         if (vipState != 0) {
-            mViewBinding.titleLayout.tvTitle.setText("会员充值");
-            mViewBinding.vipCountAddTodayTitle.setText("充值金额");
-            mViewBinding.vipCountTitle.setText("今日充值");
+            mViewBinding.titleLayout.tvTitle.setText(R.string.vip_recharge_title);
+            mViewBinding.vipCountAddTodayTitle.setText(R.string.recharge_total_amount);
+            mViewBinding.vipCountTitle.setText(R.string.recharge_today_amount);
             mViewBinding.addVipLinearLayout.setVisibility(View.GONE);
-        }else {
-            mViewBinding.titleLayout.tvTitle.setText("会员管理");
+        } else {
+            mViewBinding.titleLayout.tvTitle.setText(R.string.member_title);
         }
         mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
         vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
@@ -103,7 +102,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             switch (view.getId()) {
                 case R.id.addVip:
                     if (mPresenter.levels == null || mPresenter.levels.size() == 0) {
-                        ToastUtils.showShort("缺少会员等级");
+                        ToastUtils.showShort(R.string.member_less_class);
                         return;
                     }
                     toStartVipInfo(null);
@@ -184,7 +183,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             mViewBinding.vipLevelR.removeAllViews();
         }
 
-        if (levelPager.getList()==null||levelPager.getList().size()==0){
+        if (levelPager.getList() == null || levelPager.getList().size() == 0) {
             ToastUtils.showShort("没有开通会员功能！");
             return;
         }
@@ -231,9 +230,9 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
     public void getVipListSus(Pager<Vip> vipPager, int mPageNumber) {
         vipListAdapter.loadMoreComplete();
         mViewBinding.vipRefresh.setRefreshing(false);
-        if (vipPager.getPageNumber()<=1) {
+        if (vipPager.getPageNumber() <= 1) {
             vipListAdapter.setNewData(vipPager.getList());
-        }else {
+        } else {
             vipListAdapter.addData(vipPager.getList());
         }
         if (vipPager.isLastPage()) {
@@ -248,7 +247,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 
 
     public void toStartVipInfo(Vip vip) {
-        mPresenter.vipRechargeFragment=new VipRechargeFragment();
+        mPresenter.vipRechargeFragment = new VipRechargeFragment();
         mPresenter.vipRechargeFragment.setVip(vip);
         if (vip != null) {
             if (vipState == 0) {
@@ -270,7 +269,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
      */
     public void getVipNumberSus(Sta sta) {
         if (vipState != 0) {
-            mViewBinding.vipCount.setText(sta.getCardCount() + "/次");
+            mViewBinding.vipCount.setText(String.valueOf(sta.getCardCount()));
             mViewBinding.vipCountAddToday.setText("￥" + ConvertUtil.fenToYuan2(sta.getCardAmt()));
         } else {
             mViewBinding.vipCount.setText(sta.getVipCount() + "");

app/src/main/res/layout/dialog_integral_exchange_setting.xml

@@ -30,7 +30,7 @@
                 android:background="@drawable/up_down_line_gray"
                 android:gravity="left|center_vertical"
                 android:paddingLeft="@dimen/all_padding"
-                android:text="基本信息"
+                android:text="@string/all_baseinfo"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/text_secondary_title"/>
 
@@ -57,7 +57,7 @@
                     android:layout_weight="2"
                     android:drawableLeft="@mipmap/point"
                     android:paddingLeft="@dimen/all_padding"
-                    android:text="启用状态:"
+                    android:text="@string/all_state"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/et_textsize"/>
 
@@ -90,7 +90,7 @@
                         android:background="@drawable/selector_checkbox_bg"
                         android:button="@null"
                         android:onClick="@{OnClickListener}"
-                        android:text="启用 "
+                        android:text="@string/all_state_open"
                         android:textSize="@dimen/et_textsize"/>
 
                 </RadioGroup>

app/src/main/res/layout/dialog_integral_get_setting.xml

@@ -52,7 +52,7 @@
                     android:background="@drawable/up_down_line_gray_bottom"
                     android:gravity="left|center_vertical"
                     android:paddingLeft="@dimen/all_bounced_padding"
-                    android:text="基本信息"
+                    android:text="@string/all_baseinfo"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/text_secondary_title"/>
 
@@ -116,7 +116,7 @@
                         android:drawableLeft="@mipmap/point"
                         android:drawablePadding="@dimen/all_bounced_spacing"
                         android:paddingLeft="@dimen/all_bounced_padding"
-                        android:text="启用状态:"
+                        android:text="@string/all_state"
                         android:textColor="@color/black"
                         android:textSize="@dimen/et_textsize"/>
 
@@ -151,7 +151,7 @@
                             android:background="@drawable/selector_checkbox_bg"
                             android:button="@null"
                             android:onClick="@{OnClickListener}"
-                            android:text="启用 "
+                            android:text="@string/all_state_open"
                             android:textSize="@dimen/et_textsize"/>
 
                     </RadioGroup>
@@ -194,7 +194,7 @@
                         android:drawableLeft="@mipmap/point"
                         android:drawablePadding="@dimen/all_bounced_spacing"
                         android:paddingLeft="@dimen/all_bounced_padding"
-                        android:text="会员等级:"
+                        android:text="@string/menu_ms_vip_level"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
 

app/src/main/res/layout/dialog_ticket_add_setting.xml

@@ -30,7 +30,7 @@
                 android:background="@drawable/up_down_line_gray_bottom"
                 android:gravity="left|center_vertical"
                 android:paddingLeft="@dimen/all_padding"
-                android:text="基本信息"
+                android:text="@string/all_baseinfo"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/text_secondary_title"/>
 
@@ -87,7 +87,7 @@
                     android:layout_weight="2"
                     android:drawableLeft="@mipmap/point"
                     android:drawablePadding="@dimen/all_bounced_spacing"
-                    android:text="启用状态:"
+                    android:text="@string/all_state"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/et_textsize"/>
 
@@ -108,7 +108,7 @@
                         android:background="@drawable/selector_checkbox_bg"
                         android:button="@null"
                         android:onClick="@{OnClickListener}"
-                        android:text="暂停 "
+                        android:text="@string/all_cancel "
                         android:textSize="@dimen/et_textsize"/>
 
                     <RadioButton
@@ -121,7 +121,7 @@
                         android:background="@drawable/selector_checkbox_bg"
                         android:button="@null"
                         android:onClick="@{OnClickListener}"
-                        android:text="启用 "
+                        android:text="@string/all_state_open"
                         android:textSize="@dimen/et_textsize"/>
                 </RadioGroup>
             </LinearLayout>

app/src/main/res/layout/fragment_integral_main.xml

@@ -8,15 +8,14 @@
             type="android.view.View.OnClickListener"></variable>
     </data>
     
-    <android.support.constraint.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white">
         
         <include
             android:id="@+id/ic_title"
-            layout="@layout/title"/>
+            layout="@layout/title" />
         
         <LinearLayout
             android:id="@+id/btn_add"
@@ -36,15 +35,15 @@
                 android:id="@+id/iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/but_add"/>
+                android:src="@mipmap/but_add" />
             
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_padding"
-                android:text="添加获取规则"
+                android:text="@string/integral_add"
                 android:textColor="@color/red_guanyu"
-                android:textSize="@dimen/text_three_title"/>
+                android:textSize="@dimen/text_three_title" />
         
         </LinearLayout>
         
@@ -79,9 +78,9 @@
                     android:gravity="center"
                     android:onClick="@{OnClickListener}"
                     android:padding="@dimen/all_padding"
-                    android:text="获取规则"
+                    android:text="@string/integral_get_title"
                     android:textColor="@drawable/radio_select"
-                    android:textSize="@dimen/et_textsize"/>
+                    android:textSize="@dimen/et_textsize" />
                 
                 
                 <RadioButton
@@ -94,9 +93,9 @@
                     android:gravity="center"
                     android:onClick="@{OnClickListener}"
                     android:padding="@dimen/all_padding"
-                    android:text="兑换规则"
+                    android:text="@string/integral_exchange_title"
                     android:textColor="@drawable/radio_select"
-                    android:textSize="@dimen/et_textsize"/>
+                    android:textSize="@dimen/et_textsize" />
             </RadioGroup>
         
         
@@ -132,8 +131,7 @@
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/rv_message"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-                    </android.support.v7.widget.RecyclerView>
+                        android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
                 </android.support.v4.widget.SwipeRefreshLayout>
             </LinearLayout>
             
@@ -149,8 +147,7 @@
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rv_exchange_message"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                </android.support.v7.widget.RecyclerView>
+                    android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
             </LinearLayout>
         </LinearLayout>
     

app/src/main/res/layout/fragment_recharge_rule_edit.xml

@@ -29,7 +29,7 @@
                 style="@style/default_blacktext_bigstyle"
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:text="基本信息" />
+                android:text="@string/all_baseinfo" />
         </LinearLayout>
 
         <include layout="@layout/line_layout"/>
@@ -109,7 +109,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:maxLength="11"
-                        android:text="启用状态：" />
+                        android:text="@string/all_state" />
 
                     <RadioGroup
                         android:id="@+id/rule_state"
@@ -137,7 +137,7 @@
                             android:background="@drawable/selector_checkbox_bg"
                             android:button="@null"
                             android:tag="0"
-                            android:text="启用" />
+                            android:text="@string/all_state_open" />
                     </RadioGroup>
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/fragment_recharge_rule_list.xml

@@ -55,7 +55,7 @@
                     style="@style/default_blacktext_bigstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="添加充值优惠"
+                    android:text="@string/recharge_dis_add"
                     android:textColor="@color/deep_red" />
             </LinearLayout>
         </LinearLayout>
@@ -85,7 +85,7 @@
                     style="@style/textView_body_small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="还没有充值优惠，请添加充值优惠~"
+                    android:text="@string/recharge_dis_empty"
                     android:textColor="@color/gray_huanggai"
                     android:textSize="22sp" />
             </LinearLayout>

app/src/main/res/layout/fragment_ticker_main.xml

@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_padding"
-                android:text="添加优惠券"
+                android:text="@string/ticket_add_ticket"
                 android:textColor="@color/red_guanyu"
                 android:textSize="@dimen/text_three_title"/>
 
@@ -139,7 +139,7 @@
                 android:drawableLeft="@mipmap/bindingcounter_addcounter_befor"
                 android:onClick="@{OnClickListener}"
                 android:paddingLeft="5dp"
-                android:text="添加优惠券"
+                android:text="@string/ticket_add_ticket"
                 android:textColor="@color/white"
                 android:textSize="@dimen/et_textsize"/>
         </LinearLayout>

app/src/main/res/layout/fragment_vip_add_succeed.xml

@@ -99,7 +99,7 @@
 
                 <TextView
                     style="@style/default_blacktext_no_margin_smallstyle"
-                    android:text="会员等级" />
+                    android:text="@string/menu_ms_vip_level" />
 
                 <TextView
                     android:id="@+id/vip_level"

app/src/main/res/layout/fragment_vip_level_edit.xml

@@ -29,7 +29,7 @@
                 style="@style/default_blacktext_bigstyle"
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:text="基本信息" />
+                android:text="@string/all_baseinfo" />
         </LinearLayout>
       <include layout="@layout/line_layout"></include>
 

app/src/main/res/layout/fragment_vip_level_list.xml

@@ -27,14 +27,14 @@
         
         
         <LinearLayout
-            android:visibility="gone"
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
             android:layout_height="58dp"
             android:layout_marginTop="10dp"
             android:background="@color/white"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:visibility="gone">
             
             <LinearLayout
                 android:id="@+id/addVip"
@@ -84,7 +84,7 @@
                     style="@style/textView_body_small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="还没有会员等级，请添加会员等级~"
+                    android:text="@string/member_empty_class"
                     android:textColor="@color/gray_huanggai"
                     android:textSize="22sp" />
             </LinearLayout>

app/src/main/res/layout/item_integral.xml

@@ -111,7 +111,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="启用状态"
+                    android:text="@string/all_state"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_text_size_low"/>
 
@@ -121,7 +121,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="3"
                     android:gravity="right"
-                    android:text="启用状态"
+                    android:text="@string/all_state"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_text_size_low"/>
             </LinearLayout>

app/src/main/res/layout/item_marketing_menu.xml

@@ -49,7 +49,7 @@
                 android:layout_height="match_parent"
                 android:gravity="center|left"
                 android:padding="@dimen/all_padding"
-                android:text="会员等级"
+                android:text="@string/menu_ms_vip_level"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/et_textsize" />
         </LinearLayout>

app/src/main/res/values-en/strings.xml

@@ -222,7 +222,7 @@
     <string name="login_et_phone_hint">Enter Phone Number</string>
     <string name="login_signinfragmentfragment_btn_login">Login</string>
     <!--获取验证码界面-->
-    <string name="login_smscodefragment_tv_get_sms">Click to get Code</string>
+    <string name="login_smscodefragment_tv_get_sms">Click to get</string>
     <string name="login_smscodefragment_et_input_sms_hint">Enter Code</string>
     <string name="login_smscodefragment_btn_next">Next</string>
     <!--输入密码界面-->

app/src/main/res/values-en/stringzz.xml

+<resources>
+    <string name="login_back_login">Back to login</string>
+    <string name="login_vya">Verify your account</string>
+    
+    <string name="all_reboot">reboot</string>
+    <string name="all_ignore">ignore</string>
+    
+    <string name="member_title">Member</string>
+    <string name="member_total_cnt">Total count</string>
+    <string name="member_today_cnt">New member today</string>
+    <string name="member_add_hint">Enter Phone Number/Name</string>
+    
+    <string name="recharge_today_amount">Today amount</string>
+    <string name="recharge_total_amount">Total amount</string>
+    
+    <string name="member_less_class">Must add member class</string>
+    <string name="member_empty_class">Not find the Member class</string>
+    
+    <string name="integral_add">Add Rules</string>
+    
+    <string name="ticket_title">Ticket</string>
+    <string name="ticket_add_ticket">Add Ticket</string>
+    <string name="ticket_empty">Not find the Ticket</string>
+    
+    <string name="all_baseinfo">Info</string>
+    <string name="all_state">State</string>
+    
+    <string name="all_state_open">Open</string>
+    <string name="all_state_close">Close</string>
+    
+    <string name="recharge_dis_title">Recharge Plan</string>
+    <string name="recharge_dis_add">Add Recharge Plan</string>
+    <string name="recharge_dis_update">Update Recharge Plan</string>
+    <string name="recharge_dis_empty">Not find the Recharge Plan</string>
+
+</resources>

app/src/main/res/values-zh/stringzz.xml

+<resources>
+    <string name="login_back_login">返回登陆页面</string>
+    <string name="login_vya">验证账号</string>
+    
+    <string name="all_reboot">重启</string>
+    <string name="all_ignore">忽略</string>
+    
+    <string name="member_title">会员管理</string>
+    <string name="member_total_cnt">本店会员</string>
+    <string name="member_today_cnt">今日新增</string>
+    <string name="member_add_hint">请输入手机号或会员姓名</string>
+    
+    <string name="recharge_today_amount">今日充值</string>
+    <string name="recharge_total_amount">充值金额</string>
+    
+    <string name="member_less_class">缺少会员等级</string>
+    <string name="member_empty_class">还没有会员等级，请添加会员等级~</string>
+    
+    <string name="integral_add">添加规则</string>
+    
+    <string name="ticket_title">优惠券规则</string>
+    <string name="ticket_add_ticket">添加优惠券</string>
+    <string name="ticket_empty">没有优惠券~</string>
+    
+    <string name="all_baseinfo">基本信息</string>
+    <string name="all_state">启用状态</string>
+    
+    <string name="all_state_open">启用</string>
+    <string name="all_state_close">暂停</string>
+    
+    <string name="recharge_dis_title">充值优惠</string>
+    <string name="recharge_dis_add">新增充值优惠</string>
+    <string name="recharge_dis_update">修改充值优惠</string>
+    <string name="recharge_dis_empty">还没有充值优惠，请添加充值优惠~</string>
+
+</resources>

app/src/main/res/values/strings.xml

@@ -18,12 +18,8 @@
     <string name="password">＊</string>
     <string name="rate">%</string>
     <string name="all_hint_date">日期不符合区间</string>
-    <string name="all_continue">继续</string>
-    
-    <string name="all_ignore">忽略</string>
-    <string name="all_reboot">重启</string>
-    
     
+    <string name="all_continue">继续</string>
     <!--返回-->
     <string name="all_go_back">返回</string>
     
@@ -43,7 +39,7 @@
     <string name="login_phone_hint">手机</string>
     <string name="login_password_hint">密码</string>
     <string name="login_sign_in">登录</string>
-    <string name="login_forget_password">忘记密码 ? </string>
+    <string name="login_forget_password">忘记密码</string>
     <string name="login_sign_up">注册</string>
     <!--启动页面 <WHERE>_<DESCRIPTION>-->
     <string name="splash_info">\@2017浙星提供云计算服务</string>

app/src/main/res/values/stringzz.xml

@@ -2,4 +2,35 @@
     <string name="login_back_login">返回登陆页面</string>
     <string name="login_vya">验证账号</string>
     
+    <string name="all_reboot">重启</string>
+    <string name="all_ignore">忽略</string>
+    
+    <string name="member_title">会员管理</string>
+    <string name="member_total_cnt">本店会员</string>
+    <string name="member_today_cnt">今日新增</string>
+    <string name="member_add_hint">请输入手机号或会员姓名</string>
+    
+    <string name="recharge_today_amount">今日充值</string>
+    <string name="recharge_total_amount">充值金额</string>
+    
+    <string name="member_less_class">缺少会员等级</string>
+    <string name="member_empty_class">还没有会员等级，请添加会员等级~</string>
+    
+    <string name="integral_add">添加规则</string>
+    
+    <string name="ticket_title">优惠券规则</string>
+    <string name="ticket_add_ticket">添加优惠券</string>
+    <string name="ticket_empty">没有优惠券~</string>
+    
+    <string name="all_baseinfo">基本信息</string>
+    <string name="all_state">启用状态</string>
+    
+    <string name="all_state_open">启用</string>
+    <string name="all_state_close">暂停</string>
+    
+    <string name="recharge_dis_title">充值优惠</string>
+    <string name="recharge_dis_add">添加充值优惠</string>
+    <string name="recharge_dis_update">修改充值优惠</string>
+    <string name="recharge_dis_empty">还没有充值优惠，请添加充值优惠~</string>
+
 </resources>