From cdbaf79d124d46b69dc62b653fde55f9d40b5534 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 01 Nov 2018 17:23:32 +0800
Subject: [PATCH] [*]修改电磁版本
---
app/app.iml | 116 +++++++++++++++++++++++++--------------------------------
1 files changed, 51 insertions(+), 65 deletions(-)
diff --git a/app/app.iml b/app/app.iml
index 091837d..ac419e1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -70,13 +70,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" 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" />
@@ -84,84 +77,77 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/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" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
- <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/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="__local_aars__:F.\project\pregnancy_guard_android\app\libs\BaiduLBS_Android.jar:unspecified@jar" level="project" />
- <orderEntry type="library" scope="TEST" name="com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
- <orderEntry type="library" name="com.android.support:support-v13-25.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
- <orderEntry type="library" name="com.alibaba:fastjson:1.1.56.android@jar" level="project" />
- <orderEntry type="library" name="com.contrarywind:Android-PickerView-3.1.2" level="project" />
- <orderEntry type="library" name="com.android.support:cardview-v7-25.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
- <orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
- <orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
- <orderEntry type="library" name="me.zhanghai.android.materialprogressbar:library-1.4.0" level="project" />
- <orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
- <orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
- <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
- <orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
- <orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
- <orderEntry type="library" name="com.afollestad.material-dialogs:core-0.9.4.4" level="project" />
- <orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
- <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
- <orderEntry type="library" name="pub.devrel:easypermissions-0.4.0" level="project" />
- <orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.4.1@jar" level="project" />
- <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
- <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
- <orderEntry type="library" name="com.lzy.net:okgo-2.1.4" level="project" />
- <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
- <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
- <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
- <orderEntry type="library" name="com.afollestad.material-dialogs:commons-0.9.4.4" level="project" />
- <orderEntry type="library" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
- <orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
- <orderEntry type="library" name="in.srain.cube:ultra-ptr-1.0.11" level="project" />
- <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
- <orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
- <orderEntry type="library" name="com.pnikosis:materialish-progress-1.0" level="project" />
- <orderEntry type="library" name="com.github.lecho:hellocharts-library-1.5.8" level="project" />
- <orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
- <orderEntry type="library" name="com.daimajia.numberprogressbar:library-1.4" level="project" />
- <orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
- <orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
- <orderEntry type="library" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
- <orderEntry type="library" name="com.squareup.okio:okio:1.9.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.3.1@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
+ <orderEntry type="library" name="Gradle: pub.devrel:easypermissions-0.4.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-25.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.pnikosis:materialish-progress-1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
+ <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library-1.4.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-compat-25.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
+ <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons-0.9.4.4" 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: com.android.support:support-v13-25.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.contrarywind:Android-PickerView-3.1.2" level="project" />
+ <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:core-0.9.4.4" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-v4-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.0.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-25.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: in.srain.cube:ultra-ptr-1.0.11" level="project" />
+ <orderEntry type="library" name="Gradle: org.greenrobot:eventbus:3.0.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.1.56.android@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.github.lecho:hellocharts-library-1.5.8" level="project" />
+ <orderEntry type="library" name="Gradle: __local_aars__:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/app/libs/BaiduLBS_Android.jar:unspecified@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.daimajia.numberprogressbar:library-1.4" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.lzy.net:okgo-2.1.4" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.4.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.9.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
<orderEntry type="module" module-name="andbrickslib" />
<orderEntry type="module" module-name="FastBleLib" />
</component>
--
Gitblit v1.8.0