Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -19,17 +19,20 @@
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/main_title"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" >
+        </activity>
+
         <activity
             android:name=".ui.splash.SplashActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:theme="@style/AppTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ui.login.LoginActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
@@ -69,6 +72,10 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity android:name=".ui.help.HelpActivity" />
         <activity android:name=".ui.feedback.FeedBackActivity"></activity>
+        <activity
+            android:name=".ui.vip.VipActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -69,7 +69,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
     }
 
 
-    protected void seConfirmEnable( boolean isEnable){
+    protected void seConfirmEnable(boolean isEnable) {
         mBaseBinding.btnConfirm.setEnabled(isEnable);
     }
 
@@ -143,7 +143,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         super.onActivityCreated(savedInstanceState);
         if (!isEasy()) {
             WindowManager.LayoutParams attributes = getDialog().getWindow().getAttributes();
-            attributes.width = ScreenUtils.getScreenWidth() * 45 / 100;
+            attributes.width = ScreenUtils.getScreenWidth() * 95 / 100;
             attributes.height = -2;
             getDialog().getWindow().setAttributes(attributes);
         }

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

@@ -270,10 +270,10 @@ interface MainContract {
 //         */
 //        public abstract void clickChangePassword();
 //
-//        /**
-//         * 菜单EXIT页面 - 点击交班 打开交班报表页面
-//         */
-//        public abstract void clickHandover();
+        /**
+         * 菜单EXIT页面 - 点击交班 打开交班报表页面
+         */
+        public abstract void clickHandover();
 //
 //
 //        /**

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

@@ -131,11 +131,11 @@ public class MainPresenter extends MainContract.Presenter {
 //        mView.showChangePasswordDialog();
 //    }
 //
-//    @Override
-//    public void clickHandover() {
-//        mView.showHandoverDialog();
-//    }
-//
+@Override
+public void clickHandover() {
+    mView.showHandoverDialog();
+}
+
 //
 //    @Override
 //    public void clickFeedback() {

app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java

@@ -24,7 +24,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
 
     @Override
     public int getTitle() {
-        return R.string.handover_title;
+        return R.string.handover_hint;
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java

 package com.xingdata.zzdpos.ui.main.fragment;
 
+import android.content.Intent;
 
 import android.support.v7.widget.GridLayoutManager;
 
 import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -14,6 +16,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
+import com.xingdata.zzdpos.ui.vip.VipActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.splash.SplashActivity;
 import com.xingdata.zzdpos.util.MyMenuItemDecoration;
@@ -51,7 +54,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch ((int) adapter.getData().get(position)) {
                     case C.MENU.MENU_VIP://会员
-
+                        ActivityUtils.startActivity(new Intent(getActivity(),VipActivity.class));
                         break;
                     case C.MENU.MENU_RECHARGE://充值
 
@@ -84,6 +87,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
                 ActivityUtils.startActivity(getActivity(), SplashActivity.class);
             }
         });
+        mViewBinding.btnHandover.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.clickHandover();
+            }
+        });
 
     }
 }

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

+package com.xingdata.zzdpos.ui.vip;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityVipBinding;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
+import com.xingdata.zzdpos.ui.vip.fragment.VipLevleFragment;
+
+public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
+    private VipInfoFragment vipInfoFragment = new VipInfoFragment();
+    private VipLevleFragment vipLevleFragment = new VipLevleFragment();
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_vip;
+    }
+    @Override
+    public void initView() {
+        loadRootFragment(R.id.vip_level_frame, vipLevleFragment, false, false);
+    }
+
+    @Override
+    public Pager<Vip> getVipLevelSus() {
+        return null;
+    }
+
+    @Override
+    public Pager<Level> getVipListSus() {
+        return null;
+    }
+
+    @Override
+    public String getVipNumberSus() {
+        return null;
+    }
+}

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

+package com.xingdata.zzdpos.ui.vip;
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Vip;
+
+
+interface VipContract {
+
+    interface View extends BaseView {
+        Pager<Vip> getVipLevelSus();
+        Pager<Level> getVipListSus();
+        String getVipNumberSus();
+
+    }
+
+    abstract class Presenter extends BasePresenter<VipContract.View> {
+        public abstract void getVipList(int levelId, int pageNumber);
+        public abstract void getVipLevel();
+        public abstract void getVipNumber();
+    }
+}
\ No newline at end of file

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

+package com.xingdata.zzdpos.ui.vip;
+
+
+public class VipPresenter extends VipContract.Presenter {
+    @Override
+    public void onAttached() {
+    }
+
+    @Override
+    public void getVipList(int levelId, int pageNumber) {
+
+    }
+
+    @Override
+    public void getVipLevel() {
+
+    }
+
+    @Override
+    public void getVipNumber() {
+
+    }
+}

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

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+
+/**
+ * 会员信息界面
+ */
+public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_viplevel_title;
+    }
+
+    @Override
+    public void initView() {
+//        RadioButton radioButton = new RadioButton(getActivity());
+//        radioButton.setText("AAAAAAAAAAAAAAA");
+//        mViewBinding.vipLevelRadioGroup.addView(radioButton);
+
+    }
+}

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

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.widget.GridView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.ui.vip.VipActivity;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+
+/**
+ * 会员等级列表
+ */
+public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_viplevel_title;
+    }
+
+    @Override
+    public void initView() {
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+        layoutParams.height = 120;
+        layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
+        for (int i = 0; i < 5; i++) {
+            mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams));
+        }
+        setRadioButtonChecked(true, ((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)));
+        mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> {
+            for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
+                //动态设置按钮颜色
+                setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i)));
+            }
+        });
+    }
+
+    /**
+     * 设置按钮选中
+     *
+     * @param b
+     * @param button
+     */
+    private void setRadioButtonChecked(boolean b, RadioButton button) {
+        button.getPaint().setFakeBoldText(b);//字体加粗
+        if (b) {
+            button.setTextSize(17);
+        } else {
+            button.setTextSize(15);
+        }
+    }
+
+    @SuppressLint("ResourceAsColor")
+    private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams) {
+        RadioButton radioButton = new RadioButton(getActivity());
+        radioButton.setTextSize(15);
+        radioButton.setText("金牌会员");
+        setRadioButtonChecked(false, radioButton);
+        radioButton.setGravity(Gravity.CENTER);
+        radioButton.setButtonDrawable(null);
+        radioButton.getPaint().setFakeBoldText(true);
+        radioButton.setBackgroundResource(R.drawable.checkbox_viplevel_bg);
+        radioButton.setTextColor(R.color.black_baozheng);
+        radioButton.setLayoutParams(layoutParams);
+        return radioButton;
+    }
+}

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

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+
+/**
+ * 会员列表
+ */
+public class VipListFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_viplevel_title;
+    }
+
+    @Override
+    public void initView() {
+//        RadioButton radioButton = new RadioButton(getActivity());
+//        radioButton.setText("AAAAAAAAAAAAAAA");
+//        mViewBinding.vipLevelRadioGroup.addView(radioButton);
+
+    }
+}

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

+package com.xingdata.zzdpos.ui.vip.fragment;
+
+/**
+ * Created by JM_DEV on 2017/12/21.
+ */
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
+import com.xingdata.zzdpos.ui.vip.VipPresenter;
+
+/**
+ * 会员消费充值记录
+ */
+public class VipRecordFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_viplevel_title;
+    }
+
+    @Override
+    public void initView() {
+//        RadioButton radioButton = new RadioButton(getActivity());
+//        radioButton.setText("AAAAAAAAAAAAAAA");
+//        mViewBinding.vipLevelRadioGroup.addView(radioButton);
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -55,7 +55,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "548496";
+        return "92209325";
     }
 
 

app/src/main/res/drawable/black_border.xml

@@ -3,10 +3,10 @@
 
     <corners android:radius="@dimen/all_shape_radius" />
 
+
     <stroke
         android:width="0.5dp"
         android:color="@color/black" />
 
     <solid android:color="@color/all_transparent" />
-
 </shape>
\ No newline at end of file

app/src/main/res/drawable/checkbox_viplevel_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@mipmap/vip_level_check_bg" android:state_checked="true" />
+    <item android:drawable="@mipmap/vip_level_bg" android:state_checked="false" />
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/redout_border_whitein.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="@dimen/all_radius" />
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/red_guanyu" />
+
+    <solid android:color="@color/white_caocao" />
+</shape>
\ No newline at end of file

app/src/main/res/drawable/selector_gradient_gray_button_background.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
+    <item android:drawable="@drawable/red_border_allradius" android:state_pressed="true" />
     <item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
-    <item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke" />
+    <item android:drawable="@drawable/redout_border_whitein" />
 
 </selector>
\ No newline at end of file

app/src/main/res/drawable/selector_gray_button_text_color.xml

@@ -2,6 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:color="@color/white" android:state_pressed="true" />
-    <item android:color="@color/blue" />
+    <item android:color="@color/red_guanyu" />
 
 </selector>
\ No newline at end of file

app/src/main/res/drawable/shape_transparent_round.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/settle_btn_radius" />
-    <solid android:color="@color/gray_transparent" />
+    <solid android:color="@color/white_transparent15" />
 
 </shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <include
+                layout="@layout/title_search"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:background="@mipmap/swipe_card_bg" />
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:background="@mipmap/scan_bg" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line1" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="@dimen/view_line_L5"
+            android:background="@color/line1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="本店会员" />
+
+            <TextView
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="今日新增" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="150"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+
+            <TextView
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="10"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="@dimen/view_line_L5"
+            android:background="@color/line1" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/all_margin_left"
+            android:orientation="horizontal">
+
+            <FrameLayout
+                android:id="@+id/vip_level_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"></FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/vip_frame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"></FrameLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -15,7 +15,7 @@
             style="@style/dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/all_margin" />
+            android:layout_marginBottom="@dimen/all_padding" />
 
 
         <ViewStub
@@ -26,14 +26,21 @@
             android:inflatedId="@+id/panel_import" />
 
 
-        <android.support.constraint.ConstraintLayout
+        <LinearLayout
+            android:layout_marginTop="@dimen/all_padding"
+            android:orientation="horizontal"
+            android:weightSum="2"
+            android:padding="@dimen/dp_4"
+            android:background="@color/white_caocao"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <Button
+                android:layout_margin="1dp"
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
-                android:layout_width="@dimen/dialog_button_width"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/all_margin"
                 android:layout_marginTop="@dimen/all_margin"
@@ -47,9 +54,11 @@
                 tools:targetApi="lollipop" />
 
             <Button
+                android:layout_margin="1dp"
                 android:id="@+id/btn_confirm"
                 style="@style/button_positive"
-                android:layout_width="@dimen/dialog_button_width"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/all_margin"
                 android:layout_marginTop="@dimen/all_margin"
@@ -62,7 +71,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:targetApi="lollipop" />
 
-        </android.support.constraint.ConstraintLayout>
+        </LinearLayout>
 
 
     </LinearLayout>

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

@@ -38,11 +38,7 @@
             type="String" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true">
+
 
         <android.support.constraint.ConstraintLayout
             android:id="@+id/cl_default"
@@ -54,11 +50,13 @@
 
             <TextView
                 android:id="@+id/handover_tv_sumamt"
-                style="@style/textView_body_small"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center"
+                android:singleLine="true"
                 android:text="￥9999"
                 android:textColor="@color/red900"
+                android:textSize="@dimen/big_text_size"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -66,10 +64,14 @@
 
             <TextView
                 android:id="@+id/handover_tv_sumamt_hint"
-                style="@style/textView_body"
-                android:layout_width="wrap_content"
+                android:paddingTop="@dimen/all_margin"
+                android:paddingBottom="@dimen/all_padding"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center"
                 android:text="实收金额"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/small_text_size"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -88,13 +90,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:padding="@dimen/dp_4"
+                android:paddingTop="@dimen/dp_4"
+                android:paddingStart="@dimen/dp_4"
+                android:paddingEnd="@dimen/dp_4"
+                android:paddingBottom="@dimen/all_padding"
                 android:weightSum="2"
                 app:layout_constraintTop_toBottomOf="@id/view1">
 
                 <LinearLayout
 
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical">
@@ -103,53 +108,61 @@
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_date" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_oper" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_orderNum" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_cash" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_wechat" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_alipay" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_bank" />
 
                     <TextView
                         style="@style/textView_body_small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:singleLine="true"
                         android:text="@string/handover_vip" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
@@ -160,6 +173,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{date}"
                         android:textColor="@color/black_likui" />
 
@@ -168,6 +182,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{operName}"
                         android:textColor="@color/black_likui" />
 
@@ -176,6 +191,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{orderNum}"
                         android:textColor="@color/black_likui" />
 
@@ -184,6 +200,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{cash}"
                         android:textColor="@color/black_likui" />
 
@@ -192,6 +209,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{wechat}"
                         android:textColor="@color/black_likui" />
 
@@ -200,6 +218,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{alipay}"
                         android:textColor="@color/black_likui" />
 
@@ -208,6 +227,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{bank}"
                         android:textColor="@color/black_likui" />
 
@@ -216,6 +236,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="right"
+                        android:singleLine="true"
                         android:text="@{vipPay}"
                         android:textColor="@color/black_likui" />
                 </LinearLayout>
@@ -223,5 +244,5 @@
 
 
         </android.support.constraint.ConstraintLayout>
-    </android.support.constraint.ConstraintLayout>
+
 </layout>
\ No newline at end of file

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

@@ -54,6 +54,7 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/btn_handover"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/all_margin"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <RadioGroup
+            android:gravity="center"
+            android:id="@+id/vip_level_RadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+        </RadioGroup>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bg"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:background="@mipmap/go_back" />
+
+            <EditText
+                style="@style/editText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="0dp"
+                android:layout_weight="1"
+                android:background="@color/listview_bg"
+                android:hint="请输入手机号或会员姓名" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -21,7 +21,7 @@
     <!-- 全透明 -->
     <color name="all_transparent">#00000000</color>
     <color name="black_half">#50000000</color>
-    <color name="gray_transparent">#50aaaaaa</color>
+    <color name="white_transparent15">#0faaaaaa</color>
     <color name="black">#101010</color>
     <color name="black1">#273542</color>
 
@@ -77,6 +77,8 @@
     <color name="blue2">#19346b</color>
     <color name="blue3">#4faaff</color>
     <color name="darkgray">#323232</color>
+    <color name="line1">#e6e6e6</color>
+
 
 
     <color name="grey1">#E2E2E2</color>

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

@@ -240,7 +240,7 @@
     </style>
 
     <style name="button_positive" parent="android:ButtonBar">
-        <item name="android:background">@drawable/selector_gradient_red_button_background</item>
+        <item name="android:background">@drawable/red_border_allradius</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
         <item name="android:focusable">false</item>