diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 58d06dd..1ed66e3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ - + xmlns:tools="http://schemas.android.com/tools"> + diff --git a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java index 4565a82..77aa436 100644 --- a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java +++ b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java @@ -24,7 +24,8 @@ public class Weigher2 { public static final int ERR_004 = 1004; public static final int ERR_PCB_NOT_SUPPORT = 2000; private static SensorScale mSensorScale; - private static String mDevicePort = "/dev/ttyS4"; +// private static String mDevicePort = "/dev/ttyS4"; + private static String mDevicePort = "/dev/ttyS7"; private static boolean mConnect = false; private static Listener mListener; @@ -41,7 +42,8 @@ public class Weigher2 { System.init(); initScale(); if (var0 == "pcb_908") { - mDevicePort = "/dev/ttyS4"; +// mDevicePort = "/dev/ttyS4"; + mDevicePort = "/dev/ttyS7"; } mSensorScale.openScale(mDevicePort, 115200, (open) -> {