feat(日志)：增加扫码器日志

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/gradle.xml

@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,8 +15,7 @@
             <option value="$PROJECT_DIR$/waynelib_" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="resolveExternalAnnotations" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
+</project>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 android {
     signingConfigs {
         debug {
-            storeFile file('C:\\Users\\10076532\\AndroidStudioProjects\\issp-dev\\issp\\signature.jks')
+            storeFile file('C:\\myFiles\\code\\androidProjects\\issp\\signature.jks')
             storePassword '123456'
             keyAlias 'isspt'
             keyPassword '123456'
@@ -21,8 +21,8 @@ android {
         applicationId "com.doverfuelingsolutions.issp"
         minSdkVersion 22
         targetSdkVersion 26
-        versionCode 22
+        versionCode 23
-        versionName "1.2.09"
+        versionName "1.2.10"
         archivesBaseName = versionName + "." + getTime()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/doverfuelingsolutions/issp/driver/scan/ComScanKeyManager.java

@@ -22,6 +22,7 @@ public class ComScanKeyManager implements ScanManager, DataReceivedListener {
 
     @Override
     public void onDataReceived(byte[] data, ScanValueListener scanValueListener) {
+        DFSLog.Companion.i("【扫码器】收到回调数据",data);
         if (data == null || data.length <= 2) return;
         /*
 //        try {
@@ -55,6 +56,7 @@ public class ComScanKeyManager implements ScanManager, DataReceivedListener {
             }
             if (code == null) return;
             if (null != scanValueListener) {
+                DFSLog.Companion.i("【扫码器】解析到的码：" + code);
                 this.scanValueListener = scanValueListener;
                 stop();
 

app/src/main/java/com/doverfuelingsolutions/issp/driver/serialPort/SerialControl.java

@@ -2,6 +2,7 @@ package com.doverfuelingsolutions.issp.driver.serialPort;
 
 import com.doverfuelingsolutions.issp.driver.printer.PrintStatusListen;
 import com.doverfuelingsolutions.issp.driver.scan.ScanValueListener;
+import com.wayne.www.waynelib.util.log.DFSLog;
 
 public class SerialControl extends SerialHelper {
     private final static String TAG = "SerialControl";
@@ -29,6 +30,7 @@ public class SerialControl extends SerialHelper {
                 return;
             }
             if (null != printStatusListen) {
+                DFSLog.Companion.i("【扫码器】回调数据");
                 listener.onDataReceived(ComRecData.bRec, printStatusListen);
                 return;
             }

app/src/main/java/com/doverfuelingsolutions/issp/driver/serialPort/SerialHelper.java

@@ -122,6 +122,7 @@ public abstract class SerialHelper {
                     byte[] buffer = new byte[512];
                     int size = mInputStream.read(buffer);
                     if (size > 0) {
+                        DFSLog.Companion.i("【扫码器】获取到输入流");
                         ComBean ComRecData = new ComBean(sPort, buffer, size);
                         onDataReceived(ComRecData);
                     }
@@ -134,6 +135,7 @@ public abstract class SerialHelper {
                 } catch (Throwable e) {
                     e.printStackTrace();
 //                    Utils.postException(e);
+                    DFSLog.Companion.e(e);
                     return;
                 }
             }