最新代码

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/misc.xml

@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/uas/equipment/fragment/StorageInFragment.java

@@ -11,7 +11,9 @@ import android.support.v4.content.ContextCompat;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -44,6 +46,7 @@ import com.uas.equipment.util.FragmentUtils;
 import com.uas.equipment.util.HttpCallback;
 import com.uas.equipment.util.HttpParams;
 import com.uas.equipment.util.VollyRequest;
+import com.uas.equipment.view.ClearableEditText;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -72,6 +75,8 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
     private Column<String> mNumColumn, mClassColumn, mPdaStatusColumn, mDE_DCKIND,mDE_NEXTDATEBYWEEK,mWhcodeColumn,
             mSupplierColumn,mWhcodeDesColumn,mMi_yeaRColumn,mMi_tallyColumn,mMi_calibrationColumn;
     private Button mMenuButton;
+    private ClearableEditText cet_barcaode;
+    private ImageView iv_scan;
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
     private String de_code1;
@@ -93,7 +98,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
         mMoreBtn = mActivity.findViewById(R.id.btn_actionbar_more);
 //        打开相机扫一扫
-        CommonUtil.scanBarcode(mActivity, this, 0x10);
+//        CommonUtil.scanBarcode(mActivity, this, 0x10);
     }
 
     @Override
@@ -108,6 +113,8 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         tv_de_telvendor = root.findViewById(R.id.tv_de_telvendor);
         tv_de_location = root.findViewById(R.id.tv_de_location);
         mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
+        cet_barcaode = (ClearableEditText) root.findViewById(R.id.cet_barcaode);
+        iv_scan = (ImageView) root.findViewById(R.id.iv_scan);
 
         mSmartTable = root.findViewById(R.id.pda_wms_in_filter_list_st);
 
@@ -117,6 +124,26 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this);
         }
+
+        cet_barcaode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = cet_barcaode.getText().toString().trim();
+                    getNewData(va_code);
+                    return true;
+                }
+                return false;
+            }
+        });
+        iv_scan.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.scanBarcode(mActivity, StorageInFragment.this, 0x10);
+            }
+        });
     }
     private List<itemdata> mitemdata = new ArrayList<>();
     @Override

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

@@ -1,184 +1,236 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:orientation="vertical">
+
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/pda_wms_in_filter_list_srl"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <com.scwang.smartrefresh.layout.header.ClassicsHeader
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
         <LinearLayout
-            android:background="@color/white"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@color/white"
             android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="15dp"
+                android:background="@drawable/bg_line_edittext">
+
+                <com.uas.equipment.view.ClearableEditText
+                    android:id="@+id/cet_barcaode"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="请输入条码号"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/iv_scan"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginRight="10dp"
+                    android:clickable="false"
+                    android:src="@drawable/ic_edittext_scan" />
+            </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="设备号："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="设备号：" />
+
                 <TextView
                     android:id="@+id/tv_de_code"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="品牌："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="品牌：" />
+
                 <TextView
                     android:id="@+id/tv_de_vendor"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
 
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="名称："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="名称：" />
+
                 <TextView
                     android:id="@+id/tv_de_name"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="规格："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="规格：" />
+
                 <TextView
                     android:id="@+id/tv_de_spec"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="储位："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="储位：" />
+
                 <TextView
                     android:id="@+id/tv_de_location"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="当前部门名称："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="当前部门名称：" />
+
                 <TextView
                     android:id="@+id/tv_de_currentcentername"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
 
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="厂商联系人："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="厂商联系人：" />
+
                 <TextView
                     android:id="@+id/tv_de_contact"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:background="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_10"
+                android:background="@color/white"
                 android:orientation="horizontal">
+
                 <TextView
-                    android:text="厂商电话："
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="厂商电话：" />
+
                 <TextView
                     android:id="@+id/tv_de_telvendor"
-                    android:text=""
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:text="" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/dp_10"
+                android:orientation="vertical">
+
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/smar_item1"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:layout_marginBottom="5dp"/>
+                    android:layout_marginBottom="5dp"
+                    android:layout_weight="1" />
 
                 <com.bin.david.form.core.SmartTable
-                    android:layout_marginTop="5dp"
                     android:id="@+id/pda_wms_in_filter_list_st"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
+                    android:layout_marginTop="5dp"
                     android:layout_weight="1.7" />
 
             </LinearLayout>
 
 
-
         </LinearLayout>
 
         <com.scwang.smartrefresh.layout.footer.ClassicsFooter
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
 

build.gradle

@@ -3,6 +3,10 @@
 buildscript {
 //    ext.kotlin_version = '1.2.30'
     repositories {
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
@@ -13,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
@@ -58,8 +62,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 11,
+            versionName      : "v1.0.0"
     ]
 
     depsVersion = [

gradle/wrapper/gradle-wrapper.properties

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

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -6,13 +6,5 @@ package com.handmark.pulltorefresh.library;
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
   public static final String LIBRARY_PACKAGE_NAME = "com.handmark.pulltorefresh.library";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 10;
-  public static final String VERSION_NAME = "v1.0";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

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

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Jan 22 14:44:47 CST 2024
+#Thu Dec 19 17:13:00 CST 2024
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\layout\\pull_to_refresh_header_vertical.xml=D\:\\AndroidData\\NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\layout\\pull_to_refresh_header_vertical.xml

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="10"
-5    android:versionName="v1.0" >
+4    android:versionCode="2110"
+5    android:versionName="2.1.1" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/outputs/logs/manifest-merger-debug-report.txt

@@ -2,10 +2,6 @@
 manifest
 ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
 INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
-INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
 INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:1-10:12
 	package
 		ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:3:5-49
@@ -13,14 +9,10 @@ INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrar
 		INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	android:versionName
 		ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:5:5-32
-		INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 	xmlns:android
 		ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:2:11-69
 	android:versionCode
 		ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:4:5-31
-		INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
-		INJECTED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml
 application
 ADDED from D:\AndroidData\NewEquipmentManagement\pda_libs\pulltoreflashlibrary\src\main\AndroidManifest.xml:8:5-20
 uses-sdk