Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -209,4 +210,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     }
 
 
+    @Override
+    protected void onDestroy() {
+        ZX_PrintPOS.getInstance(this).Destory();
+        super.onDestroy();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java

@@ -237,7 +237,6 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
 
     private View getEmptyView(int resHint) {
         View view = getLayoutInflater().inflate(R.layout.view_empty, null);
-        view.setBackgroundResource(R.color.gray_zhouyu);
         ((TextView) view.findViewById(R.id.tv_empty)).setText(resHint);
         return view;
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java

@@ -50,6 +50,11 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
         mPresenter.userListFragment.delUserSus();
     }
 
+    @Override
+    public void searchOperSus(Pager<Oper> operPager) {
+        mPresenter.userListSearchFragment.searchOperSus(operPager);
+    }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         Global.clickHideKeyboard(ev, this);

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserContract.java

@@ -25,6 +25,7 @@ public interface UserContract {
         void addSusSus(Oper oper);
         void updateUserSus(Oper oper);
         void delUserSus();
+        void searchOperSus(Pager<Oper> operPager);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -33,6 +34,5 @@ public interface UserContract {
         public abstract  void querySta();
         public abstract  void updateUser(Oper oper);
         public abstract  void delUser(Oper oper);
-        public abstract  void queryUser(String wd);
     }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java

@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.ui.manage.user.dialog.UserMenuDialog;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoEditFragment;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoFragment;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
+import com.xingdata.zzdpos.ui.manage.user.fragment.UserListSearchFragment;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,6 +22,7 @@ public class UserPresenter extends UserContract.Presenter {
     public UserInfoFragment userInfoFragment = new UserInfoFragment();
     public LinkedHashMap<String, String> operLevel = new LinkedHashMap<>();//用户级别 1 员工 2主管 3 店长 9老板
     public UserMenuDialog userMenuDialog = new UserMenuDialog();
+    public UserListSearchFragment userListSearchFragment = new UserListSearchFragment();
 
     @Override
     public void onAttached() {
@@ -50,7 +52,12 @@ public class UserPresenter extends UserContract.Presenter {
     @Override
     public void getUserList(String wd) {
         ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+
+            if (wd==null){
                 mView.queryOperSus(operPager);
+            }else {
+                mView.searchOperSus(operPager);
+            }
         }, throwable -> {
             ToastUtils.showShort(throwable.getMessage());
         });
@@ -92,14 +99,14 @@ public class UserPresenter extends UserContract.Presenter {
         });
     }
 
-    @Override
-    public void queryUser(String wd) {
-        ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
-            mView.queryOperSus(operPager);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
+//    @Override
+//    public void queryUser(String wd) {
+//        ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+//            mView.queryOperSus(operPager);
+//        }, throwable -> {
+//            ToastUtils.showShort(throwable.getMessage());
+//        });
+//    }
 
 
     public List<String> getOperLevelList() {

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java

@@ -37,7 +37,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
 
     @Override
     public void initView() {
-        adapter = new UserListAdapter(getActivity(), opers,mPresenter);
+        adapter = new UserListAdapter(getActivity(), opers, mPresenter);
         mViewBinding.userRefresh.setOnRefreshListener(this::onRefresh);
         mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mViewBinding.userRecyclerView.setAdapter(adapter);
@@ -48,6 +48,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
         adapter.setEnableLoadMore(false);
         mViewBinding.titleLayout.tvTitle.setText("店员管理");
+        mViewBinding.searchLayout.serchEditText.setHint("请输入手机号或者店员名称");
         mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -60,18 +61,21 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
                     mPresenter.userInfoEditFragment.setOper(null);
                     start(mPresenter.userInfoEditFragment);
                     break;
-                case R.id.userSearch:
-                    if(mViewBinding.userSearch.getText().toString().length()==0){
-                        ToastUtils.showShort("搜索条件不能为空");
-                        return;
-                    }
-                    mPresenter.queryUser( mViewBinding.searchLayout.serchEditText.getText().toString().trim());
-                    break;
+//                case R.id.userSearch:
+//                    if(mViewBinding.userSearch.getText().toString().length()==0){
+//                        ToastUtils.showShort("搜索条件不能为空");
+//                        return;
+//                    }
+//
+//                    break;
 //                case R.id.onBack:
 //                    getActivity().finish();
 //                    break;
             }
         });
+        mViewBinding.searchLayout.serchEditText.setOnClickListener(view -> {
+            start( mPresenter.userListSearchFragment);
+        });
         onRefresh();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListSearchFragment.java

+package com.xingdata.zzdpos.ui.manage.user.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentUserListBinding;
+import com.xingdata.zzdpos.databinding.FragmentUserSearchListBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Oper;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Sta;
+import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
+import com.xingdata.zzdpos.ui.manage.user.adapter.UserListAdapter;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 店员管理界面
+ */
+public class UserListSearchFragment extends BaseFragment<UserPresenter, FragmentUserSearchListBinding> {
+    private UserListAdapter adapter;
+    private List<Oper> opers = new ArrayList<>();
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_user_search_list;
+    }
+
+    @Override
+    public void initView() {
+        adapter = new UserListAdapter(getActivity(), opers, mPresenter);
+        mViewBinding.userRefresh.setOnRefreshListener(this::onRefresh);
+        mViewBinding.userRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mViewBinding.userRecyclerView.setAdapter(adapter);
+        adapter.setOnItemClickListener((adapter, view, position) -> {
+            mPresenter.userInfoFragment.setOper((Oper) adapter.getData().get(position));
+            start(mPresenter.userInfoFragment);
+        });
+        adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
+        adapter.setEnableLoadMore(false);
+        mViewBinding.vipSearch.requestFocus();
+        mViewBinding.vipSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
+
+
+            if (EditorInfo.IME_ACTION_SEARCH == i) {
+                if (textView.getText().toString().trim().length() == 0) {
+                    ToastUtils.showShort("搜索条件不能");
+                    return true;
+                }
+                mPresenter.getUserList(textView.getText().toString().trim());
+            }
+
+            return false;
+        });
+        mViewBinding.ivBack.setOnClickListener(view -> {
+            pop();
+        });
+        onRefresh();
+    }
+
+    private void onLoadMore() {
+    }
+
+    public void onRefresh() {
+        mPresenter.getUserList(null);
+        mPresenter.querySta();
+    }
+
+
+    public void searchOperSus(Pager<Oper> operPager) {
+        adapter.setNewData(operPager.getList());
+        adapter.setEnableLoadMore(false);
+        adapter.loadMoreComplete();
+        mViewBinding.userRefresh.setRefreshing(false);
+        if (operPager.getTotalPage() == 0) {
+            ToastUtils.showShort("沒有搜索到店员信息");
+        }
+    }
+
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mViewBinding.vipSearch.setText("");
+    }
+}

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

@@ -74,7 +74,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("没有优惠券~"));
         }
         if (trulePager != null && trulePager.getList() != null) {
             mViewBinding.tvEmpty.setVisibility(View.GONE);

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -277,7 +277,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 @Override
                 protected void myOnClickListener(View v) {
                     try {
-                        ZX_PrintPOS.getInstance(StatisticsDetailActivity.this).print(1, mSaleorder);
+                        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, mSaleorder);
                     } catch (Exception e) {
                         ToastUtils.showShort("打印异常");
                     }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

@@ -100,7 +100,7 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
     @Override
     public void rechangeSus(Vip v) {
         ViewTools.toastSuss(this, "充值成功");
-        mPresenter.vipRechargeFragment.pop();
+        popTo(mPresenter.vipListFragment.getClass(),false);
         mPresenter.vipListFragment.onRefresh();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.vip.fragment.VipAddSucceedFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
@@ -39,7 +40,7 @@ public class VipPresenter extends VipContract.Presenter {
     public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
     public VipSearchFragment vipSearchFragment = new VipSearchFragment();
     public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
-    public  VipAddSucceedFragment vipAddSucceedFragment =new VipAddSucceedFragment();
+    public VipAddSucceedFragment vipAddSucceedFragment = new VipAddSucceedFragment();
     public ArrayList<Level> levels = new ArrayList<>();
 
     @Override
@@ -78,10 +79,9 @@ public class VipPresenter extends VipContract.Presenter {
     }
 
 
-
     @Override
     public void addVip(Vip vip) {
-        int vipDis= vip.getVipDefDiscount();
+        int vipDis = vip.getVipDefDiscount();
         if (vip.getVipId() == null) {
             ApiFactory.User.addVip(vip).subscribe(mVip -> {
                 mVip.setVipLevelName(vip.getVipLevelName());
@@ -210,7 +210,7 @@ public class VipPresenter extends VipContract.Presenter {
             mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
             mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
             try {
-                ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
+                ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, mVipRechangeOrdervip);
             } catch (Exception e) {
                 ToastUtils.showShort("打印异常");
             }

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

@@ -38,21 +38,23 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
         //继续添加
         mViewBinding.vipAdd.setOnClickListener(view -> {
             mPresenter.vipInfoEditFragment.setVip(null);
-            startWithPop(mPresenter.vipInfoEditFragment);
+            popTo(mPresenter.vipInfoEditFragment.getClass(),false);
+//            start(mPresenter.vipInfoEditFragment);
         });
 
         //充值
         mViewBinding.vipRecharge.setOnClickListener(view -> {
             mPresenter.vipRechargeFragment.setVip(mVip);
-            startWithPop(mPresenter.vipRechargeFragment);
+            start(mPresenter.vipRechargeFragment);
         });
 
         mViewBinding.vipSure.setOnClickListener(view -> {
             mPresenter.vipListFragment.updateVipSus(null);
         });
 
+        //返回强制出堆栈
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
-            pop();
+            popTo(mPresenter.vipListFragment.getClass(),false);
         });
 
     }

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

@@ -235,7 +235,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             vipListAdapter.notifyDataSetChanged();
             pageNumber = 0;
 //            ToastUtils.showShort("没有更多数据");
-            return;
+//            return;
         }
         vipListAdapter.addData(vipPager.getList());
         pageNumber = vipPager.getPageNumber() + 1;

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

@@ -57,14 +57,15 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
     @Override
     public void initView() {
-        setMoney("0","0");
+        setMoney("0", "0");
         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.vipBalance.setText(getString(R.string.vip_balance_text, ConvertUtil.fenToYuan2(mVip.getAcctCbal())));
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
-            pop();
+//            pop();
+            popTo(mPresenter.vipListFragment.getClass(), false);
         });
         mPresenter.getMscardList(mVip.getVipId());
         mPayAdapter = new PayAdapter();
@@ -102,18 +103,16 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
         });
 
 
-
     }
 
 
     @Override
     public boolean onBackPressedSupport() {
-        pop();
+        popTo(mPresenter.vipListFragment.getClass(), false);
         return true;
     }
 
 
-
     public void setVip(Vip mVip) {
         this.mVip = mVip;
     }
@@ -124,8 +123,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
         mscards.clear();
         mscards.addAll(mscardPager.getList());
-
-        layoutParams = new LinearLayout.LayoutParams(inWight/3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
+        layoutParams = new LinearLayout.LayoutParams(inWight / 3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
         layoutParams.setMargins(0, 0, 20, 0);
         int mscardLength = 0;
         if (mscards.size() <= 3) {
@@ -141,6 +139,9 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
             mViewBinding.payMoneyLayout.addView(radioButton);
         }
 
+        if (mViewBinding.payMoneyLayout.getChildCount() != 0) {
+            mViewBinding.payMoneyLayout.setVisibility(View.VISIBLE);
+        }
 
         String hintStr = "自定义金额";
         SpannableString ss = new SpannableString(hintStr);
@@ -157,10 +158,12 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
             }
         });
 
+
         //输入监听
         mViewBinding.stealMoney.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
             }
 
             @Override
@@ -169,8 +172,11 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
             @Override
             public void afterTextChanged(Editable editable) {
-                if (mViewBinding.stealMoney.getText().length() == 0){
-                    setMoney("0","0");
+                if (!mViewBinding.stealMoney.hasFocus()){
+                    return;
+                }
+                if (mViewBinding.stealMoney.getText().length() == 0 ) {
+                    setMoney("0", "0");
                     return;
                 }
 
@@ -197,9 +203,9 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
      */
     private void setMoney(String rechangeMoney, String sendMoney) {
         mViewBinding.sendAmt.setText(sendMoney);
-        mViewBinding.rechargAMT.setText(rechangeMoney);
 //        mViewBinding.rechangeMoney.setText(rechangeMoney);
         mViewBinding.recargeAccount.setText(ConvertUtil.fenToYuan2(ConvertUtil.yuanToFen(sendMoney) + ConvertUtil.yuanToFen(rechangeMoney)));
+        mViewBinding.rechargAMT.setText(rechangeMoney);
     }
 
 

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

@@ -211,8 +211,9 @@
                 android:id="@+id/srl_products"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/gray_zhouyu"
-                android:padding="@dimen/all_padding">
+                android:layout_marginLeft="@dimen/all_padding"
+                android:layout_marginRight="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rc_bale_shop"

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

@@ -250,8 +250,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="9"
-                android:paddingLeft="@dimen/all_padding"
-                android:paddingRight="@dimen/all_padding"
                 android:visibility="visible"/>
 
         </LinearLayout>

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

@@ -13,15 +13,23 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <include
                 android:id="@+id/title_layout"
                 layout="@layout/title" />
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:gravity="center_vertical"
             android:background="@drawable/up_down_line_white_bottom"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <include
@@ -30,6 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
+
             <TextView
                 android:id="@+id/userSearch"
                 style="@style/textView_body_small"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="android.view.View.OnClickListener" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@drawable/up_down_line_white_bottom"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iv_back"
+                android:layout_width="wrap_content"
+                android:padding="@dimen/all_margin"
+                android:layout_height="wrap_content"
+                android:background="@mipmap/go_back" />
+
+            <EditText
+                android:id="@+id/vip_search"
+                style="@style/searchBarEditor"
+                android:layout_width="0dp"
+                android:imeOptions="actionSearch"
+                android:hint="请输入手机或者店员名称"
+                android:layout_weight="1"
+                android:inputType="text"
+                android:labelFor="@+id/et_search" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/all_margin_left"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <android.support.v4.widget.SwipeRefreshLayout
+                    android:id="@+id/user_refresh"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/userRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                </android.support.v4.widget.SwipeRefreshLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -139,7 +139,7 @@
                 style="@style/default_blacktext_bigstyle"
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:text="晋级标准" />
+                android:text="本级标准" />
         </LinearLayout>
 
         <View

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

@@ -27,6 +27,7 @@
 
 
         <LinearLayout
+            android:visibility="gone"
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
             android:layout_height="58dp"

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

@@ -95,6 +95,7 @@
                     android:layout_height="50dp"
                     android:layout_marginBottom="@dimen/all_margin"
                     android:gravity="center_vertical"
+                    android:visibility="gone"
                     android:onCheckedChanged="@{onCheckedChangeListener}"
                     android:orientation="horizontal"></RadioGroup>
 
@@ -126,7 +127,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
                             android:background="@null"
-                            android:digits="1234567890."
+                            android:digits="1234567890"
                             android:inputType="phone"
                             android:maxLength="6"
                             android:onClick="@{onClickListener}"

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

@@ -4,6 +4,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <LinearLayout
@@ -87,9 +88,6 @@
             </LinearLayout>
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+      <include layout="@layout/line_layout"/>
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -2,5 +2,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="0.5dp"
-    android:background="@color/black_likui"
+    android:background="@color/gray_huanggai"
     ></LinearLayout>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="0.5dp"
-    android:background="@color/line_bg"
+    android:background="@color/gray_huanggai"
     android:layout_marginLeft="@dimen/all_margin_left"
     android:layout_marginRight="@dimen/all_margin_left"
     ></LinearLayout>
\ No newline at end of file

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

@@ -19,6 +19,7 @@
                 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="请输入手机号或会员姓名"

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

@@ -4,7 +4,9 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-        android:gravity="center">
+                  android:gravity="center"
+                  android:orientation="vertical">
+
 
         <TextView
             android:id="@+id/tv_empty"

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

@@ -451,7 +451,7 @@
     <string name="tv_bale_edit_count"> 共 %s 件</string>
     <string name="money">￥ %s </string>
     <!--会员管理-->
-    <string name="adv_plan"> 晋级标准：消费金额满 %s</string>
+    <string name="adv_plan"> 本级标准：消费金额满 %s</string>
     <string name="level_Number">共有 %s个会员等级</string>
     <string name="vip_level_title">等级设置</string>
     <string name="vip_mscard_period_of_validity">有效期：%s-%s</string>