Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/example/beijing_daxing/HomePageActivity.java
#	app/src/main/java/com/example/beijing_daxing/InActivity.java
#	app/src/main/java/com/example/beijing_daxing/OutActivity.java
#	app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java

app/build.gradle

@@ -39,43 +39,23 @@ android {
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    //noinspection GradleCompatible
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation files('libs\\App_Demo_API.jar')
-    implementation files('libs\\DeviceAPIver20150204.jar')
-    implementation files('libs\\logutil-1.5.1.1.jar')
-    implementation files('libs\\ModuleAPI_J.jar')
-    implementation files('libs\\reader(1).jar')
-    implementation files('libs\\UHF67_v3.6.jar')
-//    implementation files('libs\\uhflonger_v1.3.jar')
-//    implementation files('libs\\ModuleAPI_J.jar')
+    implementation files('libs\\6109\\App_Demo_API.jar')
+    implementation files('libs\\6109\\DeviceAPIver20150204.jar')
+    implementation files('libs\\6109\\logutil-1.5.1.1.jar')
+    implementation files('libs\\6109\\ModuleAPI_J.jar')
+    implementation files('libs\\6109\\reader(1).jar')
+    implementation files('libs\\6109\\UHF67_v3.6.jar')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
     implementation 'com.lzy.net:okgo:3.0.4'
-    // https://mvnrepository.com/artifact/com.google.code.gson/gson
     implementation 'com.google.code.gson:gson:2.10.1'
-    // https://mvnrepository.com/artifact/com.contrarywind/Android-PickerView
-//    implementation 'com.contrarywind:Android-PickerView:4.1.9'
     implementation 'org.litepal.android:java:3.0.0'
-
-
     implementation 'com.github.xuexiangjys:XUpdate:2.1.4'
     implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.1'
-//
-//
-//    implementation 'com.lzy.net:okhttputils:1.6.0'  //可以单独使用，不需要依赖下方的扩展包
-//    implementation 'com.lzy.net:okhttpserver:0.1.7' //扩展了下载管理和上传管理，根据需要添加
-
-//    implementation 'com.jakewharton:butterknife:10.2.0'
-//    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
-//    implementation 'com.github.bumptech.glide:glide:4.8.0'
-//    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
-
-    // https://mvnrepository.com/artifact/com.github.bumptech.glide/glide
     implementation 'com.github.bumptech.glide:glide:4.16.0'
 
 }

app/src/main/java/com/example/beijing_daxing/base/MyApplication.java

@@ -39,7 +39,8 @@ import okhttp3.OkHttpClient;
 public class MyApplication extends Application {
 
     MyApplication application;
-    public static UHFRManager uhfLongerManager;
+    // public static UHFRManager uhfLongerManager;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -47,32 +48,30 @@ public class MyApplication extends Application {
         LitePal.initialize(this);
         SharedPreferencesUtils.init(getApplicationContext(), "myapp");
         okGoBase();
-        getUhfLongerManager();
-        XUpdate.get()
-                .debug(true)
-                .isWifiOnly(false)                                               //默认设置只在wifi下检查版本更新
-                .isGet(true)                                                    //默认设置使用get请求检查版本
-                .isAutoMode(false)                                              //默认设置非自动模式，可根据具体使用配置
+        // getUhfLongerManager();
+        XUpdate.get().debug(true).isWifiOnly(false)                                               // 默认设置只在wifi下检查版本更新
+                .isGet(true)                                                    // 默认设置使用get请求检查版本
+                .isAutoMode(false)                                              // 默认设置非自动模式，可根据具体使用配置
                 // .param("versionCode", UpdateUtils.getVersionCode(this))         //设置默认公共请求参数
                 // .param("appKey", getPackageName())
 
-                .supportSilentInstall(false)                                     //设置是否支持静默安装，默认是true
-                .setIUpdateHttpService(new OkHttpUpdateHttpServiceImpl())           //这个必须设置！实现网络请求功能。
+                .supportSilentInstall(false)                                     // 设置是否支持静默安装，默认是true
+                .setIUpdateHttpService(new OkHttpUpdateHttpServiceImpl())           // 这个必须设置！实现网络请求功能。
                 .init(this);
     }
 
-    public static UHFRManager getUhfLongerManager() {
-        if (uhfLongerManager==null){
-            try {
-                uhfLongerManager = UHFRManager.getInstance();
-                uhfLongerManager.setPower(33,33);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return uhfLongerManager;
-    }
+    // public static UHFRManager getUhfLongerManager() {
+    //     if (uhfLongerManager==null){
+    //         try {
+    //             uhfLongerManager = UHFRManager.getInstance();
+    //             uhfLongerManager.setPower(33,33);
+    //         } catch (Exception e) {
+    //             e.printStackTrace();
+    //         }
+    //     }
+    //
+    //     return uhfLongerManager;
+    // }
     // OKGO 初始化
     private void okGoBase() {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
@@ -85,11 +84,11 @@ public class MyApplication extends Application {
         HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory();
         builder.sslSocketFactory(sslParams1.sSLSocketFactory, sslParams1.trustManager);
         builder.addInterceptor(loggingInterceptor);
-// 全局的读取超时时间
+        // 全局的读取超时时间
         builder.readTimeout(3000, TimeUnit.MILLISECONDS);
-// 全局的写入超时时间
+        // 全局的写入超时时间
         builder.writeTimeout(3000, TimeUnit.MILLISECONDS);
-// 全局的连接超时时间
+        // 全局的连接超时时间
         builder.connectTimeout(3000, TimeUnit.MILLISECONDS);
         // 使用内存保持cookie，app退出后，cookie消失
         builder.cookieJar(new CookieJarImpl(new MemoryCookieStore()));
@@ -101,4 +100,6 @@ public class MyApplication extends Application {
 
     }
 
+
+
 }

app/src/main/java/com/example/beijing_daxing/rfid/RFID.java

@@ -0,0 +1,10 @@
+package com.example.beijing_daxing.rfid;
+
+public interface RFID {
+    void initRFIDModel();
+    void setPower(int power);
+    void sanRFID();
+    void close();
+
+
+}

app/src/main/java/com/example/beijing_daxing/rfid/impl/Device6109.java

@@ -0,0 +1,60 @@
+package com.example.beijing_daxing.rfid.impl;
+
+import android.util.Log;
+
+import com.example.beijing_daxing.rfid.RFID;
+import com.handheld.uhfr.UHFRManager;
+import com.uhf.api.cls.Reader;
+
+import java.util.List;
+
+public class Device6109 implements RFID {
+
+    private UHFRManager uhfrManager;
+    private EpcDataInterface epcDataInterface;
+
+    public Device6109(EpcDataInterface epcDataInterface) {
+        this.epcDataInterface = epcDataInterface;
+    }
+
+    public Device6109() {
+    }
+
+    @Override
+    public void initRFIDModel() {
+        if (uhfrManager == null) {
+            uhfrManager = UHFRManager.getInstance();
+        }
+        uhfrManager.asyncStartReading();
+    }
+
+    @Override
+    public void setPower(int power) {
+        Reader.READER_ERR readerErr = uhfrManager.setPower(power, power);
+        Log.e("TAG", "setPower:" + readerErr);
+    }
+
+    @Override
+    public void sanRFID() {
+        List<Reader.TAGINFO> data = uhfrManager.tagInventoryRealTime();
+        if (data == null || data.isEmpty()) {
+            return;
+        }
+        epcDataInterface.epcData(data);
+    }
+
+    @Override
+    public void close() {
+        if (uhfrManager == null) {
+            return;
+        }
+        uhfrManager.asyncStopReading();
+        uhfrManager.close();
+        uhfrManager = null;
+    }
+
+
+    public interface EpcDataInterface {
+        void epcData(List<Reader.TAGINFO> data);
+    }
+}