占用

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.rms.agv"
         minSdk 27
         targetSdk 31
-        versionCode 9
-        versionName "1.2.0"
+        versionCode 10
+        versionName "1.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/qy/agv/activity/HomeActivity.java

@@ -207,6 +207,11 @@ public class HomeActivity extends BaseActivity {
             }
             registerReceiver(mReceiver, filter);
         }
+        if(Constant.MODEL.contains("MV-IDP")){
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(ACTION_PDA_SERVICE_SCANNER_DATA);
+            registerReceiver(mHkReceiver, intentFilter);
+        }
     }
 
     public void checkToken(String loginName, String loginPwd) {

app/src/main/java/com/qy/agv/activity/MainActivity.java

@@ -249,6 +249,11 @@ public class MainActivity extends BaseActivity {
             }
             registerReceiver(mReceiver, filter);
         }
+        if(Constant.MODEL.contains("MV-IDP")){
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(ACTION_PDA_SERVICE_SCANNER_DATA);
+            registerReceiver(mHkReceiver, intentFilter);
+        }
     }
 
     public void checkToken(String loginName, String loginPwd) {

app/src/main/java/com/qy/agv/comm/BaseActivity.java

@@ -45,6 +45,7 @@ import java.util.Map;
 public abstract class BaseActivity extends AppCompatActivity {
     public final static String SCAN_ACTION = "urovo.rcv.message";
     public final static String ET_SCAN_ACTION = "android.intent.ACTION_DECODE_DATA";
+    public final static String ACTION_PDA_SERVICE_SCANNER_DATA = "com.service.scanner.data";
     private  Context context;
     private SoundPoolMgr soundPoolMgr;
     public ActivityResultLauncher<Intent> intentActivityResultLauncher;
@@ -240,6 +241,26 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     };
 
+    public BroadcastReceiver mHkReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+
+            //接收广播内容
+            if (action.equals(ACTION_PDA_SERVICE_SCANNER_DATA)) {
+                //条码内容
+                String code = intent.getStringExtra("ScanCode");
+                //ocr识别内容
+                String phone = intent.getStringExtra("ScanOcrPhone");
+                //条码
+                String codeType = intent.getStringExtra("ScanCodeType");
+                System.out.println("条码:" + code);
+                process(code);
+            }
+        }
+    };
+
+
     private void process(String barcode) {
         System.out.println("当前扫码：" + barcode);
         if (StringUtils.isEmpty(barcode)) {
@@ -360,7 +381,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         alert.show();
     }
 
-
     public RequestParams httParams(String url){
         return HttpsUtil.httParams(url);
     }

app/src/main/java/com/qy/agv/util/ConfigureLog4J.java

@@ -33,7 +33,7 @@ public class ConfigureLog4J {
         if(StringUtils.isEmpty(mSavePath)){
             return;
         }
-        String fileName = mSavePath + File.separator + "byjr"+ File.separator + "log.log";
+        String fileName = mSavePath + File.separator + "ygtx"+ File.separator + "log.log";
         //设置文件名
         logConfigurator.setFileName(fileName);
         //设置root日志输出级别 默认为DEBUG

app/src/main/java/com/qy/agv/util/Constant.java

@@ -34,7 +34,7 @@ public class Constant {
     public static String PROJECT_NAME = "qyzl";
     public static String server_ip = "192.168.110.225:85";
     public static String HTTP_URL = "http://"+server_ip+"/api";
-    public static String UPDATE_URL = "http://"+server_ip+"/app";
+    public static String UPDATE_URL = "http://222.243.138.146:810";
 
 //    public static String PROJECT_NAME = "qyzl";
 //    public static String server_ip = "192.168.110.105:8081";