内容过长, 不宜展示

app/build.gradle

@@ -23,6 +23,10 @@ android {
                 includeCompileClasspath = true
             }
         }
+        ndk {
+            //设置支持的SO库架构（开发者可以根据需要，选择一个或多个平台的so）
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+        }
     }
     buildTypes {
         release {
@@ -80,9 +84,10 @@ dependencies {
     implementation deps.permisson
     implementation deps.basePopup
     implementation deps.smartTable
-    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数据请一定集成，可选
+// 友盟基础组件库（所有友盟业务SDK都依赖基础组件库）
+    implementation 'com.umeng.umsdk:common:9.4.4' //（必选）
+    implementation 'com.umeng.umsdk:asms:1.4.1' // asms包依赖(必选)
+    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选)
 }
 
 def getVersionName() {

app/proguard-rules.pro

@@ -166,4 +166,17 @@
 ################################
 ##实体类
 #-keep class com.uas.pda_smart_com.bean.** {*;}
-##-keep .** {*;}
+##-keep .** {*;}
+
+#友盟混淆
+-keep class com.umeng.** {*;}
+-keep class org.repackage.** {*;}
+-keep class com.uyumao.** { *; }
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+

app/src/main/AndroidManifest.xml

@@ -18,6 +18,10 @@
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:name="com.uas.pda_smart_com.application.PdaApplication"
         android:allowBackup="true"

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

@@ -65,16 +65,19 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        //请求储位  no use
-        VolleyUtil.requestGetUseLocationOrNot(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA,
-                VolleyUtil.METHOD_POST, pageType);
-        //原材料出库采集方式  CollectAlreadyFragment...
-        VolleyUtil.requestProdOutType(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA);
-        //获取条码打印模板
-        getPrintTemplate();
-        pdaApplication = new PdaApplication();
-        pdaApplication.startCountdown();
+        try {
+            //请求储位  no use
+            VolleyUtil.requestGetUseLocationOrNot(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA,
+                    VolleyUtil.METHOD_POST, pageType);
+            //原材料出库采集方式  CollectAlreadyFragment...
+            VolleyUtil.requestProdOutType(getApplicationContext(), GloableParams.ADDRESS_GET_FIELD_DATA);
+            //获取条码打印模板
+            getPrintTemplate();
+            pdaApplication = new PdaApplication();
+            pdaApplication.startCountdown();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     private void getPrintTemplate() {

app/src/main/java/com/uas/pda_smart_com/application/PdaApplication.java

@@ -135,12 +135,12 @@ public class PdaApplication extends Application {
 
     private void initUmeng() {
         //2.在Application.oncreate()中调用预初始化函数
-        UMConfigure.preInit(this, "6170b8b61c91e0671bb0da5a","umeng");
+        UMConfigure.preInit(this, "67bc46458f232a05f11cc56f","umeng");
         UMConfigure.setLogEnabled(true);
         //3.客户端用户同意隐私政策后，正式初始化友盟+SDK
         UMConfigure.init(
                 this,
-                "6170b8b61c91e0671bb0da5a",
+                "67bc46458f232a05f11cc56f",
                 "umeng",
                 UMConfigure.DEVICE_TYPE_PHONE, ""
         );

app/src/main/java/com/uas/pda_smart_com/bean/OutboundOrderBean.java

@@ -0,0 +1,55 @@
+package com.uas.pda_smart_com.bean;
+
+public
+        /**
+         * Created by sw on 2025-02-24
+         */
+class OutboundOrderBean {
+
+    public long getPI_ID() {
+        return PI_ID;
+    }
+
+    public void setPI_ID(long PI_ID) {
+        this.PI_ID = PI_ID;
+    }
+
+    private long PI_ID;
+    private String pI_INOUTNO;
+    private String pI_CLASS;
+    private String pI_PDASTATUS;
+
+    private String PD_WHCODE;
+
+    public String getPD_WHCODE() {
+        return PD_WHCODE;
+    }
+
+    public void setPD_WHCODE(String PD_WHCODE) {
+        this.PD_WHCODE = PD_WHCODE;
+    }
+
+    public String getPI_INOUTNO() {
+        return pI_INOUTNO;
+    }
+
+    public void setPI_INOUTNO(String pI_INOUTNO) {
+        this.pI_INOUTNO = pI_INOUTNO;
+    }
+
+    public String getPI_CLASS() {
+        return pI_CLASS;
+    }
+
+    public void setPI_CLASS(String pI_CLASS) {
+        this.pI_CLASS = pI_CLASS;
+    }
+
+    public String getPI_PDASTATUS() {
+        return pI_PDASTATUS;
+    }
+
+    public void setPI_PDASTATUS(String pI_PDASTATUS) {
+        this.pI_PDASTATUS = pI_PDASTATUS;
+    }
+}

app/src/main/java/com/uas/pda_smart_com/fragment/IOCOutMakeMaterial.java

@@ -42,6 +42,7 @@ import com.uas.pda_smart_com.R;
 import com.uas.pda_smart_com.application.PdaApplication;
 import com.uas.pda_smart_com.bean.IOCOutMakeMaterialFuzzySearch;
 import com.uas.pda_smart_com.bean.MaterialOutMessageBean;
+import com.uas.pda_smart_com.bean.OutboundOrderBean;
 import com.uas.pda_smart_com.bean.SubmitNotParam;
 import com.uas.pda_smart_com.database.DBManager;
 import com.uas.pda_smart_com.global.GloableParams;
@@ -51,10 +52,14 @@ import com.uas.pda_smart_com.tools.SharedPreUtil;
 import com.uas.pda_smart_com.tools.VolleyUtil;
 import com.uas.pda_smart_com.util.CommonUtil;
 import com.uas.pda_smart_com.util.Constants;
+import com.uas.pda_smart_com.util.FastjsonUtil;
+import com.uas.pda_smart_com.util.HttpCallback;
+import com.uas.pda_smart_com.util.HttpParams;
 import com.uas.pda_smart_com.util.JsonTools;
 import com.uas.pda_smart_com.util.JsonUtils;
 import com.uas.pda_smart_com.util.LogUtil;
 import com.uas.pda_smart_com.util.MyArrayAdapter;
+import com.uas.pda_smart_com.util.VollyRequest;
 import com.uas.pda_smart_com.view.ClearableEditText;
 
 import org.json.JSONArray;
@@ -79,8 +84,6 @@ public class IOCOutMakeMaterial extends BaseFragment {
 
     private static String TAG = "IOCOutMakeMaterial";
 
-
-
     private IOCOutMakeMaterialFuzzySearch fuzzySearchData;
     private MyArrayAdapter<String> autoStringAdapter;
     private StringRequest stringRequest, stringRequestPost;
@@ -133,23 +136,24 @@ public class IOCOutMakeMaterial extends BaseFragment {
         mProdOutType = SharedPreUtil.getString(getActivity().getApplicationContext(), Constants.FLAG.PRODOUT_TYPE_CACHE, "byBatch");
 
         dataList = (List<MaterialOutMessageBean.DataBean>) PdaApplication.getDataCacheFromMap(Constants.FLAG.MATERIAL_OUT_CACHE);
-        if (dataList == null || dataList.size() == 0) {
+        if (dataList == null) {
             dataList = new ArrayList<>();
-            adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
-            listInOut.setAdapter(adapterListView);
-        } else {
-            adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
-            listInOut.setAdapter(adapterListView);
-            if (CommonUtil.isNetWorkConnected(mActivity))
-                refreshMaterialStatus();
         }
-
+//        if (dataList == null || dataList.size() == 0) {
+//            dataList = new ArrayList<>();
+//            adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
+//            listInOut.setAdapter(adapterListView);
+//        } else {
+//            adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
+//            listInOut.setAdapter(adapterListView);
+//            if (CommonUtil.isNetWorkConnected(mActivity))
+//                refreshMaterialStatus();
+//        }
 
     }
 
     @Override
     protected void initEvents() {
-
         listInOut.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
@@ -170,38 +174,7 @@ public class IOCOutMakeMaterial extends BaseFragment {
         inOutNo.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
-                    CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
-                } else if (CommonUtil.isStringContainsSpecialChar(inOutNo.getText().toString().trim())) {
-                    CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                } else if (CommonUtil.isStringContainsSpecialChar(whCode.getText().toString().trim())) {
-                    CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
-                } else {
-                    //判断单号和仓库组合是否已经存在于变量orders中
-                    boolean isExist = false;
-                    for (int i = 0; i < dataList.size(); i++) {
-                        if ((dataList.get(i).getPI_INOUTNO()).equals(inOutNo.getText().toString().trim()) && (dataList.get(i).getPD_WHCODE()).equals(whCode.getText().toString().trim())) {
-                            isExist = true;
-                            break;
-                        }
-                    }
-                    if (isExist) {
-                        Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
-                        reset();
-                    } else {
-                        submitBtnClick();
-                    }
-                }
-            }
-        });
-
-        inOutNo.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                try {
                     if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
                         CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
                     } else if (CommonUtil.isStringContainsSpecialChar(inOutNo.getText().toString().trim())) {
@@ -224,8 +197,53 @@ public class IOCOutMakeMaterial extends BaseFragment {
                             submitBtnClick();
                         }
                     }
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
 
-                    return true;
+        inOutNo.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                try {
+                    if (actionId == EditorInfo.IME_ACTION_SEND
+                            || actionId == EditorInfo.IME_ACTION_SEARCH
+                            || actionId == EditorInfo.IME_ACTION_DONE
+                            || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                        if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
+                            CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
+                        } else if (CommonUtil.isStringContainsSpecialChar(inOutNo.getText().toString().trim())) {
+                            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                        } else if (CommonUtil.isStringContainsSpecialChar(whCode.getText().toString().trim())) {
+                            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
+                        } else {
+                            //判断单号和仓库组合是否已经存在于变量orders中
+                            boolean isExist = false;
+
+                            for (int i = 0; i < dataList.size(); i++) {
+                                try {
+                                    if ((dataList.get(i).getPI_INOUTNO()).equals(inOutNo.getText().toString().trim())
+                                            && (dataList.get(i).getPD_WHCODE()).equals(whCode.getText().toString().trim())) {
+                                        isExist = true;
+                                        break;
+                                    }
+                                }catch (Exception e) {
+                                    isExist = false;
+                                }
+                            }
+                            if (isExist) {
+                                Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
+                                reset();
+                            } else {
+                                submitBtnClick();
+                            }
+                        }
+
+                        return true;
+                    }
+                }catch (Exception e) {
+                    e.printStackTrace();
                 }
                 return false;
             }
@@ -266,7 +284,97 @@ public class IOCOutMakeMaterial extends BaseFragment {
 
     @Override
     protected void initDatas() {
+        getlistData();
+    }
 
+    private void getlistData() {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GET_OUT_PRODIO_LIST)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getlistData")
+                        .flag(0)
+//                        .addParam("sc_code", sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        try {
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                            if (isSuccess){
+                                com.alibaba.fastjson.JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+//                                if (dataArray == null || dataArray.size() == 0 && dataList.size() <= 0){
+//                                    CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+//                                    return;
+//                                }
+                                List<OutboundOrderBean> outboundOrderBeans = new ArrayList<>();
+                                for (int i = 0; i < dataArray.size(); i++) {
+                                    com.alibaba.fastjson.JSONObject jsonObject = dataArray.getJSONObject(i);
+                                    OutboundOrderBean workOrderListBean = new OutboundOrderBean();
+                                    workOrderListBean.setPI_ID(jsonObject.getLongValue("PI_ID")==-1?-1:jsonObject.getLongValue("PI_ID"));
+                                    workOrderListBean.setPI_CLASS(jsonObject.getString("PI_CLASS")==null?"":jsonObject.getString("PI_CLASS"));
+                                    workOrderListBean.setPD_WHCODE(jsonObject.getString("PD_WHCODE")==null?"":jsonObject.getString("PD_WHCODE"));
+                                    workOrderListBean.setPI_INOUTNO(jsonObject.getString("PI_INOUTNO")==null?"":jsonObject.getString("PI_INOUTNO"));
+                                    workOrderListBean.setPI_PDASTATUS(jsonObject.getString("PI_PDASTATUS")==null?"":jsonObject.getString("PI_PDASTATUS"));
+                                    outboundOrderBeans.add(workOrderListBean);
+                                }
+
+                                dataList = (List<MaterialOutMessageBean.DataBean>) PdaApplication.getDataCacheFromMap(Constants.FLAG.MATERIAL_OUT_CACHE);
+                                if (dataList == null) {
+                                    dataList = new ArrayList<>();
+                                }
+                                for (int i = 0; i < outboundOrderBeans.size(); i++) {
+                                    OutboundOrderBean outboundOrderBean = outboundOrderBeans.get(i);
+                                    MaterialOutMessageBean.DataBean dataBean = new MaterialOutMessageBean.DataBean();
+                                    dataBean.setPI_ID(outboundOrderBean.getPI_ID());
+                                    dataBean.setPI_CLASS(outboundOrderBean.getPI_CLASS());
+                                    dataBean.setPD_WHCODE(outboundOrderBean.getPD_WHCODE());
+                                    dataBean.setPI_INOUTNO(outboundOrderBean.getPI_INOUTNO());
+                                    dataBean.setPI_PDASTATUS(outboundOrderBean.getPI_PDASTATUS());
+                                    dataList.add(dataBean);
+                                }
+                                if (dataList.size() <= 0) {
+                                    dataList = new ArrayList<>();
+                                    adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
+                                    listInOut.setAdapter(adapterListView);
+                                } else {
+                                    //清除pi_id的项
+                                    dataList = removeDuplicate1(dataList);
+
+                                    adapterListView = new AdapterListView(getActivity(), R.layout.item_list_ioc_out_make_material, dataList);
+                                    listInOut.setAdapter(adapterListView);
+                                    if (CommonUtil.isNetWorkConnected(mActivity)) {
+                                        refreshMaterialStatus();
+                                    }
+                                }
+                            }
+                        }catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+    }
+
+    /**
+     * 使用for循环删除list中的PI_ID重复的元素
+     */
+    public List<MaterialOutMessageBean.DataBean> removeDuplicate1(List<MaterialOutMessageBean.DataBean>  list) {
+        for (int i = 0; i < list.size() - 1; i++) {
+            for (int j = list.size() - 1; j > i; j--) {
+                if (list.get(j).getPI_ID() == list.get(i).getPI_ID()) {
+                    list.remove(j);
+                }
+            }
+        }
+        return list;
     }
 
     @Override
@@ -320,13 +428,17 @@ public class IOCOutMakeMaterial extends BaseFragment {
                     }
                     adapterListView.notifyDataSetChanged();
                 } catch (Exception e) {
-
+                    e.printStackTrace();
                 }
             }
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
-
+                try {
+                    CommonUtil.toastNoRepeat(mActivity, error.getMessage());
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }) {
             @Override
@@ -463,7 +575,7 @@ public class IOCOutMakeMaterial extends BaseFragment {
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.clean_iv:
-                inOutNo.getText().clear();
+                inOutNo.setText("");
                 break;
             case R.id.submit_btn:
                 if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
@@ -576,7 +688,7 @@ public class IOCOutMakeMaterial extends BaseFragment {
                         }
                     }
                 } catch (Exception e) {
-
+                    e.printStackTrace();
                 }
 
             }

app/src/main/java/com/uas/pda_smart_com/fragment/InventoryCollectFragment.java

@@ -247,6 +247,7 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
                     progressDialog.dismiss();
                     bar_remain = "";
                     try {
+                        mBarcodeEditText.setText("");
                         String result = o.toString();
                         JSONObject resultObject = JSON.parseObject(result);
                         JSONObject dataObject = resultObject.getJSONObject("data");

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

@@ -255,7 +255,12 @@ public class GloableParams {
     public static String ADDRESS_GET_INVENTORY_BARCODE_DATA;     //库存条码打印
     public static String ADDRESS_GET_INVENTORY_BARCODE_FREEZE;     //库存条码冻结
 
-
+    public static String ADDRESS_GET_OUT_PRODIO_LIST;     //出库单--列表
+    public static String ASTATIONTHE_MAINTAIN_DATA;
+    public static String ASTATIONTHE_NAME_DATA;
+    public static String ASTATIONTHE_COMMIT_MAINITEM;
+    public static String ASTATIONTHE_COMMIT_DELIVERYFORREPAIR;
+    public static String ASTATIONTHE_SWEEP_DATA;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -707,6 +712,19 @@ public class GloableParams {
     //库存条码冻结
     private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE = "/scm/reserve/freezeBarcodeByPDA.action";
 
+    //出库单--获取列表
+    private static final String ADDRESSTAIL_GET_OUT_PRODIO_LIST = "/api/pda/outMaterial/getOutProdioList.action";
+
+    //保养类型
+    public static String ADDRESSTAIL_GET_MAINTAIN_DATA="/oa/device/getMaintaincode.action";
+    //项目名称
+    public static String ADDRESSTAIL_GET_NAME_DATA="/oa/device/getMaintainitem.action";
+    //保养页面提交
+    public static String ADDRESSTAIL_GET_COMMTI_MAINITEM="/oa/device/saveDevicechange.action";
+    //获取维修进度信息
+    public static String ADDRESSTAIL_GET_DELIVERYFORREPAIR="/oa/device/getDevicechange.action";
+    public static String ADDRESSTAIL_GET_SWEEP_DATA="/oa/device/getDevice.action";
+
 
 
     /***********************************************************************************************/
@@ -1118,6 +1136,13 @@ public class GloableParams {
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA;
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_FREEZE = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE;
 
+        GloableParams.ADDRESS_GET_OUT_PRODIO_LIST = uriHead + GloableParams.ADDRESSTAIL_GET_OUT_PRODIO_LIST;
+
+        GloableParams.ASTATIONTHE_MAINTAIN_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_MAINTAIN_DATA;
+        GloableParams.ASTATIONTHE_NAME_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_NAME_DATA;
+        GloableParams.ASTATIONTHE_COMMIT_MAINITEM = uriHead + GloableParams.ADDRESSTAIL_GET_COMMTI_MAINITEM;
+        GloableParams.ASTATIONTHE_COMMIT_DELIVERYFORREPAIR = uriHead + GloableParams.ADDRESSTAIL_GET_DELIVERYFORREPAIR;
+        GloableParams.ASTATIONTHE_SWEEP_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_SWEEP_DATA;
 
 
 

app/src/main/java/com/uas/pda_smart_com/util/CommonUtil.java

@@ -462,6 +462,31 @@ public class CommonUtil {
         }
     }
 
+    /**
+     * 判断字符串是否是浮点数
+     */
+    public static boolean isDouble(String value) {
+        try {
+            Double.parseDouble(value);
+            if (value.contains("."))
+                return true;
+            return false;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * 帕努单字符串是否是整数
+     * @param str
+     * @return
+     */
+    public static boolean isNumeric(String str){
+        Pattern pattern = Pattern.compile("[0-9]*");
+
+        return pattern.matcher(str).matches();
+
+    }
 
     private static String oldMsg;
     private static long time;

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

@@ -48,6 +48,8 @@ public interface Constants {
      */
     String JLTSTORAGEINISCHCKED ="is_chcked";
 
+    String STORAGEERECHADD ="add_codes";
+
     /**
     /**
      * 正则表达式

app/src/main/java/com/uas/pda_smart_com/util/VollyRequest.java

@@ -94,7 +94,7 @@ public class VollyRequest {
             }
         }
 
-        PdaApplication.mRequestQueue.cancelAll(httpParams.getTag());
+//        PdaApplication.mRequestQueue.cancelAll(httpParams.getTag());
 
         stringRequest = new StringRequest(httpParams.getMethod(), url,
                 new Response.Listener<String>() {

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

@@ -434,4 +434,5 @@
     <string name="Inventory_barcode_printing">库存条码打印</string>
     <string name="Please_enter_barcode">请输入条码</string>
 
+
 </resources>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 50,
-            versionName      : "v2.4.8"
+            versionCode      : 55,
+            versionName      : "v2.5.3"
     ]
 
     depsVersion = [