Browse Source

条码数量修改页取消数量限制, 修改APP名称

songw 3 months ago
parent
commit
44ea76bb9f

+ 1 - 1
app/build.gradle

@@ -41,7 +41,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "LG_UAS_PDA_SMART_COM_LGRELEASE_${releaseInfo}.apk"
+                    fileName = "联淦WMS_${releaseInfo}.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()

+ 3 - 3
app/src/main/java/com/uas/pda_smart_com_lg/fragment/ModifyBarcodeQuantityFragment.java

@@ -26,7 +26,6 @@ import com.uas.pda_smart_com_lg.global.GloableParams;
 import com.uas.pda_smart_com_lg.tools.VolleyUtil;
 import com.uas.pda_smart_com_lg.util.CameraUtil;
 import com.uas.pda_smart_com_lg.util.CommonUtil;
-import com.uas.pda_smart_com_lg.util.Constants;
 import com.uas.pda_smart_com_lg.util.JsonUtils;
 import com.uas.pda_smart_com_lg.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -133,9 +132,10 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_barcode));
                 } else if (TextUtils.isEmpty(quantity)) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
-                } else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
                 }
+//                else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
+//                    CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
+//                }
 //                else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
 //                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
 //                }

+ 2 - 1
app/src/main/java/com/uas/pda_smart_com_lg/util/PrintUtils.java

@@ -71,7 +71,8 @@ public class PrintUtils {
                                         fontSize=1;
                                     }
                                     printHelper = printHelper.printText("")
-                                            .setTextAutLine(printX+"",printY + (int) ((0.6 * dpi) / 25.4)+"",lp_width,fontSize,false,false,printText)
+                                            .setTextAutLine(printX+"",printY + (int) ((0.6 * dpi) / 25.4)+"",
+                                                    lp_width,fontSize,false,false,printText)
 //                                            .setX(printX)
 //                                            .setY(printY + (int) ((0.6 * dpi) / 25.4))
 //                                            .setBold(2)

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="my_app_name">UAS智能终端系统联淦</string>
+    <string name="my_app_name">联淦WMS</string>
     <string name="my_app_name_test">PDA-仓库通用</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

+ 2 - 2
build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 34,
-            versionName      : "v2.4.0"
+            versionCode      : 35,
+            versionName      : "v2.4.1"
     ]
 
     depsVersion = [