bug修复

app/build.gradle

@@ -41,11 +41,10 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_PDA_RELEASE_${releaseInfo}.apk"
-
+                    fileName = "UAS_PDA_WANLIDA_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_PDA_DEBUG_${debugInfo}.apk"
+                    fileName = "UAS_PDA_WANLIDA_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

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

@@ -67,18 +67,18 @@ public class IndexShopContentFragment extends BaseFragment implements AdapterVie
                 CommonUtil.toastNoRepeat(mActivity, "该功能正在开发");
                 break;
             //飞达上料
-            case GloableParams.GRIDNAME_MATERIAL_ADD:
+            case GloableParams.GRIDNAME_MATERIAL_ADD://异常预警
 //                fragment = new SCFeederPrepareFragment();
 //                getFragmentManager().beginTransaction().addToBackStack(null)
 //                        .replace(R.id.container_function_fragment, fragment,FunctionActivity.TAG_SCMAKE_FEEDER).commit();
                 CommonUtil.toastNoRepeat(mActivity, "该功能正在开发");
                 break;
             //尾料还仓
-            case GloableParams.GRIDNAME_SURPLUS_RECURRENCE:
-//                fragment = new SCTailingBackFragment();
-//                getFragmentManager().beginTransaction().addToBackStack(null)
-//                        .replace(R.id.container_function_fragment, fragment).commit();
-                CommonUtil.toastNoRepeat(mActivity, "该功能正在开发");
+            case GloableParams.GRIDNAME_SURPLUS_RECURRENCE://实时监控
+                fragment = new SCTailingBackFragment();
+                getFragmentManager().beginTransaction().addToBackStack(null)
+                        .replace(R.id.container_function_fragment, fragment).commit();
+        //        CommonUtil.toastNoRepeat(mActivity, "该功能正在开发");
                 break;
         }
     }

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

@@ -27,6 +27,9 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 /**
  * @note:条码信息核查页面
  */
@@ -150,8 +153,12 @@ public class WHCheckBarcodeFragment extends BaseFragment implements View.OnClick
         }
         //发送请求至服务器
         showLoadingView();
-        VolleyUtil.getVolleyUtil().requestBarcodeCheck(getActivity(), GloableParams.ADDRESS_WHCHECK_BARCODE, VolleyUtil.METHOD_GET,
-                VolleyUtil.FRAGMETN_WHCHECK_BARCODE, strBarcode);
+        try {
+            VolleyUtil.getVolleyUtil().requestBarcodeCheck(getActivity(), GloableParams.ADDRESS_WHCHECK_BARCODE, VolleyUtil.METHOD_GET,
+                    VolleyUtil.FRAGMETN_WHCHECK_BARCODE, URLEncoder.encode(strBarcode, "utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
     }
 
     //将服务器返回的null值转换为“ ”

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

@@ -32,6 +32,8 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -225,15 +227,19 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
 
         JSONObject paramJson = new JSONObject();
         try {
-            paramJson.put("whcode", strWhcode);
-            paramJson.put("code ", strCode);
+            paramJson.put("whcode",URLEncoder.encode(strWhcode, "UTF-8"));
+            paramJson.put("code", URLEncoder.encode(strCode, "UTF-8"));
             paramJson.put("type", type);
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         //请求条码数据
         requestType = VolleyUtil.FRAGMETN_WHTRANSFER_DATA;
-        VolleyUtil.getVolleyUtil().requestCodeData(getActivity(), GloableParams.ADDRESS_WHTRANSFER_DATA, VolleyUtil.METHOD_GET, requestType, strWhcode, strCode, type);
+        try {
+            VolleyUtil.getVolleyUtil().requestCodeData(getActivity(), GloableParams.ADDRESS_WHTRANSFER_DATA, VolleyUtil.METHOD_GET, requestType, URLEncoder.encode(strWhcode, "UTF-8"), URLEncoder.encode(strCode, "UTF-8"), type);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
     }
 
     //转移按钮点击事件/etNewLocation回车事件

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

@@ -658,7 +658,7 @@ public class GloableParams {
     //INDEX:车间管理Index
     public static final String GRIDNAME_MATERIAL_PREPARE = "工单备料";
     public static final String GRIDNAME_MATERIAL_ADD = "异常预警";
-    public static final String GRIDNAME_SURPLUS_RECURRENCE = "实时监控";
+    public static final String GRIDNAME_SURPLUS_RECURRENCE = "尾料还仓";
     public static String[] workhouseGridNames = {GRIDNAME_MATERIAL_PREPARE, GRIDNAME_MATERIAL_ADD, GRIDNAME_SURPLUS_RECURRENCE};
     //    public static String[] workhouseGridNames = {GRIDNAME_SMTMATERIAL_ADD};
     public static int[] worlhouseGridImgs = {R.drawable.ic_job_stock, R.drawable.ic_early_warning, R.drawable.ic_realtime_monitor};

build.gradle

@@ -1,5 +1,3 @@
-import sun.security.krb5.internal.crypto.Des
-
 // 万利达、高登
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
@@ -45,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 17,
-            versionName      : "v3.3"
+            versionCode      : 18,
+            versionName      : "v3.4"
     ]
 
     depsVersion = [