From fc9dc236266700d61e3538bee669f2f4abb242f2 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 14:14:22 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
andbrickslib/andbrickslib.iml | 94 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/andbrickslib/andbrickslib.iml b/andbrickslib/andbrickslib.iml
index 19a583a..1cfb37d 100644
--- a/andbrickslib/andbrickslib.iml
+++ b/andbrickslib/andbrickslib.iml
@@ -23,25 +23,26 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -49,6 +50,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -78,59 +86,59 @@
<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/annotations" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+ <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-safeguard" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
+ <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/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<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" exported="" name="okio-1.9.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
- <orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
- <orderEntry type="library" exported="" name="fastjson-1.1.56.android" level="project" />
- <orderEntry type="library" exported="" name="okgo-2.1.4" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
- <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="core-0.9.4.4" level="project" />
- <orderEntry type="library" exported="" name="support-v13-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="library-1.4.0" level="project" />
- <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
- <orderEntry type="library" exported="" name="materialish-progress-1.0" level="project" />
- <orderEntry type="library" exported="" name="okserver-1.1.3" level="project" />
- <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
- <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
- <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
- <orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
- <orderEntry type="library" exported="" name="commons-0.9.4.4" level="project" />
- <orderEntry type="library" exported="" name="android-android-25" 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: 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" name="Gradle: com.lzy.net:okserver-1.1.3" 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.google.code.gson:gson:2.8.0@jar" 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.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" 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.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.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.android.support:support-vector-drawable-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.9.0@jar" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.8.0