From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本
---
app/src/main/res/values/styles.xml | 21 +++-
.gradle/4.1/taskHistory/taskHistory.bin | 0
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_10_jar.xml | 11 ++
.gradle/4.1/javaCompile/classAnalysis.bin | 0
andbrickslib/andbrickslib.iml | 1
.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml | 11 ++
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_10_jar.xml | 11 ++
app/src/main/java/com/moral/yunfushao/SampleApplicationLike.java | 2
.gradle/4.1/taskHistory/fileSnapshots.bin | 0
build.gradle | 2
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_10_jar.xml | 11 ++
FastBleLib/FastBleLib.iml | 1
app/build.gradle | 5 +
app/app.iml | 27 +++++
.gradle/4.1/fileHashes/fileHashes.lock | 0
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 7 -
conf.gradle | 2
app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.kt | 27 +++++
/dev/null | 17 ---
app/src/test/java/com/moral/yunfushao/ExampleUnitTest.kt | 18 +++
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 39 +++----
.gradle/4.1/fileHashes/fileHashes.bin | 0
app/src/main/res/layout/fragment_monitor_layout.xml | 2
.gradle/4.1/javaCompile/javaCompile.lock | 0
app/src/main/res/layout/ac_ble_search_layout.xml | 1
.gradle/4.1/taskHistory/taskHistory.lock | 0
.gradle/4.1/javaCompile/taskHistory.bin | 0
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java | 27 ++++
28 files changed, 185 insertions(+), 58 deletions(-)
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
index f81da16..9b9fcb8 100644
--- a/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
index 645e5e8..31ea4af 100644
--- a/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
index 57ffd28..6da8fd2 100644
--- a/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
index c425b43..589480d 100644
--- a/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
index eba225c..850562f 100644
--- a/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
index e966fdf..a4c62ea 100644
--- a/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
index f99be26..4d0bbb8 100644
--- a/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
index c4392ca..89a6218 100644
--- a/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
new file mode 100644
index 0000000..93524e8
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains:annotations:13.0@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/5991ca87ef1fb5544943d9abc5a9a37583fabe03/annotations-13.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_10_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_10_jar.xml
new file mode 100644
index 0000000..388ba75
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_10_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.10@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/eedd46031f8f5dc8c088e7d52f136d855fc1bddb/kotlin-stdlib-1.3.10-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_10_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_10_jar.xml
new file mode 100644
index 0000000..eaddc1f
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_10_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.10@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/27e50db5c984a3ee710c5556c877728a4e735971/kotlin-stdlib-common-1.3.10-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_10_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_10_jar.xml
new file mode 100644
index 0000000..9f3ecb8
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_10_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/94d0ad5326fea86d06ae2ad5cbe6c1de5d80f210/kotlin-stdlib-jdk7-1.3.10-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/FastBleLib/FastBleLib.iml b/FastBleLib/FastBleLib.iml
index 9a2ba05..0dbeb6a 100644
--- a/FastBleLib/FastBleLib.iml
+++ b/FastBleLib/FastBleLib.iml
@@ -94,6 +94,7 @@
<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" />
diff --git a/andbrickslib/andbrickslib.iml b/andbrickslib/andbrickslib.iml
index 1cfb37d..e2fe7a9 100644
--- a/andbrickslib/andbrickslib.iml
+++ b/andbrickslib/andbrickslib.iml
@@ -94,6 +94,7 @@
<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" />
diff --git a/app/app.iml b/app/app.iml
index 8433497..c2878df 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -21,6 +21,28 @@
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
+ <facet type="kotlin-language" name="Kotlin">
+ <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+ <compilerSettings />
+ <compilerArguments>
+ <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
+ <option name="classpath" value="$MODULE_DIR$/libs/BaiduLBS_Android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/andbrickslib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/7ec5bffcdf49e15b0906e5e3ab0fe5b2/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/47318a0846dad2620b6a6f088a40762b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5ba88eb32d0546b9e23d9f51bc86dc37/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/5d314d3a87f8bde335969af5a4547056/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/2ccf5973c93a4ec53b8f3815d1977e8c/jars/classes.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/FastBleLib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/237107df99156e18cd87665c8a1b29c0/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/9e9eeaf9948ee4d6c3ab354e8dc14368f16994a4/glide-3.7.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/ca2d2e10b7b0b56a4a4b520b61d8aaef/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/99d315fe676bfcc05353d691f1801bc3/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/ddd99896e9569eaababbe81b35d80e1b91c4ad85/eventbus-3.0.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/a8803351f14a433311a733a488f1eb17/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/e85ecab0a533f649d05f98f8b850f5d3/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/4dc9467b0770c79acc4ceccc7a61c55b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/1d6811a9c8233f4f3b961871a67d0e09/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/8c1147deab124761102cb679027a8bd2/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/3f5e41ecffaf6897d5a4315a5e2baaff/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/9803afb728b3e086b4f7a547b2ffb612/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c4011cba5a71933834a45253eb9d00b6/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/e02e421bd05304dbd65c310ccad4a24d/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/jars/classes.jar:/Users/chenqi/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar:/Users/chenqi/Library/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.56.android/4eef0ac3ef5e18db7af5d44ca0228ca5c29dd2f6/fastjson-1.1.56.android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.4.1/c7c4f9e35c2fd5900da24f9872e3971801f08ce0/okhttp-3.4.1.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-commons/1.9.9/4af248b2b39ac366d6ca8b1f10a0630e092d92cf/tinker-commons-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.9.0/f824591a0016efbaeddb8300bee54832a1398cfa/okio-1.9.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/aosp-dexutils/1.9.9/a63b69047bc0041cfb9b8f120eb81b7630eb224b/aosp-dexutils-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/bsdiff-util/1.9.9/9ae926031682ef387ec5afdef12229b4f03270f5/bsdiff-util-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-ziputils/1.9.9/57894244db33610ceb85ed1f8751a8a6c814e385/tinker-ziputils-1.9.9.jar:/Users/chenqi/Library/Android/sdk/platforms/android-25/android.jar" />
+ <option name="noStdlib" value="true" />
+ <option name="noReflect" value="true" />
+ <option name="moduleName" value="app_debug" />
+ <option name="addCompilerBuiltIns" value="true" />
+ <option name="loadBuiltInsFromDependencies" value="true" />
+ <option name="languageVersion" value="1.3" />
+ <option name="apiVersion" value="1.3" />
+ <option name="pluginOptions">
+ <array />
+ </option>
+ <option name="pluginClasspaths">
+ <array />
+ </option>
+ </compilerArguments>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
@@ -94,6 +116,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<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/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -112,6 +135,7 @@
<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: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: org.jetbrains.kotlin:kotlin-stdlib:1.3.10@jar" 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" name="Gradle: com.pnikosis:materialish-progress-1.0" level="project" />
@@ -121,6 +145,8 @@
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" name="Gradle: com.tencent.bugly:nativecrashreport-3.3.1" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10@jar" 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.android.support:support-v4-25.3.1" level="project" />
@@ -149,6 +175,7 @@
<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" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.10@jar" level="project" />
<orderEntry type="library" name="Gradle: com.tencent.tinker:tinker-ziputils:1.9.9@jar" 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" />
diff --git a/app/build.gradle b/app/build.gradle
index 3b25094..087181f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
apply from: 'tinker-support.gradle'
android {
@@ -91,4 +92,8 @@
// ������tinker���������������������������������1.3.5������������������������tinker���
implementation 'com.tencent.tinker:tinker-android-lib:1.9.9'
implementation 'com.tencent.bugly:nativecrashreport:latest.release'
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+ mavenCentral()
}
diff --git a/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.java
deleted file mode 100644
index 7cd0516..0000000
--- a/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.moral.yunfushao;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() throws Exception {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("com.moral.istanbul", appContext.getPackageName());
- }
-}
diff --git a/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..e549832
--- /dev/null
+++ b/app/src/androidTest/java/com/moral/yunfushao/ExampleInstrumentedTest.kt
@@ -0,0 +1,27 @@
+package com.moral.yunfushao
+
+import android.content.Context
+import android.support.test.InstrumentationRegistry
+import android.support.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ @Throws(Exception::class)
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getTargetContext()
+
+ assertEquals("com.moral.istanbul", appContext.packageName)
+ }
+}
diff --git a/app/src/main/java/com/moral/yunfushao/SampleApplicationLike.java b/app/src/main/java/com/moral/yunfushao/SampleApplicationLike.java
index 54a434e..8e10ecf 100644
--- a/app/src/main/java/com/moral/yunfushao/SampleApplicationLike.java
+++ b/app/src/main/java/com/moral/yunfushao/SampleApplicationLike.java
@@ -48,7 +48,7 @@
// ������������������������������������������false
Beta.canNotifyUserRestart = true;
// ���������������������������60s(���������������������0s)���60s���SDK������������������������������);
- Beta.upgradeCheckPeriod = 60 * 1000;
+ Beta.upgradeCheckPeriod = 10 * 1000;
// ���������������������1s���������������3s������APP������1s������������SDK���������������APP������������;
Beta.initDelay = 1 * 1000;
diff --git a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
index d534b49..f72d9ed 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -13,11 +13,13 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v13.app.ActivityCompat;
+import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
+import android.view.KeyEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -26,6 +28,7 @@
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
import com.moral.andbrickslib.baseadapter.recyclerview.MultiItemTypeAdapter;
import com.moral.andbrickslib.utils.ActivityManager;
+import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.BleDeviceAdapter;
@@ -150,7 +153,7 @@
isScan = !isScan;
break;
case R.id.tv_left:
- finish();
+ finishA();
break;
}
@@ -278,12 +281,12 @@
}
private void checkPermissions() {
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
!= PackageManager.PERMISSION_GRANTED) {//���������������������
//������������������,200������������
- ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 200);
+ ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, 200);
} else {
- if (!isLocationEnable(this)){
+ if (!isLocationEnable(this)) {
Intent locationIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
this.startActivityForResult(locationIntent, 2);
}
@@ -327,4 +330,20 @@
mBluetoothService.scanDevice();
}
}
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ finishA();
+ return true;
+ }
+ return super.onKeyDown(keyCode, event);
+ }
+
+ public void finishA(){
+ Intent i = new Intent(this, MainActivity.class);
+ ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(this, iv_searchpic, "dddd");
+ startActivity(i, optionsCompat.toBundle());
+ finish();
+ }
}
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
index 6602109..6a5e22a 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -324,9 +324,7 @@
String data = jsonObject.optString("data");
ArrayList<UserData> temp = (ArrayList<UserData>) FastJsonTools.getArrayJson(data, UserData.class);
dataList.clear();
-
dataList.addAll(resetData(temp));
-
//������
reshowChart(dataList);
tv_value.setText(NumberUtils.getBigDecimalValue(jsonObject.optDouble("avg"), 3) + "uSv");
@@ -442,15 +440,12 @@
public void onSuccess(String res, String msg) {
if (TextUtils.isEmpty(res)) {
return;
- }
- try {
+ }try {
JSONObject json = new JSONObject(res);
showAd(json.optString("content"), json.optString("logo"), json.optString("name"));
} catch (JSONException e) {
e.printStackTrace();
}
-
-
}
@Override
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index 6c4ee08..9ab6e2c 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -14,6 +14,7 @@
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityOptionsCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -199,6 +200,7 @@
mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
resetHandler();
+ textShowMac();//
pv.setStatusStr("���������");
//������������
((MainActivity) getActivity()).resetBLECallBack();
@@ -400,9 +402,12 @@
iv_dianliang.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
- FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
- }
+ Intent intent = new Intent(getActivity(), BLESearchActivity.class);
+ ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), iv_dianliang, "dddd");
+ startActivity(intent,optionsCompat.toBundle());
+// if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
+// FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+// }
}
});
tv_dianliang2.setOnClickListener(new View.OnClickListener() {
@@ -469,14 +474,12 @@
@Override
protected void processClick(View v) {
- Intent intent = null;
+ Intent intent;
switch (v.getId()) {
case R.id.pv:
if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
return;
}
- intent = new Intent(getActivity(), BLESearchActivity.class);
- startActivity(intent);
break;
case R.id.iv_his:
intent = new Intent(getActivity(), ChartActivity.class);
@@ -523,6 +526,7 @@
handler.postDelayed(reconnectRunnable, 0);
}
}
+
/**
* ������������
*/
@@ -583,14 +587,14 @@
danger = R.mipmap.icon_danger;
tvLijiTitle.setText("������������(uSv)");
tvShishiTitle.setText("������������(uSv/h)");
- iv_dianliang.setEnabled(false);
+// iv_dianliang.setEnabled(false);
} else if (type == 2) {
//������
yanzhang = R.mipmap.dianliyanyang;
danger = R.mipmap.dianlidanger;
tvLijiTitle.setText("������������");
tvShishiTitle.setText("������������");
- iv_dianliang.setEnabled(true);
+// iv_dianliang.setEnabled(true);
}
if (level == 0) {
@@ -630,7 +634,7 @@
tv_status.setTextColor(getResources().getColor(R.color.red_txt));
ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
} else if (level == -1) {
- iv_dianliang.setVisibility(View.GONE);
+// iv_dianliang.setVisibility(View.GONE);
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -701,7 +705,6 @@
int leijiValue = Integer.parseInt(nowResult.substring(28, 30), 16) * 1024 + Integer.parseInt(nowResult.substring(30, 32), 16) * 512 + Integer.parseInt(nowResult.substring(32, 34), 16) * 256 + Integer.parseInt(nowResult.substring(34, 36), 16);
int b1 = Integer.parseInt(nowResult.substring(6, 8), 16);
int b2 = Integer.parseInt(nowResult.substring(12, 14), 16);
-// XLog.d("���������" + shunshiValue + "|���������" + leijiValue + "-----���������" + b1 + "|" + b2);
tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
tv_shishi.setText(realValue + "");
@@ -800,14 +803,11 @@
tv_ljjl.setText(elecValue + "(��T)");
- /**
- * ���������������������
- */
+ //���������������������
RecData data = new RecData();
data.setValue(electricFieldValue);
data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
data.setType(0);
-
showStatus(Integer.parseInt(strings[21], 16));
@@ -838,19 +838,10 @@
isVirating = true;
AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
}
- } else if (baojing == 3) {
+ } else if (baojing == 3 || baojing == 4) {
data.setIs_warn(1);
showStatus(3);
pv.setPercent((float) (0.875));
- play(2);
- if (!isVirating) {
- isVirating = true;
- AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
- }
- } else if (baojing == 4) {
- data.setIs_warn(1);
- showStatus(3);
- pv.setPercent((float) (1.00));
play(2);
if (!isVirating) {
isVirating = true;
diff --git a/app/src/main/res/layout/ac_ble_search_layout.xml b/app/src/main/res/layout/ac_ble_search_layout.xml
index dc5a497..7a080e7 100644
--- a/app/src/main/res/layout/ac_ble_search_layout.xml
+++ b/app/src/main/res/layout/ac_ble_search_layout.xml
@@ -27,6 +27,7 @@
<ImageView
android:id="@+id/iv_searchpic"
android:layout_width="@dimen/x70"
+ android:transitionName="dddd"
android:layout_height="@dimen/x70"
android:scaleType="centerCrop"
android:src="@mipmap/bg_start" />
diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index c860adb..bf4eac7 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -177,6 +177,7 @@
android:id="@+id/pv"
android:layout_width="@dimen/x280"
android:layout_height="@dimen/x280"
+ android:transitionName="pv_main"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="center_horizontal" />
@@ -239,6 +240,7 @@
android:layout_alignParentRight="true"
android:layout_gravity="right"
android:layout_marginTop="20dp"
+ android:transitionName="dddd"
android:layout_marginRight="20dp"
android:src="@mipmap/icon_full" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7131f49..cc97e9e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,30 +1,41 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Base.Theme.Design">
- </style>
+ <!--<style name="AppTheme" parent="Base.Theme.Design">-->
+ <!--<item name="android:windowContentTransitions">true</item>-->
+ <!--</style>-->
<!-- Base application theme. -->
- <style name="Base.Theme.Design" parent="Theme.AppCompat.Light.NoActionBar">
+ <style name="Base.Theme.Design" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
+
<style name="AppWelcomeTheme" parent="Base.Theme.Design">
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
<item name="android:windowBackground">@mipmap/welcome</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
- <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+ <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+ <item name="android:windowContentTransitions">true</item>
- <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+ </style>
+
+ <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
+ <item name="android:windowContentTransitions">true</item>
+
+ </style>
<style name="tab_rb_style">
diff --git a/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.java b/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.java
deleted file mode 100644
index e3962a3..0000000
--- a/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.moral.yunfushao;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() throws Exception {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.kt b/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.kt
new file mode 100644
index 0000000..f376ae7
--- /dev/null
+++ b/app/src/test/java/com/moral/yunfushao/ExampleUnitTest.kt
@@ -0,0 +1,18 @@
+package com.moral.yunfushao
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see [Testing documentation](http://d.android.com/tools/testing)
+ */
+class ExampleUnitTest {
+ @Test
+ @Throws(Exception::class)
+ fun addition_isCorrect() {
+ assertEquals(4, (2 + 2).toLong())
+ }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bb35b5a..b60d399 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@
apply from: 'conf.gradle'
buildscript {
+ ext.kotlin_version = '1.3.10'
repositories {
jcenter()
@@ -10,6 +11,7 @@
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "com.tencent.bugly:tinker-support:1.1.5"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/conf.gradle b/conf.gradle
index 79bf9c2..48b77d1 100644
--- a/conf.gradle
+++ b/conf.gradle
@@ -6,7 +6,7 @@
versionName : "1.0.3.1",
minSdkVersion : 21,
targetSdkVersion : 25,
- debugVersion : "_sp1",
+ debugVersion : "_sp2",
]
dependencies = [
--
Gitblit v1.8.0