Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xingdata.zzdpos">
+          package="com.xingdata.zzdpos">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
 
     <application
         android:name=".App"
@@ -25,64 +25,65 @@
             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"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.exception.ErrorDialogActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
         <activity
             android:name=".ui.exception.ServerErrActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
         <activity
             android:name=".ui.payment.PaymentActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.marketing.integral.IntegralActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.marketing.ticket.ReturnTicketActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_ticket"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/AppTheme"/>
         <activity
             android:name=".ui.sendticke.SendTicketActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/title_activity_ticket"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/AppTheme"/>
         <activity
             android:name=".ui.settle.SettleActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.store.StoreActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.announcement.AnnouncementActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name=".ui.help.HelpActivity" />
-        <activity android:name=".ui.feedback.FeedBackActivity" />
-        <activity android:name=".ui.statistics.StatisticsActivity"></activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+        <activity android:name=".ui.help.HelpActivity"/>
+        <activity android:name=".ui.feedback.FeedBackActivity"/>
+        <activity android:name=".ui.statistics.StatisticsActivity"/>
         <activity
             android:name=".ui.vip.VipActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
+        <activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -255,6 +255,8 @@ public class C {
             private static final String ROOT_URL = PKG + "ticket/";
 
             public static final String query = ROOT_URL + "query";
+
+            public static final String ticketBatchSend = ROOT_URL + "batchSend";
         }
 
         public final class SSSKU {

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

@@ -557,7 +557,8 @@ public final class ApiFactory {
                     .retryWhen(new RetryHelper(3));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata.zzdpos.model.Saleorder.Pay saleorderPay) {
+        public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata
+                                                                                             .zzdpos.model.Saleorder.Pay saleorderPay) {
             return Api.getInstance().service.addOrderPayMis(saleorderPay)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
@@ -577,6 +578,16 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
+        public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
+                vipId, Long truleId) {
+            return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId)
+                    .onErrorReturn(new ErrorFilter<>())
+                    .map(new ResultFilter<>())
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .retryWhen(new RetryHelper(3));
+        }
     }
 
     public static class Sssku {
@@ -700,7 +711,8 @@ public final class ApiFactory {
          * @param pageSize
          * @return
          */
-        public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, int
+        public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
+                                                                                 int
                 pageSize, long startDate, long endDate) {
             return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
                     endDate).onErrorReturn(new
@@ -933,7 +945,8 @@ public final class ApiFactory {
         }
 
 
-        public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms ms) {
+        public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms
+                                                                           ms) {
             return Api.getInstance().service.addMs(ms)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())

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

@@ -136,7 +136,8 @@ interface ApiService {
 
     @POST(C.URL.ORDER.queryOrderList)
     Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
-            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long endDate);
+            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
+                                                                   endDate);
 
     @POST(C.URL.ORDER.getOrderDetail)
     Observable<HttpMessage<Saleorder>> getOrderDetail(@Query("id") String orderId);
@@ -197,6 +198,12 @@ interface ApiService {
     @POST(C.URL.TICKET.query)
     Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("vipId") Long vipId);
 
+    @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);
+
     @POST(C.URL.SALEORDER.addOrderMis)
     Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam);
 

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

@@ -42,6 +42,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
     public boolean isShowing;
 
     static {
+
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
     }
 
@@ -75,13 +76,17 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         mBaseBinding.btnConfirm.setEnabled(isEnable);
     }
 
+
     public int getTitle() {
         return R.string.all_dialog;
     }
 
+
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle
+            savedInstanceState) {
         getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
+        mContext = ActivityUtils.getTopActivity();
 
         mPresenter = (P) getBaseActivity().mPresenter;
         getBaseActivity().mDialogs.add(0, this);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

+package com.xingdata.zzdpos.ui.marketing.marketingMenu;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.xingdata.zzdpos.R;
+
+public class MarketingMenuActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_marketing_menu);
+    }
+}

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

@@ -40,5 +40,15 @@ public class SendTickerC {
         return vipTypeList;
     }
 
+    public static Long getServerId(long id) {
+        if (id == 10001l) {
+            return 1l;
+        } else if (id == 10002l) {
+            return 2l;
+        } else if (id == 10003l) {
+            return 3l;
+        }
+        return -1l;
+    }
 
 }

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

@@ -50,10 +50,17 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
         mPresenter.sendTickerFragment.truleQuerySucc(trulePager, loadingDialog);
     }
 
+    @Override
+    public void sendTickerSucc(LoadingDialog loadingDialog) {
+        closeLoading(loadingDialog);
+        mPresenter.sendTickerFragment.sendSucc();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
     }
+
     private void closeLoading(LoadingDialog loadingDialog) {
         if (loadingDialog != null) {
             loadingDialog.dismiss();

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

@@ -33,6 +33,8 @@ public interface SendTicketContract {
         void loadVip(Vip vip);
 
         void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog);
+
+        void sendTickerSucc( LoadingDialog loadingDialog);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -52,5 +54,7 @@ public interface SendTicketContract {
 
         abstract void truleQuery(LoadingDialog loadingDialog);
 
+        abstract void sendTicker(String birthdayType, String vipLevel, Long
+                vipId, Long truleId, LoadingDialog loadingDialog);
     }
 }

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

@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment;
 import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
+import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerSuccFragment;
 import com.xingdata.zzdpos.ui.sendticke.fragment.VipFragment;
 
 import java.util.ArrayList;
@@ -18,6 +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();
     /**
      * 当前会员
      */
@@ -54,4 +56,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
             mView.error(throwable.getMessage(), loadingDialog);
         });
     }
+
+    @Override
+    public void sendTicker(String birthdayType, String vipLevel, Long vipId, Long truleId,
+                           LoadingDialog loadingDialog) {
+        ApiFactory.Ticket.batchSend(birthdayType, vipLevel, vipId, truleId).subscribe(s -> {
+            mView.sendTickerSucc(loadingDialog);
+        }, throwable -> {
+            mView.error(throwable.getMessage(), loadingDialog);
+        });
+    }
 }

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

@@ -87,15 +87,43 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                     break;
                     case R.id.btn_send: {
                         if (isNull()) {
-                            ToastUtils.showLong("发券");
+                            long tickerId = truleList
+                                    .get(nowTickerItemId).getTruleMapId();
+                            loadingDialog.show((BaseActivity) getActivity());
+                            if (nowtype == 0) {
+                                //单独会员发券
+                                mPresenter.sendTicker(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,
+                                            loadingDialog);
+                                    return;
+                                }
+                                for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
+                                    long tempServerId = SendTickerC.getServerId(tempLevelId);
+                                    //选择 当月下月以及流失会员
+                                    if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
+                                            tempServerId != -1) {
+                                        mPresenter.sendTicker(tempServerId + "", null,
+                                                null, tickerId,
+                                                loadingDialog);
+                                        return;
+                                    }
+                                }
+                                //选择金牌银牌等会员类别
+                                mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
+                                                .getVipLevel() + "",
+                                        null, tickerId,
+                                        loadingDialog);
+                            }
+
                         }
 
                     }
-                    break;
-                    default: {
 
-                    }
-                    break;
                 }
             }
         });
@@ -160,9 +188,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         SendTickerC.getVipType().get(0).setSelect(true);
         levelList.add(SendTickerC.getVipType().get(0));
         for (int i = 0; i < levels.size(); i++) {
+            levels.get(i).setSelect(false);
             levelList.add(levels.get(i));
         }
         for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
+            SendTickerC.getVipType().get(i).setSelect(false);
             levelList.add(SendTickerC.getVipType().get(i));
         }
         mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
@@ -226,4 +256,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         }
         return true;
     }
+
+    public void sendSucc() {
+        mPresenter.sendTickerSuccFragment = new SendTickerSuccFragment();
+        if (nowtype == 0) {
+            mPresenter.sendTickerSuccFragment.setUiData(truleList
+                    .get(nowTickerItemId).getTruleName(), nowVip.getVipName());
+        }else {
+            mPresenter.sendTickerSuccFragment.setUiData(truleList
+                    .get(nowTickerItemId).getTruleName(),  levelList.get(nowVipGroupId).getVipLevelName());
+        }
+
+        startWithPop(mPresenter.sendTickerSuccFragment);
+    }
 }
\ No newline at end of file

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

+package com.xingdata.zzdpos.ui.sendticke.fragment;
+
+import android.view.View;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentSendSuccTickerBinding;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
+        FragmentSendSuccTickerBinding> {
+    String tickerName, sendUser;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_send_succ_ticker;
+    }
+
+    @Override
+    public void initView() {
+        mViewBinding.icTitle.tvTitle.setText("发券成功");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
+                startWithPop(mPresenter.sendTickerIndexFragment);
+            }
+        });
+        mViewBinding.tvTickerName.setText(tickerName);
+        mViewBinding.tvSendTickerUser.setText(sendUser);
+        mViewBinding.tvSendTickerTime.setText(com.blankj.utilcode.util.TimeUtils.getNowString());
+        mViewBinding.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
+                startWithPop(mPresenter.sendTickerIndexFragment);
+            }
+        });
+    }
+
+
+    private void closeLoading(LoadingDialog loadingDialog) {
+        if (loadingDialog != null) {
+            loadingDialog.dismiss();
+        }
+    }
+
+    public void setUiData(String tickerName, String sendUser) {
+        this.tickerName = tickerName;
+        this.sendUser = sendUser;
+    }
+
+}
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java

+package com.xingdata.zzdpos.ui.vip.adapter;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemVipListItemBinding;
+import com.xingdata.zzdpos.databinding.ItemVipRechargeItemBinding;
+import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.model.VipRechangeOrder;
+
+import java.util.List;
+
+/**
+ * Created by JM_DEV on 2017/12/25.
+ */
+
+public class VipRechargeAdapter extends BaseAdapter<VipRechangeOrder, ItemVipRechargeItemBinding> {
+    private Context mContext;
+
+    public VipRechargeAdapter(Context mContext, @Nullable List<VipRechangeOrder> data) {
+        super(R.layout.item_vip_list_item, data);
+        this.mContext=mContext;
+    }
+    @Override
+    protected void convert(ItemVipRechargeItemBinding mViewBinding, VipRechangeOrder item) {
+//        mViewBinding.vipName.setText(item.getVipName());
+//        mViewBinding.vipMobile.setText(String.valueOf(item.getVipMobile()));
+//        mViewBinding.vipDiscount.setText(String.valueOf(item.getVipDefDiscount()));
+    }
+}

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

@@ -4,15 +4,25 @@ package com.xingdata.zzdpos.ui.vip.fragment;
  * Created by JM_DEV on 2017/12/21.
  */
 
+import android.support.v7.widget.LinearLayoutManager;
+
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
+import com.xingdata.zzdpos.model.VipRechangeOrder;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
+import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 会员信息界面
  */
 public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding> {
+    private VipRechargeAdapter vipRechargeAdapter;
+    private List<VipRechangeOrder> orders = new ArrayList<>();
     @Override
     public int getLayoutId() {
         return R.layout.fragment_vipinfo;
@@ -20,7 +30,16 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoB
 
     @Override
     public void initView() {
+        vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
+        mViewBinding.rechargeRecyclerView.setLayoutManager( new LinearLayoutManager(getActivity()));
+        mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
+        mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
+    }
 
+    private void onRefresh() {
+        vipRechargeAdapter.addData(new ArrayList<VipRechangeOrder>());
+        mViewBinding.rechargeRefresh.setRefreshing(false);
+        ToastUtils.showShort("刷新成功");
     }
 
     @Override

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

@@ -38,6 +38,9 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         mViewBinding.vipRecyclerView.setLayoutManager( new LinearLayoutManager(getActivity()));
         mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
         mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
+        mViewBinding.vipRecyclerView.setOnClickListener(view -> {
+            start(new VipInfoFragment());
+        });
     }
 
     private void onRefresh() {

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

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
+
+    <include
+        android:id="@+id/ic_title"
+        layout="@layout/title"
+        app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_menu"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
+</android.support.constraint.ConstraintLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+
+        <variable
+            name="OnClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener"/>
+
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title"/>
+
+        <LinearLayout
+            android:id="@+id/ll_top"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/ll_bottom"
+            android:layout_below="@+id/ic_title"
+            android:orientation="vertical">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="300dp"
+                android:layout_margin="@dimen/all_padding"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:src="@mipmap/ic_succeed"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/iv"
+                        android:layout_marginTop="@dimen/all_padding"
+                        android:gravity="center"
+                        android:text="发券成功"
+                        android:textSize="@dimen/text_three_title"
+                        android:textStyle="bold"/>
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:background="@color/light_gray"></View>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="@dimen/all_padding">
+
+                        <TextView
+                            android:layout_width="@dimen/all_textview_width"
+                            android:layout_height="wrap_content"
+                            android:text="优惠券："
+                            android:textSize="@dimen/et_textsize"/>
+
+                        <TextView
+                            android:id="@+id/tv_ticker_name"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="right"
+                            android:textSize="@dimen/et_textsize"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="@dimen/all_padding">
+
+                        <TextView
+                            android:layout_width="@dimen/all_textview_width"
+                            android:layout_height="wrap_content"
+                            android:text="发送对象："
+                            android:textSize="@dimen/et_textsize"/>
+
+                        <TextView
+                            android:id="@+id/tv_send_ticker_user"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="right"
+                            android:textSize="@dimen/et_textsize"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="@dimen/all_padding">
+
+                        <TextView
+                            android:layout_width="@dimen/all_textview_width"
+                            android:layout_height="wrap_content"
+                            android:text="发送时间："
+                            android:textSize="@dimen/et_textsize"/>
+
+                        <TextView
+                            android:id="@+id/tv_send_ticker_time"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="right"
+                            android:textSize="@dimen/et_textsize"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/red_border"
+                android:onClick="@{OnClickListener}"
+                android:text="确 定"
+                android:textColor="@color/white"
+                android:textSize="@dimen/three_grid_unit"/>
+        </LinearLayout>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

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

@@ -38,6 +38,7 @@
 
         <LinearLayout
             android:id="@+id/ll_top"
+            android:layout_above="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
@@ -186,6 +187,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_alignParentBottom="true"

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

@@ -4,9 +4,126 @@
     <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:background="@color/bg"
         android:orientation="vertical">
-        <include layout="@layout/title"/>
+
+        <include layout="@layout/title_pop" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:background="@color/white"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="张思" />
+
+                <TextView
+
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="13311525312" />
+            </LinearLayout>
+
+            <TextView
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/all_margin"
+                android:text="@string/vip_info_discount" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可用金額" />
+
+                <TextView
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="50.00"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="40dp"
+                android:background="@color/line_bg"></View>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/default_blacktext_smallstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可用金額" />
+
+                <TextView
+                    style="@style/default_blacktext_bigstyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="160.00"
+                    android:textColor="@color/reddeep" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line_bg"></View>
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/recharge_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rechargeRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v4.widget.SwipeRefreshLayout>
+
     </LinearLayout>
 
 </layout>
\ No newline at end of file

app/src/main/res/layout/item_vip_recharge_item.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:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/all_margin"
+            android:background="@mipmap/pay_alipay" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/rechange_type"
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="支付宝支付" />
+
+            <TextView
+                android:id="@+id/rechange_time"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="wrap_content"
+                android:textColor="@color/black_likui"
+                android:layout_height="wrap_content"
+                android:text="08-09 10:10" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_margin="@dimen/all_margin"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/rechange_money"
+                style="@style/default_blacktext_bigstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="+充值金额" />
+
+            <TextView
+                android:id="@+id/rechange_shop"
+                android:textColor="@color/black_likui"
+                style="@style/default_blacktext_smallstyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="充值总店" />
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file

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

@@ -5,26 +5,24 @@
 
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener"/>
+            type="com.xingdata.zzdpos.util.OnClickListener" />
 
 
     </data>
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    android:background="@drawable/singleline_white_gray"
-                    android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@drawable/singleline_white_gray"
+        android:orientation="horizontal">
 
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="60dp"
             android:layout_height="match_parent"
-            android:background="@color/transparent"
-            android:onClick="@{onClickListener}"
-            android:padding="@dimen/all_margin"
-            android:src="@mipmap/back_black"/>
+            android:background="@mipmap/go_back"
+            android:onClick="@{onClickListener}" />
 
         <TextView
             android:id="@+id/tv_title"
@@ -33,7 +31,7 @@
             android:layout_centerInParent="true"
             android:text="标题"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/text_secondary_title"/>
+            android:textSize="@dimen/text_secondary_title" />
 
 
     </RelativeLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener" />
+
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@drawable/singleline_white_gray"
+        android:orientation="horizontal">
+
+
+        <ImageButton
+            android:id="@+id/iv_back"
+            android:layout_width="?attr/actionBarSize"
+            android:layout_height="match_parent"
+            android:background="@mipmap/go_back"
+            android:onClick="@{onClickListener}" />
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="标题"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/text_secondary_title" />
+
+        <ImageButton
+            android:id="@+id/pop_menu"
+            android:layout_width="60dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:background="@mipmap/pop_menu"
+            android:onClick="@{onClickListener}" />
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

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

@@ -20,6 +20,7 @@
     <dimen name="all_margin_left">15dp</dimen>
     <dimen name="title_height">50dp</dimen>
     <dimen name="small_text_size">13sp</dimen>
+    <dimen name="all_textview_width">120dp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="sbig_text_size">25sp</dimen>
     <integer name="all_top_weight">2</integer>

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

@@ -129,6 +129,7 @@
     <string name="vip_message_point_amt_hint">积分可抵金额</string>
     <string name="vip_message_point_cr_hint">(100积分=1元)</string>
     <string name="vip_message_ticket_none">不使用优惠券</string>
+    <string name="vip_info_discount">折扣：%s折</string>
 
 
     <!--抹零页面-->