Merge remote-tracking branch 'origin/master'

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

@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
 import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
 import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
 import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
+import com.xingdata.zzdpos.ui.splash.dialog.UpgradeDialog;
 import com.xingdata.zzdpos.util.Global;
 
 import java.util.ArrayList;
@@ -39,6 +40,7 @@ import io.reactivex.schedulers.Schedulers;
 public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements
         MainContract.View {
     public static MainActivity mainActivity;
+    UpgradeDialog upgradeDialog = new UpgradeDialog();
     private long mExitTime;
     private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
     private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R
@@ -83,26 +85,26 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
             }
         }).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<View>() {
-            int i = 0;
+                    int i = 0;
 
-            @Override
-            public void accept(View view) throws Exception {
+                    @Override
+                    public void accept(View view) throws Exception {
 
-                ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
-                itemMenuBottomBinding.text.setText(titleInts[i]);
-                if (i == 0) {
-                    itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
-                            .red_guanyu));
-                }
-                itemMenuBottomBinding.img.setImageResource(iconList[i]);
-                itemMenuBottomBindings.add(itemMenuBottomBinding);
-                itemMenuBottomBinding.getRoot().setMinimumHeight(200);
-                mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
+                        ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
+                        itemMenuBottomBinding.text.setText(titleInts[i]);
+                        if (i == 0) {
+                            itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
+                                    .red_guanyu));
+                        }
+                        itemMenuBottomBinding.img.setImageResource(iconList[i]);
+                        itemMenuBottomBindings.add(itemMenuBottomBinding);
+                        itemMenuBottomBinding.getRoot().setMinimumHeight(200);
+                        mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
 
 
-                i++;
-            }
-        });
+                        i++;
+                    }
+                });
 
 
         mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@@ -200,4 +202,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
         return super.dispatchTouchEvent(ev);
     }
 
+    @Override
+    public void showUptateDialog(String updateUrl, String version) {
+        upgradeDialog.setupdateData(updateUrl, version);
+        upgradeDialog.show(this);
+    }
+
+
 }

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_hint;
+        return -1;
     }
 
     @Override
@@ -48,6 +48,8 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
         mViewBinding.setBank(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getPos(), true));
         mViewBinding.handoverTvSumamt.setText(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getFinallyAmt(), true));
         mViewBinding.setOrderNum(String.valueOf(MainPresenter.handoverInfo.getSumOrder()));
+
+        setBtnName("取消","交班");
     }
 
 

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

@@ -48,7 +48,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
         integers.add(110);
         integers.add(111);
         mMySelfRecyclerAdapter = new MySelfRecyclerAdapter(getActivity(), integers);
-        mViewBinding.fragmentMyselfRecycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 1, getResources().getColor(R.color.gray_kongming)));
+
         mMySelfRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentMyselfRecycler);
         mMySelfRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -61,7 +61,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
                         ActivityUtils.startActivity(getActivity(), FeedBackActivity.class);
                         break;
                     case C.MENU.MENU_UPDATE://升级
-                        ToastUtils.showShort("已经是最新版本");
+                        mPresenter.checkUpdate();
                         break;
 
                     case C.MENU.MENU_HELP://帮助

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java

@@ -30,7 +30,7 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("积分规则");
+        mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java

@@ -67,7 +67,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("积分规则");
+        mViewBinding.icTitle.tvTitle.setText("获取积分规则");
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
 import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter;
 import com.xingdata.zzdpos.util.OnClickListener;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,7 +49,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("积分规则");
+        mViewBinding.icTitle.tvTitle.setText("获取积分规则");
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -90,6 +89,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
                 case R.id.rb_get: {
                     mViewBinding.rbGet.getPaint().setFakeBoldText(true);
                     mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
+                    mViewBinding.icTitle.tvTitle.setText("获取积分规则");
                     showView(v.getId());
                     mPresenter.query(1, NORMAL_TYPE, null);
                 }
@@ -97,6 +97,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
                 case R.id.rb_exchange: {
                     mViewBinding.rbGet.getPaint().setFakeBoldText(false);
                     mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
+                    mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
                     showView(v.getId());
                     LoadingDialog loadingDialog = new LoadingDialog();
                     loadingDialog.show((BaseActivity) getActivity());

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

@@ -47,7 +47,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
         list.add(C.MENU.MENU_MS_TICKET);
         list.add(C.MENU.MENU_MS_RECHARGE);
         list.add(C.MENU.MENU_MS_MS);
-        list.add(C.MENU.MENU_MS_SMS);
+//        list.add(C.MENU.MENU_MS_SMS);
 
         marketingMenuAdapter = new MarketingMenuAdapter(list);
         mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);

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

@@ -19,6 +19,7 @@ public interface SendTicketContract {
         void error(String errorMsg, LoadingDialog loadingDialog);
 
         /**
+         *
          * 加载会员列表
          *
          * @param vips 会员列表

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

@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.sendticke.fragment;
 
 import android.view.View;
 
+import com.blankj.utilcode.util.ActivityUtils;
 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.SendTicketActivity;
 import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -34,8 +36,22 @@ public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
         mViewBinding.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
-                startWithPop(mPresenter.sendTickerIndexFragment);
+                switch (v.getId()) {
+                    case R.id.btn_over: {
+                        ActivityUtils.finishActivity(SendTicketActivity.class);
+                    }
+                    break;
+                    case R.id.btn_continue_send: {
+                        mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
+                        startWithPop(mPresenter.sendTickerIndexFragment);
+                    }
+                    break;
+                    default: {
+
+                    }
+                    break;
+                }
+
             }
         });
     }

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

 package com.xingdata.zzdpos.ui.settle;
 
 
+import android.widget.TextView;
+
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.StringUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -384,7 +387,12 @@ public class SettlePresenter extends SettleContract.Presenter {
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
         this.updateHandover(MainPresenter.handoverInfo);
-        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
+        try{
+            ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
+        }catch (Exception e){
+            ToastUtils.showShort("打印异常");
+        }
+
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeSearchFragment.java

@@ -8,6 +8,7 @@ import android.view.View;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.entity.SectionEntity;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
@@ -19,6 +20,8 @@ import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeGroupAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
+import com.xingdata.zzdpos.util.StatisticsCallback;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.text.SimpleDateFormat;
@@ -50,7 +53,6 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
 
     @Override
     public void initView() {
-
         if (mStatisticsAdapter == null) {
             mStatisticsAdapter = new StatisticsRechargeGroupAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -59,6 +61,17 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         }
+        mViewBinding.statisticsRecycler.addItemDecoration(
+                new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
+                    @Override
+                    public SectionEntity getItem(int position) {
+                        if (position<mStatisticsAdapter.getData().size()){
+                            return mStatisticsAdapter.getData().get(position);
+                        }else {
+                            return null;
+                        }
+                    }
+                }));
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (VipRechargeOrders != null) {

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/TicketSearchFragment.java

@@ -8,6 +8,7 @@ import android.view.View;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.entity.SectionEntity;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
@@ -18,6 +19,8 @@ import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketGroupAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
+import com.xingdata.zzdpos.util.StatisticsCallback;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.text.SimpleDateFormat;
@@ -59,6 +62,17 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         }
+        mViewBinding.statisticsRecycler.addItemDecoration(
+                new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
+                    @Override
+                    public SectionEntity getItem(int position) {
+                        if (position<mStatisticsAdapter.getData().size()){
+                            return mStatisticsAdapter.getData().get(position);
+                        }else {
+                            return null;
+                        }
+                    }
+                }));
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (Tickets != null) {

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java

@@ -55,6 +55,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
 
     @Override
     public void initView() {
+        mViewBinding.edTitle.setText("");
         Calendar calendar = Calendar.getInstance();
 //获得当前时间的月份，月份从0开始所以结果要加1
         month = calendar.get(Calendar.MONTH) + 1;

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderSearchFragment.java

@@ -8,6 +8,7 @@ import android.view.View;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.entity.SectionEntity;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 
@@ -19,6 +20,8 @@ import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
 import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
+import com.xingdata.zzdpos.util.StatisticsCallback;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.text.SimpleDateFormat;
@@ -63,6 +66,17 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
         }
+        mViewBinding.statisticsRecycler.addItemDecoration(
+                new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
+                    @Override
+                    public SectionEntity getItem(int position) {
+                        if (position<mStatisticsAdapter.getData().size()){
+                            return mStatisticsAdapter.getData().get(position);
+                        }else {
+                            return null;
+                        }
+                    }
+                }));
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
         if (saleorders != null) {

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

+package com.xingdata.zzdpos.util;
+
+import android.content.Context;
+
+/**
+ * Created by Administrator on 2018/1/22.
+ */
+
+
+public class DensityUtil {
+
+    /**
+     * 根据手机的分辨率从 dp 的单位 转成为 px(像素)
+     */
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    /**
+     * 根据手机的分辨率从 px(像素) 的单位 转成为 dp
+     */
+    public static int px2dip(Context context, float pxValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+}

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

@@ -140,6 +140,7 @@ public class RecyclerViewUtil {
         private StatisticsCallback mStatisticsCallback;
         private int mDividerHight = 1;
         private Paint mColorPaint;
+        private Context mContext;
 
 
         public final int[] ATRRS = new int[]{android.R.attr.listDivider};
@@ -147,6 +148,7 @@ public class RecyclerViewUtil {
         public StatisticsItemDecoration(Context context) {
             final TypedArray ta = context.obtainStyledAttributes(ATRRS);
             this.mDividerDarwable = ta.getDrawable(0);
+            mContext = context;
             ta.recycle();
         }
 
@@ -189,13 +191,13 @@ public class RecyclerViewUtil {
                 SectionEntity sectionEntity = mStatisticsCallback.getItem(position);
                 if (sectionEntity != null) {
                     if (!sectionEntity.isHeader) {
-                        final int left = child.getLeft() - params.leftMargin - mDividerHight + 200;
+                        final int left = child.getLeft() - params.leftMargin - mDividerHight + DensityUtil.dip2px(mContext, 65);
                         final int right = child.getRight() + params.rightMargin;
                         int top = 0;
                         int bottom = 0;
 
 
-                        top = child.getBottom() + params.bottomMargin +1;
+                        top = child.getBottom() + params.bottomMargin + 1;
                         bottom = top + mDividerHight;
                         //画分割线
                         mDividerDarwable.setBounds(left, top, right, bottom);

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

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

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp">
+        <shape>
+            <solid android:color="@color/gray_zhouyu"/>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/gray_huanggai"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="-2dp"
+        android:bottom="-2dp"
+        android:right="-2dp">
+        <shape>
+            <solid android:color="@color/gray_zhouyu"/>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/gray_huanggai"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="-2dp"
+        android:top="-2dp"
+        android:right="-2dp">
+        <shape>
+            <solid android:color="@android:color/white"/>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/gray_huanggai"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="-2dp"
+        android:bottom="-2dp"
+        android:right="-2dp">
+        <shape>
+            <solid android:color="@android:color/white"/>
+            <stroke
+                android:width="0.5dp"
+                android:color="@color/gray_huanggai"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

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

@@ -27,7 +27,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@color/gray_zhouyu"
+                android:background="@drawable/up_down_line_gray"
                 android:gravity="left|center_vertical"
                 android:paddingLeft="@dimen/all_padding"
                 android:text="基本信息"
@@ -45,6 +45,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
+                android:minHeight="@dimen/list1_height"
                 android:gravity="center"
                 android:paddingBottom="@dimen/all_padding"
                 android:paddingTop="@dimen/all_padding">
@@ -156,7 +157,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
-                    android:background="@color/gray_zhouyu"
+                    android:background="@drawable/up_down_line_gray"
                     android:gravity="left|center_vertical"
                     android:paddingLeft="@dimen/all_padding"
                     android:text="兑换条件"
@@ -209,9 +210,9 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/all_line_width"
-                    android:layout_marginLeft="@dimen/all_padding"
-                    android:layout_marginRight="@dimen/all_padding"
-                    android:background="@color/gray1"></View>
+                    android:layout_marginLeft="@dimen/all_bounced_spacing"
+                    android:layout_marginRight="@dimen/all_bounced_spacing"
+                    android:background="@color/gray_huanggai"></View>
 
                 <LinearLayout
                     android:layout_width="match_parent"

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

@@ -47,30 +47,21 @@
                 android:orientation="vertical">
 
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/all_line_width"
-                    android:background="@color/gray_huanggai"></View>
-
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
-                    android:background="@color/gray_zhouyu"
+                    android:background="@drawable/up_down_line_gray"
                     android:gravity="left|center_vertical"
                     android:paddingLeft="@dimen/all_bounced_padding"
                     android:text="基本信息"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/text_secondary_title"/>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/all_line_width"
-                    android:background="@color/gray_huanggai"></View>
 
                 <LinearLayout
                     android:id="@+id/ll_rules_name"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/list1_height"
                     android:background="@color/white"
                     android:gravity="center"
                     android:paddingBottom="@dimen/all_padding"
@@ -109,7 +100,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/list1_height"
                     android:background="@color/white"
                     android:gravity="center"
                     android:paddingBottom="@dimen/all_padding"
@@ -188,6 +179,7 @@
                     android:layout_height="wrap_content"
                     android:background="@color/white"
                     android:gravity="center"
+                    android:minHeight="@dimen/list1_height"
                     android:paddingBottom="@dimen/all_padding"
                     android:paddingTop="@dimen/all_padding">
 
@@ -237,12 +229,19 @@
 
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:layout_marginLeft="@dimen/all_bounced_spacing"
+                    android:layout_marginRight="@dimen/all_bounced_spacing"
+                    android:background="@color/gray_huanggai"></View>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/up_down_line_white"
+                    android:background="@color/white"
                     android:gravity="center"
+                    android:minHeight="@dimen/list1_height"
                     android:paddingBottom="@dimen/all_padding"
                     android:paddingTop="@dimen/all_padding">
 
@@ -250,6 +249,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
+                        android:drawableLeft="@mipmap/point"
+                        android:drawablePadding="@dimen/all_bounced_spacing"
                         android:paddingLeft="@dimen/all_bounced_padding"
                         android:text="获取方式:"
                         android:textColor="@color/black"
@@ -322,6 +323,12 @@
                         android:visibility="gone"/>
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/view_line_height"
+                    android:layout_marginLeft="@dimen/all_bounced_spacing"
+                    android:layout_marginRight="@dimen/all_bounced_spacing"
+                    android:background="@color/gray_huanggai"></View>
 
                 <LinearLayout
                     android:id="@+id/ll_all"
@@ -434,7 +441,7 @@
                     android:id="@+id/ll_category"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/up_down_line_white"
+                    android:background="@drawable/up_down_line_white_bottom"
                     android:gravity="center"
                     android:orientation="vertical"
                     android:visibility="gone">
@@ -443,6 +450,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:minHeight="@dimen/list1_height"
                         android:orientation="horizontal"
                         android:paddingBottom="@dimen/all_padding"
                         android:paddingTop="@dimen/all_padding">
@@ -542,6 +550,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:minHeight="@dimen/list1_height"
                         android:orientation="horizontal"
                         android:paddingBottom="@dimen/all_padding"
                         android:paddingTop="@dimen/all_padding">
@@ -593,6 +602,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:minHeight="@dimen/list1_height"
                         android:orientation="horizontal"
                         android:paddingBottom="@dimen/all_padding"
                         android:paddingTop="@dimen/all_padding"
@@ -641,6 +651,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/white"
+                    android:minHeight="@dimen/list1_height"
                     android:orientation="horizontal"
                     android:paddingBottom="@dimen/all_padding"
                     android:paddingTop="@dimen/all_padding"

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

@@ -33,6 +33,7 @@
                 android:paddingBottom="@dimen/all_padding"
                 android:textSize="@dimen/text_three_title"
                 android:paddingTop="@dimen/all_padding"
+                android:background="@drawable/up_down_line_white"
                 android:text="系统提示"
                 android:textColor="@color/black_baozheng"/>
 

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

@@ -64,7 +64,7 @@
             <RadioGroup
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/up_down_line_white"
+                android:background="@drawable/up_down_line_white_bottom"
                 android:checkedButton="@id/rb_get"
                 android:gravity="center"
                 android:orientation="horizontal">

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

@@ -68,8 +68,7 @@
                 android:paddingTop="@dimen/all_padding"
                 android:text="共0人次盘库记录"
                 android:textColor="@color/black_baozheng"
-                android:textSize="@dimen/all_text_size_low"
-                android:textStyle="bold" />
+                android:textSize="@dimen/all_text_size_low" />
 
         </RelativeLayout>
 

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

 <layout>
 
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout 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"
@@ -13,8 +13,10 @@
 
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="-1dp"
+            android:background="@color/white_caocao"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -31,5 +33,5 @@
 
         </android.support.v4.widget.SwipeRefreshLayout>
 
-    </android.support.constraint.ConstraintLayout>
+    </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -129,10 +129,10 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/all_margin"
                         android:orientation="horizontal"
                         android:paddingBottom="@dimen/all_spacing"
                         android:paddingEnd="@dimen/all_margin"
-                        android:layout_marginBottom="@dimen/all_margin"
                         android:paddingStart="@dimen/all_margin">
 
                         <TextView
@@ -155,6 +155,7 @@
         </android.support.v7.widget.CardView>
 
         <Button
+            android:id="@+id/btn_over"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_margin"
@@ -163,9 +164,23 @@
             android:background="@drawable/shape_red_r1"
             android:foreground="?android:attr/selectableItemBackground"
             android:onClick="@{OnClickListener}"
-            android:text="确 定"
+            android:text="完 成"
             android:textColor="@color/white_caocao"
             android:textSize="@dimen/all_text_size"/>
+
+        <Button
+            android:id="@+id/btn_continue_send"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:background="@drawable/shape_red_r1_thr"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:onClick="@{OnClickListener}"
+            android:text="继续发券"
+            android:textColor="@color/red_guanyu"
+            android:textSize="@dimen/all_text_size"/>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -65,6 +65,7 @@
                     android:layout_weight="1"
                     android:inputType="number"
                     android:maxLength="11"
+                    android:hint="@string/vip_seach_hint"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -19,6 +19,52 @@
             android:id="@+id/ic_title"
             layout="@layout/title"/>
 
+        <FrameLayout
+            android:id="@+id/fl_senior_title"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@+id/ic_title">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
+                android:background="@drawable/shape_black_b2"
+                android:gravity="center_vertical"
+                android:padding="@dimen/all_spacing">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_red_r1"
+                    android:paddingBottom="@dimen/all_shape_radius"
+                    android:paddingEnd="@dimen/all_spacing"
+                    android:paddingStart="@dimen/all_spacing"
+                    android:paddingTop="@dimen/all_shape_radius"
+                    android:text="@string/ms_user_title"
+                    android:textColor="@color/white_caocao"/>
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/all_spacing"
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    android:text="@string/ticket_hint"
+                    android:textColor="@color/black_baozheng"/>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/all_line_width"
+                android:layout_gravity="bottom"
+                android:background="@color/gray_kongming"/>
+        </FrameLayout>
+
         <LinearLayout
             android:id="@+id/btn_add"
             android:layout_width="match_parent"
@@ -30,7 +76,7 @@
             app:layout_constraintBottom_toTopOf="@id/ll_menu"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ic_title">
+            app:layout_constraintTop_toBottomOf="@+id/fl_senior_title">
 
 
             <ImageView

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

@@ -2,10 +2,12 @@
 <layout>
 
     <data>
-       <import type="android.view.View"/>
+
+        <import type="android.view.View" />
+
         <variable
             name="isShow"
-            type="Boolean"/>
+            type="Boolean" />
 
     </data>
 
@@ -53,33 +55,33 @@
         </LinearLayout>
 
         <TextView
-            android:visibility="@{isShow? View.VISIBLE: View.GONE}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toLeftOf="@+id/iv"
-            android:textColor="@color/red_guanyu"
-            android:text="高级功能"
-            android:layout_marginEnd="@dimen/all_margin"
             android:layout_centerVertical="true"
-            android:textSize="@dimen/all_text_size_small"
-            android:paddingTop="@dimen/dp_4"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_toLeftOf="@+id/iv"
+            android:background="@drawable/red_border_thr_bigradius"
             android:paddingBottom="@dimen/dp_4"
             android:paddingEnd="@dimen/all_bounced_padding"
             android:paddingStart="@dimen/all_bounced_padding"
-            android:background="@drawable/red_border_thr_bigradius"/>
+            android:paddingTop="@dimen/dp_4"
+            android:text="高级功能"
+            android:textColor="@color/red_guanyu"
+            android:textSize="@dimen/all_text_size_small"
+            android:visibility="@{isShow? View.VISIBLE: View.GONE}" />
 
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
             android:layout_alignParentTop="true"
-            android:background="@color/gray_kongming" />
+            android:background="@color/gray_huanggai" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
             android:layout_alignParentBottom="true"
-            android:background="@color/gray_kongming" />
+            android:background="@color/gray_huanggai" />
 
 
     </RelativeLayout>

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

@@ -32,19 +32,20 @@
             app:layout_constraintStart_toStartOf="@id/item_tv"
             app:layout_constraintTop_toTopOf="@id/item_tv" />
 
+
         <View
             android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/item_tv"
+            android:layout_height="@dimen/all_padding"
+            android:background="@color/gray_zhouyu"
             app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
+            app:layout_constraintStart_toStartOf="@id/item_tv"
+            app:layout_constraintTop_toBottomOf="@id/item_tv" />
 
         <View
             android:layout_width="0dp"
-            android:layout_height="@dimen/all_padding"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@id/item_tv"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintBottom_toBottomOf="@id/item_tv"
             app:layout_constraintEnd_toEndOf="@id/item_tv"
             app:layout_constraintStart_toStartOf="@id/item_tv" />
 

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

@@ -69,7 +69,7 @@
     <dimen name="dialog_button_width">190dp</dimen>
     <!--提示对话框-->
     <dimen name="prompt_dialog_width">300dp</dimen>
-    <dimen name="prompt_dialog_height">200dp</dimen>
+    <dimen name="prompt_dialog_height">220dp</dimen>
     <dimen name="prompt_dialog_logo_size">48dp</dimen>
     <!--商品页面-->
     <integer name="fragment_store_product_item_span_count">4</integer>

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

@@ -437,6 +437,7 @@
     <string name="integral_exchange_title">积分兑换规则</string>
     <!--优惠券-->
     <string name="return_ticket_title">新增优惠券</string>
+    <string name="ticket_hint">优惠券规则功能限时免费使用 1 个月</string>
     <string name="tv_rule">满%s可用</string>
     <string name="tv_money">%s 元优惠券</string>
     <string name="tv_date">有效期至： %s</string>
@@ -499,6 +500,7 @@
 
     <string name="menu_ticket">发券</string>
     <string name="send_ticker_dialog_title">确认发送优惠券？</string>
+    <string name="vip_seach_hint">请输入会员手机号</string>
 
 
     <string name="menu_statistics">统计</string>