diff --git a/.env.development b/.env.development
index 546b18a1..71411a27 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
diff --git a/Android/.gradle/8.11.1/checksums/checksums.lock b/Android/.gradle/8.11.1/checksums/checksums.lock
index 62c22e01..af34991d 100644
Binary files a/Android/.gradle/8.11.1/checksums/checksums.lock and b/Android/.gradle/8.11.1/checksums/checksums.lock differ
diff --git a/Android/.gradle/8.11.1/checksums/md5-checksums.bin b/Android/.gradle/8.11.1/checksums/md5-checksums.bin
index 70f92d4e..c7a0e63d 100644
Binary files a/Android/.gradle/8.11.1/checksums/md5-checksums.bin and b/Android/.gradle/8.11.1/checksums/md5-checksums.bin differ
diff --git a/Android/.gradle/8.11.1/checksums/sha1-checksums.bin b/Android/.gradle/8.11.1/checksums/sha1-checksums.bin
index 16189965..5eab9335 100644
Binary files a/Android/.gradle/8.11.1/checksums/sha1-checksums.bin and b/Android/.gradle/8.11.1/checksums/sha1-checksums.bin differ
diff --git a/Android/.gradle/8.11.1/executionHistory/executionHistory.bin b/Android/.gradle/8.11.1/executionHistory/executionHistory.bin
index 2493b2a7..89dd0ab3 100644
Binary files a/Android/.gradle/8.11.1/executionHistory/executionHistory.bin and b/Android/.gradle/8.11.1/executionHistory/executionHistory.bin differ
diff --git a/Android/.gradle/8.11.1/executionHistory/executionHistory.lock b/Android/.gradle/8.11.1/executionHistory/executionHistory.lock
index 99aaab35..38112baf 100644
Binary files a/Android/.gradle/8.11.1/executionHistory/executionHistory.lock and b/Android/.gradle/8.11.1/executionHistory/executionHistory.lock differ
diff --git a/Android/.gradle/8.11.1/fileHashes/fileHashes.bin b/Android/.gradle/8.11.1/fileHashes/fileHashes.bin
index 129edd81..eae9f502 100644
Binary files a/Android/.gradle/8.11.1/fileHashes/fileHashes.bin and b/Android/.gradle/8.11.1/fileHashes/fileHashes.bin differ
diff --git a/Android/.gradle/8.11.1/fileHashes/fileHashes.lock b/Android/.gradle/8.11.1/fileHashes/fileHashes.lock
index 97553c62..2559398b 100644
Binary files a/Android/.gradle/8.11.1/fileHashes/fileHashes.lock and b/Android/.gradle/8.11.1/fileHashes/fileHashes.lock differ
diff --git a/Android/.gradle/8.11.1/fileHashes/resourceHashesCache.bin b/Android/.gradle/8.11.1/fileHashes/resourceHashesCache.bin
index 3e5b6fb7..ae507183 100644
Binary files a/Android/.gradle/8.11.1/fileHashes/resourceHashesCache.bin and b/Android/.gradle/8.11.1/fileHashes/resourceHashesCache.bin differ
diff --git a/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index a4ced1c8..cb74e64c 100644
Binary files a/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/Android/.gradle/buildOutputCleanup/outputFiles.bin b/Android/.gradle/buildOutputCleanup/outputFiles.bin
index 78bc8547..61c3d249 100644
Binary files a/Android/.gradle/buildOutputCleanup/outputFiles.bin and b/Android/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/Android/.gradle/file-system.probe b/Android/.gradle/file-system.probe
index eb2c3449..b481a30f 100644
Binary files a/Android/.gradle/file-system.probe and b/Android/.gradle/file-system.probe differ
diff --git a/Android/build.gradle b/Android/build.gradle
index 5cc3d3b4..a6076272 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -3,10 +3,12 @@ buildscript {
maven {url 'https://maven.aliyun.com/repository/google'}
maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
maven {url 'https://maven.aliyun.com/repository/public'}
+ maven { url 'https://jitpack.io' }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.7.3'
+ classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -17,6 +19,7 @@ allprojects {
maven {url 'https://maven.aliyun.com/repository/google'}
maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
maven {url 'https://maven.aliyun.com/repository/public'}
+ maven { url 'https://jitpack.io' }
google()
}
}
diff --git a/Android/settings.gradle b/Android/settings.gradle
index 2448467f..e5b991b4 100644
--- a/Android/settings.gradle
+++ b/Android/settings.gradle
@@ -1 +1,2 @@
include ':simpleDemo'
+include ':ty-camera'
diff --git a/Android/simpleDemo/build.gradle b/Android/simpleDemo/build.gradle
index 8a79f54e..97dedfb8 100644
--- a/Android/simpleDemo/build.gradle
+++ b/Android/simpleDemo/build.gradle
@@ -49,6 +49,19 @@ android {
}
}
+// 核心修复:统一 Kotlin 版本 + 解决依赖冲突
+configurations.all {
+ resolutionStrategy {
+ // 强制所有模块使用统一的 Kotlin 版本(1.8.22 适配你的依赖)
+ force 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
+ force 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22'
+ force 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22'
+ // 排除所有第三方库自带的旧版 Kotlin 依赖,避免冲突
+ exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+ exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+ }
+}
+
dependencies {
implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -61,4 +74,25 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.9.0'
implementation 'com.alibaba:fastjson:1.2.83'
implementation 'androidx.webkit:webkit:1.5.0'
+ implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+ implementation 'androidx.activity:activity-ktx:1.9.2'
+
+ implementation "com.squareup.okhttp3:okhttp:3.12.12"
+ implementation "androidx.core:core-ktx:1.6.0"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.0"
+ implementation "org.jetbrains.kotlin:kotlin-reflect:2.2.0"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
+ implementation "com.github.getActivity:XXPermissions:18.63"
+
+ implementation "com.squareup.okhttp3:okhttp:3.12.12"
+ implementation "androidx.core:core-ktx:1.6.0"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.0"
+ implementation "org.jetbrains.kotlin:kotlin-reflect:2.2.0"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
+ implementation "com.github.getActivity:XXPermissions:18.63"
+
+ implementation project(':ty-camera')
+
}
diff --git a/Android/simpleDemo/libs/debug-server-release.aar b/Android/simpleDemo/libs/debug-server-release.aar
new file mode 100644
index 00000000..f6eef4bc
Binary files /dev/null and b/Android/simpleDemo/libs/debug-server-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-chooseMedia-release.aar b/Android/simpleDemo/libs/uni-chooseMedia-release.aar
new file mode 100644
index 00000000..cdaf53ce
Binary files /dev/null and b/Android/simpleDemo/libs/uni-chooseMedia-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-createRequestPermissionListener-release.aar b/Android/simpleDemo/libs/uni-createRequestPermissionListener-release.aar
new file mode 100644
index 00000000..b24b6166
Binary files /dev/null and b/Android/simpleDemo/libs/uni-createRequestPermissionListener-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-exit-release.aar b/Android/simpleDemo/libs/uni-exit-release.aar
new file mode 100644
index 00000000..3de4a0da
Binary files /dev/null and b/Android/simpleDemo/libs/uni-exit-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getAccessibilityInfo-release.aar b/Android/simpleDemo/libs/uni-getAccessibilityInfo-release.aar
new file mode 100644
index 00000000..cb290bb5
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getAccessibilityInfo-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getAppAuthorizeSetting-release.aar b/Android/simpleDemo/libs/uni-getAppAuthorizeSetting-release.aar
new file mode 100644
index 00000000..6aa91f0b
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getAppAuthorizeSetting-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getAppBaseInfo-release.aar b/Android/simpleDemo/libs/uni-getAppBaseInfo-release.aar
new file mode 100644
index 00000000..3666a937
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getAppBaseInfo-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getDeviceInfo-release.aar b/Android/simpleDemo/libs/uni-getDeviceInfo-release.aar
new file mode 100644
index 00000000..16498993
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getDeviceInfo-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getNetworkType-release.aar b/Android/simpleDemo/libs/uni-getNetworkType-release.aar
new file mode 100644
index 00000000..6c9fdf02
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getNetworkType-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getSystemInfo-release.aar b/Android/simpleDemo/libs/uni-getSystemInfo-release.aar
new file mode 100644
index 00000000..c30f2805
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getSystemInfo-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-getSystemSetting-release.aar b/Android/simpleDemo/libs/uni-getSystemSetting-release.aar
new file mode 100644
index 00000000..8b563c1e
Binary files /dev/null and b/Android/simpleDemo/libs/uni-getSystemSetting-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-installApk-release.aar b/Android/simpleDemo/libs/uni-installApk-release.aar
new file mode 100644
index 00000000..51e6e8da
Binary files /dev/null and b/Android/simpleDemo/libs/uni-installApk-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-network-release.aar b/Android/simpleDemo/libs/uni-network-release.aar
new file mode 100644
index 00000000..641ddf3b
Binary files /dev/null and b/Android/simpleDemo/libs/uni-network-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-openAppAuthorizeSetting-release.aar b/Android/simpleDemo/libs/uni-openAppAuthorizeSetting-release.aar
new file mode 100644
index 00000000..c7031894
Binary files /dev/null and b/Android/simpleDemo/libs/uni-openAppAuthorizeSetting-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-privacy-release.aar b/Android/simpleDemo/libs/uni-privacy-release.aar
new file mode 100644
index 00000000..8fbef2a6
Binary files /dev/null and b/Android/simpleDemo/libs/uni-privacy-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-prompt-release.aar b/Android/simpleDemo/libs/uni-prompt-release.aar
new file mode 100644
index 00000000..bb909a5a
Binary files /dev/null and b/Android/simpleDemo/libs/uni-prompt-release.aar differ
diff --git a/Android/simpleDemo/libs/uni-storage-release.aar b/Android/simpleDemo/libs/uni-storage-release.aar
new file mode 100644
index 00000000..14c7f911
Binary files /dev/null and b/Android/simpleDemo/libs/uni-storage-release.aar differ
diff --git a/Android/simpleDemo/libs/utsplugin-release.aar b/Android/simpleDemo/libs/utsplugin-release.aar
new file mode 100644
index 00000000..f2c3bfaf
Binary files /dev/null and b/Android/simpleDemo/libs/utsplugin-release.aar differ
diff --git a/Android/simpleDemo/src/main/AndroidManifest.xml b/Android/simpleDemo/src/main/AndroidManifest.xml
index 228c63a1..1070f030 100644
--- a/Android/simpleDemo/src/main/AndroidManifest.xml
+++ b/Android/simpleDemo/src/main/AndroidManifest.xml
@@ -22,6 +22,11 @@