修改ui

.idea/modules.xml

@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
-      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
+      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -638,7 +638,19 @@ public final class ApiFactory {
 
         public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
                 vipId, Long truleId) {
-            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId)
+            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
+                    truleId, null)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
+
+        public static Observable<String> batchSendBefor(String birthdayType, String vipLevel, Long
+                vipId, Long truleId) {
+            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
+                    truleId, "true")
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -86,7 +86,7 @@ interface ApiService {
     @POST(C.URL.LOGIN.register)
     Observable<HttpMessage<Object>> register(@Query("operMobile") String operMobile, @Query
             ("loginPwd") String loginPwd, @Query("merName") String merName, @Query("operName")
-            String operName, @Query("shopName")
+                                                     String operName, @Query("shopName")
                                                      String shopName, @Query("mccId") int mccId,
                                              @Query("cityCountyId") int
                                                      cityCountyId, @Query("cityAddress") String
@@ -195,18 +195,22 @@ interface ApiService {
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize);
+                                                                           ("pageSize") int
+                                                                           pageSize);
 
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,
                                                                    @Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize);
+                                                                           ("pageSize") int
+                                                                           pageSize);
 
     @POST(C.URL.RCTRACE.query)
     Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
                                                                            pageNum, @Query
-            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
+                                                                           ("pageSize") int
+                                                                           pageSize, @Query
+            ("startDate") long startDate, @Query("endDate") long
                                                                            endDate);
 
     @POST(C.URL.PSB.queryDetail)
@@ -234,19 +238,23 @@ interface ApiService {
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
-            String ticketIsList);
+                                                               String ticketIsList);
 
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
-            String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
+                                                               String ticketIsList, @Query
+                                                               ("startDate") long startDate,
+                                                       @Query("endDate") long
                                                                endDate);
 
     @POST(C.URL.TICKET.ticketBatchSend)
     Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,
                                                     @Query("vipLevel") String vipLevel,
                                                     @Query("vipId") Long vipId,
-                                                    @Query("truleId") Long truleId);
+                                                    @Query("truleId") Long truleId, @Query
+                                                            ("flag") String flag);
+
 
     @POST(C.URL.SALEORDER.addOrderMis)
     Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam);
@@ -257,7 +265,10 @@ interface ApiService {
     @POST(C.URL.SALEORDER.querySaleorderByVipId)
     Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId,
                                                                     @Query
-            ("pageNumber") int pageNum, @Query("pageSize") int pageSize);
+                                                                            ("pageNumber") int
+                                                                            pageNum, @Query
+                                                                            ("pageSize") int
+                                                                            pageSize);
 
 
     @POST(C.URL.USER.query)

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

@@ -84,6 +84,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
         );
         loadingDialog.show((BaseActivity) getActivity());
         mPresenter.usskuQuery("", loadingDialog);
+
         KeyboardUtils.showSoftInput(mViewBinding.tvKeyword);
     }
 

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

@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment;
 import android.annotation.SuppressLint;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -66,12 +68,16 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
                                                                                  .getText()
                                                                                  .toString(),
                                                                          loadingDialog);
-                                                                 pop();
+                                                                  pop();
                                                                  return false;
                                                              }
                                                          }
 
         );
+        mViewBinding.etKeyword.setFocusable(true);
+        mViewBinding.etKeyword.setFocusableInTouchMode(true);
+        mViewBinding.etKeyword.requestFocus();
+        KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
     }
 
 

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

@@ -6,6 +6,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
 
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -105,6 +106,10 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
                                                          }
 
         );
+        mViewBinding.etKeyword.setFocusable(true);
+        mViewBinding.etKeyword.setFocusableInTouchMode(true);
+        mViewBinding.etKeyword.requestFocus();
+        KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
     }
 
     public void setNewData(List<Sssku> newData, Boolean isLoadMore) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java

@@ -32,8 +32,8 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
 //        mViewBinding.tvSend.setText("发\n券");
 //        mViewBinding.tvSend.setText("\n");
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
         mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java

@@ -56,6 +56,12 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
         mPresenter.sendTickerFragment.sendSucc();
     }
 
+    @Override
+    public void sendTickerBeforSucc(long count,LoadingDialog loadingDialog) {
+        closeLoading(loadingDialog);
+        mPresenter.sendTickerFragment.sendSuccBefor(count);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketContract.java

@@ -34,7 +34,9 @@ public interface SendTicketContract {
 
         void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog);
 
-        void sendTickerSucc( LoadingDialog loadingDialog);
+        void sendTickerSucc(LoadingDialog loadingDialog);
+
+        void sendTickerBeforSucc(long count,LoadingDialog loadingDialog);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -56,5 +58,8 @@ public interface SendTicketContract {
 
         abstract void sendTicker(String birthdayType, String vipLevel, Long
                 vipId, Long truleId, LoadingDialog loadingDialog);
+
+        abstract void sendTickerBefor(String birthdayType, String vipLevel, Long
+                vipId, Long truleId, LoadingDialog loadingDialog);
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketPresenter.java

@@ -19,7 +19,7 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
     public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment();
     public VipFragment vipFragment = new VipFragment();
     public SendTickerFragment sendTickerFragment = new SendTickerFragment();
-    public SendTickerSuccFragment  sendTickerSuccFragment = new SendTickerSuccFragment();
+    public SendTickerSuccFragment sendTickerSuccFragment = new SendTickerSuccFragment();
     /**
      * 当前会员
      */
@@ -66,4 +66,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
             mView.error(throwable.getMessage(), loadingDialog);
         });
     }
+
+    @Override
+    public void sendTickerBefor(String birthdayType, String vipLevel, Long vipId, Long truleId,
+                                LoadingDialog loadingDialog) {
+        ApiFactory.Ticket.batchSendBefor(birthdayType, vipLevel, vipId, truleId).subscribe(s -> {
+            mView.sendTickerBeforSucc(Long.parseLong(s), loadingDialog);
+        }, throwable -> {
+            mView.error(throwable.getMessage(), loadingDialog);
+        });
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java

@@ -31,18 +31,18 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
         if (item.isSelect()) {
             mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);
+            mViewBinding.ivSelect.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect02_stroke);
+            mViewBinding.ivSelect.setVisibility(View.GONE);
         }
-        mViewBinding.ivSelect.setVisibility(View.VISIBLE);
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
-        mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+        mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyy-mm-dd"))));
+                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
 
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java

+package com.xingdata.zzdpos.ui.sendticke.dialog;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseDialog;
+import com.xingdata.zzdpos.databinding.DialogSendTickerBeforBinding;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
+
+/**
+ * Created by Administrator on 2018/1/17.
+ */
+
+public class SendTickerBeforDialog extends BaseDialog<SendTicketPresenter,
+        DialogSendTickerBeforBinding> {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_sendTicker_befor;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+}

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

@@ -43,7 +43,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
     VipGroupAdapter vipGroupAdapter;
     LoadingDialog loadingDialog = new LoadingDialog();
     //当前优惠券点击的item id
-    int nowTickerItemId = -1;
+    int nowTickerItemId = 0;
     List<Trule> truleList = new ArrayList<>();
     //当前选中会员组别Item ID
     int nowVipGroupId = 0;
@@ -92,13 +92,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                             loadingDialog.show((BaseActivity) getActivity());
                             if (nowtype == 0) {
                                 //单独会员发券
-                                mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId,
+                                mPresenter.sendTickerBefor(null, null, nowVip.getVipId(), tickerId,
                                         loadingDialog);
                             } else if (nowtype == 1) {
                                 Long tempLevelId = levelList.get(nowVipGroupId).getId();
                                 if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
                                     //选择全部会员
-                                    mPresenter.sendTicker(null, null, null, tickerId,
+                                    mPresenter.sendTickerBefor(null, null, null, tickerId,
                                             loadingDialog);
                                     return;
                                 }
@@ -107,14 +107,14 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                     //选择 当月下月以及流失会员
                                     if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
                                             tempServerId != -1) {
-                                        mPresenter.sendTicker(tempServerId + "", null,
+                                        mPresenter.sendTickerBefor(tempServerId + "", null,
                                                 null, tickerId,
                                                 loadingDialog);
                                         return;
                                     }
                                 }
                                 //选择金牌银牌等会员类别
-                                mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
+                                mPresenter.sendTickerBefor(null, levelList.get(nowVipGroupId)
                                                 .getVipLevel() + "",
                                         null, tickerId,
                                         loadingDialog);
@@ -213,10 +213,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
             mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
             mViewBinding.rlTicker.setVisibility(View.GONE);
         }
-        if (trulePager != null && trulePager.getList() != null) {
+        if (trulePager != null && trulePager.getList() != null && trulePager.getList().size() > 0) {
             truleList = trulePager.getList();
             mViewBinding.tvEmpty.setVisibility(View.GONE);
             mViewBinding.rlTicker.setVisibility(View.VISIBLE);
+            trulePager.getList().get(0).setSelect(true);
             returnTicketAdapter.setNewData(trulePager.getList());
         }
     }
@@ -263,11 +264,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         if (nowtype == 0) {
             mPresenter.sendTickerSuccFragment.setUiData(truleList
                     .get(nowTickerItemId).getTruleName(), nowVip.getVipName());
-        }else {
+        } else {
             mPresenter.sendTickerSuccFragment.setUiData(truleList
-                    .get(nowTickerItemId).getTruleName(),  levelList.get(nowVipGroupId).getVipLevelName());
+                    .get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId)
+                    .getVipLevelName());
         }
 
         startWithPop(mPresenter.sendTickerSuccFragment);
     }
+
+    public void sendSuccBefor(long count) {
+        LogUtils.e("count------------------------->  " + count);
+    }
 }
\ No newline at end of file

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

@@ -66,6 +66,10 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
             mPresenter.searchVip(textView.getText().toString());
             return false;
         });
+        mViewBinding.etSearch.setFocusable(true);
+        mViewBinding.etSearch.setFocusableInTouchMode(true);
+        mViewBinding.etSearch.requestFocus();
+        KeyboardUtils.showSoftInput(mViewBinding.etSearch);
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/ReturnTicketAdapter.java

@@ -30,10 +30,9 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
 
     @Override
     protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
-        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
-        mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+//        mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
+//                ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
+        mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,

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

@@ -6,7 +6,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/black" />
+        android:color="@color/black_likui" />
 
     <solid android:color="@color/all_transparent" />
 </shape>
\ No newline at end of file

app/src/main/res/layout/dialog_sendTicker_befor.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="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:background="@drawable/transparent_border"
+                  android:gravity="center"
+                  android:orientation="vertical">
+
+
+        <RelativeLayout
+            android:layout_width="@dimen/prompt_dialog_width"
+            android:layout_height="@dimen/prompt_dialog_height"
+            android:background="@color/store_back"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/all_margin">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@+id/ll_bottom"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_text_size_low"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="优惠券："
+                        android:textSize="@dimen/all_text_size_low"/>
+
+                    <TextView
+                        android:id="@+id/tv_ticker"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="50元"
+                        android:textSize="@dimen/all_text_size_small"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="发送对象："
+                        android:textSize="@dimen/all_text_size_low"/>
+
+                    <TextView
+                        android:id="@+id/tv_ticker"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:text="50元"
+                        android:textSize="@dimen/all_text_size_small"/>
+                </LinearLayout>
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file

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

@@ -19,17 +19,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/gray_zhouyu"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
         tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
 
         <android.support.constraint.ConstraintLayout
             android:id="@+id/cl_title"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:animateLayoutChanges="true"
             android:background="@color/white_caocao"
-            android:focusableInTouchMode="true"
             app:layout_constraintBottom_toTopOf="@id/btn_add"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -124,7 +120,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/all_padding"
-                android:text="添加获取规则"
+                android:text="添加商品组合"
                 android:textColor="@color/red_guanyu"
                 android:textSize="@dimen/text_three_title"/>
 
@@ -145,7 +141,7 @@
             android:paddingLeft="@dimen/all_padding"
             android:text="共 2 个组合"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/text_secondary_title"
+            android:textSize="@dimen/text_three_title"
             app:layout_constraintTop_toBottomOf="@+id/btn_add"/>
 
         <View

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

@@ -32,7 +32,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="300dp"
-                android:layout_margin="@dimen/all_padding"
+                android:layout_margin="@dimen/all_margin"
                 android:background="@color/white"
                 android:orientation="vertical">
 
@@ -136,6 +136,8 @@
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/all_margin"
+                android:layout_marginRight="@dimen/all_margin"
                 android:background="@drawable/red_border"
                 android:onClick="@{OnClickListener}"
                 android:text="确 定"

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

@@ -38,9 +38,9 @@
 
         <LinearLayout
             android:id="@+id/ll_top"
-            android:layout_above="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_above="@+id/ll_bottom"
             android:orientation="vertical">
 
             <include
@@ -51,15 +51,10 @@
                 android:id="@+id/ll_vip_single"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1.2"
+                android:layout_weight="2"
                 android:onClick="@{OnClickListener}"
                 android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/all_line_width"
-                    android:layout_gravity="bottom"
-                    android:background="@color/gray_huanggai"/>
 
                 <android.support.constraint.ConstraintLayout
                     android:id="@+id/cl_vip"
@@ -149,11 +144,19 @@
             <LinearLayout
                 android:id="@+id/ll_all"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="2"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="gone">
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/all_margin"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:paddingLeft="@dimen/all_padding"
+                    android:text="请选择发放对象"
+                    android:textColor="@color/black_baozheng"
+                    android:textSize="@dimen/text_three_title"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/vip_type"
@@ -162,6 +165,15 @@
                     android:background="@color/white"/>
             </LinearLayout>
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin"
+                android:paddingLeft="@dimen/all_padding"
+                android:text="请选择要发送的优惠券"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/text_three_title"/>
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/rl_ticker"
@@ -212,8 +224,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@drawable/red_border_allradius"
-                android:text="发券"
                 android:onClick="@{OnClickListener}"
+                android:text="发券"
                 android:textColor="@color/white"
                 android:textSize="@dimen/et_textsize"/>
         </LinearLayout>

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

@@ -61,9 +61,10 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_weight="1"
                     android:inputType="number"
+                    android:maxLength="11"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

@@ -68,7 +68,7 @@
 
         <TextView
             android:id="@+id/tv_money"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/all_et_money_width"
             android:layout_height="wrap_content"
             android:text="999"
             android:textColor="@color/store_product_price"
@@ -98,9 +98,9 @@
             android:gravity="center"
             android:orientation="horizontal"
             android:visibility="visible"
-            app:layout_constraintLeft_toRightOf="@+id/tv_money"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
-            app:layout_constraintEnd_toEndOf="parent">
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/tv_money">
 
             <ImageButton
                 android:id="@+id/btn_down"
@@ -171,7 +171,7 @@
             <EditText
                 android:id="@+id/et_shop_Num_edit"
                 android:layout_width="50dp"
-                android:layout_height="@dimen/textview_height"
+                android:layout_height="match_parent"
                 android:background="@drawable/selector_edit_frame_blue_background"
                 android:digits="1234567890"
                 android:ems="5"
@@ -180,6 +180,8 @@
                 android:lines="1"
                 android:maxLength="2"
                 android:singleLine="true"
+                android:textColor="@color/black"
+                android:textSize="@dimen/all_text_size_low"
                 />
 
 

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_vip_title"
@@ -70,7 +70,7 @@
                 android:layout_below="@+id/ll_vip"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_source_title"
@@ -101,7 +101,7 @@
                 android:layout_below="@+id/ll_source"
                 android:background="@color/white"
                 android:orientation="horizontal"
-                android:padding="@dimen/all_margin">
+                android:padding="@dimen/all_padding">
 
                 <TextView
                     android:id="@+id/tv_status_title"

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

@@ -12,20 +12,18 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/all_padding"
                     android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/all_padding"
             android:orientation="horizontal">
 
             <android.support.constraint.ConstraintLayout
                 android:id="@+id/cl_item"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="2.3">
+                android:layout_weight="1">
 
                 <ImageView
                     android:layout_width="match_parent"
@@ -33,68 +31,39 @@
                     android:background="@mipmap/return_ticket_one"/>
 
                 <LinearLayout
-                    android:id="@+id/ll_top"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:gravity="center"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/all_padding"
-                    app:layout_constraintBottom_toTopOf="@id/ll_bottom"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_weight="4">
+                    android:orientation="horizontal">
 
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="right"
-                        android:layout_weight="1.8"
-                        android:src="@mipmap/bg_return_ticker_logo"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="￥"
+                        android:textStyle="bold"
+                        android:layout_marginTop="@dimen/all_spacing_min"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/all_text_size_low"/>
 
                     <TextView
-                        android:id="@+id/tv_ticket_money"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="5"
+                        android:id="@+id/tv_ticket_moneys"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:text="@string/tv_money"
+                        android:text="123.3"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/text_secondary_title"
+                        android:textSize="@dimen/text_primary_title_smile"
                         android:textStyle="bold"/>
-
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/ll_bottom"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:orientation="vertical"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ll_top"
-                    app:layout_constraintVertical_weight="2">
-
 
-                    <TextView
-                        android:id="@+id/tv_date"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="@dimen/all_margin"
-                        android:text="@string/tv_date"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/et_textsize"/>
-                </LinearLayout>
             </android.support.constraint.ConstraintLayout>
 
             <android.support.constraint.ConstraintLayout
                 android:id="@+id/cl_send"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1">
+                android:layout_weight="2.3">
 
                 <ImageView
                     android:layout_width="match_parent"
@@ -103,19 +72,20 @@
                     />
 
                 <TextView
-                    android:id="@+id/tv_ticket_moneys"
+                    android:id="@+id/tv_rule"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:gravity="center"
-                    android:text="@string/money"
+                    android:paddingTop="@dimen/all_spacing"
+                    android:text="@string/tv_rule"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/text_primary_title_smile"
-                    android:textStyle="bold"
+                    android:textSize="@dimen/big_text_size"
                     app:layout_constraintBottom_toTopOf="@+id/vw_line"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"/>
 
+
                 <View
                     android:id="@+id/vw_line"
                     android:layout_width="0dp"
@@ -123,19 +93,22 @@
                     android:layout_marginLeft="@dimen/all_padding"
                     android:layout_marginRight="@dimen/all_padding"
                     android:background="@color/gray1"
-                    app:layout_constraintBottom_toTopOf="@id/tv_rule"
+                    app:layout_constraintBottom_toTopOf="@id/tv_date"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_ticket_moneys"></View>
+                    app:layout_constraintTop_toBottomOf="@+id/tv_rule"></View>
 
                 <TextView
-                    android:id="@+id/tv_rule"
+                    android:id="@+id/tv_date"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:gravity="center"
-                    android:text="@string/tv_rule"
+                    android:paddingBottom="@dimen/all_spacing"
+                    android:paddingLeft="@dimen/all_margin"
+                    android:text="@string/tv_date"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/et_textsize"
+                    android:textSize="@dimen/dialog_inputPassWord_textsize_small"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
@@ -147,9 +120,9 @@
             android:id="@+id/iv_select"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:visibility="gone"
             android:layout_alignParentRight="true"
             android:layout_marginRight="@dimen/all_margin"
-            android:src="@mipmap/but_elect02_stroke"/>
+            android:src="@mipmap/but_elect02_stroke"
+            android:visibility="gone"/>
     </RelativeLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/item_settle_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>
 
         <variable
             name="name"
-            type="String" />
+            type="String"/>
 
         <variable
             name="phone"
-            type="String" />
+            type="String"/>
 
         <variable
             name="disRate"
-            type="String" />
+            type="String"/>
     </data>
 
     <android.support.constraint.ConstraintLayout
@@ -36,7 +36,7 @@
             app:placeholderImage="@mipmap/img_number01"
             app:roundAsCircle="true"
             app:roundingBorderColor="@color/gray_huanggai"
-            app:roundingBorderWidth="@dimen/all_line_width" />
+            app:roundingBorderWidth="@dimen/all_line_width"/>
 
 
         <com.facebook.drawee.view.SimpleDraweeView
@@ -45,7 +45,7 @@
             android:layout_height="@dimen/settle_vip_level"
             app:layout_constraintBottom_toBottomOf="@id/iv_head"
             app:layout_constraintRight_toRightOf="@id/iv_head"
-            app:roundAsCircle="true" />
+            app:roundAsCircle="true"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -61,14 +61,14 @@
                 android:layout_height="wrap_content"
                 android:text="@{name}"
                 android:textColor="@color/black_zhangfei"
-                android:textSize="@dimen/all_text_size" />
+                android:textSize="@dimen/all_text_size"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{phone}"
                 android:textColor="@color/black_likui"
-                android:textSize="@dimen/all_caption_size" />
+                android:textSize="@dimen/all_caption_size"/>
         </LinearLayout>
 
         <TextView
@@ -80,7 +80,7 @@
             android:textSize="@dimen/all_caption_size"
             app:layout_constraintBottom_toTopOf="parent"
             app:layout_constraintRight_toLeftOf="@id/cb_point"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent"/>
 
         <CheckBox
             android:id="@+id/cb_point"
@@ -91,13 +91,13 @@
             android:contentDescription="@string/settle_balance"
             app:layout_constraintBottom_toTopOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent"/>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
             android:background="@color/gray_huanggai"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"/>
     </android.support.constraint.ConstraintLayout>
 
 </layout>

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

@@ -29,7 +29,7 @@
             android:padding="@dimen/all_padding"
             android:singleLine="true"
             android:text="全部会员"
-            android:textColor="@color/black"
+            android:textColor="@color/black_likui"
             android:textSize="@dimen/et_textsize"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

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

@@ -8,6 +8,8 @@
     <dimen name="all_margin_big_big">40dp</dimen>
     <dimen name="all_margin_big">28dp</dimen>
     <dimen name="all_spacing">8dp</dimen>
+    <dimen name="all_spacing_min">5dp</dimen>
+    <dimen name="all_bounced_spacing">6dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="big_big_text_size">20sp</dimen>
@@ -39,6 +41,8 @@
     <dimen name="all_button_radius_height_min">35dp</dimen>
     <dimen name="all_button_radius_width">120dp</dimen>
     <dimen name="all_button_radius_height">40dp</dimen>
+    <!--金额显示框-->
+    <dimen name="all_et_money_width">100dp</dimen>
     <!--RADIUS-->
     <dimen name="card_radius_medium">14dp</dimen>
     <!--PADDING-->