修改扫描二维码的编码

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 = "UAS_PDA_WANLIDA_RELEASE_${releaseInfo}.apk"
+                    fileName = "微浦_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_PDA_WANLIDA_DEBUG_${debugInfo}.apk"

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

@@ -676,22 +676,27 @@ public class GloableParams {
     public static final String GRIDNAME_SMTMATERIAL_ADD = "SMT上料";
     public static final String GRIDNAME_SOLDER_MANAGER = "锡膏管理";
     public static final String GRIDNAME_SETTING = "设置";
+
     public static String[] indexMainGridNames = {
             GRIDNAME_INOUT_STORAGE,
-//            GRIDNAME_SHOPCONTENT,
+            GRIDNAME_SHOPCONTENT,
             GRIDNAME_STORAGE_MANAGER,
-//            GRIDNAME_MSD_MANAGER,
-//            GRIDNAME_SMTMATERIAL_ADD,
-//            GRIDNAME_SOLDER_MANAGER,
-            GRIDNAME_SETTING};
+            GRIDNAME_MSD_MANAGER,
+            GRIDNAME_SMTMATERIAL_ADD,
+            GRIDNAME_SOLDER_MANAGER,
+            GRIDNAME_SETTING
+    };
+
     public static int[] indexMainGridImgs = {
             R.drawable.mainmenu_outinstorage,
-//            R.drawable.mainmenu_workhousemanager,
+            R.drawable.mainmenu_workhousemanager,
             R.drawable.mainmenu_storehousemanager,
-//            R.drawable.storage_msd_manager,
-//            R.drawable.ic_smt_feed,
-//            R.drawable.ic_solder_manage,
-            R.drawable.mainmenu_usersetting};
+            R.drawable.storage_msd_manager,
+            R.drawable.ic_smt_feed,
+            R.drawable.ic_solder_manage,
+            R.drawable.mainmenu_usersetting
+    };
+
     //INDEX:出入库管理Index
     public static final String GRIDNAME_CODEBAR_COLLECT = "入库";
     public static final String GRIDNAME_CODEBAR_VERIFY = "出库";

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

@@ -58,7 +58,6 @@
                 android:text="@string/text_btn_close"/>
             <Button
                 android:id="@+id/btn_print"
-                android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
                 android:text="@string/text_btn_print"/>
         </RelativeLayout>

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
 //        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.13'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pda_libs/pulltoreflashlibrary/.gitignore

@@ -0,0 +1 @@
+/build

pda_libs/pulltoreflashlibrary/src/main/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="2110"
-    android:versionName="2.1.1" >
+     >
+
 
-    <uses-sdk android:minSdkVersion="12" />
 
     <application />