diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f2a9f7d..351480e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,13 +11,13 @@ android { applicationId = "com.stand.standapp" minSdk = 24 targetSdk = 34 - versionCode = 11 - versionName = "1.0.10" + versionCode = 12 + versionName = "1.0.11" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" ndk { - abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")) + abiFilters.addAll(listOf("armeabi-v7a","x86")) } } diff --git a/app/src/main/assets/print_demo.html b/app/src/main/assets/print_demo.html index 8e924c9..af2fc23 100644 --- a/app/src/main/assets/print_demo.html +++ b/app/src/main/assets/print_demo.html @@ -281,7 +281,9 @@ var html = '应用名称: ' + info.appName + '
' + '版本号: ' + info.versionName + '
' + '设备型号: ' + info.model + '
' + - '系统版本: Android ' + info.osVersion; + '系统版本: Android ' + info.osVersion + '
' + + 'CPU 架构: ' + info.cpuAbi + '
' + + '运行模式: ' + (info.is64Bit ? "64位" : "32位兼容模式"); document.getElementById('aboutBody').innerHTML = html; document.getElementById('aboutModal').style.display = 'flex'; } catch (e) { diff --git a/app/src/main/java/com/stand/standapp/AndroidInterface.kt b/app/src/main/java/com/stand/standapp/AndroidInterface.kt index 915568f..3cc63ce 100644 --- a/app/src/main/java/com/stand/standapp/AndroidInterface.kt +++ b/app/src/main/java/com/stand/standapp/AndroidInterface.kt @@ -149,9 +149,22 @@ class AndroidInterface(private val activity: MainActivity) { json.put("versionName", packageInfo.versionName) json.put("model", android.os.Build.MODEL) json.put("osVersion", android.os.Build.VERSION.RELEASE) + + // 增加 CPU 架构信息 + val abis = android.os.Build.SUPPORTED_ABIS + json.put("cpuAbi", abis.joinToString(",")) + + // 增加当前进程是否为 64 位的判断 + val is64Bit = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { + android.os.Process.is64Bit() + } else { + abis.any { it.contains("64") } + } + json.put("is64Bit", is64Bit) + json.toString() } catch (e: Exception) { - "{ \"appName\": \"StandApp\", \"versionName\": \"1.0.0\" }" + "{ \"appName\": \"消防值守台\", \"versionName\": \"1.0.0\" }" } } diff --git a/app/src/main/java/com/stand/standapp/printer/PrintTestActivity.java b/app/src/main/java/com/stand/standapp/printer/PrintTestActivity.java index 2b28e43..1c006ad 100644 --- a/app/src/main/java/com/stand/standapp/printer/PrintTestActivity.java +++ b/app/src/main/java/com/stand/standapp/printer/PrintTestActivity.java @@ -138,14 +138,21 @@ public class PrintTestActivity extends AppCompatActivity implements View.OnClick } String baudrate = spBaudrate.getSelectedItem().toString(); - if (sf.OpenPort(path, baudrate)) { - tvStatus.setText("状态: 已连接 (" + path + ")"); - tvStatus.setTextColor(0xFF4CAF50); - Toast.makeText(this, "串口已开启", Toast.LENGTH_SHORT).show(); - } else { - tvStatus.setText("状态: 连接失败"); + try { + if (sf.OpenPort(path, baudrate)) { + tvStatus.setText("状态: 已连接 (" + path + ")"); + tvStatus.setTextColor(0xFF4CAF50); + Toast.makeText(this, "串口已开启", Toast.LENGTH_SHORT).show(); + } else { + tvStatus.setText("状态: 连接失败"); + tvStatus.setTextColor(0xFFFF0000); + Toast.makeText(this, "串口开启失败", Toast.LENGTH_SHORT).show(); + } + } catch (Throwable e) { + tvStatus.setText("状态: 驱动加载失败"); tvStatus.setTextColor(0xFFFF0000); - Toast.makeText(this, "串口开启失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "串口驱动异常(可能缺少64位库): " + e.getMessage(), Toast.LENGTH_LONG).show(); + e.printStackTrace(); } } diff --git a/app/src/main/jniLibs/arm64-v8a/libptt.so b/app/src/main/jniLibs/arm64-v8a/libptt.so deleted file mode 100644 index 5a5906d..0000000 Binary files a/app/src/main/jniLibs/arm64-v8a/libptt.so and /dev/null differ diff --git a/app/src/main/jniLibs/armeabi/libszzkserialport.so b/app/src/main/jniLibs/armeabi/libszzkserialport.so deleted file mode 100644 index c5ae86a..0000000 Binary files a/app/src/main/jniLibs/armeabi/libszzkserialport.so and /dev/null differ