From 38492bbaa63586e2f4877da0eaa01a082fd565a6 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:42:58 +0800
Subject: [PATCH] a
---
app/app.iml | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/app/app.iml b/app/app.iml
index bd2f2ed..f913c3f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -27,7 +27,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
@@ -80,14 +80,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -96,6 +88,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
@@ -122,6 +122,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -138,7 +139,6 @@
<orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: org.androidannotations:rest-spring-api:4.5.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.2" level="project" />
- <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.2.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.8.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="Gradle: org.springframework.android:spring-android-rest-template:2.0.0.M3@jar" level="project" />
@@ -153,7 +153,6 @@
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.17@jar" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\slf4j-api-1.7.9.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: net.zetetic:android-database-sqlcipher-3.5.7" level="project" />
<orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.2@jar" level="project" />
@@ -161,16 +160,19 @@
<orderEntry type="library" name="Gradle: com.github.ybq:Android-SpinKit-1.2.0" level="project" />
<orderEntry type="library" name="Gradle: com.contrarywind:wheelview-4.0.8" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:fresco-1.1.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.rabbitmq:amqp-client:4.6.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\slf4j-android-1.7.9.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.7@jar" level="project" />
<orderEntry type="library" name="Gradle: com.nineoldandroids:library:2.4.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: org.apache.directory.studio:org.apache.commons.io:2.4@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:E.\workspace\Security_alarm\app\libs\universal-image-loader-1.9.2-SNAPSHOT-with-sources.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-framework-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.wdullaer:materialdatetimepicker-3.6.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence.room:runtime-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0-rc02" level="project" />
+ <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4@jar" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0-rc02@jar" level="project" />
@@ -178,9 +180,9 @@
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.nightonke:jellytogglebutton-1.0.2" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava:2.4.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:E.\workspace\Security_alarm\app\libs\libthrift-0.9.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:print-28.0.0-rc02" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\universal-image-loader-1.9.2-SNAPSHOT-with-sources.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient-android:4.3.5.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: org.xutils:xutils-3.5.0" level="project" />
@@ -190,20 +192,19 @@
<orderEntry type="library" name="Gradle: de.hdodenhof:circleimageview-2.2.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0-rc02" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\sdkapi.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.9.0@jar" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\libthrift-0.9.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.rengwuxian.materialedittext:library-2.1.4" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:E.\workspace\Security_alarm\app\libs\FRICPayToolV20P.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.github.angads25:toggle-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.9.7@jar" level="project" />
+ <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:transition-28.0.0-rc01" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0-rc02" level="project" />
- <orderEntry type="library" name="Gradle: jnanomsg:jnanomsg:0.4.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.amitshekhar.android:debug-db-1.0.4" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.11.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
@@ -215,14 +216,15 @@
<orderEntry type="library" name="Gradle: android.arch.persistence.room:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.kyleduo.switchbutton:library-2.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0-rc02" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\xUtils-2.6.14.jar:unspecified@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:E.\workspace\Security_alarm\app\libs\xUtils-2.6.14.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0-rc01" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:E.\workspace\Security_alarm\app\libs\sdkapi.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.persistence:db-1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0-rc01" level="project" />
@@ -232,7 +234,6 @@
<orderEntry type="library" name="Gradle: com.android.support:design-28.0.0-rc01" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
- <orderEntry type="library" name="Gradle: __local_aars__:C.\workspace\Security_alarm\app\libs\FRICPayToolV20P.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v13-28.0.0-rc02" level="project" />
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.1.0" level="project" />
--
Gitblit v1.8.0