Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -3,6 +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\TangKuPos2\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" />
+      <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\TangKuPos2.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\TangKuPos2.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/model/Industry.java

+package com.xingdata.zzdpos.model;
+
+/**
+ * Created by Administrator on 2018/1/23.
+ */
+
+public class Industry {
+    private boolean isSelect =false;
+    private int id;
+    private String industryName;
+
+    public String getIndustryName() {
+        return industryName;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industryName = industryName;
+    }
+
+    public boolean isSelect() {
+        return isSelect;
+    }
+
+    public void setSelect(boolean select) {
+        isSelect = select;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+}

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

@@ -144,14 +144,14 @@ public class PromptDialog extends BaseDialog<LoginPresenter, DialogPromptBinding
 
     private void setBtn() {
         if (btnText.isEmpty()) {
-            mViewBinding.btnCustom.setVisibility(View.GONE);
+            mViewBinding.rlBtn.setVisibility(View.GONE);
             mViewBinding.llBottom.setVisibility(View.VISIBLE);
             mViewBinding.btnCancel.setOnClickListener(errorOnClick);
             mViewBinding.btnOk.setOnClickListener(okOnClick);
 
         } else {
             mViewBinding.llBottom.setVisibility(View.GONE);
-            mViewBinding.btnCustom.setVisibility(View.VISIBLE);
+            mViewBinding.rlBtn.setVisibility(View.VISIBLE);
             mViewBinding.btnCustom.setText(btnText);
             mViewBinding.btnCustom.setOnClickListener(customOnClick);
         }
@@ -163,14 +163,14 @@ public class PromptDialog extends BaseDialog<LoginPresenter, DialogPromptBinding
             case PROMPTDIALOG_ING: {
                 mViewBinding.spinKit.setVisibility(View.VISIBLE);
                 mViewBinding.ivLogo.setVisibility(View.GONE);
-                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.succ));
+//                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.succ));
             }
             break;
             case PROMPTDIALOG_ERROR: {
                 mViewBinding.spinKit.setVisibility(View.GONE);
                 mViewBinding.ivLogo.setVisibility(View.VISIBLE);
                 mViewBinding.ivLogo.setImageResource(R.mipmap.prompt_dialog_fail);
-                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.error));
+//                mViewBinding.tvText.setTextColor(getResources().getColor(R.color.error));
             }
             break;
             case PROMPTDIALOG_SUCC: {

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

@@ -14,6 +14,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityLoginBinding;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.login.fragment.SelectIndustryFragment;
 import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
@@ -135,6 +136,22 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
                            LoadingDialog loadingDialog) {
         closeLoading(loadingDialog);
         promptDialog.dismiss();
+
+        if (SPUtils.getInstance().getBoolean(loginReturnBean.getOperMobile() + "")) {
+            mPresenter.startUi();
+        } else {
+            SPUtils.getInstance().put(loginReturnBean.getOperMobile() + "", true);
+            start(mPresenter.selectIndustryFragment);
+        }
+    }
+
+    /**
+     * 登录成功UI跳转
+     *
+     * @param loginReturnBean
+     */
+    @Override
+    public void startUi(LoginReturnBean loginReturnBean) {
         //如果sn已经绑定款台，则直接跳转主页
         if (loginReturnBean.getBindSN()) {
             startActivity(new Intent(LoginActivity.this, MainActivity.class));
@@ -170,7 +187,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
             }
             break;
         }
-
     }
 
     @Override
@@ -309,6 +325,12 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
             } else {
                 AppUtils.exitApp();
             }
+
+        } else if (getTopFragment() instanceof SelectIndustryFragment) {
+            mPresenter.logout();
+            SPUtils.getInstance().put(LoginPresenter.loginReturnBean.getOperMobile() + "",
+                    false);
+            pop();
         } else {
             pop();
         }
@@ -327,5 +349,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         return super.dispatchTouchEvent(ev);
     }
 
+
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginContract.java

@@ -2,10 +2,6 @@ package com.xingdata.zzdpos.ui.login;
 
 import android.content.Context;
 
-
-import java.util.ArrayList;
-import java.util.List;
-
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
@@ -15,6 +11,9 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * 登录模块契约类
@@ -132,6 +131,13 @@ public interface LoginContract {
          */
         void addStoreSucc(LoadingDialog loadingDialog);
 
+        /**
+         * ui跳转
+         *
+         * @param loginReturnBean
+         */
+
+        void startUi(LoginReturnBean loginReturnBean);
     }
 
 
@@ -144,7 +150,7 @@ public interface LoginContract {
         /**
          * 所有fragment赋值操作
          */
-        abstract LoginBean getLoginBean( );
+        abstract LoginBean getLoginBean();
         /*********************************************************************************************************************************
          登录界面逻辑接口定义**********************************************************************************************************
          *********************************************************************************************************************************/
@@ -190,7 +196,8 @@ public interface LoginContract {
          * 创建门店操作
          */
         abstract void createStore(String operMobile, String loginPwd, String
-                merName,String operName, String shopName, int cityCountyId, String cityAddress, int startWay,
+                merName, String operName, String shopName, int cityCountyId, String cityAddress,
+                                  int startWay,
                                   LoadingDialog loadingDialog);
         /*********************************************************************************************************************************
          绑定款台界面逻辑接口定义**********************************************************************************************************
@@ -226,6 +233,10 @@ public interface LoginContract {
 
         abstract void deviceRegister(String phone, String password, PromptDialog promptDialog,
                                      LoadingDialog loadingDialog);
+
+        abstract void startUi();
+
+        abstract void logout();
     }
 
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java

@@ -21,6 +21,7 @@ import com.xingdata.zzdpos.ui.login.fragment.BindingCounterFragment;
 import com.xingdata.zzdpos.ui.login.fragment.ChoiceStoreFragment;
 import com.xingdata.zzdpos.ui.login.fragment.CreateStoreFragment;
 import com.xingdata.zzdpos.ui.login.fragment.InputPasswordFragment;
+import com.xingdata.zzdpos.ui.login.fragment.SelectIndustryFragment;
 import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
 import com.xingdata.zzdpos.ui.login.fragment.SmsCodeFragment;
 import com.xingdata.zzdpos.ui.login.fragment.bean.LoginBean;
@@ -64,7 +65,7 @@ public class LoginPresenter extends LoginContract.Presenter {
     public InputPasswordFragment inputPasswordFragment = new InputPasswordFragment();
     public SignInFragment signInFragment = new SignInFragment();
     public SmsCodeFragment smsCodeFragment = new SmsCodeFragment();
-
+    public SelectIndustryFragment selectIndustryFragment = new SelectIndustryFragment();
     //存储Login内所有操作的数据，方便最终提交使用
     private LoginBean loginBean = new LoginBean();
     //省市县数据列表
@@ -304,6 +305,18 @@ public class LoginPresenter extends LoginContract.Presenter {
         });
     }
 
+    @Override
+    public void startUi() {
+        mView.startUi(loginReturnBean);
+    }
+
+    @Override
+    public void logout() {
+        ApiFactory.Test.logout().subscribe(s -> {
+        }, throwable -> {
+        });
+    }
+
     /**
      * 创建门店界面初始化数据（省市县，以及门店类型）
      *

app/src/main/java/com/xingdata/zzdpos/ui/login/adapter/SelectIndustryAdapter.java

+package com.xingdata.zzdpos.ui.login.adapter;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.xingdata.zzdpos.App;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemSelectIndustryBinding;
+import com.xingdata.zzdpos.model.Industry;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2017/11/24.
+ */
+
+public class SelectIndustryAdapter extends BaseAdapter<Industry, ItemSelectIndustryBinding> {
+
+    public SelectIndustryAdapter(@Nullable List<Industry> data) {
+        super(R.layout.item_select_industry, data);
+    }
+
+    @Override
+    protected void convert(ItemSelectIndustryBinding mViewBinding, Industry item) {
+        mViewBinding.tvItem.setText(item.getIndustryName());
+        mViewBinding.tvItemSelect.setText(item.getIndustryName());
+        if (item.isSelect()) {
+            mViewBinding.tvItemSelect.setVisibility(View.VISIBLE);
+            mViewBinding.tvItem.setVisibility(View.GONE);
+        } else {
+            mViewBinding.tvItemSelect.setVisibility(View.GONE);
+            mViewBinding.tvItem.setVisibility(View.VISIBLE);
+        }
+        switch (item.getId()) {
+            case 0: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_market);
+            }
+            break;
+            case 1: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_flower);
+            }
+            break;
+            case 2: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_clothes);
+            }
+            break;
+            case 3: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_pharmacy);
+            }
+            break;
+            case 4: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_food);
+            }
+            break;
+            case 5: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_fresh);
+            }
+            break;
+            case 6: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_store);
+            }
+            break;
+            case 7: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_spouse);
+            }
+            break;
+            case 8: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_smoke);
+            }
+            break;
+            case 9: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_baby);
+            }
+            break;
+            case 10: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_tea);
+            }
+            break;
+            case 11: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_book);
+            }
+            break;
+            case 12: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_beauty);
+            }
+            break;
+            case 13: {
+                setDrawableLeft(mViewBinding, R.mipmap.industry_other);
+            }
+            break;
+
+        }
+
+
+    }
+
+    private void setDrawableLeft(ItemSelectIndustryBinding mViewBinding, int resources) {
+        Drawable drawable = App.instance.getResources().getDrawable(resources);
+        drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+        mViewBinding.tvItem.setCompoundDrawables(drawable, null, null, null);
+        mViewBinding.tvItemSelect.setCompoundDrawables(drawable, null, null, null);
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SelectIndustryFragment.java

+package com.xingdata.zzdpos.ui.login.fragment;
+
+import android.support.v7.widget.GridLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.SPUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentSelectIndustryBinding;
+import com.xingdata.zzdpos.model.Industry;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.ui.login.adapter.SelectIndustryAdapter;
+import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 绑定款台界面
+ * <p>
+ * 设备没有绑定款台的进行绑定操作
+ */
+public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
+        FragmentSelectIndustryBinding> {
+    public static String[] industryName = new String[]{
+            "超市", "鲜花", "鞋服", "药店", "熟食", "生鲜", "便利店", "夫妻店", "烟酒", "母婴", "茶叶", "书店", "美妆", "其他"};
+    List<Industry> list = new ArrayList<>();
+    SelectIndustryAdapter selectIndustryAdapter;
+    long mExitTime;
+    LoadingDialog loadingDialog = new LoadingDialog();
+    Boolean isLoadMore = false;
+    int nowId = 0;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_select_industry;
+    }
+
+    @Override
+    public void initView() {
+        list.clear();
+        addData();
+        selectIndustryAdapter = new SelectIndustryAdapter(list);
+        mViewBinding.rvSelect.setAdapter(selectIndustryAdapter);
+        mViewBinding.rvSelect.setLayoutManager(new GridLayoutManager(getActivity(), 2));
+        mViewBinding.rvSelect.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(2,
+                50, true));
+        mViewBinding.sl.setOnRefreshListener(this::refreshProduct);
+        selectIndustryAdapter.setOnLoadMoreListener(this::loadMoreProduct, mViewBinding.rvSelect);
+        selectIndustryAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
+                (selectIndustryAdapter.getData().get(position)));
+        mViewBinding.icTitle.tvTitle.setText("选择行业");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                SPUtils.getInstance().put(LoginPresenter.loginReturnBean.getOperMobile() + "",
+                        false);
+                mPresenter.logout();
+                pop();
+            }
+        });
+        mViewBinding.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                switch (v.getId()) {
+                    case R.id.btn_ok: {
+                        mPresenter.startUi();
+                    }
+                    break;
+                    default: {
+
+                    }
+                    break;
+                }
+            }
+        });
+    }
+
+    /**
+     * 刷新商品
+     */
+    private void refreshProduct() {
+        selectIndustryAdapter.setEnableLoadMore(false);
+        mViewBinding.sl.setRefreshing(false);
+    }
+
+    /**
+     * 加载更多商品
+     */
+    private void loadMoreProduct() {
+        mViewBinding.sl.setRefreshing(false);
+        selectIndustryAdapter.setEnableLoadMore(false);
+    }
+
+    /**
+     * 点击item
+     */
+    private void clickProduct(Industry industry) {
+        if ((System.currentTimeMillis() - mExitTime) > 100) {
+            mExitTime = System.currentTimeMillis();
+            list.get(nowId).setSelect(false);
+            industry.setSelect(true);
+            nowId = industry.getId();
+            selectIndustryAdapter.notifyDataSetChanged();
+//            ToastUtils.showLong(industry.getIndustryName());
+
+        } else {
+            ToastUtils.showLong("您操作太快了");
+        }
+    }
+
+    private void addData() {
+        for (int i = 0; i < industryName.length; i++) {
+            Industry industry = new Industry();
+            industry.setId(i);
+            industry.setIndustryName(industryName[i]);
+            if (i == 0) {
+                industry.setSelect(true);
+            } else {
+                industry.setSelect(false);
+            }
+            list.add(industry);
+        }
+    }
+}

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

@@ -113,8 +113,24 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                     }
                     break;
                     case R.id.btn_cancel: {
-                        pop();
-                        listData.clear();
+                        PromptDialog promptDialog = new PromptDialog();
+                        promptDialog.setDialogType(PromptDialog
+                                .PROMPTDIALOG_SELECT, "当前商品没有组合，确定退出？")
+                                .setClick(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View view) {
+                                        pop();
+                                        listData.clear();
+                                        promptDialog.dismiss();
+                                    }
+                                }, new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View view) {
+                                        promptDialog.dismiss();
+                                    }
+                                }).show((BaseActivity) getActivity());
+
+
                     }
                     break;
                     case R.id.btn_ok: {
@@ -130,7 +146,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                             }
 
                         } else {
-                            ToastUtils.showLong("数据不能为null");
+                            ToastUtils.showLong("数据不能为空");
                         }
                     }
                     break;

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

@@ -5,6 +5,7 @@ import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.Html;
 import android.view.View;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -87,9 +88,10 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                                                         pop();
                                                                         loadingDialog.show(
                                                                                 (BaseActivity)
-                                                                                getActivity());
+                                                                                        getActivity());
                                                                         mPresenter.usskuQuery
-                                                                                (barcode, loadingDialog);
+                                                                                (barcode,
+                                                                                        loadingDialog);
                                                                     }
                                                                 });
                                                         if (!mScanFragment.isAdded()) {
@@ -123,19 +125,19 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
         isAddData = false;
         this.isLoadMore = isLoadMore;
         if (nowData == null || nowData.size() <= 0) {
-            mViewBinding.llNull.setVisibility(View.VISIBLE);
-            mViewBinding.srlProducts.setVisibility(View.GONE);
-            return;
+//            mViewBinding.llNull.setVisibility(View.VISIBLE);
+//            mViewBinding.srlProducts.setVisibility(View.GONE);
+            mBaleIndexAdapter.setEmptyView(getEmptyView(R.string.bale_no_seach));
         } else {
-            mViewBinding.llNull.setVisibility(View.GONE);
-            mViewBinding.srlProducts.setVisibility(View.VISIBLE);
+//            mViewBinding.llNull.setVisibility(View.GONE);
+//            mViewBinding.srlProducts.setVisibility(View.VISIBLE);
         }
         if (mBaleIndexAdapter != null) {
             mViewBinding.srlProducts.setRefreshing(false);
             mBaleIndexAdapter.setEnableLoadMore(false);
-            if (nowData != null) {
-                mBaleIndexAdapter.setNewData(nowData);
-            }
+//            if (nowData != null) {
+            mBaleIndexAdapter.setNewData(nowData);
+//            }
         }
     }
 
@@ -165,7 +167,12 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
 
         mBaleIndexAdapter.setEnableLoadMore(false);
         loadingDialog.show((BaseActivity) getActivity());
-        mPresenter.usskuQuery(null, loadingDialog);
+        if (nowData.size() <= 0) {
+            mPresenter.usskuQuery("", loadingDialog);
+        } else {
+            mPresenter.usskuQuery(null, loadingDialog);
+        }
+
     }
 
     /**
@@ -220,6 +227,12 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
 
     }
 
+    private View getEmptyView(int resHint) {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        view.setBackgroundResource(R.color.gray_zhouyu);
+        ((TextView) view.findViewById(R.id.tv_empty)).setText(resHint);
+        return view;
+    }
 //    public void myHidekey() {
 //        List<View> list = new ArrayList<>();
 //        list.add(mViewBinding.etKeyword);

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java

@@ -28,10 +28,6 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
 
     @Override
     public void initView() {
-
-        mViewBinding.etBarcode.requestFocus();
-        KeyboardUtils.showSoftInput(mViewBinding.etBarcode);
-
         mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
             if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
                 KeyboardUtils.hideSoftInput(textView);
@@ -57,6 +53,12 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
         });
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        KeyboardUtils.showSoftInput(mViewBinding.etBarcode);
+    }
+
     public void loadCheckSkus(List<Sssku> ssskus) {
         mSkuAdapter.setNewData(ssskus);
     }

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

@@ -9,7 +9,6 @@ import android.widget.TextView;
 
 import com.bigkoo.pickerview.OptionsPickerView;
 import com.bigkoo.pickerview.listener.CustomListener;
-import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.App;
@@ -314,8 +313,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
      * 初始化会员等级选择对话框
      */
     private void initVipLevelOptionPicker(RealmResults<Level> realmResult) {//条件选择器初始化，自定义布局
-        pvCustomOptions = new OptionsPickerView.Builder(getActivity(), new OptionsPickerView
-                .OnOptionsSelectListener() {
+        pvCustomOptions = new OptionsPickerView.Builder(getActivity(), new OptionsPickerView.OnOptionsSelectListener() {
             @Override
             public void onOptionsSelect(int options1, int option2, int options3, View v) {
                 gbound.setVipLevel(realmResult.get(options1).getVipLevel());
@@ -340,10 +338,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                     }
                 });
             }
-        })
-                .isDialog(true)
-                .build();
-
+        }).isDialog(true).build();
 
         pvCustomOptions.setPicker(realmResult);//添加数据
         pvCustomOptions.show();

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java

@@ -209,6 +209,11 @@ interface MsContract {
          */
         public abstract void clickTypeSkuSearch();
 
+        /**
+         * 编辑页面 - 点击营销类型商品的扫描键
+         */
+        public abstract void clickTypeSkuScan();
+
         /**
          * 编辑页面 - 点击搜索按钮
          *

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java

@@ -123,6 +123,11 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
         mView.showSearchFragment(C.TITLE_MODE.GIFT);
     }
 
+    @Override
+    public void clickTypeSkuScan() {
+        mView.showScanFragment(C.TITLE_MODE.GIFT);
+    }
+
 
     @Override
     public void clickSearchButton(String keyword) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/MsAdapter.java

@@ -96,7 +96,8 @@ public class MsAdapter extends BaseAdapter<Ms, ItemMsBinding> {
                 strType = mContext.getResources().getString(R.string.ms_type_money_off_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftOffAmt()));
                 break;
             case C.MS_TYPE.GIFT:
-                strType = mContext.getResources().getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), ms.getGiftSkuName());
+                String spuName = DBFactory.Marketing.Ms.querySpuNameBySkuId(ms.getGiftSkuId());
+                strType = mContext.getResources().getString(R.string.ms_type_gift_info, ConvertUtil.fenToYuan(ms.getPayAmt()), ConvertUtil.fenToYuan(ms.getGiftSkuPrice()), spuName);
                 break;
         }
         return strGroup + strType;

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/EditorFragment.java

@@ -176,7 +176,6 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
      */
     public <Sku extends BaseSku> void loadGroupSku(Sku sssku) {
         if (mGroupView instanceof GroupSkuView) ((GroupSkuView) mGroupView).loadSssku(sssku);
-
     }
 
     /**
@@ -185,6 +184,7 @@ public class EditorFragment extends BaseFragment<MsPresenter, FragmentMsEditorBi
      * @param sssku 商品
      */
     public <Sku extends BaseSku> void loadTypeSku(Sku sssku) {
+        if (mTypeView instanceof TypeGiftView) ((TypeGiftView) mTypeView).loadSssku(sssku);
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/SearchFragment.java

@@ -40,7 +40,7 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
         mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
         mSkuAdapter.setOnItemClickListener((adapter, view, position) -> {
             mPresenter.clickSku(mSkuAdapter.getData().get(position), mSearchType);
-            this.pop();
+            ((MsActivity) getActivity()).backToEditFragment();
         });
 
         // set empty

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/GroupSkuView.java

@@ -29,9 +29,7 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
         mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
             if (b) mPresenter.clickGroupSkuSearch();
         });
-        mViewBinding.btnScan.setOnClickListener(view -> {
-            mPresenter.clickGroupSkuScan();
-        });
+        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickGroupSkuScan());
     }
 
     @SuppressLint("SetTextI18n")
@@ -39,8 +37,6 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
     protected void setViewByMs() {
         if (mMs.getMsTouchTag2() == null || mMs.getMsTouchTag2() != C.MS_GROUP.SKU) return;
         mViewBinding.llProduct.setVisibility(View.VISIBLE);
-        mViewBinding.etSearch.setText(ConvertUtil.longToString(mMs.getSkuBarCode()));
-
         mViewBinding.setName(mMs.getSkuName());
         mViewBinding.setPrice(ConvertUtil.fenToYuan(mMs.getSkuPrice1(), true));
     }
@@ -57,7 +53,6 @@ public class GroupSkuView<Sku extends BaseSku> extends BaseGroupView<ViewGroupSk
     public void loadSssku(Sku sku) {
         this.mSku = sku;
         if (sku != null) {
-            mViewBinding.etSearch.setText(ConvertUtil.longToString(sku.getSpuBarcode()));
             mViewBinding.setName(sku.getSpuName());
             mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
             mViewBinding.llProduct.setVisibility(View.VISIBLE);

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/view/TypeGiftView.java

 package com.xingdata.zzdpos.ui.marketing.ms.view;
 
+import android.annotation.SuppressLint;
+import android.view.View;
+import android.widget.EditText;
+
+import com.blankj.utilcode.util.StringUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.ViewTypeGiftBinding;
 import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.InputFilters;
 
 /**
  * 促销页面
  */
-public class TypeGiftView extends BaseTypeView<ViewTypeGiftBinding> {
+public class TypeGiftView<Sku extends BaseSku> extends BaseTypeView<ViewTypeGiftBinding> {
+
+    private Sku mSssku;
+
+    private View.OnFocusChangeListener mOnFocusChangeListener;
+
+    public TypeGiftView() {
+        mOnFocusChangeListener = (view, b) -> {
+            if (view instanceof EditText) {
+                EditText editText = (EditText) view;
+                if (b && editText.getText().toString().equals("0.00")) {
+                    editText.setText("");
+                } else if (!b && editText.getText().length() == 0) {
+                    editText.setText("0.00");
+                }
+            }
+        };
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.view_type_gift;
     }
 
+    @Override
+    public void initView() {
+        super.initView();
+        mViewBinding.etAmt.setFilters(InputFilters.getMoneyFilter(6));
+        mViewBinding.etAddAmt.setFilters(InputFilters.getMoneyFilter(6));
+
+        mViewBinding.etAmt.setOnFocusChangeListener(mOnFocusChangeListener);
+        mViewBinding.etAddAmt.setOnFocusChangeListener(mOnFocusChangeListener);
+
+        mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
+            if (b) mPresenter.clickTypeSkuSearch();
+        });
+        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickTypeSkuScan());
+    }
+
+    @SuppressLint("SetTextI18n")
     @Override
     protected void setViewByMs() {
+        if (mMs.getMsTools() == null || mMs.getMsTools() != C.MS_TYPE.GIFT) return;
+
+        mViewBinding.etAmt.setText(ConvertUtil.fenToYuan(mMs.getPayAmt()));
+        mViewBinding.etAddAmt.setText(ConvertUtil.fenToYuan(mMs.getGiftSkuPrice()));
+
+        mViewBinding.llProduct.setVisibility(View.VISIBLE);
+        mViewBinding.setName(mMs.getGiftSkuName());
+        mViewBinding.setPrice(ConvertUtil.fenToYuan(mMs.getGiftSkuPrice1(), true));
     }
 
     @Override
     public boolean processMs(Ms ms) {
         ms.setMsTools(C.MS_TYPE.GIFT);
+
+        String strAmt = mViewBinding.etAmt.getText().toString();
+        if (StringUtils.isEmpty(strAmt)) return false;
+        ms.setPayAmt(ConvertUtil.yuanToFen(strAmt));
+
+        String strAddAmt = mViewBinding.etAddAmt.getText().toString();
+        if (StringUtils.isEmpty(strAddAmt)) return false;
+        ms.setGiftSkuPrice(ConvertUtil.yuanToFen(strAddAmt));
+
+        if (mSssku == null && ms.getGiftSkuId() == null) return false;
+        if (mSssku != null) ms.setGiftSkuId(mSssku.getSkuId());
         return true;
     }
 
+
+    @SuppressLint("SetTextI18n")
+    public void loadSssku(Sku sku) {
+        this.mSssku = sku;
+        if (sku != null) {
+            mViewBinding.setName(sku.getSpuName());
+            mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
+            mViewBinding.llProduct.setVisibility(View.VISIBLE);
+        } else {
+            mViewBinding.llProduct.setVisibility(View.GONE);
+        }
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java

@@ -53,7 +53,9 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
         mViewBinding.etTicketMoney.addTextChangedListener(mTextWatcher);
         mViewBinding.etRuleMoney.addTextChangedListener(mTextWatcher);
         mViewBinding.etTicketCount.addTextChangedListener(mTextWatcher);
+        mViewBinding.llTickerName.setVisibility(View.GONE);
         if (nowType == 2) {
+            mViewBinding.llTickerName.setVisibility(View.VISIBLE);
             mViewBinding.icTitles.tvTitle.setText("编辑优惠券");
             mViewBinding.tvIntegralRuleName.setText(trule.getTruleName());
             if (trule.getTruleStatus() == 1) {

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -12,8 +13,7 @@ import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.util.Global;
 
-public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding>
-        implements PaymentContract.View {
+public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View {
 
     private PaymentFragment mPaymentFragment = new PaymentFragment();
 
@@ -29,6 +29,11 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
     }
 
 
+    @Override
+    public void showMsg(String msg) {
+        ToastUtils.showShort(msg);
+    }
+
     @Override
     public void showSettle(Long amt) {
         Intent intent = new Intent(PaymentActivity.this, SettleActivity.class);

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentContract.java

@@ -8,6 +8,13 @@ interface PaymentContract {
 
     interface View extends BaseView {
 
+        /**
+         * 显示信息
+         *
+         * @param msg 信息
+         */
+        void showMsg(String msg);
+
         /**
          * 显示结算页面
          */

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java

@@ -8,6 +8,10 @@ public class PaymentPresenter extends PaymentContract.Presenter {
 
     @Override
     public void clickSettle(Long amt) {
-        mView.showSettle(amt);
+        if (amt > 99999999999L) {
+            mView.showMsg("金额不合法,请重新输入");
+        } else {
+            mView.showSettle(amt);
+        }
     }
 }

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

@@ -45,6 +45,8 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
                     mView.loadVips(vips);
                 },
                 throwable -> {
+                    List<Vip> vips = new ArrayList<>();
+                    mView.loadVips(vips);
                 });
     }
 

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

@@ -22,6 +22,9 @@ import java.util.List;
 public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendTickerVipBinding> {
 
     private VipAdapter mVipAdapter;
+    @SuppressLint("InflateParams")
+    View emptyView;
+    TextView noSeachData;
 
     @Override
     public int getLayoutId() {
@@ -35,10 +38,9 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
         mVipAdapter = new VipAdapter();
         mViewBinding.rlVip.setAdapter(mVipAdapter);
         mViewBinding.rlVip.setLayoutManager(new LinearLayoutManager(mContext));
-        @SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout
-                .view_empty, null);
-        ((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string
-                .settle_vip_search_empty);
+        emptyView = getLayoutInflater().inflate(R.layout.view_empty, null);
+        noSeachData = ((TextView) emptyView.findViewById(R.id.tv_empty));
+        noSeachData.setText(R.string.settle_vip_search_empty);
         mVipAdapter.setEmptyView(emptyView);
 
         mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
@@ -80,7 +82,12 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
      * @param vips 会员列表
      */
     public void loadVips(List<Vip> vips) {
-        mViewBinding.setEmpty(vips.size() == 0);
+        if (vips.size() == 0) {
+            noSeachData.setText(R.string.settle_vip_search_empty_no_seach);
+            mVipAdapter.setEmptyView(emptyView);
+            mViewBinding.setEmpty(vips.size() == 0);
+        }
+
         mVipAdapter.setNewData(vips);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/PayResultFragment.java

@@ -18,13 +18,19 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
 
     @Override
     public void initView() {
-        mViewBinding.setPayResult(mResult);
-        mViewBinding.tvCount.setText(mSaleorder.getGoodsCnt());
-        mViewBinding.tvOrderAmt.setText(mSaleorder.getPayAmt());
-        if (mResult) {
-            mViewBinding.tvType.setText(mSaleorder.getPayChannel());
-            mViewBinding.tvTime.setText(mSaleorder.getOrderTime());
+        if (mSaleorder == null) {
+            mViewBinding.setPayResult(false);
+            return;
+        } else {
+            mViewBinding.tvCount.setText(mSaleorder.getGoodsCnt());
+            mViewBinding.tvOrderAmt.setText(mSaleorder.getPayAmt());
+            if (mResult) {
+                mViewBinding.tvType.setText(mSaleorder.getPayChannel());
+                mViewBinding.tvTime.setText(mSaleorder.getOrderTime());
+            }
         }
+
+        mViewBinding.setPayResult(mResult);
         mViewBinding.ivResult.setImageResource(mResult ? R.mipmap.ic_succeed : R.mipmap.ic_fail);
 
         mViewBinding.btnConfirm.setOnClickListener(view -> {

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

@@ -58,9 +58,8 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "548496";
+        return "54849689";
     }
-
     /**
      * 获取应用名称
      *
@@ -80,8 +79,7 @@ public final class SystemUtil {
     }
 
     /**
-     *
-     *获取是否存在NavigationBar
+     * 获取是否存在NavigationBar
      */
 
     public static boolean checkDeviceHasNavigationBar(Context context) {

app/src/main/res/drawable/black_border_zhouyu_01.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"/>
+
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/black_likui"/>
+
+    <solid android:color="@color/gray_zhouyu"/>
+</shape>
\ No newline at end of file

app/src/main/res/drawable/black_border_zhouyu_02.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"/>
+
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/red_guanyu"/>
+
+    <solid android:color="@color/red_guanyu"/>
+</shape>
\ No newline at end of file

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

@@ -48,6 +48,7 @@
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
                     android:layout_weight="1"
+                    android:inputType="text"
                     android:labelFor="@+id/et_search" />
 
             </LinearLayout>

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

@@ -45,8 +45,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:minHeight="@dimen/list1_height"
                 android:gravity="center"
+                android:minHeight="@dimen/list1_height"
                 android:paddingBottom="@dimen/all_padding"
                 android:paddingTop="@dimen/all_padding">
 
@@ -55,6 +55,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
+                    android:drawableLeft="@mipmap/point"
                     android:paddingLeft="@dimen/all_padding"
                     android:text="启用状态:"
                     android:textColor="@color/black_baozheng"
@@ -84,7 +85,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin"
-                        android:layout_marginRight="@dimen/all_margin"
+                        android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="1"
                         android:background="@drawable/selector_checkbox_bg"
                         android:button="@null"
@@ -148,6 +149,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="2"
                         android:text=" 个积分=1元"
                         android:textColor="@color/black_baozheng"
@@ -180,7 +182,7 @@
                         android:drawablePadding="@dimen/all_bounced_spacing"
                         android:gravity="left"
                         android:paddingLeft="@dimen/all_padding"
-                        android:text="订单实收满 "
+                        android:text="实收满: "
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
 
@@ -201,6 +203,7 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="1"
                         android:text="元"
                         android:textColor="@color/black_baozheng"
@@ -230,7 +233,7 @@
                         android:drawablePadding="@dimen/all_bounced_spacing"
                         android:gravity="left"
                         android:paddingLeft="@dimen/all_padding"
-                        android:text="可以使用 "
+                        android:text="可以使用:"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
 
@@ -251,8 +254,9 @@
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="1"
-                        android:text="个积分"
+                        android:text="积分"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
                 </LinearLayout>
@@ -270,7 +274,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_margin="@dimen/all_margin"
+            android:layout_margin="@dimen/all_bounced_padding"
             android:background="@drawable/red_border"
             android:onClick="@{OnClickListener}"
             android:text="确定"

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

@@ -73,6 +73,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_baozheng"
@@ -112,6 +114,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"

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

@@ -25,66 +25,74 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                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"/>
-
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@+id/ll_bottom"
-                android:layout_below="@+id/tv_title"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                            android:id="@+id/spin_kit"
-                                                            style="@style/SpinKitView.Circle"
-                                                            android:layout_width="@dimen/prompt_dialog_logo_size"
-                                                            android:layout_height="@dimen/prompt_dialog_logo_size"
-                                                            android:layout_marginTop="@dimen/all_bounced_padding"
-                                                            android:visibility="gone"
-                                                            app:SpinKit_Color="@color/black"/>
-
-                <ImageView
-                    android:id="@+id/iv_logo"
-                    android:layout_width="@dimen/prompt_dialog_logo_size"
-                    android:layout_height="@dimen/prompt_dialog_logo_size"
-                    android:layout_centerHorizontal="true"
-                    android:src="@mipmap/prompt_dialog_success" />
-
-                <ScrollView
+                android:layout_below="@+id/tv_title">
+
+                <RelativeLayout
+                    android:id="@+id/rl_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="@dimen/all_bounced_padding"
+                    android:background="@drawable/up_down_line_white_top"
+                    android:paddingBottom="@dimen/all_bounced_padding"
+                    android:paddingTop="@dimen/all_bounced_padding">
+
+
+                    <Button
+                        android:id="@+id/btn_custom"
+                        style="@style/button_positive_allradius"
+                        android:layout_width="@dimen/button1_width"
+                        android:layout_height="@dimen/button1_height"
+                        android:layout_centerInParent="true"
+                        android:text="重新获取"/>
+                </RelativeLayout>
+
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/list2_height">
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:layout_above="@+id/rl_btn"
+                    android:layout_marginTop="@dimen/all_bounced_spacing"
+                    android:orientation="vertical">
+
+                    <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                                android:id="@+id/spin_kit"
+                                                                style="@style/SpinKitView.Circle"
+                                                                android:layout_width="@dimen/prompt_dialog_logo_size"
+                                                                android:layout_height="@dimen/prompt_dialog_logo_size"
+                                                                android:layout_marginTop="@dimen/all_bounced_padding"
+                                                                android:visibility="gone"
+                                                                app:SpinKit_Color="@color/black"/>
+
+                    <ImageView
+                        android:id="@+id/iv_logo"
+                        android:layout_width="@dimen/prompt_dialog_logo_size"
+                        android:layout_height="@dimen/prompt_dialog_logo_size"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/all_bounced_padding"
+                        android:src="@mipmap/prompt_dialog_success"/>
 
-                    <TextView
-                        android:id="@+id/tv_text"
+                    <ScrollView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/all_bounced_padding"
-                        android:gravity="center"
-                        android:text="正在处理，请稍后."
-                        android:textColor="@color/black_baozheng"
-                        android:textSize="@dimen/all_text_size"/>
-                </ScrollView>
-
-
-                <Button
-                    android:id="@+id/btn_custom"
-                    style="@style/button_positive_allradius"
-                    android:layout_width="@dimen/button1_width"
-                    android:layout_height="@dimen/button1_height"
-                    android:layout_marginBottom="@dimen/all_bounced_padding"
-                    android:text="重新获取"/>
-            </LinearLayout>
+                        android:layout_marginTop="@dimen/all_bounced_padding">
+
+                        <TextView
+                            android:id="@+id/tv_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:text="正在处理，请稍后."
+                            android:textColor="@color/black_baozheng"
+                            android:textSize="@dimen/all_text_size"/>
+                    </ScrollView>
+                </LinearLayout>
+
+            </RelativeLayout>
 
 
             <android.support.constraint.ConstraintLayout

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

@@ -27,7 +27,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@drawable/up_down_line_gray"
+                android:background="@drawable/up_down_line_gray_bottom"
                 android:gravity="left|center_vertical"
                 android:paddingLeft="@dimen/all_padding"
                 android:text="基本信息"
@@ -35,6 +35,7 @@
                 android:textSize="@dimen/text_secondary_title"/>
 
             <LinearLayout
+                android:id="@+id/ll_ticker_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -45,6 +46,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:text="活动名称:"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/et_textsize"/>
@@ -53,8 +56,10 @@
                     android:id="@+id/tv_integral_rule_name"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/all_bounced_padding"
                     android:layout_weight="5"
                     android:focusable="true"
+                    android:gravity="right"
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textColor="@color/black_baozheng"
@@ -80,6 +85,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:text="启用状态:"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/et_textsize"/>
@@ -160,7 +167,7 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="2"
+                            android:layout_weight="2.5"
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="优惠券面值:"
@@ -182,7 +189,9 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/all_bounced_padding"
                             android:layout_weight="2"
+                            android:gravity="right"
                             android:paddingLeft="@dimen/all_padding"
                             android:text="元"
                             android:textColor="@color/black_baozheng"
@@ -205,7 +214,7 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="2"
+                            android:layout_weight="2.5"
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="券有效期:"
@@ -227,6 +236,7 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/all_bounced_padding"
                             android:layout_weight="2"
                             android:textSize="@dimen/et_textsize"/>
                     </LinearLayout>
@@ -247,7 +257,7 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="2"
+                            android:layout_weight="2.5"
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="订单金额满:"
@@ -269,7 +279,9 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/all_bounced_padding"
                             android:layout_weight="2"
+                            android:gravity="right"
                             android:paddingLeft="@dimen/all_padding"
                             android:text="元可用"
                             android:textColor="@color/black_baozheng"
@@ -292,7 +304,7 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="2"
+                            android:layout_weight="2.5"
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="每单使用:"
@@ -314,7 +326,9 @@
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/all_bounced_padding"
                             android:layout_weight="2"
+                            android:gravity="right"
                             android:paddingLeft="@dimen/all_padding"
                             android:text="张"
                             android:textColor="@color/black_baozheng"

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

@@ -90,12 +90,11 @@
         <LinearLayout
             android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_statistics_bottom_height"
             android:layout_alignParentBottom="true"
             android:background="@drawable/up_down_line_white"
             android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingBottom="@dimen/all_spacing">
+            android:orientation="horizontal">
 
             <Button
                 android:id="@+id/btn_cancel"
@@ -132,7 +131,6 @@
                 android:id="@+id/tv_keyword"
                 style="@style/searchBarEditor"
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
                 android:layout_marginBottom="@dimen/padding_small"
                 android:layout_marginEnd="@dimen/all_bounced_padding"
                 android:layout_marginStart="@dimen/all_bounced_padding"
@@ -149,7 +147,6 @@
                 android:onClick="@{OnClickListener}"
                 android:paddingLeft="@dimen/all_padding"
                 android:textColor="@color/black_likui"
-                android:textColorHint="@color/gray_huanggai"
                 android:textSize="@dimen/all_text_size_low"
                 />
         </LinearLayout>
@@ -189,6 +186,7 @@
                     android:layout_width="@dimen/all_button_radius_width_min"
                     android:layout_height="@dimen/all_button_radius_height_min"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/all_bounced_padding"
                     android:background="@drawable/red_border_allradius"
                     android:onClick="@{OnClickListener}"
                     android:stateListAnimator="@null"
@@ -213,7 +211,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="3"
+                    android:layout_weight="2.9"
                     android:orientation="vertical"
                     android:padding="@dimen/all_padding">
 
@@ -231,7 +229,8 @@
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="名称："
-                            android:textColor="@color/black"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/all_text_size"/>
 
                         <com.xingdata.zzdpos.view.ContainsEmojiEditText
                             android:id="@+id/et_shop_name"
@@ -269,7 +268,8 @@
                             android:drawableLeft="@mipmap/point"
                             android:drawablePadding="@dimen/all_bounced_spacing"
                             android:text="价格："
-                            android:textColor="@color/black"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/all_text_size"/>
 
                         <EditText
                             android:id="@+id/et_shop_money"
@@ -294,7 +294,8 @@
                             android:layout_weight="1"
                             android:paddingLeft="@dimen/all_padding"
                             android:text=" 元"
-                            android:textColor="@color/black"/>
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/all_text_size"/>
                     </LinearLayout>
 
                 </LinearLayout>
@@ -303,8 +304,13 @@
                     android:id="@+id/rv_img_list"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_marginBottom="@dimen/all_padding"
+                    android:layout_marginRight="@dimen/all_bounced_padding"
+                    android:layout_marginTop="@dimen/all_padding"
                     android:layout_weight="1"
-                    android:padding="@dimen/all_padding"></android.support.v7.widget.RecyclerView>
+                    android:background="@drawable/shape_black"
+                    android:paddingLeft="@dimen/all_bounced_spacing"
+                    android:paddingRight="@dimen/all_bounced_spacing"></android.support.v7.widget.RecyclerView>
             </LinearLayout>
         </LinearLayout>
 

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

@@ -74,9 +74,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@color/transparent"
-                    android:onClick="@{OnClickListener}"
                     android:contentDescription="@string/store_scan"
                     android:foreground="?android:attr/actionBarItemBackground"
+                    android:onClick="@{OnClickListener}"
                     android:src="@mipmap/but_sweep_yard"/>
 
             </LinearLayout>
@@ -101,7 +101,6 @@
                 android:id="@+id/tv_keyword"
                 style="@style/searchBarEditor"
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
                 android:layout_marginBottom="@dimen/padding_small"
                 android:layout_marginEnd="@dimen/all_bounced_padding"
                 android:layout_marginStart="@dimen/all_bounced_padding"
@@ -118,7 +117,6 @@
                 android:onClick="@{OnClickListener}"
                 android:paddingLeft="@dimen/all_padding"
                 android:textColor="@color/black_likui"
-                android:textColorHint="@color/gray_huanggai"
                 android:textSize="@dimen/all_text_size_low"
                 />
         </LinearLayout>
@@ -158,7 +156,7 @@
             android:id="@+id/btn_group"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@drawable/up_down_line_gray"
+            android:background="@drawable/up_down_line_gray_bottom"
             android:gravity="left|center_vertical"
             android:paddingLeft="@dimen/all_padding"
             android:text="共 2 个组合"
@@ -186,18 +184,6 @@
             app:layout_constraintTop_toBottomOf="@id/btn_group"
             app:layout_constraintVertical_weight="22">
 
-            <android.support.v4.widget.SwipeRefreshLayout
-                android:id="@+id/srl_products"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rc_bale_shop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-                </android.support.v7.widget.RecyclerView>
-            </android.support.v4.widget.SwipeRefreshLayout>
-
             <LinearLayout
                 android:id="@+id/ll_null"
                 android:layout_width="match_parent"
@@ -206,20 +192,32 @@
                 android:orientation="vertical"
                 android:visibility="gone">
 
-
                 <TextView
                     android:id="@+id/tv_empty"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:drawablePadding="@dimen/all_margin"
-                    android:drawableTop="@mipmap/icon_things_null"
+                    android:drawableTop="@mipmap/nong"
                     android:gravity="center"
+                    android:lineSpacingExtra="@dimen/all_padding"
                     android:text="没有组合商品"
-                    android:textColor="@color/white_half"
-                    android:textSize="@dimen/all_text_size_big"/>
+                    android:textColor="@color/gray_huanggai"
+                    android:textSize="@dimen/all_text_size"/>
 
             </LinearLayout>
 
+            <android.support.v4.widget.SwipeRefreshLayout
+                android:id="@+id/srl_products"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rc_bale_shop"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                </android.support.v7.widget.RecyclerView>
+            </android.support.v4.widget.SwipeRefreshLayout>
+
 
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>

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

@@ -58,8 +58,8 @@
 
                 <EditText
                     android:id="@+id/et_keyword"
+                    style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:background="@drawable/shape_gray_r1"
@@ -73,8 +73,8 @@
                     android:maxLines="1"
                     android:onClick="@{OnClickListener}"
                     android:paddingLeft="@dimen/all_padding"
+                    android:saveEnabled="false"
                     android:textColor="@color/black_likui"
-                    android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>
 
                 <TextView

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

@@ -58,7 +58,6 @@
                     android:id="@+id/et_keyword"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:focusable="true"
@@ -68,7 +67,6 @@
                     android:labelFor="@+id/et_search"
                     android:saveEnabled="false"
                     android:textColor="@color/black_likui"
-                    android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>
 
                 <TextView

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

@@ -64,7 +64,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_amt"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_text_size" />
 
                     <TextView
@@ -72,7 +72,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="end"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_sub_title_size" />
                 </LinearLayout>
 
@@ -96,7 +96,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/settle_pay_change"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_text_size" />
 
                     <TextView
@@ -104,7 +104,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="end"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_sub_title_size" />
                 </LinearLayout>
 

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

+<layout>
+
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="android.view.View.OnClickListener"/>
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title"/>
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list1_height"
+            android:layout_below="@+id/ic_title"
+            android:layout_marginLeft="@dimen/all_bounced_padding"
+            android:background="@drawable/up_down_line_white_bottom"
+            android:gravity="center_vertical"
+            android:text="请选择零售行业"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/text_three_title"/>
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/sl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/ll_bottom"
+            android:layout_below="@+id/tv_title">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_select"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/white">
+
+            <Button
+                android:id="@+id/btn_ok"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_bounced_padding"
+                android:background="@drawable/red_border"
+                android:onClick="@{onClickListener}"
+                android:text="确定"
+                android:textColor="@color/white"
+                android:textSize="@dimen/et_textsize"/>
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

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

@@ -116,10 +116,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="@dimen/all_spacing"
+                        android:drawablePadding="@dimen/all_bounced_spacing"
+                        android:drawableRight="@mipmap/drop_down"
                         android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
                         android:textColor="@color/black_zhangfei"
                         android:textSize="@dimen/all_caption_size"
-                        android:visibility="gone"
                         app:layout_constraintBottom_toTopOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/cb_point"
                         app:layout_constraintTop_toBottomOf="parent"/>
@@ -183,11 +184,11 @@
                 <android.support.constraint.ConstraintLayout
                     android:id="@+id/cl_all"
                     android:layout_width="match_parent"
-                    android:visibility="gone"
                     android:layout_height="@dimen/list3_height"
                     android:background="@drawable/up_down_line_white"
                     android:foreground="?android:attr/selectableItemBackground"
-                    android:onClick="@{OnClickListener}">
+                    android:onClick="@{OnClickListener}"
+                    android:visibility="gone">
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/iv_all_head"

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

@@ -61,11 +61,10 @@
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="@dimen/all_seach_height"
                     android:layout_weight="1"
+                    android:hint="@string/vip_seach_hint"
                     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_settle.xml

@@ -136,7 +136,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/all_margin"
                         android:text="@string/settle_select_vip"
-                        android:textColor="@color/black_zhangfei"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_text_size"
                         android:visibility="@{defualtVip?View.VISIBLE:View.INVISIBLE}"
                         app:layout_constraintBottom_toTopOf="parent"

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

@@ -53,6 +53,7 @@
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     android:gravity="center_vertical"
+                    android:imeOptions="actionSearch"
                     android:inputType="number"
                     android:labelFor="@+id/et_barcode"
                     android:saveEnabled="false"

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

@@ -149,6 +149,7 @@
             android:id="@+id/rc_ticket"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@color/gray_zhouyu"
             android:padding="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_bias="0.0"

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

@@ -60,6 +60,7 @@
             android:id="@+id/tv_goods_size"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/all_bounced_padding"
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
             android:text="规格"
@@ -119,6 +120,8 @@
                 android:id="@+id/et_shop_Num"
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_4"
                 android:layout_weight="1"
                 android:background="@drawable/selector_edit_frame_blue_background"
                 android:digits="1234567890"
@@ -174,6 +177,8 @@
                 android:id="@+id/et_shop_Num_edit"
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_4"
                 android:background="@drawable/selector_edit_frame_blue_background"
                 android:digits="1234567890"
                 android:ems="5"

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

@@ -34,6 +34,7 @@
             android:id="@+id/ll_shop_message"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginLeft="@dimen/all_bounced_padding"
             android:orientation="vertical"
             card_view:layout_constraintBottom_toBottomOf="parent"
             card_view:layout_constraintHorizontal_weight="1.5"
@@ -77,15 +78,24 @@
                     android:layout_height="wrap_content"
                     android:text="8531651233213"/>
 
-                <TextView
-                    android:id="@+id/tv_goods_size"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/frame_frame_zhouyu_bg"
-                    android:padding="@dimen/dp_4"
-                    android:text="规格"
-                    android:textSize="@dimen/all_text_size_small"
-                    />
+                    android:gravity="right"
+                    android:layout_marginRight="@dimen/all_bounced_padding"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv_goods_size"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/frame_frame_zhouyu_bg"
+                        android:padding="@dimen/dp_4"
+                        android:text="规格"
+                        android:textSize="@dimen/all_text_size_small"
+                        />
+                </LinearLayout>
+
             </LinearLayout>
 
 

app/src/main/res/layout/item_select_industry.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"
+    >
+
+    <data>
+
+        <variable
+            name="OnClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener"/>
+
+    </data>
+
+    <LinearLayout
+        android:id="@+id/cl_vip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_item"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/black_border_zhouyu_01"
+            android:drawableLeft="@mipmap/industry_market"
+            android:gravity="center"
+            android:maxEms="4"
+            android:maxLength="4"
+            android:padding="@dimen/all_padding"
+            android:singleLine="true"
+            android:text="超市"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/et_textsize"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/tv_item_select"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/black_border_zhouyu_02"
+            android:drawableLeft="@mipmap/industry_market"
+            android:gravity="center"
+            android:maxEms="4"
+            android:maxLength="4"
+            android:padding="@dimen/all_padding"
+            android:singleLine="true"
+            android:text="超市"
+            android:textColor="@color/white"
+            android:textSize="@dimen/et_textsize"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+    </LinearLayout>
+
+</layout>
+
+

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

@@ -5,15 +5,15 @@
 
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
+            type="com.xingdata.zzdpos.util.OnClickListener"/>
 
     </data>
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/white_caocao"
-        android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:background="@drawable/up_down_line_white_bottom"
+                    android:orientation="horizontal">
 
 
         <ImageButton
@@ -30,18 +30,14 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="标题"
-            android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_sub_title_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_sub_title_size"/>
+
 
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
-            app:layout_constraintBottom_toBottomOf="parent" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/view_type_gift.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">
+<layout>
 
-    <LinearLayout
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="name"
+            type="String" />
+
+        <variable
+            name="price"
+            type="String" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@color/white_caocao"
         android:orientation="vertical">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/ms_editor_type_gift_text1"
+                android:textColor="@color/black"
+                android:textSize="@dimen/big_text_size" />
+
+            <EditText
+                android:id="@+id/et_amt"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
+                android:layout_weight="1"
+                android:background="@color/transparent"
+                android:inputType="numberDecimal"
+                android:labelFor="@+id/et_amt"
+                android:saveEnabled="false"
+                android:textSize="@dimen/all_body_size" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/ms_editor_type_gift_text2"
+                android:textColor="@color/black"
+                android:textSize="@dimen/big_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:background="@color/gray_kongming" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/ms_editor_type_gift_text3"
+                android:textColor="@color/black"
+                android:textSize="@dimen/big_text_size" />
+
+            <EditText
+                android:id="@+id/et_add_amt"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
+                android:layout_weight="1"
+                android:background="@color/transparent"
+                android:inputType="numberDecimal"
+                android:labelFor="@+id/et_add_amt"
+                android:textSize="@dimen/all_body_size" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/ms_editor_type_gift_text2"
+                android:textColor="@color/black"
+                android:textSize="@dimen/big_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:background="@color/gray_kongming" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/all_margin"
+                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_margin">
+
+                <EditText
+                    android:id="@+id/et_search"
+                    style="@style/searchBarEditor"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="@dimen/all_spacing"
+                    android:layout_weight="1"
+                    android:hint="@string/ms_editor_type_gift_search_hint"
+                    android:inputType="text"
+                    android:labelFor="@+id/et_search"
+                    android:saveEnabled="false" />
+
+                <ImageButton
+                    android:id="@+id/btn_scan"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@color/transparent"
+                    android:contentDescription="@string/store_scan"
+                    android:foreground="?android:attr/actionBarItemBackground"
+                    android:src="@mipmap/but_sweep_yard" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_product"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="@{name.length()>0?View.VISIBLE:View.GONE }">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:layout_marginEnd="@dimen/all_margin"
+                    android:layout_marginStart="@dimen/all_margin"
+                    android:background="@color/gray_kongming" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:id="@+id/tv_product_pic"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/all_margin"
+                        app:placeholderImage="@mipmap/icon_goods_default" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/all_spacing"
+                        android:orientation="vertical"
+                        android:padding="@dimen/all_margin">
+
+                        <TextView
+                            android:id="@+id/tv_product_name"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@{@string/ms_editor_group_sku_name+name}" />
+
+                        <TextView
+                            android:id="@+id/tv_product_price"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/all_margin"
+                            android:text="@{@string/ms_editor_group_sku_price+price}" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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">220dp</dimen>
+    <dimen name="prompt_dialog_height">200dp</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

@@ -366,8 +366,8 @@
     <string name="ms_editor_type_money_off_text2">减</string>
     <string name="ms_editor_type_money_off_text3">元</string>
     <string name="ms_editor_type_gift_text1">满</string>
-    <string name="ms_editor_type_gift_text2">元，加</string>
-    <string name="ms_editor_type_gift_text3">元换购</string>
+    <string name="ms_editor_type_gift_text2">元</string>
+    <string name="ms_editor_type_gift_text3">加</string>
     <string name="ms_editor_type_gift_text4">1件</string>
     <string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
     <string name="ms_editor_type_gift_name">品名:</string>
@@ -444,6 +444,7 @@
     <string name="tv_ticket_count"> 共 %s 种优惠券</string>
     <!--商品组合-->
     <string name="bale_select_title">请选择商品</string>
+    <string name="bale_no_seach">没有组合商品 ~</string>
     <string name="bale_title">新增优惠券</string>
     <string name="tv_bale_count"> 共 %s 个组合</string>
     <string name="tv_bale_edit_count"> 共 %s 件</string>
@@ -581,6 +582,7 @@
     <!--支付里的Vip-->
     <string name="settle_vip_search_hint">请输入会员手机号</string>
     <string name="settle_vip_search_empty">请输入会员手机号进行搜索~</string>
+    <string name="settle_vip_search_empty_no_seach">没有搜到此会员</string>
     <string name="settle_vip_search_none">没有搜到此会员~</string>
     <string name="settle_vip_none">不需要会员</string>
 

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

@@ -443,7 +443,7 @@
         <item name="android:saveEnabled">false</item>
         <item name="android:background">@drawable/selector_white_background_stroke</item>
         <item name="android:layout_width">0dp</item>
-        <item name="android:textSize">@dimen/small_text_size</item>
+        <item name="android:textSize">@dimen/all_body_size</item>
     </style>
 
     <style name="all_edittext_14sp_style">