修复标题名称, 默认光标在料架上

app/src/main/java/com/uas/keg_wms_new/fragment/FreeListingFragment.java

@@ -0,0 +1,429 @@
+package com.uas.keg_wms_new.fragment;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.keg_wms_new.R;
+import com.uas.keg_wms_new.activity.FunctionActivity;
+import com.uas.keg_wms_new.global.GloableParams;
+import com.uas.keg_wms_new.listener.MyEditorActionListener;
+import com.uas.keg_wms_new.tools.SharedPreUtil;
+import com.uas.keg_wms_new.util.CameraUtil;
+import com.uas.keg_wms_new.util.CommonUtil;
+import com.uas.keg_wms_new.util.FastjsonUtil;
+import com.uas.keg_wms_new.util.FragmentUtils;
+import com.uas.keg_wms_new.util.HttpCallback;
+import com.uas.keg_wms_new.util.HttpParams;
+import com.uas.keg_wms_new.util.VolleyRequest;
+import com.uas.keg_wms_new.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+public class FreeListingFragment extends BaseFragment {
+    private static final int SCAN_BARCODE_CODE = 101;
+    private ClearableEditText mBarcodeEditText,cet_material_rack;
+    private CheckBox cb_free_listing;
+    private Button mConfirmButton;
+    private TextView mResultTextView;
+    private ImageView mScanImageView;
+    private int mFocusId;
+    private String mBarCode;
+    private org.json.JSONObject jsonObject;
+    private Button btn_kill;
+    private Button mMenuButton;
+    private LinearLayout ll_shangjia,ll_end_data;
+    private PopupWindow mMenuPopupWindow;
+    private Fragment mFragment;
+    private TextView tv_liaojia,tv_barcode_tailback,tv_liaohao,tv_barremain,tv_name,
+            tv_guige,tv_wuliaomorencangku,tv_current_position,tv_aready_stored_in_storage_space,tv_end_data;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_free_listing;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getResources().getString(R.string.free_listing));
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+        mBarcodeEditText = root.findViewById(R.id.barcode_info_collect_barcode_et);
+        mConfirmButton = root.findViewById(R.id.barcode_info_collect_confirm_btn);
+        mResultTextView = root.findViewById(R.id.barcode_info_collect_result_tv);
+        cet_material_rack = (ClearableEditText) root.findViewById(R.id.cet_material_rack);
+        cb_free_listing = (CheckBox) root.findViewById(R.id.cb_free_listing);
+        ll_shangjia = root.findViewById(R.id.ll_shangjia);
+        tv_liaojia = root.findViewById(R.id.tv_liaojia);
+        tv_barcode_tailback = root.findViewById(R.id.tv_barcode_tailback);
+        tv_liaohao = root.findViewById(R.id.tv_liaohao);
+        tv_barremain = root.findViewById(R.id.tv_barremain);
+        tv_name = root.findViewById(R.id.tv_name);
+        tv_guige = root.findViewById(R.id.tv_guige);
+        tv_wuliaomorencangku = root.findViewById(R.id.tv_wuliaomorencangku);
+        tv_current_position = root.findViewById(R.id.tv_current_position);
+        tv_aready_stored_in_storage_space = root.findViewById(R.id.tv_aready_stored_in_storage_space);
+        ll_end_data = root.findViewById(R.id.ll_end_data);
+        tv_end_data = root.findViewById(R.id.tv_end_data);
+
+        btn_kill = mActivity.findViewById(R.id.btn_kill);
+
+        cet_material_rack.requestFocus();
+        jsonObject=new org.json.JSONObject();
+    }
+
+    @Override
+    protected void initEvents() {
+        //料架回车
+        CommonUtil.setEditorActionListener(cet_material_rack, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                if (!text.isEmpty()&&!cet_material_rack.getText().toString().isEmpty()){
+                    materialRackCode();
+                }
+            }
+        });
+        //条码回车
+        CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                try{
+                    if (!TextUtils.isEmpty(cet_material_rack.getText().toString().trim())
+                            && !TextUtils.isEmpty(mBarcodeEditText.getText().toString().trim())
+                    ){
+                        getBarAcceptCode(mBarcodeEditText.getText().toString().trim(),cet_material_rack.getText().toString().trim());
+                    }
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        mConfirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getBarAcceptCode(mBarcodeEditText.getText().toString().trim(),cet_material_rack.getText().toString().trim());
+            }
+        });
+        btn_kill.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String userName = SharedPreUtil.getString(mActivity, SharedPreUtil.KEY_USERNAME, "");
+                new AlertDialog.Builder(getActivity()).setTitle("提示")
+                        .setMessage("是否结束（" + userName + "）的所有进行中的上架任务？")
+                        .setPositiveButton("是", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                                savekillAcceptCode("");
+                            }
+                        })
+                        .setNegativeButton("否", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        })
+                        .show();
+            }
+        });
+
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+        initPopupWindow();
+        mMenuButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
+                mMenuPopupWindow.showAsDropDown(mMenuButton);
+            }
+        });
+    }
+
+    private void materialRackCode() {
+        String materialRack = cet_material_rack.getText().toString().trim();
+        if (TextUtils.isEmpty(materialRack)) {
+            CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.Please_enter_the_material_rack));
+            cet_material_rack.requestFocus();
+            return;
+        }
+
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_CHECK_SHELF)
+                .method(Request.Method.GET)
+                .addParam("shcode",materialRack)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                org.json.JSONObject resultObject = new org.json.JSONObject(o.toString());
+                mResultTextView.setVisibility(View.VISIBLE);
+                ll_shangjia.setVisibility(View.GONE);
+                ll_end_data.setVisibility(View.GONE);
+                if (resultObject.optBoolean("success")) {
+                    mResultTextView.setTextColor(getResources().getColor(R.color.blue));
+                    mResultTextView.setText(getResources().getText(R.string.Shelf_validation_successful));
+                    if (!cb_free_listing.isChecked()){
+                        cet_material_rack.setText("");
+                    }
+                    //mBarcodeEditText.setText("");
+                    mBarcodeEditText.requestFocus();
+                }else {
+                    mResultTextView.setTextColor(getResources().getColor(R.color.red));
+                    mResultTextView.setText(resultObject.getString("message"));
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                cet_material_rack.setText(null);
+                cet_material_rack.requestFocus();
+                mResultTextView.setVisibility(View.VISIBLE);
+                mResultTextView.setTextColor(getResources().getColor(R.color.red));
+                mResultTextView.setText(failStr);
+                ll_shangjia.setVisibility(View.GONE);
+                ll_end_data.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    private void initPopupWindow() {
+        View view = View.inflate(getActivity(), R.layout.pop_storage_recharge_menu, null);
+
+        Button doneButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_1);
+        Button todoButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_2);
+        doneButton.setText("上架任务查询");
+        todoButton.setVisibility(View.GONE);
+        mFragment = new PositionInquiryFragment();
+
+        doneButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+//                Bundle bundle = new Bundle();
+//                bundle.putString(Constants.FLAG.FLAG_RECHARGE_CALLER, "AcceptNotify!Have");
+//                mFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(FreeListingFragment.this, mFragment);
+            }
+        });
+
+        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeMenuPopupWindow();
+            }
+        });
+    }
+
+    private void closeMenuPopupWindow() {
+        if (mMenuPopupWindow != null) {
+            mMenuPopupWindow.dismiss();
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+    @Override
+    protected void initDatas() { ;
+
+    }
+
+    private void getBarAcceptCode(String barcode,String shcode) {
+        if (TextUtils.isEmpty(barcode)){
+            CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.Please_enter_the_barcode_number));
+            return;
+        }
+        if (TextUtils.isEmpty(shcode)){
+            CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.Please_enter_the_material_rack));
+            return;
+        }
+        progressDialog.show();
+        try {
+            VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                    .url(GloableParams.ADDRESS_FREE_SMART_START)
+                    .method(Request.Method.GET)
+                    .addParam("shcode", barcode)
+                    .addParam("barcode", barcode)
+                    .build(), new HttpCallback() {
+                @Override
+                public void onSuccess(int flag, Object o) throws Exception {
+                    progressDialog.dismiss();
+                    org.json.JSONObject resultObject = new org.json.JSONObject(o.toString());
+                    if (resultObject.optBoolean("success")) {
+                        cet_material_rack.requestFocus();
+                        cet_material_rack.setSelection(cet_material_rack.getText().length());
+                        ll_shangjia.setVisibility(View.VISIBLE);
+                        ll_end_data.setVisibility(View.GONE);
+
+                        JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                        String BAR_PRODCODE = dataObject.getString("BAR_PRODCODE") == null ? "" : dataObject.getString("BAR_PRODCODE");
+                        String PR_DETAIL = dataObject.getString("PR_DETAIL") == null ? "" : dataObject.getString("PR_DETAIL");
+                        String PR_SPEC = dataObject.getString("PR_SPEC") == null ? "" : dataObject.getString("PR_SPEC");
+                        String PR_ORISPECCODE = dataObject.getString("PR_ORISPECCODE") == null ? "" : dataObject.getString("PR_ORISPECCODE");
+                        String BAR_LOCATION = dataObject.getString("BAR_LOCATION") == null ? "" : dataObject.getString("BAR_LOCATION");
+                        String BAR_CODE = dataObject.getString("BAR_CODE") == null ? "" : dataObject.getString("BAR_CODE");
+                        String BAR_REMAIN = dataObject.getString("BAR_REMAIN") == null ? "" : dataObject.getString("BAR_REMAIN");
+                        String BAR_WHCODE = dataObject.getString("BAR_WHCODE") == null ? "" : dataObject.getString("BAR_WHCODE");
+                        String PR_LOCATION = dataObject.getString("PR_LOCATION") == null ? "" : dataObject.getString("PR_LOCATION");
+                        String LOCATIONS = dataObject.getString("LOCATIONS") == null ? "" : dataObject.getString("LOCATIONS");
+
+                        tv_liaojia.setText(shcode);
+                        tv_barcode_tailback.setText(barcode);
+                        tv_liaohao.setText(BAR_PRODCODE);
+                        tv_barremain.setText(BAR_REMAIN);
+                        tv_name.setText(PR_DETAIL);
+                        tv_guige.setText(PR_SPEC);
+                        tv_wuliaomorencangku.setText(PR_LOCATION);
+                        tv_current_position.setText(BAR_LOCATION);
+                        tv_aready_stored_in_storage_space.setText(LOCATIONS);
+
+                        if (cb_free_listing.isChecked()) {
+                            mBarcodeEditText.setText("");
+                        }else {
+                            mBarcodeEditText.setText("");
+                            cet_material_rack.setText("");
+                        }
+                    }
+                }
+
+                @Override
+                public void onFail(int flag, String failStr) throws Exception {
+                    progressDialog.dismiss();
+                    CommonUtil.toastNoRepeat(mActivity, failStr);
+                    mResultTextView.setTextColor(Color.RED);
+                    mResultTextView.setVisibility(View.VISIBLE);
+                    mResultTextView.setText(failStr);
+                    mBarcodeEditText.requestFocus();
+                    mBarcodeEditText.setText(null);
+                    cet_material_rack.setText(null);
+                    ll_shangjia.setVisibility(View.GONE);
+                    ll_end_data.setVisibility(View.GONE);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void savekillAcceptCode(String barcode) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_FREE_SMART_END)
+                .method(Request.Method.POST)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                org.json.JSONObject resultObject = new org.json.JSONObject(o.toString());
+                if (resultObject.optBoolean("success")) {
+                    mResultTextView.setVisibility(View.VISIBLE);
+                    ll_shangjia.setVisibility(View.GONE);
+                    ll_end_data.setVisibility(View.VISIBLE);
+                    mResultTextView.setText(null);
+                    mBarcodeEditText.setText(null);
+                    mBarcodeEditText.requestFocus();
+                    mResultTextView.setTextColor(getResources().getColor(R.color.blue));
+                    mResultTextView.setText("结束上架操作成功");
+
+                    cet_material_rack.requestFocus();
+                    cet_material_rack.setSelection(cet_material_rack.getText().length());
+
+                    JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                    tv_end_data.setText(dataObject.toJSONString());
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mResultTextView.setTextColor(getResources().getColor(R.color.red));
+                mResultTextView.setVisibility(View.VISIBLE);
+                mResultTextView.setText(failStr);
+                mBarcodeEditText.requestFocus();
+                mBarcodeEditText.setText(null);
+                cet_material_rack.setText(null);
+                ll_shangjia.setVisibility(View.GONE);
+                ll_end_data.setVisibility(View.GONE);
+            }
+        });
+
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.barcode_info_collect_barcode_et) {
+                    mBarcodeEditText.setText(result);
+                    mBarcodeEditText.setSelection(result.length());
+                    if (!TextUtils.isEmpty(cet_material_rack.getText().toString())) {
+                        getBarAcceptCode(result,cet_material_rack.getText().toString().trim());
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            FunctionActivity.setTitle(getResources().getString(R.string.free_listing));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+}

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

@@ -851,7 +851,8 @@ public class GloableParams {
     public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String MENU_STORAGE_STOCK_INFO_COLLECT = "库存条码绑定";
 //    public static final String GRIDNAME_SMART_SHELVES = "智能上架(扫码)";
-    public static final String GRIDNAME_SMART_SHELVES = "AGV上架";
+//    public static final String GRIDNAME_SMART_SHELVES = "AGV上架";
+    public static final String GRIDNAME_SMART_SHELVES = "自由上架";
     public static final String[] storageGridNames = {
             GRIDNAME_GOOD_SEARCH,
             GRIDNAME_BATCH_OPRATION,

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

@@ -0,0 +1,387 @@
+<?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="match_parent"
+    xmlns:ndroid="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:padding="@dimen/root_layout_padding">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <CheckBox
+            android:id="@+id/cb_free_listing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:text="@string/continuously_listed"
+            android:textSize="16sp"
+            />
+
+        <LinearLayout
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/material_in_collect_location_tv"
+                android:layout_width="70dp"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="@string/material_rack"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp"  />
+
+            <com.uas.keg_wms_new.view.ClearableEditText
+                android:id="@+id/cet_material_rack"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:hint="@string/Please_enter_the_material_rack"
+                android:background="@drawable/shape_msg_block"
+                android:lines="1"
+                android:maxLines="1"
+                android:textColor="@color/black"
+                android:singleLine="true"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="70dp"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="6dp"
+                android:text="@string/string_barcode"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.keg_wms_new.view.ClearableEditText
+                    android:id="@+id/barcode_info_collect_barcode_et"
+                    style="@style/EditTextStyle"
+                    android:background="@drawable/shape_msg_block"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:hint="@string/please_collect_barcode"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/barcode_info_collect_confirm_btn"
+            style="@style/ButtonStyle"
+            android:layout_marginTop="16dp"
+            android:text="上架"
+            android:layout_weight="1"/>
+        <Button
+            android:id="@+id/btn_kill"
+            style="@style/ButtonStyle"
+            android:layout_marginTop="16dp"
+            android:text="结束上架"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        tools:visibility="visible"
+        android:visibility="gone"
+        android:id="@+id/ll_shangjia"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/shape_msg_block"
+        android:padding="10dp"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            >
+
+            <TextView
+                android:id="@+id/tv_material_rack"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/material_rack"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_material_rack_flag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:text="："
+                android:layout_toEndOf="@+id/tv_material_rack"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:layout_toEndOf="@+id/tv_material_rack_flag"
+               android:id="@+id/tv_liaojia"
+                />
+
+            <TextView
+                android:layout_toStartOf="@+id/tv_barcode_tailback"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_barcode_tailback"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_barcode_tailback"
+                android:layout_alignParentEnd="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </RelativeLayout>
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            >
+
+            <TextView
+                android:id="@+id/tv_procode_tailback"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_procode_tailback"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_liaohao"
+                android:layout_toEndOf="@+id/tv_procode_tailback"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:layout_toStartOf="@+id/tv_barremain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_barremain"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_barremain"
+                android:layout_alignParentEnd="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_marginTop="2dp"
+            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="@string/pr_detail"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="2dp"
+            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="@string/pr_spec"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_guige"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            >
+
+            <TextView
+                android:id="@+id/tv_default_warehouse_for_materials"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/Default_warehouse_for_materials"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_default_warehouse_for_materials_flag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:text="："
+                android:layout_toEndOf="@+id/tv_default_warehouse_for_materials"
+                />
+
+            <TextView
+                android:id="@+id/tv_wuliaomorencangku"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:layout_toEndOf="@+id/tv_default_warehouse_for_materials_flag"
+                />
+
+            <TextView
+                android:layout_toStartOf="@+id/tv_current_position_flag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/Current_position"
+                android:textSize="12sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_current_position_flag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:text="："
+                android:layout_toStartOf="@+id/tv_current_position"
+                />
+
+            <TextView
+                android:id="@+id/tv_current_position"
+                android:layout_alignParentEnd="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="2dp"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/aready_stored_in_storage_space"
+                android:textSize="12sp"
+                />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:text="："
+                />
+
+            <TextView
+                android:id="@+id/tv_aready_stored_in_storage_space"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_end_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="@dimen/spacing_big"
+        android:background="@drawable/shape_msg_block"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:padding="10dp"
+        >
+
+        <TextView
+            android:id="@+id/tv_end_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="料架：xxxx，条码:xxxx 结束上架成功" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_big"
+        android:background="@drawable/shape_msg_block"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/barcode_info_collect_result_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子" />
+
+
+    </LinearLayout>
+
+
+</LinearLayout>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 1,
-            versionName      : "v1.0.0"
+            versionCode      : 2,
+            versionName      : "v1.0.1"
     ]
 
     depsVersion = [