接料界面列表修改

已上料列表接口调整
首页取消部分功能入口
解除绑定逻辑修改
修改已发现bug

app/build.gradle

@@ -88,6 +88,7 @@ dependencies {
     implementation  'com.umeng.umsdk:common:9.4.0'// 必选
     implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
     implementation 'com.umeng.umsdk:apm:1.4.0' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
+    implementation 'org.greenrobot:eventbus:3.2.0'
 }
 
 def getVersionName() {

app/src/main/java/com/uas/gdstorage/activity/HomeActivity.java

@@ -55,7 +55,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
         actionbarTextVeiw.setText("UAS车间工作站管理");
-
+        menuGridView.setNumColumns(2);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,
                 new String[]{DataSourceManager.KEY_GRID_ITEMIMG, DataSourceManager.KEY_GRID_ITEMNAME},

app/src/main/java/com/uas/gdstorage/activity/IndexActivity.java

@@ -1,8 +1,7 @@
 package com.uas.gdstorage.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
+import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -18,6 +17,8 @@ import android.view.View;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -34,6 +35,8 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.application.PdaApplication;
+import com.uas.gdstorage.bean.Master;
+import com.uas.gdstorage.bean.MoreEventBusBean;
 import com.uas.gdstorage.fragment.BaseFragment;
 import com.uas.gdstorage.fragment.WorkOrderSearchFragment;
 import com.uas.gdstorage.global.GloableParams;
@@ -57,8 +60,12 @@ import com.uas.gdstorage.view.business.StaffUpPopup;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import razerdp.basepopup.BasePopupWindow;
 
@@ -87,6 +94,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //        SharedPreUtil.removeAll(getApplicationContext());
         VolleyUtil.distoryVolley();
         super.onDestroy();
+        EventBus.getDefault().unregister(this);
     }
 
     @Override
@@ -149,6 +157,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
 
         getPrintTemplate();
+        EventBus.getDefault().register(this);
 
     }
 
@@ -477,7 +486,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             return;
         }
     }
-
+    int pageType = -1;
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
@@ -509,44 +518,67 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         CommonUtil.toastNoRepeat(this, "暂无在线工单，无法进行解除绑定操作");
                         return;
                     }
-                    new AlertDialog.Builder(this).setTitle("提示").setMessage("确认解除绑定？\n"+"工单:"+workOrder)
-                            .setPositiveButton(getString(R.string.confirm), new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    progressDialog.show();
-                                    VollyRequest.getInstance().stringRequest(mStringRequest,
-                                            new HttpParams.Builder()
-                                                    .url(GloableParams.ADDRESS_PDA_STOPMA)
-                                                    .method(Request.Method.POST)
-                                                    .tag("stopMa")
-                                                    .flag(0)
-                                                    .addParam("ma_code",workOrder)
-                                                    .addParam("sc_code",sc_code)
-                                                    .build(), new HttpCallback() {
-                                                @Override
-                                                public void onSuccess(int flag, Object o) throws Exception {
-                                                    Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
-                                                    if (isSuccess){
-                                                        CommonUtil.toastNoRepeat(IndexActivity.this,"解绑成功！");
-                                                        JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
-                                                        Intent intent =  new Intent(IndexActivity.this, IndexActivity.class);
-                                                        intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
-                                                        startActivity(intent);
-                                                    }else{
-                                                        CommonUtil.toastNoRepeat(IndexActivity.this,"解绑失败!");
-                                                    }
-                                                    progressDialog.dismiss();
-                                                }
-
-                                                @Override
-                                                public void onFail(int flag, String failStr) throws Exception {
-                                                    progressDialog.dismiss();
-                                                    CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
-                                                }
-                                            });
-
+                    List<Master> masterList = DataSourceManager.getDataSourceManager().getMasterList();
+                    String maName = masterList.get(position).getMaName();
+                    String userName = SharedPreUtil.getString(this, "user_name", null);
+                    pageType = VolleyUtil.FRAGMENT_LOGIN;
+                    Dialog dia = new Dialog(IndexActivity.this);
+                    dia.setContentView(R.layout.dialog_custom);
+                    CheckBox check_alldelete = dia.findViewById(R.id.check_alldelete);
+                    LinearLayout lineone = dia.findViewById(R.id.lineone);
+                    LinearLayout linetwo = dia.findViewById(R.id.linetwo);
+                    TextView tv_info = dia.findViewById(R.id.tv_info);
+                    ClearableEditText et_pwd_login = dia.findViewById(R.id.et_pwd_login);
+                    Button btn_cancel = dia.findViewById(R.id.btn_cancel);//取消
+                    Button btn_confirm = dia.findViewById(R.id.btn_confirm);//确定
+                    tv_info.setText("工单:"+workOrder);
+                    dia.show();
+                    check_alldelete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                        @Override
+                        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                            if (isChecked==true){
+                                lineone.setVisibility(View.GONE);
+                                linetwo.setVisibility(View.VISIBLE);
+                            }else {
+                                lineone.setVisibility(View.VISIBLE);
+                                linetwo.setVisibility(View.GONE);
+                            }
+                        }
+                    });
+
+                    dia.setCanceledOnTouchOutside(true);
+                        btn_confirm.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                String password = SharedPreUtil.getString(IndexActivity.this, Constants.FLAG.LOGINPASSOWRD, null);
+                                String et_pwd_logintrim = et_pwd_login.getText().toString().trim();
+                                if (check_alldelete.isChecked()){
+                                    if (et_pwd_logintrim.isEmpty()){
+                                        CommonUtil.toastNoRepeat(IndexActivity.this,"请输入密码");
+                                        return;
+                                    }
+                                    if (!StringUtil.isEmpty(password)){
+                                        if (et_pwd_logintrim.equals(password)){
+                                            getalldeltes(workOrder);
+                                            dia.dismiss();
+                                        }else {
+                                            CommonUtil.toastNoRepeat(IndexActivity.this, "密码不正确");
+                                        }
+                                    }
+                                }else {
+                                    getDatagong(workOrder);
+                                    dia.dismiss();
                                 }
-                            }).setNegativeButton(getString(R.string.cancel), null).create().show();
+
+                            }
+                        });
+
+                    btn_cancel.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            dia.dismiss();
+                        }
+                    });
 
                 }else{
                     if (StringUtil.isEmpty(workOrder)){
@@ -569,6 +601,88 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 
     }
 
+    @Subscribe
+    public void onMessageEvent(MoreEventBusBean evensst) {
+
+    }
+
+
+    //全部删除
+    public void getalldeltes(String workOrder){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_DELETEMSSALL)
+                        .method(Request.Method.POST)
+                        .tag(TAG + "deleteMSSAll")
+                        .flag(0)
+                        .addParam("ma_code",workOrder)
+                        .addParam("sc_code", mPositionR.getText().toString().trim())
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            progressDialog.dismiss();
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                            if (isSuccess) {
+//                                JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                                getDatagong(workOrder);
+                            }
+
+
+                        } catch (Exception e) {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+                    }
+
+                });
+    }
+
+    //解除绑定
+    public void getDatagong(String workOrder){
+        Log.e("workOrder",workOrder);
+        Log.e("mPositionR",mPositionR.getText().toString().trim());
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_STOPMA)
+                        .method(Request.Method.POST)
+                        .tag("stopMa")
+                        .flag(0)
+                        .addParam("ma_code",workOrder)
+                        .addParam("sc_code",mPositionR.getText().toString().trim())
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            CommonUtil.toastNoRepeat(IndexActivity.this,"解绑成功！");
+                            JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                            Intent intent =  new Intent(IndexActivity.this, IndexActivity.class);
+                            intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
+                            startActivity(intent);
+                            Log.e("密码","解绑成功");
+                        }else{
+                            CommonUtil.toastNoRepeat(IndexActivity.this,"解绑失败!");
+                        }
+                        progressDialog.dismiss();
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+                    }
+                });
+    }
+
     private void staffDown() {
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()

app/src/main/java/com/uas/gdstorage/bean/ChargingSummaryBean.java

@@ -4,6 +4,15 @@ public class ChargingSummaryBean {
     private String MSS_PRODCODE;
     private double MSS_QTY;
     private double MSS_REMAIN;
+    private String PR_DETAIL;
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
 
     public String getMSS_PRODCODE() {
         return MSS_PRODCODE;

app/src/main/java/com/uas/gdstorage/bean/MoreEventBusBean.java

@@ -0,0 +1,7 @@
+package com.uas.gdstorage.bean;
+
+public class MoreEventBusBean {
+    public MoreEventBusBean(String s) {
+
+    }
+}

app/src/main/java/com/uas/gdstorage/fragment/ChargingSummaryFragment.java

@@ -1,18 +1,19 @@
 package com.uas.gdstorage.fragment;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.KeyEvent;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.IFormat;
+import com.bin.david.form.data.table.TableData;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
-import com.uas.gdstorage.adapter.ChargingSummaryAdapter;
 import com.uas.gdstorage.bean.ChargingSummaryBean;
 import com.uas.gdstorage.global.GloableParams;
 import com.uas.gdstorage.util.CommonUtil;
@@ -26,12 +27,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ChargingSummaryFragment extends BaseFragment {
+    private SmartTable mSmartTable;
     private RefreshLayout mRefreshLayout;
-    private RecyclerView mRecyclerView;
-    private ChargingSummaryAdapter mChargingSummaryAdapter;
+//    private RecyclerView mRecyclerView;
+//    private ChargingSummaryAdapter mChargingSummaryAdapter;
     private List<ChargingSummaryBean> mChargingSummaryBeans;
     private String mSccode;
     private String title;
+    private TableData<ChargingSummaryBean> mTableData;
+    private Column<String> mTypeColumn, mdetailColumn;
+    private Column<Double> mProdcodeColumn,mOutqtyColumn;
 
     @Override
     protected int getLayout() {
@@ -49,11 +54,30 @@ public class ChargingSummaryFragment extends BaseFragment {
             setTitle(title);
         }
         mRefreshLayout = root.findViewById(R.id.charging_summary_srl);
-        mRecyclerView = root.findViewById(R.id.charging_summary_rv);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
+//        mRecyclerView = root.findViewById(R.id.charging_summary_rv);
+        mSmartTable = root.findViewById(R.id.stock_data_summary_st);
+//        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
         mChargingSummaryBeans = new ArrayList<>();
-        mChargingSummaryAdapter = new ChargingSummaryAdapter(mChargingSummaryBeans);
-        mRecyclerView.setAdapter(mChargingSummaryAdapter);
+//        mChargingSummaryAdapter = new ChargingSummaryAdapter(mChargingSummaryBeans);
+//        mRecyclerView.setAdapter(mChargingSummaryAdapter);
+        //表格数据展示
+        CommonUtil.getDefaultTable(mActivity, mSmartTable);
+        mTypeColumn = new Column<String>("  料号  ", "MSS_PRODCODE");
+        mOutqtyColumn = new Column<Double>("上料数量", "MSS_QTY", new IFormat<Double>() {
+            @Override
+            public String format(Double aDouble) {
+                return CommonUtil.doubleFormat(aDouble);
+            }
+        });
+        mProdcodeColumn = new Column<Double>("剩余数量", "MSS_REMAIN", new IFormat<Double>() {
+            @Override
+            public String format(Double aDouble) {
+                return CommonUtil.doubleFormat(aDouble);
+            }
+        });
+        mdetailColumn = new Column<String>("  名称  ", "PR_DETAIL");
+        setTableData(mChargingSummaryBeans);
+
     }
 
     @Override
@@ -92,16 +116,18 @@ public class ChargingSummaryFragment extends BaseFragment {
                             JSONObject dataObject = dataArray.getJSONObject(i);
                             if (dataObject != null) {
                                 ChargingSummaryBean chargingSummaryBean = new ChargingSummaryBean();
-                                chargingSummaryBean.setMSS_PRODCODE(FastjsonUtil.getText(dataObject, "MSS_PRODCODE"));
-                                chargingSummaryBean.setMSS_QTY(FastjsonUtil.getDouble(dataObject, "MSS_QTY"));
-                                chargingSummaryBean.setMSS_REMAIN(FastjsonUtil.getDouble(dataObject, "MSS_REMAIN"));
-
+                                chargingSummaryBean.setMSS_PRODCODE(FastjsonUtil.getText(dataObject, "MSS_PRODCODE"));//料号
+                                chargingSummaryBean.setMSS_QTY(FastjsonUtil.getDouble(dataObject, "MSS_QTY"));//上料数量
+                                chargingSummaryBean.setMSS_REMAIN(FastjsonUtil.getDouble(dataObject, "MSS_REMAIN"));//剩余数量
+                                chargingSummaryBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));//名称
                                 mChargingSummaryBeans.add(chargingSummaryBean);
                             }
                         }
                     }
-                    mChargingSummaryAdapter.notifyDataSetChanged();
+//                    mChargingSummaryAdapter.notifyDataSetChanged();
+                    setTableData(mChargingSummaryBeans);
                 } catch (Exception e) {
+                    setTableData(mChargingSummaryBeans);
                     e.printStackTrace();
                 }
 
@@ -109,13 +135,24 @@ public class ChargingSummaryFragment extends BaseFragment {
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
+                setTableData(mChargingSummaryBeans);
                 progressDialog.dismiss();
                 mRefreshLayout.finishRefresh(0);
                 CommonUtil.toastNoRepeat(mActivity, failStr);
             }
         });
     }
-
+    private void setTableData(List<ChargingSummaryBean> filterTableData) {
+        mTableData = new TableData<ChargingSummaryBean>("出库单列表", filterTableData,
+                mTypeColumn,mOutqtyColumn,mProdcodeColumn,mdetailColumn);
+        mSmartTable.setTableData(mTableData);
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+    }
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return false;

app/src/main/java/com/uas/gdstorage/fragment/FeededListFragment.java

@@ -25,7 +25,6 @@ import com.android.volley.toolbox.StringRequest;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.activity.FunctionActivity;
@@ -47,7 +46,7 @@ import java.util.List;
  */
 
 public class FeededListFragment extends BaseFragment {
-    private String sc_code;
+    private String sc_code,ma_code;
     private StringRequest mStringRequest;
     private RefreshLayout mRefreshLayout;
     List<FeededBean> mFeededList;
@@ -85,13 +84,14 @@ public class FeededListFragment extends BaseFragment {
         Bundle bundle = getArguments();//从activity传过来的Bundle
         if (bundle != null) {
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            ma_code = bundle.getString(Constants.FLAG.MA_CODE);
             getLoadingData();
         }
     }
 
+
     @Override
     protected void initEvents() {
-
         //右上角清空数据操作
         deleteImg.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -163,18 +163,19 @@ public class FeededListFragment extends BaseFragment {
     }
 
     private void doDeleteMSSAll() {
-
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_PDA_DELETEMSSALL)
                         .method(Request.Method.POST)
                         .tag(TAG + "deleteMSSAll")
                         .flag(0)
+                        .addParam("ma_code",ma_code)
                         .addParam("sc_code", sc_code)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         try {
+                            progressDialog.dismiss();
                             Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
                             if (isSuccess) {
 //                                JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
@@ -184,7 +185,7 @@ public class FeededListFragment extends BaseFragment {
                             } else {
 
                             }
-                            progressDialog.dismiss();
+
 
                         } catch (Exception e) {
 
@@ -318,7 +319,8 @@ public class FeededListFragment extends BaseFragment {
                     data.getString("MSS_BARCODE"),
                     data.getDouble("MSS_QTY"),
                     data.getDouble("MSS_REMAIN"),
-                    data.getInteger("MSS_ID"));
+                    data.getInteger("MSS_ID"),
+                    data.getString("PR_DETAIL"));
             mFeededList.add(bean);
         }
 
@@ -382,6 +384,7 @@ public class FeededListFragment extends BaseFragment {
             helper.setText(R.id.barcode_tv, item.getMSS_BARCODE());
             helper.setText(R.id.number_tv, CommonUtil.doubleFormat(item.getMSS_QTY()));
             helper.setText(R.id.last_tv, CommonUtil.doubleFormat(item.getMSS_REMAIN()));
+            helper.setText(R.id.detail_tv, item.getPR_DETAIL());
         }
     }
 
@@ -399,13 +402,23 @@ public class FeededListFragment extends BaseFragment {
         private double MSS_QTY;
         private double MSS_REMAIN;
         private int MSS_ID;
+        private String PR_DETAIL;
 
-        public FeededBean(String MSS_PRODCODE, String MSS_BARCODE, double MSS_QTY, double MSS_REMAIN, int MSS_ID) {
+        public FeededBean(String MSS_PRODCODE, String MSS_BARCODE, double MSS_QTY, double MSS_REMAIN, int MSS_ID,String PR_DETAIL) {
             this.MSS_PRODCODE = MSS_PRODCODE;
             this.MSS_BARCODE = MSS_BARCODE;
             this.MSS_QTY = MSS_QTY;
             this.MSS_REMAIN = MSS_REMAIN;
             this.MSS_ID = MSS_ID;
+            this.PR_DETAIL = PR_DETAIL;
+        }
+
+        public String getPR_DETAIL() {
+            return PR_DETAIL;
+        }
+
+        public void setPR_DETAIL(String PR_DETAIL) {
+            this.PR_DETAIL = PR_DETAIL;
         }
 
         public String getMSS_PRODCODE() {

app/src/main/java/com/uas/gdstorage/fragment/GdMaterialInFragment.java

@@ -153,6 +153,7 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
                 closeMenuPopupWindow();
                 Bundle mbundle = new Bundle();
                 mbundle.putString(Constants.FLAG.SC_CODE, sc_code);
+                mbundle.putString(Constants.FLAG.MA_CODE, ma_code);
                 FragmentUtils.switchFragment(GdMaterialInFragment.this, new FeededListFragment(), mbundle);
             }
         });
@@ -437,10 +438,12 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
             JSONObject data = (JSONObject) index;
             bean.setMA_CODE(data.getString("MA_CODE"));
             bean.setMM_PRODCODE(data.getString("MM_PRODCODE"));
+            bean.setPR_DETAIL(data.getString("PR_DETAIL"));
             bean.setMM_REPPRODCODE(data.getString("MM_REPPRODCODE") == null ? "-" : data.getString("MM_REPPRODCODE"));
             bean.setMM_ONEUSEQTY(data.getDouble("MM_ONEUSEQTY"));
             bean.setMM_QTY(data.getDouble("MM_QTY"));
             bean.setMM_QTY_ALL(FastjsonUtil.getDouble(data, "MM_QTY_ALL"));
+
             myUnFeedBeanList.add(bean);
         }
         if (myUnFeedBeanList.size() > 0) {
@@ -654,9 +657,11 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
         protected void convert(BaseViewHolder helper, UnFeedBean item) {
             helper.setText(R.id.MM_PRODCODE_tv, "首选料：" + item.getMM_PRODCODE());
             helper.setText(R.id.MM_REPPRODCODE_tv, "替代料：" + item.getMM_REPPRODCODE());
+            helper.setText(R.id.MM_PR_DETAIL_tv, "物料名称：" + item.getPR_DETAIL());
             helper.setText(R.id.MM_ONEUSEQTY_tv, "单位用量：" + CommonUtil.doubleFormat(item.getMM_ONEUSEQTY()));
             helper.setText(R.id.MM_QTY_tv, "未上料数：" + CommonUtil.doubleFormat(item.getMM_QTY()));
             helper.setText(R.id.MSS_COSTQTY_tv, "需求数：" + CommonUtil.doubleFormat(item.getMM_QTY_ALL()));
+
         }
     }
 
@@ -668,6 +673,15 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
         private double MM_ONEUSEQTY;
         private double MM_QTY;
         private double MM_QTY_ALL;
+        private String PR_DETAIL;
+
+        public String getPR_DETAIL() {
+            return PR_DETAIL;
+        }
+
+        public void setPR_DETAIL(String PR_DETAIL) {
+            this.PR_DETAIL = PR_DETAIL;
+        }
 
         public String getMA_CODE() {
             return MA_CODE;

app/src/main/java/com/uas/gdstorage/fragment/GdTimeReportFragment.java

@@ -64,13 +64,14 @@ public class GdTimeReportFragment extends BaseFragment {
     private int lastunitNumber = 1000;
     private int lastunreportqty = 0;
     private ClearableEditText ed_pichi;
-    private String  reportNum="";
+    private String  reportNum;
     private TextView tv_report_name;
     private ImageView mScanImageView;
     private int mFocusId;
     private static final int SCAN_BARCODE_CODE = 201;
     private Integer integer;
     private Integer charSequenceNumber;
+    private TextView material_in_collect_result_tv;
 
 
     @Override
@@ -92,6 +93,7 @@ public class GdTimeReportFragment extends BaseFragment {
         mOlExChangeBtn = root.findViewById(R.id.ol_pause_btn);
         ed_pichi=root.findViewById(R.id.ed_pichi);
         tv_report_name=root.findViewById(R.id.tv_report_name);
+        material_in_collect_result_tv = root.findViewById(R.id.material_in_collect_result_tv);
         String name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME,null);
         mOlNameTv.setText(name);
         ed_pichi.requestFocus();
@@ -170,8 +172,9 @@ public class GdTimeReportFragment extends BaseFragment {
                 if (reportNum==null){
                     return;
                 }
+
                 Integer reportNums = Integer.valueOf(reportNum);
-                if (!TextUtils.isEmpty(s.toString())){
+                if (!TextUtils.isEmpty(mOlNumbersEt.getText().toString().trim())){
                     integer = Integer.valueOf(s.toString());
                     if (integer <=reportNums){
                         mOlUnuseEt.setFocusableInTouchMode(true);
@@ -186,7 +189,6 @@ public class GdTimeReportFragment extends BaseFragment {
                 }else {
                     mOlUnuseEt.setFocusableInTouchMode(false);
                     mOlRemarkEt.setFocusableInTouchMode(false);
-                    CommonUtil.toastNoRepeat(getContext(),"报工数不可为空");
                 }
 
             }
@@ -221,10 +223,16 @@ public class GdTimeReportFragment extends BaseFragment {
             @Override
             public void afterTextChanged(Editable s) {
                 String reportNum = SharedPreUtil.getString(getContext(), "reportNum", null);
+                if(StringUtil.isEmpty(reportNum)){
+                    return;
+                }
                 //接口返回的报工数
                 artisan = Integer.valueOf(reportNum);
                 //手动输入报工数
                 String mOlNumbersEtNum = mOlNumbersEt.getText().toString().trim();
+                if (StringUtil.isEmpty(mOlNumbersEtNum)){
+                    return;
+                }
                 Integer integermOlNumbersEtNum = Integer.valueOf(mOlNumbersEtNum);
 //                    mOlNumbersEt2 = mOlNumbersEt.getText().toString().trim();
                 if(!StringUtil.isEmpty(s.toString())){
@@ -412,15 +420,15 @@ public class GdTimeReportFragment extends BaseFragment {
 
     private void dosubmitClick() {
         Map<Object,String> exchangeData = new HashMap<>();
-        String pici = ed_pichi.getText().toString();//批次号
-        String madeqty = mOlNumbersEt.getText().toString();//报工数
-        String scrapqty = mOlUnuseEt.getText().toString();//报废数
-        String remark = mOlRemarkEt.getText().toString();//备注
+        String pici = ed_pichi.getText().toString().trim();//批次号
+        String madeqty = mOlNumbersEt.getText().toString().trim();//报工数
+        String scrapqty = mOlUnuseEt.getText().toString().trim();//报废数
+        String remark = mOlRemarkEt.getText().toString().trim();//备注
         if(TextUtils.isEmpty(pici)){
             CommonUtil.toastNoRepeat(mActivity,"生产批次不能为空");
             return;
         }
-        if(madeqty.length() == 0 || madeqty == ""){
+        if(TextUtils.isEmpty(madeqty)){//madeqty.length() == 0 || madeqty == ""
             CommonUtil.toastNoRepeat(mActivity,"报工数不能为空");
             return;
         }
@@ -449,81 +457,39 @@ public class GdTimeReportFragment extends BaseFragment {
                         progressDialog.dismiss();
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
                         if (isSuccess){
-                            CommonUtil.toastNoRepeat(mActivity,"报工成功");
+                            material_in_collect_result_tv.setVisibility(View.VISIBLE);
+                            material_in_collect_result_tv.setTextColor(getResources().getColor(R.color.green));
+                            material_in_collect_result_tv.setText("报工成功");
                             ed_pichi.setText("");//生产批次
                             mOlNumbersEt.setText("");//报工数
                             mOlUnuseEt.setText("");//报废数
                             mOlRemarkEt.setText("");//备注
                             ed_pichi.requestFocus();
                         }
+
                     }
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
-                        CommonUtil.toastNoRepeat(mActivity, failStr);
-                    }
-                });
-    }
+                        material_in_collect_result_tv.setVisibility(View.VISIBLE);
+                        material_in_collect_result_tv.setTextColor(getResources().getColor(R.color.red));
+                        material_in_collect_result_tv.setText(failStr);
+                        ed_pichi.setText("");//生产批次
+                        mOlNumbersEt.setText("");//报工数
+                        mOlUnuseEt.setText("");//报废数
+                        mOlRemarkEt.setText("");//备注
+                        ed_pichi.requestFocus();
 
 
-    //获取当前线别在线工单、当前登录人员名称、工单未报工数
-    private void getUnreportqty() {
 
-        progressDialog.show();
-        VollyRequest.getInstance().stringRequest(mStringRequest,
-                new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_PDA_GETMAREPORTQTY)
-                        .method(Request.Method.GET)
-                        .tag(TAG + "getUnreportqty")
-                        .flag(0)
-                        .addParam("sc_code",sc_code)
-                        .addParam("ma_code", ma_code)
-                        .build(), new HttpCallback() {
-                    @Override
-                    public void onSuccess(int flag, Object o) throws Exception {
-                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
-                        if (isSuccess){
-                            JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
-                            if (dataObject == null){
-//                                CommonUtil.toastNoRepeat(mActivity,);
-                                return;
-                            }
-                            mOlNUmbersTv.setText(dataObject.getString("UNREPORTQTY") == null ?"-":dataObject.getString("UNREPORTQTY"));
-                            lastunreportqty = dataObject.getIntValue("LASTUNREPORTQTY");
-                            mOlNumbersEt.setText(lastunreportqty+"");
-
-                            lastUnit = dataObject.getString("UNIT");
-                            unitSelctStr = lastUnit;
-                            upDateUnitNumber();
-
-                            //处理上次单位，计算当前返回可报工数
-                            switch (lastUnit){
-                                case "":
-                                    lastunitNumber = 1;break;
-                                case "KPCS":
-                                    lastunitNumber = 1000;break;
-                                case "PCS":
-                                    lastunitNumber = 1;break;
-                                default:break;
-                            }
-
-
-                        }else {
 
-                        }
-                        progressDialog.dismiss();
                     }
+                });
+    }
 
-                    @Override
-                    public void onFail(int flag, String failStr) throws Exception {
-                        progressDialog.dismiss();
-                        CommonUtil.toastNoRepeat(mActivity, failStr);
 
-                    }
 
-                });
-    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

app/src/main/java/com/uas/gdstorage/fragment/LoginFragment.java

@@ -335,11 +335,16 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
      * @note:连接服务器请求登录
      */
     private void connect() {
+        SharedPreUtil.saveString(getContext(),"user_name",userName);
         //传递Handler
         VolleyUtil.setVolleyHandler(loginHandler);
         //Volley请求服务器
         VolleyUtil.requestUserLogin(getActivity(), GloableParams.ADDRESS_LOGIN_APPLY, VolleyUtil.METHOD_POST,
                 pageType, maName, userName, password);
+        SharedPreUtil.saveString(getContext(), Constants.FLAG.LOGINPASSOWRD, password);
+
+
+
     }
 
     /**

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

@@ -911,19 +911,19 @@ public class GloableParams {
     public static final String GRIDNAME_SETTING = "设置";
     public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static String[] homeMenuNames = {
-            WAREHOUSINGMANAGEMENT,
-            OUTBOUNDMANAGEMENT,
-            WAREHOUSEMANAGEMENT,
+//            WAREHOUSINGMANAGEMENT,
+//            OUTBOUNDMANAGEMENT,
+//            WAREHOUSEMANAGEMENT,
             HOME_DISPATCH_MANAGE,
-            HOME_QUALITY_MANAGE,
+//            HOME_QUALITY_MANAGE,
             GRIDNAME_SETTING,
             QUERYSTATIONINFORMATION};
     public static int[] homeMenuIcons = {
-            R.drawable.ic_storage_in,
-            R.drawable.ic_storage_out,
-            R.drawable.mainmenu_storehousemanager,
+//            R.drawable.ic_storage_in,
+//            R.drawable.ic_storage_out,
+//            R.drawable.mainmenu_storehousemanager,
             R.drawable.ic_dispatch_manage,
-            R.drawable.ic_quality_manage,
+//            R.drawable.ic_quality_manage,
             R.drawable.mainmenu_usersetting,
             R.drawable.astation};
 

app/src/main/java/com/uas/gdstorage/tools/VolleyUtil.java

@@ -21,6 +21,7 @@ import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.application.PdaApplication;
 import com.uas.gdstorage.bean.IPPORT;
+import com.uas.gdstorage.bean.MoreEventBusBean;
 import com.uas.gdstorage.bean.Whcode;
 import com.uas.gdstorage.exception.NullListException;
 import com.uas.gdstorage.util.CommonUtil;
@@ -29,6 +30,7 @@ import com.uas.gdstorage.util.JsonTools;
 import com.uas.gdstorage.util.JsonUtils;
 import com.uas.gdstorage.util.LogUtil;
 
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -1123,6 +1125,92 @@ public class VolleyUtil {
         PdaApplication.mRequestQueue.add(stringRequest);
     }
 
+
+    /**
+     * 工单绑定确定密码
+     */
+    public static void requestUserLogins(Context pContext, String pUrl, int pMethod, int pRequestType,
+                                        final String pMaster, final String pUserName, final String pPassword) {
+        //通知连接页面类型
+        getVolleyUtil();
+        requestType = pRequestType;
+        context = pContext;
+        getVolleyUtil();
+        //get方式
+        if (pMethod == METHOD_GET) {
+            pUrl = pUrl + "?j_username=" + pUserName + "&j_password=" + pPassword + "&master=" + pMaster + "&versioncode=" + PdaApplication.mVersionCode;
+            stringRequest = new StringRequest(Request.Method.GET, pUrl,
+                    stringListener, errorListener) {
+                @Override
+                protected Response<String> parseNetworkResponse(NetworkResponse response) {
+                    String str = null;
+                    try {
+                        Map<String, String> responseHeaders = response.headers;
+                        //保存cookies
+                        cookies = responseHeaders.get("Set-Cookie");
+                        cookies = StringUtil.splitCookieString(cookies);
+                        Log.e("!!!CookiesResponseSplit", cookies);
+                        SharedPreUtil.saveString(context, "cookie", cookies);
+                        //修改字符编码
+                        str = new String(response.data, "utf-8");
+                        EventBus.getDefault().post(new MoreEventBusBean("删除全部"));
+
+
+
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+                    return Response.success(str, HttpHeaderParser.parseCacheHeaders(response));
+                }
+            };
+        }
+        //post
+        else {
+            stringRequest = new StringRequest(Request.Method.POST, pUrl,
+                    stringListener, errorListener) {
+                //重写parseNetworkResponse，获得服务器返回的cookies，修改字符编码
+                @Override
+                protected Response<String> parseNetworkResponse(NetworkResponse response) {
+                    String str = null;
+                    Log.e("!!!response", JSON.toJSONString(response));
+                    try {
+                        Map<String, String> responseHeaders = response.headers;
+                        //保存cookies
+                        cookies = responseHeaders.get("Set-Cookie");
+                        cookies = StringUtil.splitCookieString(cookies);
+                        Log.e("!!!CookiesResponseSplit", cookies);
+                        SharedPreUtil.saveString(context, "cookie", cookies);
+                        //修改字符编码
+                        str = new String(response.data, "utf-8");
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+
+
+                    EventBus.getDefault().post(new MoreEventBusBean("删除全部"));
+
+                    return Response.success(str, HttpHeaderParser.parseCacheHeaders(response));
+                }
+
+                @Override
+                protected Map<String, String> getParams() throws AuthFailureError {
+                    Map<String, String> dataMap = new HashMap();
+                    dataMap.put("j_username", pUserName);
+                    dataMap.put("j_password", pPassword);
+                    dataMap.put("master", pMaster);
+                    dataMap.put("versioncode", PdaApplication.mVersionCode + "");
+                    Log.e("Jsondata", dataMap.toString());
+                    return dataMap;
+                }
+            };
+        }
+        stringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        PdaApplication.mRequestQueue.add(stringRequest);
+    }
+
+
+
+
     /**
      * @注释:主菜单：主菜单,Menu页面获取储位
      */

app/src/main/java/com/uas/gdstorage/util/Constants.java

@@ -115,6 +115,11 @@ public interface Constants {
         //操作权限caller缓存
         String POWER_CALLER_CACHE = "power_caller_cache";
 
+
+
+        //保存登录密码
+        String LOGINPASSOWRD = "loginpassowrd";
+
         /******************************************
          * 材料入库
          */

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

@@ -18,7 +18,7 @@
         <GridView
             android:id="@+id/grid_menu"
             style="@style/MenuGridViewStyle"
-            android:layout_centerInParent="false"
+            android:layout_centerInParent="true"
             android:numColumns="3" />
     </RelativeLayout>
 </RelativeLayout>

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

@@ -31,7 +31,7 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="30dp"
+                        android:layout_height="35dp"
                         android:gravity="center_vertical">
                         <LinearLayout
                             android:layout_width="0dp"
@@ -82,9 +82,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="4dp"
-                                android:gravity="center_vertical"
-                                >
-
+                                android:gravity="center_vertical">
                                 <TextView
                                     android:layout_width="40dp"
                                     android:layout_height="wrap_content"

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

@@ -0,0 +1,116 @@
+<?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="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:background="#ffff"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_centerHorizontal="true"
+                android:text="提示"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="30dp"
+                android:textStyle="bold" />
+        </RelativeLayout>
+        <CheckBox
+            android:id="@+id/check_alldelete"
+            android:text="全部下料"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </CheckBox>
+
+        <LinearLayout
+            android:id="@+id/lineone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dp_10">
+
+            <TextView
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:id="@+id/tv_warning"
+                android:text="确认解除绑定？"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textColor="@android:color/black"
+                android:textSize="@dimen/sp_14" />
+
+            <TextView
+                android:id="@+id/tv_info"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/black"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/linetwo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dp_10">
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/et_pwd_login"
+                style="@style/EditTextStyle"
+                android:hint="@string/hint_fragment_login_pwd"
+                android:password="true" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.1dp"
+                android:background="@color/line" />
+
+        </LinearLayout>
+
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_10">
+
+            <Button
+                android:text="取消"
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="40dp"
+                android:layout_marginRight="25dp"
+                android:background="#F5F8F8"
+                android:textColor="@color/actionbar"
+                android:textSize="@dimen/sp_14" />
+
+            <Button
+                android:text="确定"
+                android:id="@+id/btn_confirm"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="40dp"
+                android:background="#F5F8F8"
+                android:textColor="@color/actionbar"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -22,6 +22,23 @@
             android:layout_marginLeft="@dimen/dp_10"
             android:text="GI01NPUT-eg" />
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="物料名称：" />
+
+        <TextView
+            android:id="@+id/detail_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:text="GI01NPUT-eg" />
+    </LinearLayout>
 
 
     <LinearLayout

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

@@ -13,8 +13,16 @@
         android:layout_height="wrap_content"
         app:srlAccentColor="@android:color/darker_gray" />
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/charging_summary_rv"
+    <com.bin.david.form.core.SmartTable
+        android:id="@+id/stock_data_summary_st"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
+
+
+
+
+
+
+
 </com.scwang.smartrefresh.layout.SmartRefreshLayout>

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

@@ -273,4 +273,14 @@
         android:id="@+id/ol_pause_btn"
         style="@style/ButtonStyle"
         android:text="确认报工" />
+    <TextView
+        android:id="@+id/material_in_collect_result_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_big"
+        android:background="@drawable/shape_msg_block"
+        android:padding="10dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:text="" />
 </LinearLayout>

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

@@ -26,7 +26,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:padding="10dp"
-                    android:text="生产批号"
+                    android:text="工单号"
                     android:textColor="@color/red"
                     android:textSize="14sp" />
 
@@ -37,7 +37,7 @@
                     android:layout_weight="1"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
-                    android:hint="请输入生产批号"
+                    android:hint="请输入工单号"
                     android:imeOptions="actionSend"
                     android:textColor="@color/black"/>
             </TableRow>

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

@@ -5,13 +5,23 @@
     android:padding="10dp"
     >
 
-
-    <TextView
-        android:id="@+id/MM_PRODCODE_tv"
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/MM_PRODCODE_tv"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/MM_REPPRODCODE_tv"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
     <TextView
-        android:id="@+id/MM_REPPRODCODE_tv"
+        android:id="@+id/MM_PR_DETAIL_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <TextView

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

@@ -813,4 +813,14 @@
         <item name="android:orientation">vertical</item>
         <item name="android:background">@color/white</item>
     </style>
+<!--    解除绑定弹框-->
+    <style name="custom_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">#00000000</item>
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
 </resources>

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 1,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.1"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/release/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.1";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Fri May 20 16:57:03 CST 2022
+#Wed Aug 10 17:02:35 CST 2022
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\default_ptr_flip.png
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_top.xml

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu May 19 18:36:54 CST 2022
+#Thu Aug 11 11:07:06 CST 2022
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\default_ptr_flip.png=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable-mdpi-v4\\default_ptr_flip.png
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\anim\\slide_out_to_bottom.xml
 D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_top.xml=D\:\\AndroidData\\uas_mes\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\release\\drawable\\indicator_bg_top.xml

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.1","enabled":true,"outputFile":"pulltoreflashlibrary-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]