1.修改各种需求不明确问题

app/src/main/java/com/wd/workoffice/bean/mesBean/QualityMarkBean.java

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class QualityMarkBean {
+
+    /**
+     * pageNum : 1
+     * pageSize : 10
+     * size : 10
+     * startRow : 1
+     * endRow : 10
+     * total : 390
+     * pages : 39
+     * list : [{"id":"04338cdf473411ea8334fa163e1166bd","createDateTime":1580809932000,"updateDateTime":1580809932000,"customerName":"222","englishName":"wwwy577","customerCode":"111","address":"w'w'w","telephone":"0000","delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"0f815f03473411ea8334fa163e1166bd","createDateTime":1580809951000,"updateDateTime":1580809951000,"customerName":"ddd","englishName":"d","customerCode":"rrr","address":"hh","telephone":"9090909","delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"18de26fe473411ea8334fa163e1166bd","createDateTime":1580809966000,"updateDateTime":1580809966000,"customerName":"21","englishName":null,"customerCode":"111","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"467a29a57f0011ea8334fa163e1166bd","createDateTime":1586944974000,"updateDateTime":1586944974000,"customerName":"测试","englishName":null,"customerCode":"CSBM001·","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"722c039e854411ea8334fa163e1166bd","createDateTime":1587633960000,"updateDateTime":1587633960000,"customerName":"cs001","englishName":null,"customerCode":"CS001","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"83dabc857efa11ea8334fa163e1166bd","createDateTime":1586942500000,"updateDateTime":1586942500000,"customerName":"测试001","englishName":null,"customerCode":"CSBM001","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"9fbbfee77eff11ea8334fa163e1166bd","createDateTime":1586944695000,"updateDateTime":1586944695000,"customerName":"测试","englishName":null,"customerCode":"CSBM002","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"b4be457c61b311ea8334fa163e1166bd","createDateTime":1583723504000,"updateDateTime":1583723504000,"customerName":"21","englishName":"12","customerCode":"12","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"KG00001","createDateTime":1574697600000,"updateDateTime":1586395507000,"customerName":"安徽创宇电力设备有限公司","englishName":"80445","customerCode":"KG00001","address":"","telephone":null,"delete":null,"createUserId":"SA","createUserName":null,"updateUserId":"SA","updateUserName":null},{"id":"KG00002","createDateTime":1574697600000,"updateDateTime":1586395507000,"customerName":"巴基斯坦","englishName":"80346","customerCode":"KG00002","address":"","telephone":null,"delete":null,"createUserId":"SA","createUserName":null,"updateUserId":"SA","updateUserName":null}]
+     * prePage : 0
+     * nextPage : 2
+     * isFirstPage : true
+     * isLastPage : false
+     * hasPreviousPage : false
+     * hasNextPage : true
+     * navigatePages : 8
+     * navigatepageNums : [1,2,3,4,5,6,7,8]
+     * navigateFirstPage : 1
+     * navigateLastPage : 8
+     * firstPage : 1
+     * lastPage : 8
+     */
+
+    private int pageNum;
+    private int pageSize;
+    private int size;
+    private int startRow;
+    private int endRow;
+    private int total;
+    private int pages;
+    private int prePage;
+    private int nextPage;
+    private boolean isFirstPage;
+    private boolean isLastPage;
+    private boolean hasPreviousPage;
+    private boolean hasNextPage;
+    private int navigatePages;
+    private int navigateFirstPage;
+    private int navigateLastPage;
+    private int firstPage;
+    private int lastPage;
+    private List<ListBean> list;
+    private List<Integer> navigatepageNums;
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public int getStartRow() {
+        return startRow;
+    }
+
+    public void setStartRow(int startRow) {
+        this.startRow = startRow;
+    }
+
+    public int getEndRow() {
+        return endRow;
+    }
+
+    public void setEndRow(int endRow) {
+        this.endRow = endRow;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+    public void setPages(int pages) {
+        this.pages = pages;
+    }
+
+    public int getPrePage() {
+        return prePage;
+    }
+
+    public void setPrePage(int prePage) {
+        this.prePage = prePage;
+    }
+
+    public int getNextPage() {
+        return nextPage;
+    }
+
+    public void setNextPage(int nextPage) {
+        this.nextPage = nextPage;
+    }
+
+    public boolean isIsFirstPage() {
+        return isFirstPage;
+    }
+
+    public void setIsFirstPage(boolean isFirstPage) {
+        this.isFirstPage = isFirstPage;
+    }
+
+    public boolean isIsLastPage() {
+        return isLastPage;
+    }
+
+    public void setIsLastPage(boolean isLastPage) {
+        this.isLastPage = isLastPage;
+    }
+
+    public boolean isHasPreviousPage() {
+        return hasPreviousPage;
+    }
+
+    public void setHasPreviousPage(boolean hasPreviousPage) {
+        this.hasPreviousPage = hasPreviousPage;
+    }
+
+    public boolean isHasNextPage() {
+        return hasNextPage;
+    }
+
+    public void setHasNextPage(boolean hasNextPage) {
+        this.hasNextPage = hasNextPage;
+    }
+
+    public int getNavigatePages() {
+        return navigatePages;
+    }
+
+    public void setNavigatePages(int navigatePages) {
+        this.navigatePages = navigatePages;
+    }
+
+    public int getNavigateFirstPage() {
+        return navigateFirstPage;
+    }
+
+    public void setNavigateFirstPage(int navigateFirstPage) {
+        this.navigateFirstPage = navigateFirstPage;
+    }
+
+    public int getNavigateLastPage() {
+        return navigateLastPage;
+    }
+
+    public void setNavigateLastPage(int navigateLastPage) {
+        this.navigateLastPage = navigateLastPage;
+    }
+
+    public int getFirstPage() {
+        return firstPage;
+    }
+
+    public void setFirstPage(int firstPage) {
+        this.firstPage = firstPage;
+    }
+
+    public int getLastPage() {
+        return lastPage;
+    }
+
+    public void setLastPage(int lastPage) {
+        this.lastPage = lastPage;
+    }
+
+    public List<ListBean> getList() {
+        return list;
+    }
+
+    public void setList(List<ListBean> list) {
+        this.list = list;
+    }
+
+    public List<Integer> getNavigatepageNums() {
+        return navigatepageNums;
+    }
+
+    public void setNavigatepageNums(List<Integer> navigatepageNums) {
+        this.navigatepageNums = navigatepageNums;
+    }
+
+    public static class ListBean {
+        /**
+         * id : 04338cdf473411ea8334fa163e1166bd
+         * createDateTime : 1580809932000
+         * updateDateTime : 1580809932000
+         * customerName : 222
+         * englishName : wwwy577
+         * customerCode : 111
+         * address : w'w'w
+         * telephone : 0000
+         * delete : null
+         * createUserId : 398c852b38e911ea8334fa163e1166bd
+         * createUserName : hello
+         * updateUserId : 398c852b38e911ea8334fa163e1166bd
+         * updateUserName : hello
+         */
+
+        private String serialNumber;
+
+        public String getSerialNumber() {
+            return serialNumber;
+        }
+
+        public void setSerialNumber(String serialNumber) {
+            this.serialNumber = serialNumber;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -496,6 +496,16 @@ public interface MesApiService {
     @POST("/himes/api/customer/show/page.json")
     Observable<BaseMesBean> qualityClientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 单支码
+     *
+     * @return
+     */
+    @POST("himes/api/feedback/show/serial/page.json")
+    Observable<BaseMesBean> markList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+
+
     /**
      * @return
      */

app/src/main/java/com/wd/workoffice/ui/activity/login/MainLoginActivity.java

 package com.wd.workoffice.ui.activity.login;
 
+import android.graphics.Color;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.view.View;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseActivity;
 import com.wd.workoffice.ui.activity.login.LoginActivity;
 import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
 import com.wd.workoffice.ui.activity.user.UserPrivacyActivity;
 import com.wd.workoffice.ui.activity.user.UserServerActivity;
+import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.UserKeeper;
 
+import androidx.annotation.NonNull;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -40,6 +51,7 @@ public class MainLoginActivity extends WorkBaseActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        privacyDialog();
     }
 
     @Override
@@ -76,4 +88,79 @@ public class MainLoginActivity extends WorkBaseActivity {
                 break;
         }
     }
+    private void privacyDialog() {
+        QMUIDialog.CustomDialogBuilder msg = DialogUtils.customDialog(this);
+        msg.setLayout(R.layout.view_privacy_dialog);
+        QMUIDialog qmuiDialog = msg.create();
+        qmuiDialog.setCancelable(false);
+//        View viewDialog = LayoutInflater.from(this).inflate(R.layout.view_privacy_dialog, null, false);
+//        qmuiDialog.setContentView(viewDialog);
+
+
+        TextView tvGo = qmuiDialog.findViewById(R.id.tv_go);
+
+
+        SpannableStringBuilder builder = new SpannableStringBuilder();
+        builder.append("你可阅读");
+
+        String userAgreement = "《软件服务协议》";
+        SpannableString userAgreementSpannable = new SpannableString(userAgreement);
+        userAgreementSpannable.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //用户协议点击
+                startActivity(UserServerActivity.class);
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(Color.parseColor("#1766DF"));
+                ds.setUnderlineText(false);
+            }
+        }, 0, userAgreement.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
+        builder.append(userAgreementSpannable);
+        builder.append("和");
+        String privacyPolicy = "《隐私协议》";
+        SpannableString privacyPolicySpannable = new SpannableString(privacyPolicy);
+        privacyPolicySpannable.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //隐私政策点击
+                startActivity(UserPrivacyActivity.class);
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(Color.parseColor("#1766DF"));
+                ds.setUnderlineText(false);//取消下划线
+            }
+        }, 0, privacyPolicySpannable.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        builder.append(privacyPolicySpannable);
+        builder.append("了解详细信息。如你同意，请点击“同意”开始接受我们的服务。");
+        tvGo.setMovementMethod(LinkMovementMethod.getInstance());
+        tvGo.setHighlightColor(Color.parseColor("#1766DF"));//修改点击后的背景色
+        tvGo.setText(builder);
+
+        Button btnOk = qmuiDialog.findViewById(R.id.btn_ok);
+        TextView tvCancel = qmuiDialog.findViewById(R.id.tv_cancel);
+        btnOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                qmuiDialog.dismiss();
+                UserKeeper.getInstance().keepFirstLogin(false);
+            }
+        });
+        tvCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                qmuiDialog.dismiss();
+                finish();
+            }
+        });
+        qmuiDialog.show();
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

@@ -30,9 +30,12 @@ import com.wd.workoffice.bean.mesBean.DefectBean;
 import com.wd.workoffice.bean.mesBean.FeedbackBean;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.TicketProActivity;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.WorkUtils;
@@ -127,16 +130,18 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     private DefectBean.ListBean chooseDefect;
     private List<ImageBean> imgList;
     private ImgAddAdapter imgAddAdapter;
+    private MesProBean.ListBean choosePro;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        rvImg.setLayoutManager( new GridLayoutManager(this,3,RecyclerView.VERTICAL,false));
+        rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
     }
 
 
     @Override
     protected void initData() {
-        imgList=new ArrayList<>();
+        imgList = new ArrayList<>();
         ImageBean imageBean = new ImageBean();
         imageBean.setUri(null);
         imgList.add(imageBean);
@@ -149,6 +154,9 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             tvFeedbackDesc.setText(ticketBean.getFeedbackDescription());
             tvOtherSupplier.setText(ticketBean.getOtherProviderBehavior());
             tvFeedbackSuggest.setText(ticketBean.getSalerOpinion());
+            tvMarkCode.setText(ticketBean.getSerialNumber());
+            param.put("serialNumber", ticketBean.getSerialNumber());
+
 
             param.put("id", ticketBean.getId());
             chooseClient = new MesClientBean.ListBean();
@@ -178,28 +186,44 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             param.put("defectCount", chooseMachine.getDefectCount());
             param.put("caster", chooseMachine.getCaster());
             chooseBox = new BoxBean();
-            chooseBox.setSerialNumber(ticketBean.getSerialNumber());
-            chooseBox.setDrawingNumber(ticketBean.getDrawingNumber());
-            chooseBox.setSpecification(ticketBean.getSpecification() + "");
-            chooseBox.setProductCode(ticketBean.getProductCode());
-            chooseBox.setProductName(ticketBean.getProductName());
+//            chooseBox.setSerialNumber(ticketBean.getSerialNumber());
+//            chooseBox.setDrawingNumber(ticketBean.getDrawingNumber());
+//            chooseBox.setSpecification(ticketBean.getSpecification() + "");
+//            chooseBox.setProductCode(ticketBean.getProductCode());
+//            chooseBox.setProductName(ticketBean.getProductName());
             chooseBox.setBoxNumber(ticketBean.getBoxCode());
             chooseBox.setBoxId(ticketBean.getBoxId());
 
-            tvProCode.setText(chooseBox.getProductCode());
-            tvProName.setText(chooseBox.getProductName());
-            tvSpec.setText(chooseBox.getSpecification());
-            tvImgCode.setText(chooseBox.getDrawingNumber());
-            tvMarkCode.setText(chooseBox.getSerialNumber());
+//            tvProCode.setText(chooseBox.getProductCode());
+//            tvProName.setText(chooseBox.getProductName());
+//            tvSpec.setText(chooseBox.getSpecification());
+//            tvImgCode.setText(chooseBox.getDrawingNumber());
+//            tvMarkCode.setText(chooseBox.getSerialNumber());
             tvBox.setText(chooseBox.getBoxId());
-            param.put("serialNumber", chooseBox.getSerialNumber());
-            param.put("drawingNumber", chooseBox.getDrawingNumber());
-            param.put("specification", chooseBox.getSpecification());
-            param.put("productCode", chooseBox.getProductCode());
-            param.put("productName", chooseBox.getProductName());
+//            param.put("serialNumber", chooseBox.getSerialNumber());
+//            param.put("drawingNumber", chooseBox.getDrawingNumber());
+//            param.put("specification", chooseBox.getSpecification());
+//            param.put("productCode", chooseBox.getProductCode());
+//            param.put("productName", chooseBox.getProductName());
             param.put("boxCode", chooseBox.getBoxNumber());
             param.put("boxId", chooseBox.getBoxId());
 
+
+            choosePro = new MesProBean.ListBean();
+            choosePro.setDrawingNumber(ticketBean.getDrawingNumber());
+            choosePro.setSpecification(ticketBean.getSpecification() + "");
+            choosePro.setProductCode(ticketBean.getProductCode());
+            choosePro.setProductName(ticketBean.getProductName());
+
+            tvProCode.setText(choosePro.getProductCode());
+            tvProName.setText(choosePro.getProductName());
+            tvSpec.setText(choosePro.getSpecification());
+            tvImgCode.setText(choosePro.getDrawingNumber());
+            param.put("drawingNumber", choosePro.getDrawingNumber());
+            param.put("specification", choosePro.getSpecification());
+            param.put("productCode", choosePro.getProductCode());
+            param.put("productName", choosePro.getProductName());
+
             chooseDefect = new DefectBean.ListBean();
             chooseDefect.setRemark(ticketBean.getMainCause());
             chooseDefect.setDefectCode(ticketBean.getDefectCode());
@@ -246,7 +270,8 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.btn_add, R.id.btn_submit, R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect})
+    @OnClick({R.id.rl_mark_code, R.id.btn_add, R.id.btn_submit, R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect,
+            R.id.rl_pro, R.id.rl_mark_code})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_add:
@@ -261,17 +286,21 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
                     toast("请先选择连铸机");
                     break;
                 }
-                if (chooseBox == null) {
-                    toast("请先选择箱号");
-                    break;
-                }
-                if (chooseDefect == null) {
-                    toast("请先选择缺陷");
-                    break;
-                }
+//                if (chooseBox == null) {
+//                    toast("请先选择箱号");
+//                    break;
+//                }
+//                if (chooseDefect == null) {
+//                    toast("请先选择缺陷");
+//                    break;
+//                }
 //                param.put("", "");
                 submit();
                 break;
+            case R.id.rl_mark_code:
+                startActivityForResult(MesQualityChooseMarkActivity.class,
+                        10006);
+                break;
             case R.id.rl_client:
                 startActivityForResult(MesTicketClientActivity.class,
                         10001);
@@ -284,6 +313,14 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
                 startActivityForResult(MesChooseMachineActivity.class,
                         10002, "code", chooseClient.getCustomerCode());
                 break;
+            case R.id.rl_pro:
+                if (chooseClient == null) {
+                    toast("请先选择客户");
+                    return;
+                }
+                startActivityForResult(TicketProActivity.class,
+                        10005, "code", chooseClient.getCustomerCode());
+                break;
             case R.id.rl_box:
                 if (chooseClient == null) {
                     toast("请先选择客户");
@@ -327,17 +364,17 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             param.put("caster", chooseMachine.getCaster());
         } else if (requestCode == 10003 && resultCode == 10001) {
             chooseBox = JSON.parseObject(data.getStringExtra("data"), BoxBean.class);
-            tvProCode.setText(chooseBox.getProductCode());
-            tvProName.setText(chooseBox.getProductName());
-            tvSpec.setText(chooseBox.getSpecification());
-            tvImgCode.setText(chooseBox.getDrawingNumber());
-            tvMarkCode.setText(chooseBox.getSerialNumber());
+//            tvProCode.setText(chooseBox.getProductCode());
+//            tvProName.setText(chooseBox.getProductName());
+//            tvSpec.setText(chooseBox.getSpecification());
+//            tvImgCode.setText(chooseBox.getDrawingNumber());
+//            tvMarkCode.setText(chooseBox.getSerialNumber());
             tvBox.setText(chooseBox.getBoxId());
-            param.put("serialNumber", chooseBox.getSerialNumber());
-            param.put("drawingNumber", chooseBox.getDrawingNumber());
-            param.put("specification", chooseBox.getSpecification());
-            param.put("productCode", chooseBox.getProductCode());
-            param.put("productName", chooseBox.getProductName());
+//            param.put("serialNumber", chooseBox.getSerialNumber());
+//            param.put("drawingNumber", chooseBox.getDrawingNumber());
+//            param.put("specification", chooseBox.getSpecification());
+//            param.put("productCode", chooseBox.getProductCode());
+//            param.put("productName", chooseBox.getProductName());
             param.put("boxCode", chooseBox.getBoxNumber());
             param.put("boxId", chooseBox.getBoxId());
         } else if (requestCode == 10004 && resultCode == 10001) {
@@ -347,6 +384,22 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             param.put("mainCause", chooseDefect.getRemark());
             param.put("defectCode", chooseDefect.getDefectCode());
             param.put("defectName", chooseDefect.getDefectName());
+        } else if (requestCode == 10005 && resultCode == 10001) {
+            choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
+            tvProCode.setText(choosePro.getProductCode());
+            tvProName.setText(choosePro.getProductName());
+            tvSpec.setText(choosePro.getSpecification());
+            tvImgCode.setText(choosePro.getDrawingNumber());
+//            tvMarkCode.setText(choosePro.get());
+            param.put("serialNumber", chooseBox.getSerialNumber());
+            param.put("drawingNumber", chooseBox.getDrawingNumber());
+            param.put("specification", chooseBox.getSpecification());
+            param.put("productCode", chooseBox.getProductCode());
+            param.put("productName", chooseBox.getProductName());
+        } else if (requestCode == 10006 && resultCode == 10001) {
+            String chooseMarkCode = data.getStringExtra("data");
+            tvMarkCode.setText(chooseMarkCode);
+            param.put("serialNumber", chooseMarkCode);
         } else if (requestCode == 10002 && resultCode == RESULT_OK) {
             List<Uri> dataUri = Matisse.obtainResult(data);
             for (Uri uri : dataUri) {
@@ -357,10 +410,10 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 
     private void getPhone(String customerCode) {
         Map<String, Object> phontParam = WorkUtils.pageMesKey();
-        phontParam.put("pageNum",1);
+        phontParam.put("pageNum", 1);
         Map<String, Object> paramMap = WorkUtils.simpleParam();
-        paramMap.put("customerCode",customerCode);
-        phontParam.put("paramMap",paramMap);
+        paramMap.put("customerCode", customerCode);
+        phontParam.put("paramMap", paramMap);
         RtfUtils.getMesRtf().clientPhoneList("1", WorkUtils.convertMapToBody(phontParam)).
                 compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
@@ -380,10 +433,10 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
                     return;
                 }
                 JSONArray dataList = JSON.parseObject(data.getData().toString()).getJSONArray("list");
-                if (dataList.size()!=0){
+                if (dataList.size() != 0) {
                     JSONObject userData = dataList.getJSONObject(0);
                     tvPhone.setText(userData.getString("telephone"));
-                    param.put("phoneNumber",userData.getString("telephone"));
+                    param.put("phoneNumber", userData.getString("telephone"));
                 }
             }
         });
@@ -425,15 +478,30 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 //    }
 
     private void submit() {
-        param.put("feedbackDescription", tvFeedbackDesc.getText().toString());
-        param.put("otherProviderBehavior", tvOtherSupplier.getText().toString());
-        param.put("salerOpinion", tvFeedbackSuggest.getText().toString());
+        String feedback = tvFeedbackDesc.getText().toString();
+        String otherSupplier = tvOtherSupplier.getText().toString();
+        String feedbackSuggest = tvFeedbackSuggest.getText().toString();
+        if (TextUtils.isEmpty(feedback)) {
+            toast("请输入反馈信息详细描述");
+            return;
+        }
+        if (TextUtils.isEmpty(otherSupplier)) {
+            toast("其他供货厂家及使用情况");
+            return;
+        }
+        if (TextUtils.isEmpty(feedbackSuggest)) {
+            toast("分析及建议");
+            return;
+        }
+        param.put("feedbackDescription", feedback);
+        param.put("otherProviderBehavior", otherSupplier);
+        param.put("salerOpinion", feedbackSuggest);
         param.put("defectCount", etNum.getText().toString());
-        List<ImageBean> uploadImg =new ArrayList<>();
-        for (int i = 0; i < imgList.size()-1; i++) {
+        List<ImageBean> uploadImg = new ArrayList<>();
+        for (int i = 0; i < imgList.size() - 1; i++) {
             uploadImg.add(imgList.get(i));
         }
-        param.put("attachments",uploadImg);
+        param.put("attachments", uploadImg);
         Observable<BaseMesBean> observable;
         if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
             param.put("status", "1");

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityChooseMarkActivity.java

+package com.wd.workoffice.ui.activity.mes.quality;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.QualityClientBean;
+import com.wd.workoffice.bean.mesBean.QualityMarkBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesQualityClientAdapter;
+import com.wd.workoffice.ui.adapter.MesQualityMarkAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 选择单支码
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesQualityChooseMarkActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<QualityMarkBean.ListBean> clientList;
+    private MesQualityMarkAdapter clientAdapter;
+    private int page = 1;
+    private Map<String, Object> paramMap;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        clientList = new ArrayList<>();
+        clientAdapter = new MesQualityMarkAdapter(R.layout.item_quality_mark, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        paramMap = WorkUtils.simpleParam();
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        param.put("paramMap", paramMap);
+        paramMap.put("orderId", "");
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().markList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<QualityMarkBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QualityMarkBean.class).getList();
+                if (page == 1) {
+                    clientList.clear();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_report, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.report:
+                String chooseMark = clientAdapter.getChooseMark();
+                if (TextUtils.isEmpty(chooseMark)) {
+                    toast("请选择单支码");
+                    return super.onOptionsItemSelected(item);
+                }
+                Intent intent = new Intent();
+                intent.putExtra("data", chooseMark);
+                setResult(10001, intent);
+                finish();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        paramMap.put("serialNumber", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java

@@ -271,13 +271,13 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
                 proDialog.show();
                 break;
             case R.id.rl_try_pro:
-                startActivityForResult(TicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001,"user",data.getCustomerUserCode());
                 break;
             case R.id.rl_tech_pro:
-                startActivityForResult(TicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001,"user",data.getCustomerUserCode());
                 break;
             case R.id.rl_quality_pro:
-                startActivityForResult(TicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001,"user",data.getCustomerUserCode());
                 break;
         }
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/TicketProActivity.java

@@ -63,13 +63,14 @@ public class TicketProActivity extends WorkToolBarActivity {
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         param = WorkUtils.pageMesKey();
         paramMap = WorkUtils.simpleParam();
+        paramMap.put("customer",getIntent().getStringExtra("user"));
         param.put("paramMap",paramMap);
         param.put("pageNum", 1);
         getData();
     }
 
     private void getData() {
-        RtfUtils.getMesRtf().proList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().ticketProList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/adapter/MesQualityMarkAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import android.icu.text.UFormat;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.QualityClientBean;
+import com.wd.workoffice.bean.mesBean.QualityMarkBean;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesQualityMarkAdapter extends BaseQuickAdapter<QualityMarkBean.ListBean, BaseViewHolder> {
+    Map<Integer, Boolean> isChoose = new HashMap<>();
+
+    public MesQualityMarkAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, QualityMarkBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getSerialNumber());
+        CheckBox cbCheck = helper.getView(R.id.cb_check);
+        cbCheck.setChecked(null != isChoose.get(helper.getLayoutPosition()) && isChoose.get(helper.getLayoutPosition()));
+        cbCheck.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                isChoose.put(helper.getLayoutPosition(), isChecked);
+            }
+        });
+
+    }
+
+    public String getChooseMark() {
+        StringBuilder chooseMark = new StringBuilder();
+        for (Map.Entry<Integer, Boolean> entry : isChoose.entrySet()) {
+            if (entry.getValue())
+                chooseMark.append(getData().get(entry.getKey()).getSerialNumber()).append(",");
+        }
+        if (chooseMark.length() > 0) {
+            chooseMark.substring(0, chooseMark.length() - 1);
+        }
+        return chooseMark.toString();
+    }
+}
+

app/src/main/java/com/wd/workoffice/util/DialogUtils.java

@@ -21,4 +21,8 @@ public class DialogUtils {
         return dialog;
     }
 
+    public static QMUIDialog.CustomDialogBuilder customDialog(Context context) {
+        QMUIDialog.CustomDialogBuilder dialog = new QMUIDialog.CustomDialogBuilder(context);
+        return dialog;
+    }
 }

app/src/main/java/com/wd/workoffice/util/UserKeeper.java

@@ -25,6 +25,7 @@ public class UserKeeper {
     private final String MES_LOGIN_INFO = "_MES_LOGIN_INFO";
     private final String COOKIE = "_COOKIE";
     private final String IS_AGREE = "_IS_AGREE";
+    private final String FIRST_LOGIN = "_FIRST_LOGIN";
 
     private UserKeeper() {
     }
@@ -330,6 +331,24 @@ public class UserKeeper {
         return infoBean.getString("mobile");
     }
 
+    /**
+     * keepFirstLogin
+     *
+     * @param login
+     */
+    public void keepFirstLogin(boolean login) {
+        sp.put(FIRST_LOGIN, login);
+    }
+
+    public boolean getFirstLogin() {
+        return sp.getBoolean(FIRST_LOGIN,true);
+    }
+
+    public void clearFirstLogin() {
+        sp.put(FIRST_LOGIN, true);
+    }
+
+
     public void clearAll() {
         clearLoginInfo();
         clearUserInfo();

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#fff7f8fc" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file

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

@@ -111,7 +111,7 @@
                         android:layout_width="80mm"
                         android:layout_height="wrap_content"
                         android:gravity="center"
-                        android:text="单指标记码"
+                        android:text="单支标记码"
                         android:textSize="12sp" />
 
                     <TextView

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

@@ -246,7 +246,7 @@
                         android:layout_width="15mm"
                         android:layout_height="20mm"
                         android:src="@mipmap/arrow_right_gray"
-                        android:visibility="gone" />
+                       />
                 </LinearLayout>
 
             </RelativeLayout>
@@ -404,6 +404,7 @@
             <View style="@style/dividerX" />
 
             <RelativeLayout
+                android:id="@+id/rl_mark_code"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="20mm"
@@ -436,7 +437,7 @@
                         android:layout_width="15mm"
                         android:layout_height="20mm"
                         android:src="@mipmap/arrow_right_gray"
-                        android:visibility="gone" />
+                         />
                 </LinearLayout>
 
             </RelativeLayout>

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

@@ -97,7 +97,7 @@
             android:layout_width="80mm"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="单指标记码"
+            android:text="单支标记码"
             android:textSize="12sp" />
 
         <TextView

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <CheckBox
+        android:id="@+id/cb_check"
+        android:layout_width="20mm"
+        android:layout_height="20mm" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="10mm"
+        android:paddingVertical="15mm"
+        android:text="1243"
+        android:textSize="16sp" />
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:padding="14dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_gray_content_bg"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/black"
+            android:text="个人信息保护指引"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:textColor="@color/black"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:lineSpacingMultiplier="1.2"
+            android:text="请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：基于您的授权，我们可能会申请位置权限、相机权限。您可以在“设置”中管理您的授权。" />
+
+        <TextView
+                    android:id="@+id/tv_go"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+            android:textColor="@color/black"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="20dp"
+                    android:text="你可阅读《软件服务协议》和《隐私协议》了解详细信息。如你同意，请点击“同意”开始接受我们的服务" />
+
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_ok"
+        style="@style/BtnStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="同意" />
+
+    <TextView
+        android:id="@+id/tv_cancel"
+        android:layout_width="wrap_content"
+        android:textColor="@color/black"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp"
+        android:text="拒绝并退出" />
+
+</LinearLayout>
\ No newline at end of file