|
@@ -1,29 +1,3 @@
|
|
-/*
|
|
|
|
- * ********************************************************************************************************************
|
|
|
|
- *
|
|
|
|
- * iFHS7.
|
|
|
|
- * ;BBMBMBMc rZMBMBR BMB
|
|
|
|
- * MBEr:;PBM, 7MBMMEOBB: BBB RBW
|
|
|
|
- * XK: BO SB. :SZ MBM. c;; ir BBM :FFr :SSF: ;xBMB:r iuGXv. i:. iF2;
|
|
|
|
- * DBBM0r. :D S7 ;XMBMB GMBMu. MBM: BMB MBMBBBMBMS WMBMBMBBK MBMBMBM BMBRBMBW .MBMBMBMBB
|
|
|
|
- * :JMRMMD .. , 1MMRM1; ;MBMBBR: MBM ;MB: BMB: MBM. RMBr sBMH BM0 UMB, BMB. KMBv
|
|
|
|
- * ;. XOW B1; :uM: 1RE, i .2BMBs rMB. MBO MBO JMB; MBB MBM BBS 7MBMBOBM: MBW :BMc
|
|
|
|
- * OBRJ.SEE MRDOWOR, 3DE:7OBM . ;BMB RMR7BM BMB MBB. BMB ,BMR .BBZ MMB rMB, BMM rMB7
|
|
|
|
- * :FBRO0D0 RKXSXPR. JOKOOMPi BMBSSWBMB; BMBB: MBMB0ZMBMS .BMBOXRBMB MBMDE RBM2;SMBM; MBB xBM2
|
|
|
|
- * iZGE O0SHSPO. uGZ7. sBMBMBDL :BMO OZu:BMBK, rRBMB0; ,EBMB xBMBr:ER. RDU :OO;
|
|
|
|
- * ,BZ, 1D0 RPSFHXR. xWZ .SMr . .BBB
|
|
|
|
- * :0BMRDG RESSSKR. 2WOMBW; BMBMR
|
|
|
|
- * i0BM: SWKHKGO MBDv
|
|
|
|
- * .UB OOGDM. MK, Copyright (c) 2015-2019. 斯伯坦机器人
|
|
|
|
- * , XMW ..
|
|
|
|
- * r All rights reserved.
|
|
|
|
- *
|
|
|
|
- * ********************************************************************************************************************
|
|
|
|
- */
|
|
|
|
-
|
|
|
|
-/*apply plugin: 'com.android.application'
|
|
|
|
-apply plugin: 'kotlin-android'
|
|
|
|
-apply plugin: 'kotlin-android-extensions'*/
|
|
|
|
plugins {
|
|
plugins {
|
|
id 'com.android.application'
|
|
id 'com.android.application'
|
|
id 'kotlin-android'
|
|
id 'kotlin-android'
|
|
@@ -103,6 +77,9 @@ android {
|
|
exclude 'META-INF/license.txt'
|
|
exclude 'META-INF/license.txt'
|
|
exclude 'META-INF/dependencies.txt'
|
|
exclude 'META-INF/dependencies.txt'
|
|
exclude 'META-INF/LGPL2.1'
|
|
exclude 'META-INF/LGPL2.1'
|
|
|
|
+ resources {
|
|
|
|
+ excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
compileOptions {
|
|
compileOptions {
|
|
@@ -120,6 +97,12 @@ android {
|
|
cleanedAnnotations
|
|
cleanedAnnotations
|
|
compile.exclude group: 'com.intellij', module: 'annotations'
|
|
compile.exclude group: 'com.intellij', module: 'annotations'
|
|
}
|
|
}
|
|
|
|
+ buildFeatures {
|
|
|
|
+ compose true
|
|
|
|
+ }
|
|
|
|
+ composeOptions {
|
|
|
|
+ kotlinCompilerExtensionVersion "1.1.0-beta01"
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -129,7 +112,19 @@ dependencies {
|
|
implementation files('libs/universal-image-loader-1.9.4-with-sources.jar')
|
|
implementation files('libs/universal-image-loader-1.9.4-with-sources.jar')
|
|
implementation files('libs/httpclient-4.3.5.jar')
|
|
implementation files('libs/httpclient-4.3.5.jar')
|
|
implementation files('libs/httpcore-4.3.2.jar')
|
|
implementation files('libs/httpcore-4.3.2.jar')
|
|
- implementation 'com.google.ar:core:1.23.0'
|
|
|
|
|
|
+ implementation 'com.google.ar:core:1.25.0'
|
|
|
|
+
|
|
|
|
+ implementation "androidx.compose.animation:animation:1.1.0-beta03"
|
|
|
|
+ implementation "androidx.compose.compiler:compiler:1.1.0-beta03"
|
|
|
|
+ implementation "androidx.compose.foundation:foundation:1.1.0-beta03"
|
|
|
|
+ implementation "androidx.compose.runtime:runtime:1.1.0-beta03"
|
|
|
|
+ implementation "androidx.compose.ui:ui:1.1.0-beta03"
|
|
|
|
+ implementation 'androidx.compose.material:material:1.1.0-beta03'
|
|
|
|
+ implementation "androidx.navigation:navigation-compose:2.4.0-beta02"
|
|
|
|
+ implementation "androidx.compose.ui:ui-tooling-preview:1.1.0-beta03"
|
|
|
|
+ implementation 'androidx.activity:activity-compose:1.3.1'
|
|
|
|
+ implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0-rc02"
|
|
|
|
+
|
|
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: JUNIT_VERSION
|
|
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: JUNIT_VERSION
|
|
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
|
|
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
|
|
exclude group: 'com.android.support', module: 'support-annotations'
|
|
exclude group: 'com.android.support', module: 'support-annotations'
|
|
@@ -153,6 +148,9 @@ dependencies {
|
|
|
|
|
|
implementation 'com.github.bumptech.glide:glide:4.0.0'
|
|
implementation 'com.github.bumptech.glide:glide:4.0.0'
|
|
implementation 'com.github.bumptech.glide:okhttp3-integration:4.0.0'
|
|
implementation 'com.github.bumptech.glide:okhttp3-integration:4.0.0'
|
|
|
|
+ androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.0-beta02"
|
|
|
|
+ debugImplementation "androidx.compose.ui:ui-tooling:1.1.0-beta02"
|
|
|
|
+ debugImplementation "androidx.compose.ui:ui-test-manifest:1.1.0-beta02"
|
|
kapt 'com.github.bumptech.glide:compiler:4.0.0'
|
|
kapt 'com.github.bumptech.glide:compiler:4.0.0'
|
|
implementation 'com.contrarywind:Android-PickerView:4.1.3'
|
|
implementation 'com.contrarywind:Android-PickerView:4.1.3'
|
|
implementation 'com.bm.photoview:library:1.4.1'
|
|
implementation 'com.bm.photoview:library:1.4.1'
|
|
@@ -236,12 +234,13 @@ dependencies {
|
|
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
|
|
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
|
|
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
|
|
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
|
|
|
|
|
|
- implementation 'org.kodein.di:kodein-di:7.8.0'
|
|
|
|
|
|
+ implementation 'org.kodein.di:kodein-di:7.9.0'
|
|
|
|
|
|
//implementation 'org.kodein.di:kodein-di-framework-android-support:7.8.0'
|
|
//implementation 'org.kodein.di:kodein-di-framework-android-support:7.8.0'
|
|
- implementation 'org.kodein.di:kodein-di-framework-android-core:7.8.0'
|
|
|
|
- implementation 'org.kodein.di:kodein-di-framework-android-x:7.8.0'
|
|
|
|
- implementation 'org.kodein.di:kodein-di-framework-android-x-viewmodel:7.8.0'
|
|
|
|
|
|
+ implementation 'org.kodein.di:kodein-di-framework-android-core:7.9.0'
|
|
|
|
+ implementation 'org.kodein.di:kodein-di-framework-android-x:7.9.0'
|
|
|
|
+ implementation 'org.kodein.di:kodein-di-framework-android-x-viewmodel:7.9.0'
|
|
|
|
+ implementation 'org.kodein.di:kodein-di-framework-compose:7.9.0'
|
|
|
|
|
|
implementation 'com.arashivision.sdk:sdkcamera:1.3.10'
|
|
implementation 'com.arashivision.sdk:sdkcamera:1.3.10'
|
|
implementation 'com.arashivision.sdk:sdkmedia:1.3.10'
|
|
implementation 'com.arashivision.sdk:sdkmedia:1.3.10'
|