refactor(app): 优化设备ID管理和秤SDK兼容性
- 移除BaseApp中的deviceId全局变量 - 添加对x86_64架构支持以用于Windows模拟器调试 - 增加BuildConfig字段IS_TEST_DEVICE控制测试设备逻辑 - 启用buildConfig功能支持编译时配置 - 实现测试设备使用固定DEVICE_ID_2替代真实UDID - 将基础URL从测试环境切换到生产环境 - 重构WeightUtil支持多架构并添加错误处理 - 添加秤SDK可用性检查避免非ARM设备崩溃
This commit is contained in:
@@ -18,9 +18,8 @@ android {
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
ndk {
|
||||
//设置支持的SO库架构
|
||||
abiFilters.addAll(listOf("armeabi-v7a"))
|
||||
//, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
|
||||
//设置支持的SO库架构;x86_64 仅用于在 Windows 模拟器上调试(秤功能不可用)
|
||||
abiFilters.addAll(listOf("armeabi-v7a", "x86_64"))
|
||||
}
|
||||
|
||||
// 设置输出APK文件名格式
|
||||
@@ -42,10 +41,13 @@ android {
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
signingConfig = signingConfigs.getByName("debug_507")
|
||||
buildConfigField("Boolean", "IS_TEST_DEVICE", "false")
|
||||
}
|
||||
debug {
|
||||
//507扫码秤主板在android.buildTypes{}内增加
|
||||
signingConfig = signingConfigs.getByName("debug_507")
|
||||
// 调试构建视为测试设备,使用固定的 DEVICE_ID_1 代替真实 UDID
|
||||
buildConfigField("Boolean", "IS_TEST_DEVICE", "false")
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
@@ -57,10 +59,11 @@ android {
|
||||
}
|
||||
buildFeatures {
|
||||
viewBinding = true
|
||||
buildConfig = true
|
||||
}
|
||||
packagingOptions {
|
||||
pickFirst("lib/armeabi-v7a/libserial_port.so")
|
||||
pickFirst("lib/arme64-v8a/libserial_port.so")
|
||||
pickFirst("lib/arm64-v8a/libserial_port.so")
|
||||
}
|
||||
sourceSets {
|
||||
named("main") {
|
||||
|
||||
Reference in New Issue
Block a user