From 957b8e9d4bc63524dad27c2f8458856da0bf5c06 Mon Sep 17 00:00:00 2001
From: 张海江 <181069201@qq.com>
Date: Mon, 07 Aug 2017 13:20:28 +0800
Subject: [PATCH] 提交代码
---
build/android-profile/profile-2017-08-03-09-57-50-580.rawproto | 0
.idea/libraries/commons_0_9_4_4.xml | 12
build/android-profile/profile-2017-07-29-17-28-23-041.rawproto | 0
.idea/libraries/support_v4_25_3_1.xml | 10
build/android-profile/profile-2017-08-02-08-51-34-457.rawproto | 0
build/android-profile/profile-2017-08-07-08-45-52-919.rawproto | 0
.idea/libraries/support_core_ui_25_3_1.xml | 12
build/android-profile/profile-2017-07-29-10-39-24-892.rawproto | 0
.idea/libraries/BaiduLBS_Android.xml | 9
build/android-profile/profile-2017-07-29-10-38-57-997.rawproto | 0
.idea/misc.xml | 62 ++
app/src/main/java/com/moral/yunfushao/common/AppConfig.java | 1
build/android-profile/profile-2017-07-31-08-51-00-086.rawproto | 0
.idea/libraries/appcompat_v7_25_3_1.xml | 12
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 96 +++
build/android-profile/profile-2017-07-29-10-00-16-632.rawproto | 0
.idea/gradle.xml | 20
.idea/libraries/jsr305_2_0_1.xml | 9
build/android-profile/profile-2017-07-29-09-12-45-460.rawproto | 0
FastBleLib/FastBleLib.iml | 2
.idea/libraries/javax_inject_1.xml | 11
build/android-profile/profile-2017-07-31-12-19-12-987.rawproto | 0
app/src/main/java/com/moral/yunfushao/httputils/HttpUtils.java | 32
app/app.iml | 14
app/src/main/java/com/moral/yunfushao/adapter/VoiceAdapter.java | 5
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin | 0
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 67 ++
pregnancy_guard_android.iml | 19
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java | 8
build/android-profile/profile-2017-07-31-11-49-11-518.rawproto | 0
.idea/libraries/android_android_25.xml | 9
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
build/android-profile/profile-2017-07-29-16-32-50-500.rawproto | 0
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
app/src/main/res/layout/fragment_monitor_layout.xml | 10
.idea/compiler.xml | 22
build/android-profile/profile-2017-07-29-16-53-43-859.rawproto | 0
build/android-profile/profile-2017-07-29-10-28-50-206.rawproto | 0
build/android-profile/profile-2017-07-29-10-34-44-382.rawproto | 0
build/android-profile/profile-2017-07-31-08-40-27-257.rawproto | 0
.idea/libraries/hamcrest_core_1_3.xml | 11
build/android-profile/profile-2017-07-29-16-50-24-379.rawproto | 0
app/src/main/java/com/moral/yunfushao/activity/ForgetPasswordActivity.java | 8
.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0
.idea/libraries/espresso_idling_resource_2_2_2.xml | 12
.idea/libraries/javax_annotation_api_1_2.xml | 11
build/android-profile/profile-2017-07-29-09-59-29-610.rawproto | 0
.idea/libraries/recyclerview_v7_25_3_1.xml | 12
build/android-profile/profile-2017-08-02-08-51-59-753.rawproto | 0
.idea/libraries/Android_PickerView_3_1_2.xml | 12
.idea/libraries/hellocharts_library_1_5_8.xml | 12
build/android-profile/profile-2017-08-01-08-43-47-861.rawproto | 0
.idea/libraries/okgo_2_1_4.xml | 12
.idea/libraries/glide_3_7_0.xml | 11
build/android-profile/profile-2017-07-31-09-29-34-235.rawproto | 0
.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0
build/android-profile/profile-2017-07-29-10-06-59-586.rawproto | 0
.idea/libraries/core_0_9_4_4.xml | 12
build/android-profile/profile-2017-07-31-08-40-11-516.rawproto | 0
.idea/libraries/hamcrest_integration_1_3.xml | 11
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
.idea/libraries/library_1_4.xml | 12
app/src/main/java/com/moral/yunfushao/MainApp.java | 45 +
.gradle/3.3/taskArtifacts/fileHashes.bin | 0
app/src/main/res/mipmap-xxhdpi/welcome.jpg | 0
.idea/libraries/okhttp_3_4_1.xml | 11
build/android-profile/profile-2017-07-29-10-31-11-993.rawproto | 0
.idea/libraries/support_media_compat_25_3_1.xml | 12
.idea/libraries/support_compat_25_3_1.xml | 12
build/android-profile/profile-2017-08-02-15-06-04-877.rawproto | 0
.idea/libraries/okserver_1_1_3.xml | 12
build/android-profile/profile-2017-08-07-08-46-08-185.rawproto | 0
.idea/libraries/gson_2_8_0.xml | 11
build/intermediates/dex-cache/cache.xml | 32 +
.idea/copyright/profiles_settings.xml | 3
build/android-profile/profile-2017-07-29-09-07-41-960.rawproto | 0
build/android-profile/profile-2017-08-03-14-11-10-130.rawproto | 0
.idea/libraries/okio_1_9_0.xml | 11
build/android-profile/profile-2017-08-02-15-08-38-735.rawproto | 0
.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
app/src/main/res/layout/fragment_setting_layout.xml | 13
.idea/libraries/materialish_progress_1_0.xml | 12
app/src/main/java/com/moral/yunfushao/common/API.java | 59 -
.idea/libraries/support_vector_drawable_25_3_1.xml | 12
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
.idea/libraries/animated_vector_drawable_25_3_1.xml | 12
app/src/main/java/com/moral/yunfushao/MainActivity.java | 74 ++
build/android-profile/profile-2017-08-03-11-20-16-330.rawproto | 0
.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0
build/android-profile/profile-2017-07-29-13-23-08-787.rawproto | 0
FastBleLib/src/main/java/com/clj/fastble/BleManager.java | 2
.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
.idea/libraries/cardview_v7_25_3_1.xml | 12
build/android-profile/profile-2017-07-29-10-02-16-651.rawproto | 0
app/src/main/java/com/moral/yunfushao/model/User.java | 84 +++
build/android-profile/profile-2017-08-01-10-07-33-659.rawproto | 0
andbrickslib/src/main/java/com/moral/andbrickslib/utils/TimeUtil.java | 14
build/android-profile/profile-2017-07-29-09-09-59-887.rawproto | 0
.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java | 65 ++
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
app/src/main/java/com/moral/yunfushao/utils/SharedPreferencesUtil.java | 49 +
build/android-profile/profile-2017-07-31-09-12-55-082.rawproto | 0
build/android-profile/profile-2017-08-03-14-05-00-587.rawproto | 0
.idea/libraries/ultra_ptr_1_0_11.xml | 12
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
build/android-profile/profile-2017-08-03-14-09-17-494.rawproto | 0
build/android-profile/profile-2017-08-01-08-43-31-565.rawproto | 0
.idea/libraries/espresso_core_2_2_2.xml | 12
.idea/libraries/javawriter_2_1_1.xml | 11
build/android-profile/profile-2017-07-29-10-28-03-911.rawproto | 0
.idea/libraries/junit_4_12.xml | 11
.idea/libraries/eventbus_3_0_0.xml | 11
build/android-profile/profile-2017-07-29-13-43-29-527.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
.idea/libraries/runner_0_5.xml | 12
.idea/libraries/library_1_4_0.xml | 12
.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin | 0
app/src/main/res/layout/ac_charts_layout.xml | 39 +
app/src/main/java/com/moral/yunfushao/model/UpLoadParam.java | 55 +
.idea/libraries/support_fragment_25_3_1.xml | 12
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java | 7
build/android-profile/profile-2017-08-03-09-58-07-564.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
app/src/main/java/com/moral/yunfushao/activity/RegisterActivity.java | 10
.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
andbrickslib/andbrickslib.iml | 2
.idea/libraries/easypermissions_0_4_0.xml | 12
build/android-profile/profile-2017-08-04-11-19-38-914.rawproto | 0
build/android-profile/profile-2017-07-29-13-15-10-789.rawproto | 0
.idea/vcs.xml | 6
.idea/modules.xml | 11
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin | 0
.idea/libraries/support_v13_25_3_1.xml | 12
build/android-profile/profile-2017-07-31-11-41-16-619.rawproto | 0
.idea/libraries/hamcrest_library_1_3.xml | 11
.idea/libraries/constraint_layout_1_0_2.xml | 10
build/android-profile/profile-2017-07-29-10-33-02-522.rawproto | 0
app/src/main/AndroidManifest.xml | 2
build/android-profile/profile-2017-07-31-15-56-39-330.rawproto | 0
build/android-profile/profile-2017-08-03-11-18-54-403.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
.idea/libraries/fastjson_1_1_56_android.xml | 11
build/android-profile/profile-2017-07-31-11-39-32-386.rawproto | 0
.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin | 0
.idea/libraries/support_annotations_25_3_1.xml | 11
.idea/libraries/support_core_utils_25_3_1.xml | 12
build/android-profile/profile-2017-08-04-11-19-55-955.rawproto | 0
build/generated/mockable-android-25.jar | 0
app/src/main/java/com/moral/yunfushao/model/RecData.java | 27
.idea/libraries/rules_0_5.xml | 12
/dev/null | 0
.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin | 0
.idea/libraries/constraint_layout_solver_1_0_2.xml | 9
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 109 +++
.idea/runConfigurations.xml | 12
andbrickslib/src/main/java/com/moral/andbrickslib/compresshelper/StringUtils.java | 2
build/android-profile/profile-2017-07-29-16-46-49-076.rawproto | 0
build/android-profile/profile-2017-07-29-09-08-12-050.rawproto | 0
build/android-profile/profile-2017-08-03-10-57-14-783.rawproto | 0
.idea/libraries/exposed_instrumentation_api_publish_0_5.xml | 12
build/android-profile/profile-2017-07-29-16-57-12-285.rawproto | 0
164 files changed, 1,489 insertions(+), 133 deletions(-)
diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000..553a04a
--- /dev/null
+++ b/.gradle/3.3/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000..16aa7ad
--- /dev/null
+++ b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000..c1ea7a4
--- /dev/null
+++ b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
new file mode 100644
index 0000000..d8e2fe5
--- /dev/null
+++ b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
new file mode 100644
index 0000000..c670a86
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
new file mode 100644
index 0000000..bba9047
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
new file mode 100644
index 0000000..3294941
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
new file mode 100644
index 0000000..52fb673
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
new file mode 100644
index 0000000..c670a86
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
new file mode 100644
index 0000000..5e3d005
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
new file mode 100644
index 0000000..3294941
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
new file mode 100644
index 0000000..41c3b3c
--- /dev/null
+++ b/.gradle/3.3/tasks/_FastBleLib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
new file mode 100644
index 0000000..ad28a9e
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
new file mode 100644
index 0000000..4e7352a
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
new file mode 100644
index 0000000..18faaf7
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
new file mode 100644
index 0000000..13674fb
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
new file mode 100644
index 0000000..ad28a9e
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
new file mode 100644
index 0000000..6eacd6a
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
new file mode 100644
index 0000000..18faaf7
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
new file mode 100644
index 0000000..dc2384a
--- /dev/null
+++ b/.gradle/3.3/tasks/_andbrickslib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
new file mode 100644
index 0000000..1d7a443
--- /dev/null
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
new file mode 100644
index 0000000..baf4c4a
--- /dev/null
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
new file mode 100644
index 0000000..068e9d1
--- /dev/null
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
new file mode 100644
index 0000000..1719634
--- /dev/null
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..96cc43e
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ <entry name="!?*.aj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..3a9ce7b
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/FastBleLib" />
+ <option value="$PROJECT_DIR$/andbrickslib" />
+ <option value="$PROJECT_DIR$/app" />
+ </set>
+ </option>
+ <option name="resolveModulePerSourceSet" value="false" />
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Android_PickerView_3_1_2.xml b/.idea/libraries/Android_PickerView_3_1_2.xml
new file mode 100644
index 0000000..ec9ec29
--- /dev/null
+++ b/.idea/libraries/Android_PickerView_3_1_2.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="Android-PickerView-3.1.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/ef52b2d9aef6b2fce43fbfbd8520a2e920fc72e1/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/ef52b2d9aef6b2fce43fbfbd8520a2e920fc72e1/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.contrarywind/Android-PickerView/3.1.2/3010441a4ebae09df147611c6d7c71e90218e6c4/Android-PickerView-3.1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/BaiduLBS_Android.xml b/.idea/libraries/BaiduLBS_Android.xml
new file mode 100644
index 0000000..1a2eb96
--- /dev/null
+++ b/.idea/libraries/BaiduLBS_Android.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="BaiduLBS_Android">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/app/libs/BaiduLBS_Android.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/android_android_25.xml b/.idea/libraries/android_android_25.xml
new file mode 100644
index 0000000..98ea25c
--- /dev/null
+++ b/.idea/libraries/android_android_25.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="android-android-25">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-25/android.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/animated_vector_drawable_25_3_1.xml b/.idea/libraries/animated_vector_drawable_25_3_1.xml
new file mode 100644
index 0000000..3918ba6
--- /dev/null
+++ b/.idea/libraries/animated_vector_drawable_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="animated-vector-drawable-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/06c32d4d243469ae7ccc40c424e9af83b251a1a7/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/06c32d4d243469ae7ccc40c424e9af83b251a1a7/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_25_3_1.xml b/.idea/libraries/appcompat_v7_25_3_1.xml
new file mode 100644
index 0000000..57ca87a
--- /dev/null
+++ b/.idea/libraries/appcompat_v7_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="appcompat-v7-25.3.1">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/43e6cb68e777e332145f132e2b84d9349bd079b9/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/43e6cb68e777e332145f132e2b84d9349bd079b9/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/25.3.1/appcompat-v7-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_25_3_1.xml b/.idea/libraries/cardview_v7_25_3_1.xml
new file mode 100644
index 0000000..fc23f5d
--- /dev/null
+++ b/.idea/libraries/cardview_v7_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="cardview-v7-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/a60b9eb1031ba80263c0bcbc9d3da10d0f6e46b0/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/a60b9eb1031ba80263c0bcbc9d3da10d0f6e46b0/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/cardview-v7/25.3.1/cardview-v7-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_0_9_4_4.xml b/.idea/libraries/commons_0_9_4_4.xml
new file mode 100644
index 0000000..80b8081
--- /dev/null
+++ b/.idea/libraries/commons_0_9_4_4.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="commons-0.9.4.4">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/3ed3e2b8f16752b5b9852a821d1e347fba503fad/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/3ed3e2b8f16752b5b9852a821d1e347fba503fad/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.afollestad.material-dialogs/commons/0.9.4.4/6f6f75b476078511f13fb7d08efa33414477838d/commons-0.9.4.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/constraint_layout_1_0_2.xml b/.idea/libraries/constraint_layout_1_0_2.xml
new file mode 100644
index 0000000..01701a5
--- /dev/null
+++ b/.idea/libraries/constraint_layout_1_0_2.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="constraint-layout-1.0.2">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/3743e44c59c76a001743081051b1e471c1ce4381/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/3743e44c59c76a001743081051b1e471c1ce4381/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/constraint_layout_solver_1_0_2.xml b/.idea/libraries/constraint_layout_solver_1_0_2.xml
new file mode 100644
index 0000000..56b0a1d
--- /dev/null
+++ b/.idea/libraries/constraint_layout_solver_1_0_2.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="constraint-layout-solver-1.0.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/core_0_9_4_4.xml b/.idea/libraries/core_0_9_4_4.xml
new file mode 100644
index 0000000..66f7dd3
--- /dev/null
+++ b/.idea/libraries/core_0_9_4_4.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="core-0.9.4.4">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/d9b993ca0e3d1bcb873607daa6e9ff4c1e394581/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/d9b993ca0e3d1bcb873607daa6e9ff4c1e394581/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.afollestad.material-dialogs/core/0.9.4.4/23cbc9c17684233e5704844a176bbd4b75774eaa/core-0.9.4.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/easypermissions_0_4_0.xml b/.idea/libraries/easypermissions_0_4_0.xml
new file mode 100644
index 0000000..d3bff27
--- /dev/null
+++ b/.idea/libraries/easypermissions_0_4_0.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="easypermissions-0.4.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/4ec04f49e6e50dbefb0fbda4efa0418bf4d9378c/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/4ec04f49e6e50dbefb0fbda4efa0418bf4d9378c/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pub.devrel/easypermissions/0.4.0/bbc7c5db3a209a1b6419eb3c74db44329a44b25b/easypermissions-0.4.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml
new file mode 100644
index 0000000..22dd734
--- /dev/null
+++ b/.idea/libraries/espresso_core_2_2_2.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="espresso-core-2.2.2">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/160af05406e80976ab5b0ee301dae444757fe620/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/160af05406e80976ab5b0ee301dae444757fe620/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/test/espresso/espresso-core/2.2.2/espresso-core-2.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml
new file mode 100644
index 0000000..6c594b7
--- /dev/null
+++ b/.idea/libraries/espresso_idling_resource_2_2_2.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="espresso-idling-resource-2.2.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/a7bc5fefcb2dbeba91bf4dd694ee1beef69902d9/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/a7bc5fefcb2dbeba91bf4dd694ee1beef69902d9/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/eventbus_3_0_0.xml b/.idea/libraries/eventbus_3_0_0.xml
new file mode 100644
index 0000000..25a7055
--- /dev/null
+++ b/.idea/libraries/eventbus_3_0_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="eventbus-3.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/ddd99896e9569eaababbe81b35d80e1b91c4ad85/eventbus-3.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/777f0a941d3dd0f9988d4f22b42b36ce2fe64ea4/eventbus-3.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
new file mode 100644
index 0000000..61dfc33
--- /dev/null
+++ b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="exposed-instrumentation-api-publish-0.5">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/83d11c790b1567a55cc16ad23181b0f0efbfa7e4/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/83d11c790b1567a55cc16ad23181b0f0efbfa7e4/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/fastjson_1_1_56_android.xml b/.idea/libraries/fastjson_1_1_56_android.xml
new file mode 100644
index 0000000..fc5e3fe
--- /dev/null
+++ b/.idea/libraries/fastjson_1_1_56_android.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="fastjson-1.1.56.android">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.56.android/4eef0ac3ef5e18db7af5d44ca0228ca5c29dd2f6/fastjson-1.1.56.android.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.56.android/4b5bae918e858319857f429e397326f6b98793d4/fastjson-1.1.56.android-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/glide_3_7_0.xml b/.idea/libraries/glide_3_7_0.xml
new file mode 100644
index 0000000..9b3a3ea
--- /dev/null
+++ b/.idea/libraries/glide_3_7_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="glide-3.7.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/9e9eeaf9948ee4d6c3ab354e8dc14368f16994a4/glide-3.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/24a0b0e63af9530bcedd06ed1983a4f2f02155a3/glide-3.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/gson_2_8_0.xml b/.idea/libraries/gson_2_8_0.xml
new file mode 100644
index 0000000..cbabd72
--- /dev/null
+++ b/.idea/libraries/gson_2_8_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="gson-2.8.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/baf95d8519fc1a11d388f8543cb40cd2bb9d66dc/gson-2.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml
new file mode 100644
index 0000000..157e3f3
--- /dev/null
+++ b/.idea/libraries/hamcrest_core_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="hamcrest-core-1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml
new file mode 100644
index 0000000..bab4b95
--- /dev/null
+++ b/.idea/libraries/hamcrest_integration_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="hamcrest-integration-1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml
new file mode 100644
index 0000000..923d5fc
--- /dev/null
+++ b/.idea/libraries/hamcrest_library_1_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="hamcrest-library-1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/hellocharts_library_1_5_8.xml b/.idea/libraries/hellocharts_library_1_5_8.xml
new file mode 100644
index 0000000..73d0980
--- /dev/null
+++ b/.idea/libraries/hellocharts_library_1_5_8.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="hellocharts-library-1.5.8">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/788c51f6bfb989906977e4c11f6abd2fc2f7eaf1/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/788c51f6bfb989906977e4c11f6abd2fc2f7eaf1/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.lecho/hellocharts-library/1.5.8/51798d4793c333553a68292ee3a47b4758c2ec47/hellocharts-library-1.5.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml
new file mode 100644
index 0000000..6630dda
--- /dev/null
+++ b/.idea/libraries/javawriter_2_1_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="javawriter-2.1.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml
new file mode 100644
index 0000000..4179473
--- /dev/null
+++ b/.idea/libraries/javax_annotation_api_1_2.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="javax.annotation-api-1.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/ad18a02db08eaee697f812e333f692fc51129e4a/javax.annotation-api-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/javax_inject_1.xml
new file mode 100644
index 0000000..eebeedd
--- /dev/null
+++ b/.idea/libraries/javax_inject_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="javax.inject-1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/jsr305_2_0_1.xml
new file mode 100644
index 0000000..cdf9878
--- /dev/null
+++ b/.idea/libraries/jsr305_2_0_1.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="jsr305-2.0.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml
new file mode 100644
index 0000000..305df30
--- /dev/null
+++ b/.idea/libraries/junit_4_12.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="junit-4.12">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/library_1_4.xml b/.idea/libraries/library_1_4.xml
new file mode 100644
index 0000000..bd16fb5
--- /dev/null
+++ b/.idea/libraries/library_1_4.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="library-1.4">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/a82fa5528d8a29dde49f38e26dad38f5d7dfc6a7/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/a82fa5528d8a29dde49f38e26dad38f5d7dfc6a7/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.daimajia.numberprogressbar/library/1.4/fcc2dd900e02a61ee357ada5e620bd9f9344a064/library-1.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/library_1_4_0.xml b/.idea/libraries/library_1_4_0.xml
new file mode 100644
index 0000000..0e2a048
--- /dev/null
+++ b/.idea/libraries/library_1_4_0.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="library-1.4.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/09feb3ce84116008ea0b64423f06e73053c9db34/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/09feb3ce84116008ea0b64423f06e73053c9db34/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/me.zhanghai.android.materialprogressbar/library/1.4.0/d518e296d1e67576916497bcecc2c7ca16db6467/library-1.4.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/materialish_progress_1_0.xml b/.idea/libraries/materialish_progress_1_0.xml
new file mode 100644
index 0000000..ae06460
--- /dev/null
+++ b/.idea/libraries/materialish_progress_1_0.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="materialish-progress-1.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/0b83927551f78475f6a6d10173fa44fe248a0271/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/0b83927551f78475f6a6d10173fa44fe248a0271/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.pnikosis/materialish-progress/1.0/27fea1adaf2e3fca647208c0f5c65dff96eed495/materialish-progress-1.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/okgo_2_1_4.xml b/.idea/libraries/okgo_2_1_4.xml
new file mode 100644
index 0000000..e627b22
--- /dev/null
+++ b/.idea/libraries/okgo_2_1_4.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="okgo-2.1.4">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/5cd4848d49bbea543c5c4a63fb9a69171b72a4da/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/5cd4848d49bbea543c5c4a63fb9a69171b72a4da/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.lzy.net/okgo/2.1.4/c592fc30b9a9be1b3315af76dd69cfce5b09fae8/okgo-2.1.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_3_4_1.xml b/.idea/libraries/okhttp_3_4_1.xml
new file mode 100644
index 0000000..383103a
--- /dev/null
+++ b/.idea/libraries/okhttp_3_4_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="okhttp-3.4.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.4.1/c7c4f9e35c2fd5900da24f9872e3971801f08ce0/okhttp-3.4.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.4.1/70fca5cd856d0cc740e43affeb6f661204fdb2cc/okhttp-3.4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/okio_1_9_0.xml b/.idea/libraries/okio_1_9_0.xml
new file mode 100644
index 0000000..7055477
--- /dev/null
+++ b/.idea/libraries/okio_1_9_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="okio-1.9.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.9.0/f824591a0016efbaeddb8300bee54832a1398cfa/okio-1.9.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.9.0/3aaaf83694e8c88e8c33c71b609f0ad506007a4a/okio-1.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/okserver_1_1_3.xml b/.idea/libraries/okserver_1_1_3.xml
new file mode 100644
index 0000000..bfa91e7
--- /dev/null
+++ b/.idea/libraries/okserver_1_1_3.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="okserver-1.1.3">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/fc5e5bd2a4af5f14d47fb66f894b924fb83bdbff/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/fc5e5bd2a4af5f14d47fb66f894b924fb83bdbff/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.lzy.net/okserver/1.1.3/bad9ac00bed49d0837c2072b3b3de62b0efcbbc4/okserver-1.1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/recyclerview_v7_25_3_1.xml b/.idea/libraries/recyclerview_v7_25_3_1.xml
new file mode 100644
index 0000000..5d4fb01
--- /dev/null
+++ b/.idea/libraries/recyclerview_v7_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="recyclerview-v7-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/be54dc5e7201016412f2d69bd51f11d208d78572/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/be54dc5e7201016412f2d69bd51f11d208d78572/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/25.3.1/recyclerview-v7-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml
new file mode 100644
index 0000000..c057d55
--- /dev/null
+++ b/.idea/libraries/rules_0_5.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="rules-0.5">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/468a7d2b4ccd7287b9bdc7baba256aea4948a7ae/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/468a7d2b4ccd7287b9bdc7baba256aea4948a7ae/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/test/rules/0.5/rules-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml
new file mode 100644
index 0000000..4ca491d
--- /dev/null
+++ b/.idea/libraries/runner_0_5.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="runner-0.5">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/8fdf4e2b7addb0fa719574baa1197a60bceeef42/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/8fdf4e2b7addb0fa719574baa1197a60bceeef42/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/test/runner/0.5/runner-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_25_3_1.xml b/.idea/libraries/support_annotations_25_3_1.xml
new file mode 100644
index 0000000..b36c738
--- /dev/null
+++ b/.idea/libraries/support_annotations_25_3_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="support-annotations-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_compat_25_3_1.xml b/.idea/libraries/support_compat_25_3_1.xml
new file mode 100644
index 0000000..a630e46
--- /dev/null
+++ b/.idea/libraries/support_compat_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-compat-25.3.1">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/3c0483638d545d7a52c1748d801a6e23dd423d55/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/3c0483638d545d7a52c1748d801a6e23dd423d55/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-compat/25.3.1/support-compat-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_core_ui_25_3_1.xml b/.idea/libraries/support_core_ui_25_3_1.xml
new file mode 100644
index 0000000..17d8678
--- /dev/null
+++ b/.idea/libraries/support_core_ui_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-core-ui-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/bb2221b2742b95a8db0a47148f014de1984a757d/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/bb2221b2742b95a8db0a47148f014de1984a757d/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-core-ui/25.3.1/support-core-ui-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_core_utils_25_3_1.xml b/.idea/libraries/support_core_utils_25_3_1.xml
new file mode 100644
index 0000000..3257564
--- /dev/null
+++ b/.idea/libraries/support_core_utils_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-core-utils-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/30adf621209ce82543e7928330a48cf8198c41fc/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/30adf621209ce82543e7928330a48cf8198c41fc/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-core-utils/25.3.1/support-core-utils-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_fragment_25_3_1.xml b/.idea/libraries/support_fragment_25_3_1.xml
new file mode 100644
index 0000000..f22b4c5
--- /dev/null
+++ b/.idea/libraries/support_fragment_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-fragment-25.3.1">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/3a9015f7b73842479106dc14e5b7b9f73018ee64/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/3a9015f7b73842479106dc14e5b7b9f73018ee64/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-fragment/25.3.1/support-fragment-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_media_compat_25_3_1.xml b/.idea/libraries/support_media_compat_25_3_1.xml
new file mode 100644
index 0000000..9f312bf
--- /dev/null
+++ b/.idea/libraries/support_media_compat_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-media-compat-25.3.1">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/04a9db987e3a9aa313f16db7550cb2505b30b491/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/04a9db987e3a9aa313f16db7550cb2505b30b491/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_v13_25_3_1.xml b/.idea/libraries/support_v13_25_3_1.xml
new file mode 100644
index 0000000..3051011
--- /dev/null
+++ b/.idea/libraries/support_v13_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-v13-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/cb1b6403debe2ac745c069f6f1a5ead69e91afc4/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/cb1b6403debe2ac745c069f6f1a5ead69e91afc4/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v13/25.3.1/support-v13-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_25_3_1.xml b/.idea/libraries/support_v4_25_3_1.xml
new file mode 100644
index 0000000..7c0d4eb
--- /dev/null
+++ b/.idea/libraries/support_v4_25_3_1.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="support-v4-25.3.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.android/build-cache/34922cd9196fc5ed6b9671e700d6b8ba53ac6e87/output/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.android/build-cache/34922cd9196fc5ed6b9671e700d6b8ba53ac6e87/output/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_vector_drawable_25_3_1.xml b/.idea/libraries/support_vector_drawable_25_3_1.xml
new file mode 100644
index 0000000..277d3a3
--- /dev/null
+++ b/.idea/libraries/support_vector_drawable_25_3_1.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="support-vector-drawable-25.3.1">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/326ab89dbd332bca205b8c5b9ac97e7a5f8ce435/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/326ab89dbd332bca205b8c5b9ac97e7a5f8ce435/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/ultra_ptr_1_0_11.xml b/.idea/libraries/ultra_ptr_1_0_11.xml
new file mode 100644
index 0000000..ed5edfb
--- /dev/null
+++ b/.idea/libraries/ultra_ptr_1_0_11.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="ultra-ptr-1.0.11">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.android/build-cache/475c370684b7cba15b90bd0f3642670f9e80b591/output/res" />
+ <root url="jar://$USER_HOME$/.android/build-cache/475c370684b7cba15b90bd0f3642670f9e80b591/output/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/in.srain.cube/ultra-ptr/1.0.11/48c7d061c113c372fb728c7e6702100faffd7d35/ultra-ptr-1.0.11-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..7158618
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="NullableNotNullManager">
+ <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+ <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+ <option name="myNullables">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+ </list>
+ </value>
+ </option>
+ <option name="myNotNulls">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+ </list>
+ </value>
+ </option>
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
+ <component name="ProjectType">
+ <option name="id" value="Android" />
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..947652d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/FastBleLib/FastBleLib.iml" filepath="$PROJECT_DIR$/FastBleLib/FastBleLib.iml" />
+ <module fileurl="file://$PROJECT_DIR$/andbrickslib/andbrickslib.iml" filepath="$PROJECT_DIR$/andbrickslib/andbrickslib.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/pregnancy_guard_android.iml" filepath="$PROJECT_DIR$/pregnancy_guard_android.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RunConfigurationProducerService">
+ <option name="ignoredProducers">
+ <set>
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/FastBleLib/FastBleLib.iml b/FastBleLib/FastBleLib.iml
index a32c3b4..a682387 100644
--- a/FastBleLib/FastBleLib.iml
+++ b/FastBleLib/FastBleLib.iml
@@ -83,10 +83,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<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" />
diff --git a/FastBleLib/src/main/java/com/clj/fastble/BleManager.java b/FastBleLib/src/main/java/com/clj/fastble/BleManager.java
index 2ba2dd3..03c263e 100644
--- a/FastBleLib/src/main/java/com/clj/fastble/BleManager.java
+++ b/FastBleLib/src/main/java/com/clj/fastble/BleManager.java
@@ -150,7 +150,7 @@
}
/**
- * scan a known mca device, then connect
+ * scan a known mac device, then connect
*
* @param deviceMac
* @param time_out
diff --git a/andbrickslib/andbrickslib.iml b/andbrickslib/andbrickslib.iml
index 4dad6ac..19a583a 100644
--- a/andbrickslib/andbrickslib.iml
+++ b/andbrickslib/andbrickslib.iml
@@ -84,8 +84,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<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" />
diff --git a/andbrickslib/src/main/java/com/moral/andbrickslib/compresshelper/StringUtils.java b/andbrickslib/src/main/java/com/moral/andbrickslib/compresshelper/StringUtils.java
index 356abf6..cfbe51b 100644
--- a/andbrickslib/src/main/java/com/moral/andbrickslib/compresshelper/StringUtils.java
+++ b/andbrickslib/src/main/java/com/moral/andbrickslib/compresshelper/StringUtils.java
@@ -82,7 +82,7 @@
/**
* ���������������������
*
- * @param s ���������
+ * @param s //private String
* @return null������0���������������������������
*/
public static int length(CharSequence s) {
diff --git a/andbrickslib/src/main/java/com/moral/andbrickslib/utils/TimeUtil.java b/andbrickslib/src/main/java/com/moral/andbrickslib/utils/TimeUtil.java
index 53d6fd9..c354f5f 100644
--- a/andbrickslib/src/main/java/com/moral/andbrickslib/utils/TimeUtil.java
+++ b/andbrickslib/src/main/java/com/moral/andbrickslib/utils/TimeUtil.java
@@ -62,6 +62,20 @@
}
+ public static String getAfterDate(String format,String time, int day) {
+ String curDateTime = null;
+ try {
+ SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat(format);
+ Calendar c = Calendar.getInstance();
+ c.setTime(mSimpleDateFormat.parse(time));
+ c.add(Calendar.DATE, day);
+ curDateTime = mSimpleDateFormat.format(c.getTime());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return curDateTime;
+
+ }
/**
* ������������������
* @param time1
diff --git a/app/app.iml b/app/app.iml
index aa64007..680c6cf 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -62,13 +62,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" />
@@ -76,6 +69,13 @@
<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/classes" />
diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_v4_2_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_v4_2_0.so
deleted file mode 100644
index 2bd1c90..0000000
--- a/app/libs/arm64-v8a/libBaiduMapSDK_map_v4_2_0.so
+++ /dev/null
Binary files differ
diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_map_v4_2_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_map_v4_2_0.so
deleted file mode 100644
index f1cc70a..0000000
--- a/app/libs/armeabi-v7a/libBaiduMapSDK_map_v4_2_0.so
+++ /dev/null
Binary files differ
diff --git a/app/libs/armeabi/libBaiduMapSDK_map_v4_2_0.so b/app/libs/armeabi/libBaiduMapSDK_map_v4_2_0.so
deleted file mode 100644
index 2a3db8d..0000000
--- a/app/libs/armeabi/libBaiduMapSDK_map_v4_2_0.so
+++ /dev/null
Binary files differ
diff --git a/app/libs/x86/libBaiduMapSDK_map_v4_2_0.so b/app/libs/x86/libBaiduMapSDK_map_v4_2_0.so
deleted file mode 100644
index 431d1e5..0000000
--- a/app/libs/x86/libBaiduMapSDK_map_v4_2_0.so
+++ /dev/null
Binary files differ
diff --git a/app/libs/x86_64/libBaiduMapSDK_map_v4_2_0.so b/app/libs/x86_64/libBaiduMapSDK_map_v4_2_0.so
deleted file mode 100644
index f8e4563..0000000
--- a/app/libs/x86_64/libBaiduMapSDK_map_v4_2_0.so
+++ /dev/null
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c4d3ee..bb47530 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,7 +68,7 @@
<service android:name=".ble.BluetoothService" />
<meta-data
android:name="com.baidu.lbsapi.API_KEY"
- android:value="viMy2bc23ylfxKl2GtvnGGmA3HFk9dGm" />
+ android:value="r99sn0xsobaTGVKagXfHitaRGppswrbQ" />
<service
android:name="com.baidu.location.f"
android:enabled="true"
diff --git a/app/src/main/java/com/moral/yunfushao/MainActivity.java b/app/src/main/java/com/moral/yunfushao/MainActivity.java
index ccbb4d1..386bb84 100644
--- a/app/src/main/java/com/moral/yunfushao/MainActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -6,7 +6,6 @@
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.AsyncTask;
-import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Looper;
@@ -118,12 +117,13 @@
@Override
protected void initListener() {
-
+// registerBoradcastReceiver();
+// bleHeart();
}
@Override
protected void initData() {
-// prepare();
+ prepare();
if(MainApp.theApp.bleManager!=null){
if(MainApp.theApp.bleManager.isSupportBle()){
MainApp.theApp.bleManager.enableBluetooth();
@@ -234,23 +234,23 @@
/**
* ������������
*/
- if (Build.VERSION.SDK_INT >= 11) {
- new checkUpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- } else {
- new checkUpdateTask().execute();
- }
+// if (Build.VERSION.SDK_INT >= 11) {
+// new checkUpdateTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+// } else {
+// new checkUpdateTask().execute();
+// }
if (islogin)
return;
String url = API.GET_INFO;
Map<String, String> params = new HashMap<>();
- params.put("userID", MainApp.userId);
+ params.put("phone",MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getPhone());
HttpUtils.doPost(url, params, CacheMode.DEFAULT, false, new HttpCallBack() {
@Override
public void onSuccess(String res, String msg) {
User user = FastJsonTools.getJson(res, User.class);
if (user != null) {
MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
-// MainApp.theApp.userId = user.get_id();
+ MainApp.theApp.userId = user.get_id();
}
}
@@ -324,12 +324,16 @@
public void onConnectFail() {
progressDialog.dismiss();
mToatUtils.showSingletonToast("������������");
+
}
@Override
public void onDisConnected() {
progressDialog.dismiss();
mToatUtils.showSingletonToast("������������");
+ EventMessage msg = new EventMessage();
+ msg.setType(AppConfig.GET_BLE_DISCONNECT);
+ EventBus.getDefault().post(msg);
}
@Override
@@ -340,4 +344,54 @@
EventBus.getDefault().post(msg);
}
};
+
+// private void registerBoradcastReceiver() {
+// IntentFilter stateChangeFilter = new IntentFilter(
+// BluetoothAdapter.ACTION_STATE_CHANGED);
+// IntentFilter connectedFilter = new IntentFilter(
+// BluetoothDevice.ACTION_ACL_CONNECTED);
+// IntentFilter disConnectedFilter = new IntentFilter(
+// BluetoothDevice.ACTION_ACL_DISCONNECTED);
+// registerReceiver(stateChangeReceiver, stateChangeFilter);
+// registerReceiver(stateChangeReceiver, connectedFilter);
+// registerReceiver(stateChangeReceiver, disConnectedFilter);
+// }
+//
+// private BroadcastReceiver stateChangeReceiver = new BroadcastReceiver() {
+// @Override
+// public void onReceive(Context context, Intent intent) {
+// String action = intent.getAction();
+// if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+// mToatUtils.showSingletonToast("xxx������OK");
+// }
+// if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+// mToatUtils.showSingletonToast("xxx������������");
+// }
+// if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
+// mToatUtils.showSingletonToast("xxx������������");
+// }
+// }
+// };
+
+// private boolean isFinish = false;
+// Timer timer;
+//
+// private void bleHeart() {
+// timer = new Timer();
+// timer.schedule(new TimerTask() {
+// @Override
+// public void run() {
+// if (!isFinish) {
+// if(!MainApp.theApp.bleManager.isConnected()){
+// runOnUiThread(new Runnable() {
+// @Override
+// public void run() {
+// mToatUtils.showSingletonToast("TMD������������");
+// }
+// });
+// }
+// }
+// }
+// }, 0, 10000);
+// }
}
diff --git a/app/src/main/java/com/moral/yunfushao/MainApp.java b/app/src/main/java/com/moral/yunfushao/MainApp.java
index a1c153d..a46272c 100644
--- a/app/src/main/java/com/moral/yunfushao/MainApp.java
+++ b/app/src/main/java/com/moral/yunfushao/MainApp.java
@@ -3,6 +3,10 @@
import android.app.Application;
import android.bluetooth.BluetoothGattService;
+import com.baidu.location.BDLocation;
+import com.baidu.location.BDLocationListener;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
import com.baidu.mapapi.SDKInitializer;
import com.clj.fastble.BleManager;
import com.lzy.okgo.OkGo;
@@ -24,6 +28,14 @@
*/
public BleManager bleManager;
public BluetoothGattService usrService;
+
+ /**
+ * ������������
+ */
+ LocationClient mLocClient;
+ public MyLocationListenner myListener;
+ public static double mLat,mLon;
+ public static String address;
@Override
public void onCreate() {
super.onCreate();
@@ -36,9 +48,38 @@
if(sharedPreferencesUtil == null){
sharedPreferencesUtil = new SharedPreferencesUtil(this);
}
-// userId = sharedPreferencesUtil.getUserid();
- userId = "1";
+ userId = sharedPreferencesUtil.getUserid();
bleManager = new BleManager(this);
+
+ myListener = new MyLocationListenner();
+ // ���������������
+ mLocClient = new LocationClient(this);
+ mLocClient.registerLocationListener(myListener);
+ LocationClientOption option = new LocationClientOption();
+ option.setOpenGps(true); // ������gps
+ option.setCoorType("bd09ll"); // ������������������
+ option.setIsNeedAddress(true);
+ option.setScanSpan(1000*60);
+ mLocClient.setLocOption(option);
+ mLocClient.start();
+ }
+
+ /**
+ * ������SDK������������
+ */
+ public class MyLocationListenner implements BDLocationListener {
+
+ @Override
+ public void onReceiveLocation(BDLocation location) {
+ // map view ���������������������������������������
+ if (location == null) {
+ return;
+ }
+ mLat = location.getLatitude();
+ mLon = location.getLongitude();
+ address = location.getAddrStr();
+ XLog.d(mLat+"|"+mLon+"|"+address);
+ }
}
}
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 59cc093..d4ded7d 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -21,6 +21,7 @@
import com.clj.fastble.data.ScanResult;
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
import com.moral.andbrickslib.baseadapter.recyclerview.MultiItemTypeAdapter;
+import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.BleDeviceAdapter;
import com.moral.yunfushao.base.BaseActivity;
@@ -93,6 +94,12 @@
*/
if (mBluetoothService != null) {
mBluetoothService.cancelScan();
+ /**
+ * ���������������������������������������
+ */
+ if(MainApp.theApp.bleManager!=null&&MainApp.theApp.bleManager.isConnected()){
+ mBluetoothService.closeConnect();
+ }
mBluetoothService.connectDevice(scanResultList.get(position));
}
}
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 9bfeb76..284c5f7 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -2,8 +2,13 @@
import android.graphics.Color;
import android.os.Bundle;
+import android.support.annotation.IdRes;
import android.view.View;
+import android.widget.ImageView;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+import com.moral.andbrickslib.utils.TimeUtil;
import com.moral.yunfushao.R;
import com.moral.yunfushao.base.BaseActivity;
@@ -34,6 +39,11 @@
Axis axisY;
private List<PointValue> mPointValues = new ArrayList<>();
private List<AxisValue> mAxisXValues = new ArrayList<>();
+
+ private RadioGroup rg_time;
+ private TextView tv_starttime,tv_endtime;
+ private ImageView iv_pre,iv_next;
+ private int type=0;
@Override
protected void getBundleExtras(Bundle extras) {
@@ -50,11 +60,43 @@
tv_title.setText("������������");
chartView = findView(R.id.chart);
initLineChart();
+
+ rg_time = findView(R.id.rg_time);
+ tv_starttime = findView(R.id.tv_starttime);
+ tv_endtime = findView(R.id.tv_endtime);
+ iv_pre = findView(R.id.iv_pre);
+ iv_next = findView(R.id.iv_next);
+ rg_time.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
+ switch (i){
+ case R.id.rb_week:
+ type = 0;
+ axisX.setName("���������������������"); //������������
+ data.setAxisXBottom(axisX); //x ������������
+ chartView.setLineChartData(data);
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ break;
+ case R.id.rb_month:
+ type = 1;
+ axisX.setName("���������������������"); //������������
+ data.setAxisXBottom(axisX); //x ������������
+ chartView.setLineChartData(data);
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
+ break;
+ }
+ }
+ });
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
}
@Override
protected void initListener() {
-
+ iv_pre.setOnClickListener(this);
+ iv_next.setOnClickListener(this);
}
@Override
@@ -67,6 +109,27 @@
switch (view.getId()){
case R.id.tv_left:
finish();
+ break;
+ case R.id.iv_pre:
+ if(type==0){
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ }else if(type == 1){
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),-1));
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
+ }
+ break;
+ case R.id.iv_next:
+ if(TimeUtil.getCurrentDate("yyyy-MM-dd").equals(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1))){
+ return;
+ }
+ if(type==0){
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1));
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),7));
+ }else if(type == 1){
+ tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1));
+ tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),28));
+ }
break;
}
@@ -98,7 +161,7 @@
//���������
axisX = new Axis(); //X���
axisX.setHasTiltedLabels(false); //X���������������������������������������������true���������������
- axisX.setName("���������"); //������������
+ axisX.setName("���������������������"); //������������
axisX.setTextSize(10);//������������������
axisX.setTextColor(getResources().getColor(R.color.red_txt));
// axisX.setMaxLabelChars(7); //������������X���������������������������������������X���������������������7<=x<=mAxisXValues.length
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ForgetPasswordActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ForgetPasswordActivity.java
index 217de83..7f9598b 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ForgetPasswordActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ForgetPasswordActivity.java
@@ -83,7 +83,7 @@
mToatUtils.showSingletonToast("������������������");
return;
}
- sendMessage(mobile,2);
+ sendMessage(mobile,"resetPwd");
break;
case R.id.bt_sure:
String userphone = et_phone.getText().toString().trim();
@@ -121,10 +121,10 @@
}
- private void sendMessage(String tel, int type) {
+ private void sendMessage(String tel, String type) {
Map<String, String> params = new HashMap<>();
params.put("tel", tel);
- params.put("type", type + "");
+ params.put("type", type);
String url = API.REQUEST_CODE;
HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
@Override
@@ -154,7 +154,7 @@
private void modify(String username,String password,String code){
Map<String, String> params = new HashMap<>();
- params.put("username", username);
+ params.put("phone", username);
params.put("password", password);
params.put("code", code);
String url = API.FORGET_PSW;
diff --git a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
index 36b0007..a963d9d 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -55,8 +55,8 @@
tv_register = findView(R.id.tv_register);
et_phone = findView(R.id.et_phone);
et_pwd = findView(R.id.et_pwd);
- et_phone.setText("15950198162");
- et_pwd.setText("888888");
+ et_phone.setText("18362724160");
+ et_pwd.setText("123456");
}
@Override
@@ -106,7 +106,7 @@
private void login(String tel, final String pwd) {
String url = API.LOGIN;
Map<String, String> params = new HashMap<>();
- params.put("username", tel);
+ params.put("phone", tel);
params.put("password", pwd);
HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
@Override
@@ -118,7 +118,7 @@
User user = FastJsonTools.getJson(res,User.class);
if(user!=null){
MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
-// MainApp.theApp.userId = user.get_id();
+ MainApp.theApp.userId = user.get_id();
Intent intent = new Intent(getApplicationContext(), MainActivity.class);
Bundle bundle = new Bundle();
bundle.putBoolean("islogin",true);
diff --git a/app/src/main/java/com/moral/yunfushao/activity/RegisterActivity.java b/app/src/main/java/com/moral/yunfushao/activity/RegisterActivity.java
index 7c2450a..407c720 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/RegisterActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/RegisterActivity.java
@@ -93,7 +93,7 @@
mToatUtils.showSingletonToast("������������������");
return;
}
- sendMessage(mobile,1);
+ sendMessage(mobile,"register");
break;
case R.id.bt_sure:
String userphone = et_phone.getText().toString().trim();
@@ -126,10 +126,10 @@
}
- private void sendMessage(String tel, int type) {
+ private void sendMessage(String tel,String type) {
Map<String, String> params = new HashMap<>();
- params.put("tel", tel);
- params.put("type", type + "");
+ params.put("phone", tel);
+ params.put("type", type);
String url = API.REQUEST_CODE;
HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
@Override
@@ -160,7 +160,7 @@
private void registerUser(String tel, final String pwd, String code) {
String url = API.REGISTER;
Map<String, String> params = new HashMap<>();
- params.put("username", tel);
+ params.put("phone", tel);
params.put("password", pwd);
params.put("code", code);
HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
diff --git a/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java b/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
index 97b0bb8..04c1a2f 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
@@ -5,13 +5,20 @@
import android.os.Bundle;
import android.view.View;
+import com.lzy.okgo.cache.CacheMode;
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
+import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.VoiceAdapter;
import com.moral.yunfushao.base.BaseListActivity;
+import com.moral.yunfushao.common.API;
+import com.moral.yunfushao.httputils.HttpCallBack;
+import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.VoiceBean;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
/**
* Created by haijiang on 2017/7/12.
@@ -45,11 +52,22 @@
@Override
protected void onLoadMore() {
+
+
}
@Override
protected void onRefresh() {
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ if(mp!=null&&mp.isPlaying()){
+ mp.stop();
+ mp.release();
+ }
}
@Override
@@ -65,7 +83,9 @@
@Override
protected void initData() {
setNormalView();
-
+ int index = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getVideo();
+ voiceList.get(index).setSet(true);
+ adapter.notifyDataSetChanged();
}
@Override
@@ -107,6 +127,49 @@
@Override
public void setClick(int position) {
+ update("video",position+"");
+ for (VoiceBean voice :voiceList){
+ voice.setSet(false);
+ }
+ VoiceBean voiceBean = voiceList.get(position);
+ voiceBean.setSet(true);
+ adapter.notifyDataSetChanged();
+ }
+ /**
+ * ������������������������������������['refresh_frequency', 'video', 'is_open_upload']
+ * @param field
+ * @param value
+ */
+ private void update(String field, final String value) {
+ Map<String, String> params = new HashMap<>();
+ params.put("user_id", MainApp.userId);
+ params.put("field", field);
+ params.put("value", value);
+ String url = API.UPDATEUSERINFO;
+ HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
+ @Override
+ public void onSuccess(String res, String msg) {
+ mToatUtils.showSingletonToast(msg);
+ MainApp.theApp.sharedPreferencesUtil.setVideo(Integer.parseInt(value));
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ }
+
+ @Override
+ public void showLoadingDialog() {
+ progressDialog.setTitleText("���������...");
+ progressDialog.show();
+ }
+
+ @Override
+ public void onFail(int errno,String s) {
+ mToatUtils.showSingletonToast(s);
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ }
+ });
}
}
diff --git a/app/src/main/java/com/moral/yunfushao/adapter/VoiceAdapter.java b/app/src/main/java/com/moral/yunfushao/adapter/VoiceAdapter.java
index 017288b..c0d3a00 100644
--- a/app/src/main/java/com/moral/yunfushao/adapter/VoiceAdapter.java
+++ b/app/src/main/java/com/moral/yunfushao/adapter/VoiceAdapter.java
@@ -32,6 +32,11 @@
}else{
iv_play.setImageResource(R.mipmap.icon_play);
}
+ if(voiceBean.isSet()){
+ iv_set.setImageResource(R.mipmap.icon_set);
+ }else{
+ iv_set.setImageResource(R.mipmap.icon_unset);
+ }
iv_play.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/app/src/main/java/com/moral/yunfushao/common/API.java b/app/src/main/java/com/moral/yunfushao/common/API.java
index c553b70..23e062b 100644
--- a/app/src/main/java/com/moral/yunfushao/common/API.java
+++ b/app/src/main/java/com/moral/yunfushao/common/API.java
@@ -5,62 +5,19 @@
*/
public class API {
- public static final String URL_HTTP = "http://121.40.92.176:5000";
+ public static final String URL_HTTP = "http://yfsapi.7drlb.com/yfs/?service=";
- public final static String REQUEST_CODE = URL_HTTP + "/user/request_code";//���������������
+ public final static String REQUEST_CODE = URL_HTTP + "Send.Register_sms";//���������������
- public final static String REGISTER = URL_HTTP + "/user/register";//������������
+ public final static String REGISTER = URL_HTTP + "User.Register";//������������
- public final static String FORGET_PSW = URL_HTTP + "/user/forget_psw";//������������
+ public final static String LOGIN = URL_HTTP + "User.Login";//������������
- public final static String LOGIN = URL_HTTP + "/user/login";//������������
+ public final static String GET_INFO = URL_HTTP + "User.GetUserInfo";//������������
- public final static String GET_INFO = URL_HTTP + "/user/get_info";//������������
+ public final static String FORGET_PSW = URL_HTTP + "User.ResetPwd";//������������
- public final static String UPDATE_DEVICENAME = URL_HTTP + "/user/update_devicename";//������������������
+ public final static String UPLOAD = URL_HTTP + "Data.upload";//������������
- public final static String UPDATE_NAME = URL_HTTP + "/user/update_name";//������������������
-
- public final static String CHANGE_PSW = URL_HTTP + "/user/change_psw";//������������������
-
- public final static String ADD_DEVICE = URL_HTTP + "/user/add_device";//������������
-
- public final static String UNBIND = URL_HTTP + "/user/unbind";//������������
-
- public final static String GET_DEVICE_INFO = URL_HTTP + "/user/get_device_info";//������������������
-
- public final static String GET_DEVICE_INFO_WAITER = URL_HTTP + "/waiter/get_device_info";//������������������
-
- public final static String CHANGE = URL_HTTP + "/device/change";//������������������
-
- public final static String UPDATE_AD = URL_HTTP + "/device/update_ad";//������������
-
- public final static String UPDATE_ADMODE = URL_HTTP + "/device/update_admode";//������������
-
- public final static String RETURN_BACK = URL_HTTP + "/device/return_back";//������������
-
- public final static String CREATE_WAITER = URL_HTTP + "/user/create_waiter";//������������������
-
- public final static String GET_FILE_LIST = URL_HTTP + "/file/get_list";//������������
-
- public final static String GET_NOTICE_LIST = URL_HTTP + "/notice/get_list";//������������
-
- public final static String SIGN_IN = URL_HTTP + "/user/sign_in";//������
-
- public final static String SIGN_OUT = URL_HTTP + "/user/sign_out";//������
-
- public final static String GET_SIGN_INFO = URL_HTTP + "/user/get_sign_info";//������������
-
- public final static String GET_LATEST_LIST = URL_HTTP + "/notice/get_latest_list";//������������
-
- public final static String CREATE = URL_HTTP + "/spare/create";//������������������
-
- public final static String GET_LIST = URL_HTTP + "/spare/get_list";//������������
-
- public final static String GET_LIST2 = URL_HTTP + "/spare/get_list2";//������������������
-
- public final static String UPDATE = URL_HTTP + "/spare/update";//������������������
-
-// http://121.40.92.176:5000/user/590bdd6964f074059812fe26/get_hotel_list ������������������������������������
-// http://121.40.92.176:5000/hotel/591a66002b153bee6e5b6830/get_room_list ������������������������������
+ public final static String UPDATEUSERINFO = URL_HTTP + "User.UpdateUserInfo";//������������������
}
diff --git a/app/src/main/java/com/moral/yunfushao/common/AppConfig.java b/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
index 256e3cb..fae9887 100644
--- a/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
+++ b/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
@@ -7,4 +7,5 @@
public class AppConfig {
public static final int DEFAULT_SIZE = 10;
public static final int GET_BLE_SERVICE = 1;
+ public static final int GET_BLE_DISCONNECT = 2;
}
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 26b714f..c87006a 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -11,12 +11,17 @@
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import com.clj.fastble.conn.BleCharacterCallback;
import com.clj.fastble.exception.BleException;
+import com.lzy.okgo.cache.CacheMode;
+import com.moral.andbrickslib.utils.FastJsonTools;
import com.moral.andbrickslib.utils.NumberUtils;
import com.moral.andbrickslib.utils.StringUtils;
+import com.moral.andbrickslib.utils.TimeUtil;
+import com.moral.andbrickslib.utils.log.XLog;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
@@ -25,8 +30,13 @@
import com.moral.yunfushao.base.BaseFragment;
import com.moral.yunfushao.ble.BLECommon;
import com.moral.yunfushao.ble.BluetoothService;
+import com.moral.yunfushao.common.API;
import com.moral.yunfushao.common.AppConfig;
+import com.moral.yunfushao.httputils.HttpCallBack;
+import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.EventMessage;
+import com.moral.yunfushao.model.RecData;
+import com.moral.yunfushao.model.UpLoadParam;
import com.moral.yunfushao.ui.PanelView;
import org.greenrobot.eventbus.EventBus;
@@ -34,6 +44,7 @@
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Timer;
import java.util.TimerTask;
@@ -43,15 +54,16 @@
*/
public class FragmentMonitor extends BaseFragment {
- private TextView tv_ljjl, tv_tishi, tv_desc,tv_shishi;
+ private LinearLayout ll_status;
+ private TextView tv_ljjl, tv_tishi, tv_desc,tv_shishi,tv_status;
private PanelView pv;
- private ImageView iv_his;
+ private ImageView iv_his,iv_status,iv_search;
private BluetoothService mBluetoothService;
private ArrayList<String> realResult = new ArrayList<>();
//������������
- private ArrayList<String> submitResult = new ArrayList<>();
+ private ArrayList<RecData> submitResult = new ArrayList<>();
//������������������������
- private ArrayList<String> submitTempResult = new ArrayList<>();
+ private ArrayList<RecData> submitTempResult = new ArrayList<>();
/**
* ������
@@ -120,36 +132,48 @@
* 20������������5A������ 5B������
*/
if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
- submitResult.add(nowResult);
+
int shunshiValue = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16);
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);
float level = shunshiValue / 10;
-// mToatUtils.showSingletonToast("���������" + shunshiValue + "|���������" + leijiValue);
- Log.d("haijiang", "���������" + shunshiValue + "|���������" + leijiValue);
+ XLog.d("���������" + shunshiValue + "|���������" + leijiValue);
tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue*0.10,3) + "");
- tv_shishi.setText(NumberUtils.getBigDecimalValue((shunshiValue-45)/10.0*0.10,3) + "");
+ double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue-45)/10.0*0.10,3);
+ tv_shishi.setText(shishiValue + "");
+
+ /**
+ * ���������������������
+ */
+ RecData data = new RecData();
+ data.setValue(shishiValue);
+ data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
+ submitResult.add(data);
+
if (level >= 0 && level < 15) {
pv.setPercent(level / 50);
tv_tishi.setText("������������������");
tv_desc.setText("���������������������������\n������������������������������������������������");
+ showStatus(true);
} else if (level >= 15 && level < 26) {
pv.setPercent(level / 50);
tv_tishi.setText("������������������");
tv_desc.setText("���������������������������\n���������������������������������������������������");
+ showStatus(true);
} else if (level >= 26 && level < 65) {
+ showStatus(false);
tv_tishi.setText("������������������");
tv_desc.setText("���������������������������\n���������������������������������������������������");
- if (level > 45) {
+ if (level <= 45) {
pv.setPercent(level / 50);
} else {
pv.setPercent(0.9f);
}
} else if (level >= 65) {
+ showStatus(false);
tv_tishi.setText("������������������");
tv_desc.setText("���������������������������\n���������������������������������������������������");
pv.setPercent(1.0f);
}
-
realResult.clear();
}
}
@@ -168,6 +192,11 @@
});
}
+ }else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
+ pv.setStatusStr("���������");
+ pv.setPercent(0);
+ tv_ljjl.setText("0");
+ tv_shishi.setText("0");
}
}
@@ -201,17 +230,22 @@
tv_tishi = findView(R.id.tv_tishi);
tv_desc = findView(R.id.tv_desc);
tv_shishi = findView(R.id.tv_shishi);
+ tv_status = findView(R.id.tv_status);
+ iv_status = findView(R.id.iv_status);
+ ll_status = findView(R.id.ll_status);
+ iv_search = findView(R.id.iv_search);
}
@Override
protected void initListener() {
pv.setOnClickListener(this);
iv_his.setOnClickListener(this);
+ iv_search.setOnClickListener(this);
}
@Override
protected void initData() {
-
+ doTask();
}
@@ -229,6 +263,12 @@
case R.id.iv_his:
intent = new Intent(getActivity(), ChartActivity.class);
startActivity(intent);
+ break;
+ case R.id.iv_search:
+ if(mBluetoothService==null){
+ return;
+ }
+ mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),"5A0014010001000000000000004600000000005B",null);
break;
}
@@ -249,6 +289,7 @@
public void run() {
if (!isFinish) {
//������������
+ submitData();
}
}
}, 0, 10000);
@@ -258,7 +299,53 @@
//���������������������������
submitTempResult.addAll(submitResult);
submitResult.clear();
+ HashMap<String,String> params = new HashMap<>();
+ if(submitTempResult.size()==0){
+ return;
+ }
+ UpLoadParam up = new UpLoadParam();
+ up.setUserid(MainApp.userId);
+ up.setAddress(MainApp.address);
+ up.setLat(MainApp.mLat);
+ up.setLon(MainApp.mLon);
+ up.setData(submitTempResult);
+ params.put("data", FastJsonTools.toJson(up));
+ HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
+ @Override
+ public void onSuccess(String res, String msg) {
+ XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@"+msg);
+ submitTempResult.clear();
+ }
+
+ @Override
+ public void showLoadingDialog() {
+
+ }
+
+ @Override
+ public void onFail(int errno, String s) {
+
+ }
+ });
}
+
+ /**
+ * ������������������������������
+ * @param safe
+ */
+ private void showStatus(boolean safe){
+ if(safe){
+ iv_status.setImageResource(R.mipmap.icon_safe);
+ tv_status.setText("������");
+ tv_status.setTextColor(getResources().getColor(R.color.green_txt));
+ ll_status.setBackgroundResource(R.mipmap.bg_conner_green);
+ }else{
+ iv_status.setImageResource(R.mipmap.icon_danger);
+ tv_status.setText("������");
+ tv_status.setTextColor(getResources().getColor(R.color.red_txt));
+ ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
+ }
+ }
}
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
index 6959678..9b14db3 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -1,15 +1,27 @@
package com.moral.yunfushao.fragment;
import android.content.Intent;
+import android.support.v7.widget.SwitchCompat;
import android.view.View;
+import android.widget.Button;
import android.widget.RelativeLayout;
import com.bigkoo.pickerview.OptionsPickerView;
+import com.lzy.okgo.cache.CacheMode;
+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.activity.LoginActivity;
import com.moral.yunfushao.activity.VoiceSetActivity;
import com.moral.yunfushao.base.BaseFragment;
+import com.moral.yunfushao.common.API;
+import com.moral.yunfushao.httputils.HttpCallBack;
+import com.moral.yunfushao.httputils.HttpUtils;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
/**
* ������������
@@ -18,7 +30,9 @@
public class FragmentSettings extends BaseFragment {
private RelativeLayout rl_setvoice,rl_refresh;
-
+ private Button bt_sure;
+ private SwitchCompat sc_open;
+ private int refreshIndex=0;
@Override
protected int getLayoutId() {
return R.layout.fragment_setting_layout;
@@ -28,12 +42,25 @@
protected void initViews() {
rl_setvoice = findView(R.id.rl_setvoice);
rl_refresh = findView(R.id.rl_refresh);
+ bt_sure = findView(R.id.bt_sure);
+ sc_open = findView(R.id.sc_open);
}
@Override
protected void initListener() {
rl_setvoice.setOnClickListener(this);
rl_refresh.setOnClickListener(this);
+ bt_sure.setOnClickListener(this);
+ sc_open.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if(sc_open.isChecked()){
+ update("is_open_upload","1");
+ }else{
+ update("is_open_upload","0");
+ }
+ }
+ });
}
@Override
@@ -41,6 +68,20 @@
timeList.add("10s");
timeList.add("20s");
timeList.add("30s");
+ int open = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
+ if(open == 0){
+ sc_open.setChecked(false);
+ }else{
+ sc_open.setChecked(true);
+ }
+ int refresh = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
+ if(refresh == 10){
+ refreshIndex = 0;
+ }else if(refresh == 20){
+ refreshIndex = 1;
+ }else if(refresh == 30){
+ refreshIndex = 2;
+ }
}
@Override
@@ -52,6 +93,13 @@
break;
case R.id.rl_refresh:
initDialog();
+ break;
+ case R.id.bt_sure:
+ MainApp.theApp.sharedPreferencesUtil.exitLogin();
+ Intent intent1 = new Intent();
+ intent1.setClass(getActivity(), LoginActivity.class);
+ startActivity(intent1);
+ ActivityManager.getActivityManager().finishActivity(MainActivity.class);
break;
}
@@ -68,10 +116,54 @@
OptionsPickerView<String> sexView = new OptionsPickerView.Builder(getActivity(), new OptionsPickerView.OnOptionsSelectListener() {
@Override
public void onOptionsSelect(int options1, int options2, int options3, View v) {
-
+ refreshIndex = options1;
+ update("refresh_frequency",(options1+1)*10+"");
}
}).setOutSideCancelable(true).build();
+ sexView.setSelectOptions(refreshIndex);
sexView.setPicker(timeList);
sexView.show();
}
+
+ /**
+ * ������������������������������������['refresh_frequency', 'video', 'is_open_upload']
+ * @param field
+ * @param value
+ */
+ private void update(final String field, final String value) {
+ Map<String, String> params = new HashMap<>();
+ params.put("user_id", MainApp.userId);
+ params.put("field", field);
+ params.put("value", value);
+ String url = API.UPDATEUSERINFO;
+ HttpUtils.doPost(url, params, CacheMode.DEFAULT, true, new HttpCallBack() {
+ @Override
+ public void onSuccess(String res, String msg) {
+ mToatUtils.showSingletonToast(msg);
+ if("refresh_frequency".equals(field)){
+ MainApp.theApp.sharedPreferencesUtil.setRefreh(Integer.parseInt(value));
+ }else if("is_open_upload".equals(field)){
+ MainApp.theApp.sharedPreferencesUtil.setUpload(Integer.parseInt(value));
+ }
+
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ }
+
+ @Override
+ public void showLoadingDialog() {
+ progressDialog.setTitleText("���������...");
+ progressDialog.show();
+ }
+
+ @Override
+ public void onFail(int errno,String s) {
+ mToatUtils.showSingletonToast(s);
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ }
+ });
+ }
}
diff --git a/app/src/main/java/com/moral/yunfushao/httputils/HttpUtils.java b/app/src/main/java/com/moral/yunfushao/httputils/HttpUtils.java
index 75df65f..7614692 100644
--- a/app/src/main/java/com/moral/yunfushao/httputils/HttpUtils.java
+++ b/app/src/main/java/com/moral/yunfushao/httputils/HttpUtils.java
@@ -53,11 +53,12 @@
public void onSuccess(String s, Call call, Response response) {
XLog.e("result:" + s);
try {
- JSONObject jsonObject = new JSONObject(s);
+ JSONObject resJosn= new JSONObject(s);
+ JSONObject jsonObject = resJosn.getJSONObject("data");
int errno = jsonObject.optInt("code");
- String message = jsonObject.optString("desc");
+ String message = jsonObject.optString("msg");
if(errno == 0){
- httpCallBack.onSuccess(jsonObject.optString("content"),message);
+ httpCallBack.onSuccess(jsonObject.optString("info"),message);
}else{
httpCallBack.onFail(errno,message);
}
@@ -135,11 +136,12 @@
public void onSuccess(String s, Call call, Response response) {
XLog.e("result:" + s);
try {
- JSONObject jsonObject = new JSONObject(s);
+ JSONObject resJosn= new JSONObject(s);
+ JSONObject jsonObject = resJosn.getJSONObject("data");
int errno = jsonObject.optInt("code");
- String message = jsonObject.optString("desc");
+ String message = jsonObject.optString("msg");
if(errno == 0){
- httpCallBack.onSuccess(jsonObject.optString("content"),message);
+ httpCallBack.onSuccess(jsonObject.optString("info"),message);
}else{
httpCallBack.onFail(errno,message);
}
@@ -209,11 +211,12 @@
public void onSuccess(String s, Call call, Response response) {
XLog.e("result:" + s);
try {
- JSONObject jsonObject = new JSONObject(s);
- int errno = jsonObject.optInt("errno");
- String message = jsonObject.optString("message");
+ JSONObject resJosn= new JSONObject(s);
+ JSONObject jsonObject = resJosn.getJSONObject("data");
+ int errno = jsonObject.optInt("code");
+ String message = jsonObject.optString("msg");
if(errno == 0){
- uploadCallBack.onSuccess(jsonObject.optString("data"),message);
+ uploadCallBack.onSuccess(jsonObject.optString("info"),message);
}else{
uploadCallBack.onFail(message);
}
@@ -290,11 +293,12 @@
public void onSuccess(String s, Call call, Response response) {
XLog.e("result:" + s);
try {
- JSONObject jsonObject = new JSONObject(s);
- int errno = jsonObject.optInt("errno");
- String message = jsonObject.optString("message");
+ JSONObject resJosn= new JSONObject(s);
+ JSONObject jsonObject = resJosn.getJSONObject("data");
+ int errno = jsonObject.optInt("code");
+ String message = jsonObject.optString("msg");
if(errno == 0){
- uploadCallBack.onSuccess(jsonObject.optString("data"),message);
+ uploadCallBack.onSuccess(jsonObject.optString("info"),message);
}else{
uploadCallBack.onFail(message);
}
diff --git a/app/src/main/java/com/moral/yunfushao/model/RecData.java b/app/src/main/java/com/moral/yunfushao/model/RecData.java
new file mode 100644
index 0000000..53066bd
--- /dev/null
+++ b/app/src/main/java/com/moral/yunfushao/model/RecData.java
@@ -0,0 +1,27 @@
+package com.moral.yunfushao.model;
+
+/**
+ * ���������������������
+ * Created by haijiang on 2017/7/29.
+ */
+
+public class RecData {
+ private double value;
+ private String time;
+
+ public double getValue() {
+ return value;
+ }
+
+ public void setValue(double value) {
+ this.value = value;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+}
diff --git a/app/src/main/java/com/moral/yunfushao/model/UpLoadParam.java b/app/src/main/java/com/moral/yunfushao/model/UpLoadParam.java
new file mode 100644
index 0000000..76bc865
--- /dev/null
+++ b/app/src/main/java/com/moral/yunfushao/model/UpLoadParam.java
@@ -0,0 +1,55 @@
+package com.moral.yunfushao.model;
+
+import java.util.ArrayList;
+
+/**
+ * Created by haijiang on 2017/7/29.
+ */
+
+public class UpLoadParam {
+ private String userid;
+ private ArrayList<RecData> data;
+ private double lon;
+ private double lat;
+ private String address;
+
+ public String getUserid() {
+ return userid;
+ }
+
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
+
+ public ArrayList<RecData> getData() {
+ return data;
+ }
+
+ public void setData(ArrayList<RecData> data) {
+ this.data = data;
+ }
+
+ public double getLon() {
+ return lon;
+ }
+
+ public void setLon(double lon) {
+ this.lon = lon;
+ }
+
+ public double getLat() {
+ return lat;
+ }
+
+ public void setLat(double lat) {
+ this.lat = lat;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+}
diff --git a/app/src/main/java/com/moral/yunfushao/model/User.java b/app/src/main/java/com/moral/yunfushao/model/User.java
index b930e36..d276b54 100644
--- a/app/src/main/java/com/moral/yunfushao/model/User.java
+++ b/app/src/main/java/com/moral/yunfushao/model/User.java
@@ -1,8 +1,92 @@
package com.moral.yunfushao.model;
+import com.alibaba.fastjson.annotation.JSONField;
+
/**
* Created by haijiang on 2017/2/20.
*/
public class User {
+ @JSONField(name="_id")
+ private String _id;//������id
+ private String phone; //������������
+ private String encypt; //���������
+ private String password; //������
+ private String nickname; //������������
+ private int refresh_frequency; //������������
+ private int is_open_upload; //������������������
+ private int is_lock; //������������������0������������������1������������
+ private int video; //
+
+ public String get_id() {
+ return _id;
+ }
+
+ public void set_id(String _id) {
+ this._id = _id;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getEncypt() {
+ return encypt;
+ }
+
+ public void setEncypt(String encypt) {
+ this.encypt = encypt;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getNickname() {
+ return nickname;
+ }
+
+ public void setNickname(String nickname) {
+ this.nickname = nickname;
+ }
+
+ public int getRefresh_frequency() {
+ return refresh_frequency;
+ }
+
+ public void setRefresh_frequency(int refresh_frequency) {
+ this.refresh_frequency = refresh_frequency;
+ }
+
+ public int getIs_open_upload() {
+ return is_open_upload;
+ }
+
+ public void setIs_open_upload(int is_open_upload) {
+ this.is_open_upload = is_open_upload;
+ }
+
+ public int getIs_lock() {
+ return is_lock;
+ }
+
+ public void setIs_lock(int is_lock) {
+ this.is_lock = is_lock;
+ }
+
+ public int getVideo() {
+ return video;
+ }
+
+ public void setVideo(int video) {
+ this.video = video;
+ }
}
diff --git a/app/src/main/java/com/moral/yunfushao/utils/SharedPreferencesUtil.java b/app/src/main/java/com/moral/yunfushao/utils/SharedPreferencesUtil.java
index 0a4aeca..f0afa04 100644
--- a/app/src/main/java/com/moral/yunfushao/utils/SharedPreferencesUtil.java
+++ b/app/src/main/java/com/moral/yunfushao/utils/SharedPreferencesUtil.java
@@ -36,12 +36,30 @@
public void saveLoginInfo(User loginUser){
SharedPreferences preferences = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
Editor editor = preferences.edit();
+ editor.putString("id",loginUser.get_id());
+ editor.putString("phone",loginUser.getPhone());
+ editor.putString("encypt",loginUser.getEncypt());
+ editor.putString("password",loginUser.getPassword());
+ editor.putString("nickname",loginUser.getNickname());
+ editor.putInt("refresh_frequency",loginUser.getRefresh_frequency());
+ editor.putInt("is_open_upload",loginUser.getIs_open_upload());
+ editor.putInt("is_lock",loginUser.getIs_lock());
+ editor.putInt("video",loginUser.getVideo());
editor.commit();
}
public User getLoginInfo(){
SharedPreferences sp = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
User loginUserInfo = new User();
+ loginUserInfo.set_id(sp.getString("id",""));
+ loginUserInfo.setEncypt(sp.getString("encypt",""));
+ loginUserInfo.setPhone(sp.getString("phone",""));
+ loginUserInfo.setPassword(sp.getString("password",""));
+ loginUserInfo.setNickname(sp.getString("nickname",""));
+ loginUserInfo.setRefresh_frequency(sp.getInt("refresh_frequency",10));
+ loginUserInfo.setIs_open_upload(sp.getInt("is_open_upload",1));
+ loginUserInfo.setIs_lock(sp.getInt("is_lock",0));
+ loginUserInfo.setVideo(sp.getInt("video",0));
return loginUserInfo;
}
@@ -51,19 +69,38 @@
return userid;
}
-
+ public void setUpload(int is_open_upload){
+ SharedPreferences preferences = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
+ Editor editor = preferences.edit();
+ editor.putInt("is_open_upload",is_open_upload);
+ editor.commit();
+ }
+ public void setVideo(int video){
+ SharedPreferences preferences = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
+ Editor editor = preferences.edit();
+ editor.putInt("video",video);
+ editor.commit();
+ }
+ public void setRefreh(int refresh){
+ SharedPreferences preferences = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
+ Editor editor = preferences.edit();
+ editor.putInt("refresh_frequency",refresh);
+ editor.commit();
+ }
public void exitLogin(){
SharedPreferences preferences = mContext.getSharedPreferences(SP_LOGIN_USER_KEY, Context.MODE_PRIVATE);
Editor editor = preferences.edit();
editor.putString("id","");
- editor.putString("nickname","");
+ editor.putString("phone","");
+ editor.putString("encypt","");
editor.putString("password","");
- editor.putString("username","");
- editor.putString("hotelid","");
- editor.putString("hotelname","");
- editor.putInt("opt",0);
+ editor.putString("nickname","");
+ editor.putInt("refresh_frequency",0);
+ editor.putInt("is_open_upload",0);
+ editor.putInt("is_lock",0);
+ editor.putInt("video",0);
editor.commit();
MainApp.theApp.userId="";
}
diff --git a/app/src/main/res/layout/ac_charts_layout.xml b/app/src/main/res/layout/ac_charts_layout.xml
index ac5b5f4..5f3e03f 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -17,14 +17,32 @@
android:layout_width="@dimen/x20"
android:layout_height="@dimen/x20"
android:src="@mipmap/icon_red_left"/>
- <TextView
- android:id="@+id/tv_time"
+ <LinearLayout
android:layout_width="@dimen/x160"
android:layout_height="wrap_content"
- android:textSize="16sp"
- android:gravity="center"
- android:textColor="@color/red_txt"
- android:text="2017���7���13���"/>
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/tv_starttime"
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:gravity="center"
+ android:textColor="@color/red_txt"
+ android:text="2017���7���13���"/>
+ <TextView
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="���"/>
+ <TextView
+ android:id="@+id/tv_endtime"
+ android:layout_width="@dimen/x160"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:gravity="center"
+ android:textColor="@color/red_txt"
+ android:text="2017���7���13���"/>
+ </LinearLayout>
<ImageView
android:id="@+id/iv_next"
android:layout_width="@dimen/x20"
@@ -42,13 +60,14 @@
android:orientation="vertical"
android:background="@mipmap/bg_head">
<RadioGroup
+ android:id="@+id/rg_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:background="@mipmap/bg_conner"
android:layout_marginTop="@dimen/x16"
android:layout_gravity="center">
<RadioButton
+ android:id="@+id/rb_week"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
@@ -56,8 +75,10 @@
android:textColor="@color/rb_tv_color"
android:gravity="center"
android:textSize="16sp"
+ android:checked="true"
android:text="���"/>
<RadioButton
+ android:id="@+id/rb_month"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
@@ -67,14 +88,16 @@
android:textSize="16sp"
android:text="���"/>
<RadioButton
+ android:id="@+id/rb_year"
android:layout_width="@dimen/x80"
android:layout_height="@dimen/x30"
android:button="@null"
android:background="@drawable/rb_bg"
android:gravity="center"
android:textSize="16sp"
+ android:visibility="gone"
android:textColor="@color/rb_tv_color"
- android:text="���"/>
+ android:text="������"/>
</RadioGroup>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index 1cee75b..364c336 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -9,7 +9,15 @@
android:layout_width="match_parent"
android:layout_height="@dimen/y40"
android:background="@mipmap/bg_head">
-
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="@dimen/x20"
+ android:layout_height="@dimen/x20"
+ android:padding="@dimen/x4"
+ android:src="@mipmap/icon_history"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="@dimen/x16"
+ />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_setting_layout.xml b/app/src/main/res/layout/fragment_setting_layout.xml
index 53a3afd..4452907 100644
--- a/app/src/main/res/layout/fragment_setting_layout.xml
+++ b/app/src/main/res/layout/fragment_setting_layout.xml
@@ -76,6 +76,7 @@
android:textSize="16sp" />
<android.support.v7.widget.SwitchCompat
+ android:id="@+id/sc_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"/>
@@ -111,4 +112,16 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/gray_line"/>
+ <Button
+ android:id="@+id/bt_sure"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x40"
+ android:layout_marginRight="@dimen/x40"
+ android:layout_marginTop="@dimen/x24"
+ android:background="@mipmap/bt_red"
+ android:text="������������"
+ android:gravity="center"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/welcome.jpg b/app/src/main/res/mipmap-xxhdpi/welcome.jpg
new file mode 100644
index 0000000..d35a9f4
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/welcome.jpg
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/welcome.png b/app/src/main/res/mipmap-xxhdpi/welcome.png
deleted file mode 100644
index fcd9457..0000000
--- a/app/src/main/res/mipmap-xxhdpi/welcome.png
+++ /dev/null
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-09-07-41-960.rawproto b/build/android-profile/profile-2017-07-29-09-07-41-960.rawproto
new file mode 100644
index 0000000..1f7c65b
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-09-07-41-960.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-09-08-12-050.rawproto b/build/android-profile/profile-2017-07-29-09-08-12-050.rawproto
new file mode 100644
index 0000000..8dd798d
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-09-08-12-050.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-09-09-59-887.rawproto b/build/android-profile/profile-2017-07-29-09-09-59-887.rawproto
new file mode 100644
index 0000000..f669f0c
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-09-09-59-887.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-09-12-45-460.rawproto b/build/android-profile/profile-2017-07-29-09-12-45-460.rawproto
new file mode 100644
index 0000000..fd723bd
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-09-12-45-460.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-09-59-29-610.rawproto b/build/android-profile/profile-2017-07-29-09-59-29-610.rawproto
new file mode 100644
index 0000000..5a9f425
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-09-59-29-610.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-00-16-632.rawproto b/build/android-profile/profile-2017-07-29-10-00-16-632.rawproto
new file mode 100644
index 0000000..525195c
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-00-16-632.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-02-16-651.rawproto b/build/android-profile/profile-2017-07-29-10-02-16-651.rawproto
new file mode 100644
index 0000000..1f1e782
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-02-16-651.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-06-59-586.rawproto b/build/android-profile/profile-2017-07-29-10-06-59-586.rawproto
new file mode 100644
index 0000000..4e0fec8
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-06-59-586.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-28-03-911.rawproto b/build/android-profile/profile-2017-07-29-10-28-03-911.rawproto
new file mode 100644
index 0000000..c1273f3
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-28-03-911.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-28-50-206.rawproto b/build/android-profile/profile-2017-07-29-10-28-50-206.rawproto
new file mode 100644
index 0000000..ec94aa0
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-28-50-206.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-31-11-993.rawproto b/build/android-profile/profile-2017-07-29-10-31-11-993.rawproto
new file mode 100644
index 0000000..3ef2dfb
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-31-11-993.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-33-02-522.rawproto b/build/android-profile/profile-2017-07-29-10-33-02-522.rawproto
new file mode 100644
index 0000000..e26f9a3
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-33-02-522.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-34-44-382.rawproto b/build/android-profile/profile-2017-07-29-10-34-44-382.rawproto
new file mode 100644
index 0000000..abc18de
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-34-44-382.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-38-57-997.rawproto b/build/android-profile/profile-2017-07-29-10-38-57-997.rawproto
new file mode 100644
index 0000000..d13a512
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-38-57-997.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-10-39-24-892.rawproto b/build/android-profile/profile-2017-07-29-10-39-24-892.rawproto
new file mode 100644
index 0000000..6b4d209
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-10-39-24-892.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-13-15-10-789.rawproto b/build/android-profile/profile-2017-07-29-13-15-10-789.rawproto
new file mode 100644
index 0000000..c02dd7a
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-13-15-10-789.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-13-23-08-787.rawproto b/build/android-profile/profile-2017-07-29-13-23-08-787.rawproto
new file mode 100644
index 0000000..8fcbb2b
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-13-23-08-787.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-13-43-29-527.rawproto b/build/android-profile/profile-2017-07-29-13-43-29-527.rawproto
new file mode 100644
index 0000000..5ebcc56
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-13-43-29-527.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-16-32-50-500.rawproto b/build/android-profile/profile-2017-07-29-16-32-50-500.rawproto
new file mode 100644
index 0000000..8cc9432
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-16-32-50-500.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-16-46-49-076.rawproto b/build/android-profile/profile-2017-07-29-16-46-49-076.rawproto
new file mode 100644
index 0000000..0384043
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-16-46-49-076.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-16-50-24-379.rawproto b/build/android-profile/profile-2017-07-29-16-50-24-379.rawproto
new file mode 100644
index 0000000..784d65f
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-16-50-24-379.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-16-53-43-859.rawproto b/build/android-profile/profile-2017-07-29-16-53-43-859.rawproto
new file mode 100644
index 0000000..a88ca9b
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-16-53-43-859.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-16-57-12-285.rawproto b/build/android-profile/profile-2017-07-29-16-57-12-285.rawproto
new file mode 100644
index 0000000..3abb3fd
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-16-57-12-285.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-29-17-28-23-041.rawproto b/build/android-profile/profile-2017-07-29-17-28-23-041.rawproto
new file mode 100644
index 0000000..1338d3e
--- /dev/null
+++ b/build/android-profile/profile-2017-07-29-17-28-23-041.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-08-40-11-516.rawproto b/build/android-profile/profile-2017-07-31-08-40-11-516.rawproto
new file mode 100644
index 0000000..55fa2e5
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-08-40-11-516.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-08-40-27-257.rawproto b/build/android-profile/profile-2017-07-31-08-40-27-257.rawproto
new file mode 100644
index 0000000..ed9849a
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-08-40-27-257.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-08-51-00-086.rawproto b/build/android-profile/profile-2017-07-31-08-51-00-086.rawproto
new file mode 100644
index 0000000..379790a
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-08-51-00-086.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-09-12-55-082.rawproto b/build/android-profile/profile-2017-07-31-09-12-55-082.rawproto
new file mode 100644
index 0000000..2f731a4
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-09-12-55-082.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-09-29-34-235.rawproto b/build/android-profile/profile-2017-07-31-09-29-34-235.rawproto
new file mode 100644
index 0000000..bc2c90f
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-09-29-34-235.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-11-39-32-386.rawproto b/build/android-profile/profile-2017-07-31-11-39-32-386.rawproto
new file mode 100644
index 0000000..98098a9
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-11-39-32-386.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-11-41-16-619.rawproto b/build/android-profile/profile-2017-07-31-11-41-16-619.rawproto
new file mode 100644
index 0000000..b1ac073
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-11-41-16-619.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-11-49-11-518.rawproto b/build/android-profile/profile-2017-07-31-11-49-11-518.rawproto
new file mode 100644
index 0000000..9578a6f
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-11-49-11-518.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-12-19-12-987.rawproto b/build/android-profile/profile-2017-07-31-12-19-12-987.rawproto
new file mode 100644
index 0000000..0706483
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-12-19-12-987.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-07-31-15-56-39-330.rawproto b/build/android-profile/profile-2017-07-31-15-56-39-330.rawproto
new file mode 100644
index 0000000..a232c6a
--- /dev/null
+++ b/build/android-profile/profile-2017-07-31-15-56-39-330.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-01-08-43-31-565.rawproto b/build/android-profile/profile-2017-08-01-08-43-31-565.rawproto
new file mode 100644
index 0000000..86acfe1
--- /dev/null
+++ b/build/android-profile/profile-2017-08-01-08-43-31-565.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-01-08-43-47-861.rawproto b/build/android-profile/profile-2017-08-01-08-43-47-861.rawproto
new file mode 100644
index 0000000..9ed61db
--- /dev/null
+++ b/build/android-profile/profile-2017-08-01-08-43-47-861.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-01-10-07-33-659.rawproto b/build/android-profile/profile-2017-08-01-10-07-33-659.rawproto
new file mode 100644
index 0000000..25f180a
--- /dev/null
+++ b/build/android-profile/profile-2017-08-01-10-07-33-659.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-02-08-51-34-457.rawproto b/build/android-profile/profile-2017-08-02-08-51-34-457.rawproto
new file mode 100644
index 0000000..81be3cd
--- /dev/null
+++ b/build/android-profile/profile-2017-08-02-08-51-34-457.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-02-08-51-59-753.rawproto b/build/android-profile/profile-2017-08-02-08-51-59-753.rawproto
new file mode 100644
index 0000000..eb8e4f1
--- /dev/null
+++ b/build/android-profile/profile-2017-08-02-08-51-59-753.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-02-15-06-04-877.rawproto b/build/android-profile/profile-2017-08-02-15-06-04-877.rawproto
new file mode 100644
index 0000000..131da66
--- /dev/null
+++ b/build/android-profile/profile-2017-08-02-15-06-04-877.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-02-15-08-38-735.rawproto b/build/android-profile/profile-2017-08-02-15-08-38-735.rawproto
new file mode 100644
index 0000000..4af2375
--- /dev/null
+++ b/build/android-profile/profile-2017-08-02-15-08-38-735.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-09-57-50-580.rawproto b/build/android-profile/profile-2017-08-03-09-57-50-580.rawproto
new file mode 100644
index 0000000..9ff9a90
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-09-57-50-580.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-09-58-07-564.rawproto b/build/android-profile/profile-2017-08-03-09-58-07-564.rawproto
new file mode 100644
index 0000000..a92ce19
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-09-58-07-564.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-10-57-14-783.rawproto b/build/android-profile/profile-2017-08-03-10-57-14-783.rawproto
new file mode 100644
index 0000000..57d5bf5
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-10-57-14-783.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-11-18-54-403.rawproto b/build/android-profile/profile-2017-08-03-11-18-54-403.rawproto
new file mode 100644
index 0000000..a6c7e12
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-11-18-54-403.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-11-20-16-330.rawproto b/build/android-profile/profile-2017-08-03-11-20-16-330.rawproto
new file mode 100644
index 0000000..d8ff483
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-11-20-16-330.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-14-05-00-587.rawproto b/build/android-profile/profile-2017-08-03-14-05-00-587.rawproto
new file mode 100644
index 0000000..086087d
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-14-05-00-587.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-14-09-17-494.rawproto b/build/android-profile/profile-2017-08-03-14-09-17-494.rawproto
new file mode 100644
index 0000000..000be9d
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-14-09-17-494.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-03-14-11-10-130.rawproto b/build/android-profile/profile-2017-08-03-14-11-10-130.rawproto
new file mode 100644
index 0000000..4b2459f
--- /dev/null
+++ b/build/android-profile/profile-2017-08-03-14-11-10-130.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-04-11-19-38-914.rawproto b/build/android-profile/profile-2017-08-04-11-19-38-914.rawproto
new file mode 100644
index 0000000..261096a
--- /dev/null
+++ b/build/android-profile/profile-2017-08-04-11-19-38-914.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-04-11-19-55-955.rawproto b/build/android-profile/profile-2017-08-04-11-19-55-955.rawproto
new file mode 100644
index 0000000..fad07dc
--- /dev/null
+++ b/build/android-profile/profile-2017-08-04-11-19-55-955.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-07-08-45-52-919.rawproto b/build/android-profile/profile-2017-08-07-08-45-52-919.rawproto
new file mode 100644
index 0000000..5a394a7
--- /dev/null
+++ b/build/android-profile/profile-2017-08-07-08-45-52-919.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-07-08-46-08-185.rawproto b/build/android-profile/profile-2017-08-07-08-46-08-185.rawproto
new file mode 100644
index 0000000..c98f412
--- /dev/null
+++ b/build/android-profile/profile-2017-08-07-08-46-08-185.rawproto
Binary files differ
diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar
new file mode 100644
index 0000000..b46bd30
--- /dev/null
+++ b/build/generated/mockable-android-25.jar
Binary files differ
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
new file mode 100644
index 0000000..cff2528
--- /dev/null
+++ b/build/intermediates/dex-cache/cache.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<items version="2" >
+
+ <item
+ is-multidex="false"
+ jar="G:\project\pregnancy_guard_android\app\libs\BaiduLBS_Android.jar"
+ jumboMode="false"
+ optimize="true"
+ revision="25.0.2"
+ sha1="42307d4446539570cc2b5085adeaea13bce49270">
+ <dex dex="G:\project\pregnancy_guard_android\app\build\intermediates\pre-dexed\debug\BaiduLBS_Android_d97fbe610b8270c74010963bd1a8843398d73490.jar" />
+ </item>
+ <item
+ is-multidex="false"
+ jar="G:\project\pregnancy_guard_android\andbrickslib\build\intermediates\bundles\default\classes.jar"
+ jumboMode="false"
+ optimize="true"
+ revision="25.0.2"
+ sha1="f884e2f1e46f3fed215471bcc418d96071d55b54">
+ <dex dex="G:\project\pregnancy_guard_android\app\build\intermediates\pre-dexed\debug\classes_ed3297d65a5546cdbcd15452f369c24cdf4648b9.jar" />
+ </item>
+ <item
+ is-multidex="false"
+ jar="G:\project\pregnancy_guard_android\FastBleLib\build\intermediates\bundles\default\classes.jar"
+ jumboMode="false"
+ optimize="true"
+ revision="25.0.2"
+ sha1="801abde64de49a58b7d2a423226ffe023e35af0d">
+ <dex dex="G:\project\pregnancy_guard_android\app\build\intermediates\pre-dexed\debug\classes_f69bea94bf8d2a1e700cfab15ec99b3ff07bd8f3.jar" />
+ </item>
+
+</items>
diff --git a/pregnancy_guard_android.iml b/pregnancy_guard_android.iml
new file mode 100644
index 0000000..c836eb8
--- /dev/null
+++ b/pregnancy_guard_android.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="pregnancy_guard_android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ <option name="BUILDABLE" value="false" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
--
Gitblit v1.8.0