1.隐私协议/条款/订阅说明的html适配多语言

2.g30增加蓝牙一键定位功能
2026-07-27 15:18:14 +08:00
parent 0a128cb8a6
commit 2ad24899de
36 changed files with 899 additions and 1266 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ android {
        targetSdkVersion 35
        versionCode 2300
 //        versionName "2.3.0"
-        versionName "2.3.0-Beta1"
+        versionName "2.3.0-Beta2"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

@@ -72,10 +72,10 @@ android {

    //解决mapBox和百度地图libc++_shared.so发生冲突http://www.52im.net/blog-28523-2848.html
    packagingOptions {
-        pickFirst 'lib/x86/libc++_shared.so'
        pickFirst 'lib/x86_64/libc++_shared.so'
-        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
        pickFirst 'lib/armeabi/libc++_shared.so'
        pickFirst 'lib/mips/libc++_shared.so'
        pickFirst 'lib/mips64/libc++_shared.so'