Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/fragment_send_ticker_vip.xml

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java

@@ -5,7 +5,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
@@ -13,7 +12,6 @@ import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
 import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
-import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.List;
@@ -66,14 +64,11 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
                 }
             }
         });
-        mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
-            KeyboardUtils.hideSoftInput(textView);
-            mPresenter.searchVip(textView.getText().toString());
-            return false;
+        mViewBinding.vSearch.setOnSearchListener(keyword -> {
+            mViewBinding.vSearch.hideSoftInput();
+            mPresenter.searchVip(keyword);
         });
-        Global.setFocus(mViewBinding.etSearch, getActivity());
-//        KeyboardUtils.showSoftInput(getActivity());
-
+        mViewBinding.vSearch.showSoftInput();
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/view/SearchBar.java

@@ -16,6 +16,7 @@ import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.ViewSearchBarBinding;
+import com.xingdata.zzdpos.util.Global;
 
 @SuppressLint("AppCompatCustomView")
 public class SearchBar extends ConstraintLayout {
@@ -60,7 +61,8 @@ public class SearchBar extends ConstraintLayout {
      * 显示软键盘
      */
     public void showSoftInput() {
-        KeyboardUtils.showSoftInput(mViewBinding.etSearch);
+        Global.setFocus(mViewBinding.etSearch,getContext());
+//        KeyboardUtils.showSoftInput(mViewBinding.etSearch);
     }
 
     /**
@@ -81,6 +83,7 @@ public class SearchBar extends ConstraintLayout {
                     ToastUtils.showShort("请输入搜索内容");
                     return false;
                 }
+
                 KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
                 mOnSearchListener.onSearch(str);
             }

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

 <?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>
 
-        <import type="android.view.View" />
+        <import type="android.view.View"/>
 
         <variable
             name="empty"
-            type="boolean" />
+            type="boolean"/>
 
         <variable
             name="OnClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
+            type="com.xingdata.zzdpos.util.OnClickListener"/>
 
         <variable
             name="titleMode"
-            type="int" />
+            type="int"/>
     </data>
 
     <LinearLayout
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
             android:layout_gravity="bottom"
-            android:background="@color/gray_huanggai" />
+            android:background="@color/gray_huanggai"/>
 
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
@@ -38,15 +38,15 @@
 
             <ImageButton
                 android:id="@+id/btn_back"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/title_height"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/all_go_back"
                 android:gravity="center"
                 android:onClick="@{OnClickListener}"
-                android:padding="@dimen/all_padding"
+                android:padding="@dimen/all_margin"
                 android:src="@mipmap/back_black"
-                app:layout_constraintLeft_toLeftOf="parent" />
+                app:layout_constraintLeft_toLeftOf="parent"/>
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -67,7 +67,7 @@
                     android:maxLength="11"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size_low" />
+                    android:textSize="@dimen/all_text_size_low"/>
 
             </LinearLayout>
 
@@ -77,7 +77,7 @@
                 android:layout_height="@dimen/all_line_width"
                 android:layout_gravity="bottom"
                 android:background="@color/gray_huanggai"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                app:layout_constraintBottom_toBottomOf="parent"/>
         </android.support.constraint.ConstraintLayout>
 
         <View
@@ -85,18 +85,18 @@
             android:layout_height="@dimen/all_line_width"
             android:layout_marginBottom="@dimen/all_margin"
             android:background="@color/gray_huanggai"
-            android:visibility="@{empty?View.GONE:View.VISIBLE}" />
+            android:visibility="@{empty?View.GONE:View.VISIBLE}"/>
 
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
-            android:background="@color/gray_huanggai" />
+            android:background="@color/gray_huanggai"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rl_vip"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"/>
 
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -36,6 +36,7 @@
             android:background="?attr/actionBarItemBackground"
             android:contentDescription="@string/search_clear"
             android:padding="@dimen/all_spacing"
+
             android:src="@mipmap/ic_clear"
             android:visibility="@{keywordLength>0?View.VISIBLE:View.GONE}"
             app:layout_constraintBottom_toTopOf="parent"