锡膏搅拌

app/src/main/java/com/uas/uaspda/adapter/CommonSelectAdapter.java

@@ -0,0 +1,22 @@
+package com.uas.uaspda.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.uaspda.R;
+import com.uas.uaspda.bean.BaseSelectEntity;
+
+import java.util.List;
+
+public class CommonSelectAdapter<T extends BaseSelectEntity> extends BaseQuickAdapter<T, BaseViewHolder> {
+
+    public CommonSelectAdapter(@Nullable List<T> data) {
+        super(R.layout.item_common_select, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, T item) {
+        helper.setText(R.id.item_common_select_tv, item.getItemText());
+    }
+}

app/src/main/java/com/uas/uaspda/adapter/SolderOperateAdapter.java

@@ -21,6 +21,7 @@ public class SolderOperateAdapter extends BaseMultiItemQuickAdapter<SolderOperat
         addItemType(SolderPasteManageFragment.SOLDER_SCRAP, R.layout.item_solder_scrap);
         addItemType(SolderPasteManageFragment.SOLDER_RECYCLE, R.layout.item_solder_empty_recycle);
         addItemType(SolderPasteManageFragment.SOLDER_QUERY, R.layout.item_solder_log_query);
+        addItemType(SolderPasteManageFragment.SOLDER_MIXING, R.layout.item_solder_mixing);
     }
 
     @Override
@@ -45,6 +46,9 @@ public class SolderOperateAdapter extends BaseMultiItemQuickAdapter<SolderOperat
                 case SolderPasteManageFragment.SOLDER_QUERY:
                     bindQuery(helper, item);
                     break;
+                case SolderPasteManageFragment.SOLDER_MIXING:
+                    bindMixing(helper, item);
+                    break;
             }
         }
     }
@@ -100,4 +104,14 @@ public class SolderOperateAdapter extends BaseMultiItemQuickAdapter<SolderOperat
         helper.setText(R.id.item_solder_log_query_date_tv, item.getOpenDate());
         ((MTextView) helper.getView(R.id.item_solder_log_query_content_tv)).setMText(item.getSpec());
     }
+
+
+    private void bindMixing(BaseViewHolder helper, SolderOperateEntity item) {
+        helper.setText(R.id.item_solder_mixing_barcode_tv, item.getBarcode());
+        helper.setText(R.id.item_solder_mixing_brand_tv, item.getBrand());
+        helper.setText(R.id.item_solder_mixing_spec_tv, item.getSpec());
+        helper.setText(R.id.item_solder_mixing_rewarmtime_tv, item.getRewarmingTime());
+        helper.setText(R.id.item_solder_mixing_restorecount_tv, item.getRestorecount() + "");
+        helper.setText(R.id.item_solder_mixing_opentime_tv, CommonUtil.doubleFormat(item.getOpenTime()));
+    }
 }

app/src/main/java/com/uas/uaspda/bean/BaseSelectEntity.java

@@ -0,0 +1,5 @@
+package com.uas.uaspda.bean;
+
+public abstract class BaseSelectEntity {
+    public abstract String getItemText();
+}

app/src/main/java/com/uas/uaspda/bean/LineCodeEntity.java

@@ -0,0 +1,40 @@
+package com.uas.uaspda.bean;
+
+import android.graphics.Color;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+
+import com.uas.uaspda.util.SpanUtils;
+
+public class LineCodeEntity extends BaseSelectEntity {
+    private String LI_CODE;
+    private String LI_NAME;
+    private SpanUtils mSpanUtils;
+
+    public String getLI_CODE() {
+        return LI_CODE;
+    }
+
+    public void setLI_CODE(String LI_CODE) {
+        this.LI_CODE = LI_CODE;
+    }
+
+    public String getLI_NAME() {
+        return LI_NAME;
+    }
+
+    public void setLI_NAME(String LI_NAME) {
+        this.LI_NAME = LI_NAME;
+    }
+
+    @Override
+    public String getItemText() {
+        mSpanUtils = new SpanUtils();
+        mSpanUtils = mSpanUtils.append(LI_NAME).setForegroundColor(Color.BLACK);
+        if (!TextUtils.isEmpty(LI_CODE)) {
+            mSpanUtils = mSpanUtils.append("(" + LI_CODE + ")").setForegroundColor(Color.GRAY);
+        }
+        SpannableStringBuilder result = mSpanUtils.create();
+        return result.toString();
+    }
+}

app/src/main/java/com/uas/uaspda/fragment/SCSMTIndexFragment.java

@@ -1119,7 +1119,7 @@ public class SCSMTIndexFragment extends BaseFragment implements AdapterView.OnIt
     private void showConfirmAllDownDialog() {
         final ClearableEditText quantityEditText = (ClearableEditText) downAllView.findViewById(R.id.pop_smt_down_all_et);
         CheckBox unbindCheckBox = downAllView.findViewById(R.id.pop_smt_down_unbind_cb);
-        unbindCheckBox.setChecked(false);
+        unbindCheckBox.setChecked(true);
         final TextView mConfirmTextView = (TextView) downAllView.findViewById(R.id.pop_smt_down_all_confirm_tv);
         TextView mCancelTextView = (TextView) downAllView.findViewById(R.id.pop_smt_down_all_cancel_tv);
 

app/src/main/java/com/uas/uaspda/fragment/SCSMTJointFragment.java

@@ -347,6 +347,9 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                                 } else if ("barcode".equals(type)) {
                                     tvMsgNotice.setText("请采集原料卷号:" + code);
                                 }
+                                mCollectEditText.setText(code);
+                                String location = mLocationTextView.getText().toString().trim();
+                                joinDataCheck(code, location);
                             }
                         } catch (JSONException e) {
                             e.printStackTrace();

app/src/main/java/com/uas/uaspda/fragment/SolderChargingFragment.java

@@ -12,12 +12,14 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.uas.uaspda.R;
 import com.uas.uaspda.activity.FunctionActivity;
 import com.uas.uaspda.adapter.CommonFormAdapter;
 import com.uas.uaspda.bean.CaptionValueBean;
+import com.uas.uaspda.bean.LineCodeEntity;
 import com.uas.uaspda.global.GloableParams;
 import com.uas.uaspda.listener.MyEditorActionListener;
 import com.uas.uaspda.util.CameraUtil;
@@ -27,6 +29,7 @@ import com.uas.uaspda.util.HttpCallback;
 import com.uas.uaspda.util.HttpParams;
 import com.uas.uaspda.util.VolleyRequest;
 import com.uas.uaspda.view.ClearableEditText;
+import com.uas.uaspda.view.business.CommonSelectPop;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
@@ -45,8 +48,9 @@ public class SolderChargingFragment extends BaseFragment {
     private Button mConfirmButton;
     private List<CaptionValueBean> mCaptionValueBeans;
     private CommonFormAdapter mFormAdapter;
-    private ImageView mScanImageView;
+    private ImageView mScanImageView, mLineSelectIv;
     private int mFocusId;
+    private CommonSelectPop mLineSelectPop;
 
     @Override
     protected int getLayout() {
@@ -64,6 +68,7 @@ public class SolderChargingFragment extends BaseFragment {
         mLinecodeEditText = root.findViewById(R.id.solder_charging_linecode_et);
         mCheckBox = root.findViewById(R.id.solder_charging_runout_cb);
         mConfirmButton = root.findViewById(R.id.solder_charging_confirm_btn);
+        mLineSelectIv = root.findViewById(R.id.solder_charging_linecode_select_iv);
         mRecyclerView = root.findViewById(R.id.solder_charging_data_rv);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
         mCaptionValueBeans = new ArrayList<>();
@@ -72,6 +77,8 @@ public class SolderChargingFragment extends BaseFragment {
         mRecyclerView.setAdapter(mFormAdapter);
 
         mBarcodeEditText.requestFocus();
+
+        mLineSelectPop = new CommonSelectPop(mActivity, "选择线别");
     }
 
     @Override
@@ -116,6 +123,67 @@ public class SolderChargingFragment extends BaseFragment {
                 confirmCharging(barcode);
             }
         });
+
+        mLineSelectIv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                requestLines();
+            }
+        });
+
+        mLineSelectPop.setOnDataSelectListener(new CommonSelectPop.OnDataSelectListener() {
+            @Override
+            public void onDataSelect(int position, Object data) {
+                mLinecodeEditText.setText(((LineCodeEntity) data).getLI_CODE());
+                mLineSelectPop.dismiss();
+            }
+        });
+    }
+
+    private void requestLines() {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SPM_GETLINE)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    List<LineCodeEntity> lineCodeEntities = new ArrayList<>();
+                    if (dataArray != null) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                LineCodeEntity lineCodeEntity = new LineCodeEntity();
+                                lineCodeEntity.setLI_CODE(FastjsonUtil.getText(dataObject, "LI_CODE"));
+                                lineCodeEntity.setLI_NAME(FastjsonUtil.getText(dataObject, "LI_NAME"));
+
+                                lineCodeEntities.add(lineCodeEntity);
+                            }
+                        }
+                    }
+                    if (lineCodeEntities.size() == 0) {
+                        CommonUtil.toastNoRepeat(mActivity, "线别数据为空");
+                    } else {
+                        mLineSelectPop.setData(lineCodeEntities);
+                        mLineSelectPop.showPopupWindow();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
     }
 
     private void confirmCharging(String barcode) {

app/src/main/java/com/uas/uaspda/fragment/SolderPasteManageFragment.java

@@ -29,6 +29,7 @@ public class SolderPasteManageFragment extends BaseFragment {
     public static final int SOLDER_SCRAP = 0x04;
     public static final int SOLDER_RECYCLE = 0x05;
     public static final int SOLDER_QUERY = 0x06;
+    public static final int SOLDER_MIXING = 0x07;
 
     private RecyclerView mMenuRecyclerView;
     private CommonMenuAdapter mCommonMenuAdapter;
@@ -49,6 +50,8 @@ public class SolderPasteManageFragment extends BaseFragment {
         mMenuBeanList = new ArrayList<>();
         mMenuBeanList.add(new CommonMenuBean("出库回温", R.drawable.ic_solder_rewarm,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_REWARM)));
+        mMenuBeanList.add(new CommonMenuBean("锡膏搅拌", R.drawable.ic_solder_recycle,
+                SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_MIXING)));
         mMenuBeanList.add(new CommonMenuBean("锡膏开盖", R.drawable.ic_solder_open,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_OPEN)));
         mMenuBeanList.add(new CommonMenuBean("锡膏上料", R.drawable.ic_solder_charging, SolderChargingFragment.class));

app/src/main/java/com/uas/uaspda/global/GloableParams.java

@@ -217,6 +217,9 @@ public class GloableParams {
     public static String ADDRESS_MSD_CONFIRMSEALBARCODE;
     public static String ADDRESS_SMT_UNBINDFEEDER;
     public static String ADDRESS_SMT_GETBARCODEBYFEEDER;
+    public static String ADDRESS_SPM_CHECKMIXING;
+    public static String ADDRESS_SPM_MIXING;
+    public static String ADDRESS_SPM_GETLINE;
 
 
     //连接服务器请求地址
@@ -271,6 +274,13 @@ public class GloableParams {
     private static final String ADDRESSTAIL_SPM_RECOVERY = "/api/pda/spm/recovery.action";
     //日志查询
     private static final String ADDRESSTAIL_SPM_GETMPMLOG = "/api/pda/spm/getMPMLog.action";
+    //锡膏搅拌校验
+    private static final String ADDRESSTAIL_SPM_CHECKMIXING = "/api/pda/spm/checkmixing.action";
+    //确认搅拌
+    private static final String ADDRESSTAIL_SPM_MIXING = "/api/pda/spm/mixing.action";
+    //线别筛选
+    private static final String ADDRESSTAIL_SPM_GETLINE = "/api/pda/spm/getLine.action";
+
 
     //请求入库单号
     private static final String ADDRESSTAIL_INOUTNO_APPLY = "/pda/fuzzySearch.action";
@@ -963,5 +973,8 @@ public class GloableParams {
         GloableParams.ADDRESS_MSD_CONFIRMSEALBARCODE = uriHead + GloableParams.ADDRESSTAIL_MSD_CONFIRMSEALBARCODE;
         GloableParams.ADDRESS_SMT_UNBINDFEEDER = uriHead + GloableParams.ADDRESSTAIL_SMT_UNBINDFEEDER;
         GloableParams.ADDRESS_SMT_GETBARCODEBYFEEDER = uriHead + GloableParams.ADDRESSTAIL_SMT_GETBARCODEBYFEEDER;
+        GloableParams.ADDRESS_SPM_CHECKMIXING = uriHead + GloableParams.ADDRESSTAIL_SPM_CHECKMIXING;
+        GloableParams.ADDRESS_SPM_MIXING = uriHead + GloableParams.ADDRESSTAIL_SPM_MIXING;
+        GloableParams.ADDRESS_SPM_GETLINE = uriHead + GloableParams.ADDRESSTAIL_SPM_GETLINE;
     }
 }

app/src/main/java/com/uas/uaspda/presenter/SolderOperatePresenter.java

@@ -65,6 +65,9 @@ public class SolderOperatePresenter {
             case SolderPasteManageFragment.SOLDER_QUERY:
                 mSolderView.title("日志查询", null);
                 break;
+            case SolderPasteManageFragment.SOLDER_MIXING:
+                mSolderView.title("锡膏搅拌", "确认搅拌");
+                break;
         }
     }
 
@@ -89,6 +92,9 @@ public class SolderOperatePresenter {
             case SolderPasteManageFragment.SOLDER_QUERY:
                 url = GloableParams.ADDRESS_SPM_GETMPMLOG;
                 break;
+            case SolderPasteManageFragment.SOLDER_MIXING:
+                url = GloableParams.ADDRESS_SPM_CHECKMIXING;
+                break;
         }
         if (TextUtils.isEmpty(url)) {
             return;
@@ -185,6 +191,10 @@ public class SolderOperatePresenter {
                 url = GloableParams.ADDRESS_SPM_RECOVERY;
                 successMsg = "回收成功";
                 break;
+            case SolderPasteManageFragment.SOLDER_MIXING:
+                url = GloableParams.ADDRESS_SPM_MIXING;
+                successMsg = "搅拌成功";
+                break;
         }
         if (TextUtils.isEmpty(url)) {
             return;

app/src/main/java/com/uas/uaspda/view/business/CommonSelectPop.java

@@ -0,0 +1,98 @@
+package com.uas.uaspda.view.business;
+
+import android.content.Context;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.animation.Animation;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.uas.uaspda.R;
+import com.uas.uaspda.adapter.CommonSelectAdapter;
+import com.uas.uaspda.bean.BaseSelectEntity;
+import com.uas.uaspda.view.RecyclerItemDecoration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import razerdp.basepopup.BasePopupWindow;
+
+public class CommonSelectPop<T extends BaseSelectEntity> extends BasePopupWindow {
+    private Context mContext;
+    private RecyclerView mRecyclerView;
+    private TextView mTitleTextView, mCancelTextView;
+    private List<T> mDatas;
+    private CommonSelectAdapter mSelectAdapter;
+    private OnDataSelectListener mOnDataSelectListener;
+
+    public CommonSelectPop(Context context, String title) {
+        super(context);
+        this.mContext = context;
+        setAllowDismissWhenTouchOutside(false);
+
+        initViews(context, title);
+        initEvents();
+    }
+
+    public void setData(List<T> datas) {
+        if (mDatas != null && datas != null) {
+            mDatas.clear();
+            mDatas.addAll(datas);
+            mSelectAdapter.notifyDataSetChanged();
+        }
+    }
+
+    private void initEvents() {
+        mSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (mOnDataSelectListener != null) {
+                    mOnDataSelectListener.onDataSelect(position, mDatas.get(position));
+                }
+            }
+        });
+
+        mCancelTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+    }
+
+    public void setOnDataSelectListener(OnDataSelectListener onDataSelectListener) {
+        mOnDataSelectListener = onDataSelectListener;
+    }
+
+    private void initViews(Context context, String title) {
+        mCancelTextView = findViewById(R.id.pop_common_select_cancel_tv);
+        mTitleTextView = findViewById(R.id.pop_common_select_title_tv);
+        mTitleTextView.setText(title);
+        mRecyclerView = findViewById(R.id.pop_common_select_data_rv);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(context));
+        mRecyclerView.addItemDecoration(new RecyclerItemDecoration(1));
+        mDatas = new ArrayList<>();
+        mSelectAdapter = new CommonSelectAdapter(mDatas);
+        mRecyclerView.setAdapter(mSelectAdapter);
+    }
+
+    @Override
+    public View onCreateContentView() {
+        return createPopupById(R.layout.pop_common_select);
+    }
+
+    @Override
+    protected Animation onCreateShowAnimation() {
+        return getDefaultScaleAnimation(true);
+    }
+
+    @Override
+    protected Animation onCreateDismissAnimation() {
+        return getDefaultScaleAnimation(false);
+    }
+
+    public interface OnDataSelectListener<T> {
+        void onDataSelect(int position, T data);
+    }
+}

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

@@ -73,6 +73,7 @@
                     android:id="@+id/smt_down_material_unbind_cb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:checked="true"
                     android:text="料盘飞达解绑" />
             </LinearLayout>
 

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

@@ -49,6 +49,14 @@
             android:id="@+id/solder_charging_linecode_et"
             style="@style/inputItemValue"
             android:hint="请采集线别" />
+
+        <ImageView
+            android:id="@+id/solder_charging_linecode_select_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            android:padding="10dp"
+            android:src="@drawable/icon_search" />
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
@@ -62,8 +70,8 @@
         android:id="@+id/solder_charging_runout_cb"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="本次本瓶用完"
-        android:checked="false"/>
+        android:checked="false"
+        android:text="本次本瓶用完" />
 
     <Button
         android:id="@+id/solder_charging_confirm_btn"

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/selector_pop_item_bg"
+    android:padding="6dp">
+
+    <TextView
+        android:id="@+id/item_common_select_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="#333333"
+        android:textSize="15sp"
+        tools:text="content" />
+</LinearLayout>

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="4dp"
+    android:background="@drawable/selector_pop_item_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="条码："
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_barcode_tv"
+            style="@style/ValueText"
+            android:textStyle="bold"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="品牌：" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_brand_tv"
+            style="@style/ValueText"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="规格：" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_spec_tv"
+            style="@style/ValueText"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="回温时长(H)：" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_rewarmtime_tv"
+            style="@style/ValueText"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="回存次数：" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_restorecount_tv"
+            style="@style/ValueText"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp">
+
+        <TextView
+            style="@style/CaptionText"
+            android:text="累积开盖时长(H)：" />
+
+        <TextView
+            android:id="@+id/item_solder_mixing_opentime_tv"
+            style="@style/ValueText"
+            tools:text="xxxxxxxxxxxxxx" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginLeft="30dp"
+    android:layout_marginRight="30dp"
+    android:background="@drawable/shape_msg_block"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/pop_common_select_title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="6dp"
+        android:text="MPQ选择"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <View
+        style="@style/view_gray_line"
+        android:layout_height="2dp"
+        android:layout_marginTop="5dp" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/pop_common_select_data_rv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/pop_common_select_cancel_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/selector_cancel_bg"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="取消"
+        android:textColor="@color/selector_cancel_text_color" />
+</LinearLayout>

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

@@ -39,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="6dp"
+        android:checked="true"
         android:text="料盘飞达解绑" />
 
     <View

build.gradle

@@ -45,8 +45,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 9,
-            versionName      : "v2.5"
+            versionCode      : 10,
+            versionName      : "v2.6"
     ]
 
     depsVersion = [