From 50aacfed3ceb60997c2c9a4cc0f9e6fe6b5ed718 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Mon, 26 Nov 2018 15:17:11 +0800
Subject: [PATCH] [*]修改主页指针跳转动画
---
.idea/libraries/Gradle__com_github_lecho_hellocharts_library_1_5_8.xml | 4
.idea/libraries/Gradle__com_lzy_net_okserver_1_1_3.xml | 4
app/src/main/java/com/moral/yunfushao/ui/PanelView.java | 40 ++---
.idea/misc.xml | 2
app/src/main/res/layout/ac_login_layout.xml | 47 +++++--
.idea/libraries/Gradle__com_tencent_bugly_nativecrashreport_3_3_1.xml | 4
.idea/libraries/Gradle__com_tencent_tinker_tinker_android_lib_1_9_9.xml | 6
FastBleLib/FastBleLib.iml | 1
.gradle/4.1/fileHashes/resourceHashesCache.bin | 0
app/build.gradle | 1
app/app.iml | 6
.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml | 4
.idea/libraries/Gradle__com_tencent_tinker_tinker_android_loader_1_9_9.xml | 6
.idea/libraries/Gradle__com_daimajia_numberprogressbar_library_1_4.xml | 4
.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_3_1.xml | 6
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java | 49 ++++++-
.idea/libraries/Gradle__com_contrarywind_Android_PickerView_3_1_2.xml | 4
.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml | 4
.idea/libraries/Gradle__com_android_support_support_v13_25_3_1.xml | 4
.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_0.xml | 6
.gradle/4.1/fileHashes/fileHashes.bin | 0
.idea/libraries/Gradle__com_lzy_net_okgo_2_1_4.xml | 4
.idea/libraries/Gradle__com_tencent_bugly_crashreport_upgrade_1_3_6.xml | 4
.idea/libraries/Gradle__in_srain_cube_ultra_ptr_1_0_11.xml | 4
.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_4_4.xml | 4
.idea/libraries/Gradle__com_tencent_mm_opensdk_wechat_sdk_android_with_mta_5_1_6_jar.xml | 11 +
.gradle/4.1/taskHistory/taskHistory.lock | 0
.gradle/4.1/javaCompile/taskHistory.bin | 0
.gradle/4.1/taskHistory/taskHistory.bin | 0
.gradle/4.1/javaCompile/classAnalysis.bin | 0
andbrickslib/andbrickslib.iml | 1
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml | 4
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml | 4
app/src/main/res/mipmap-xxhdpi/weixin.png | 0
.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml | 6
.gradle/4.1/taskHistory/fileSnapshots.bin | 0
.idea/libraries/Gradle__com_pnikosis_materialish_progress_1_0.xml | 4
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml | 4
.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml | 4
app/src/main/res/mipmap-xhdpi/weixin.png | 0
.idea/libraries/Gradle__com_android_support_cardview_v7_25_3_1.xml | 4
.gradle/4.1/javaCompile/jarAnalysis.bin | 0
.gradle/4.1/fileHashes/fileHashes.lock | 0
.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml | 6
app/src/main/AndroidManifest.xml | 6
.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml | 6
.gradle/4.1/javaCompile/taskJars.bin | 0
.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml | 6
.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml | 4
.idea/libraries/Gradle__pub_devrel_easypermissions_0_4_0.xml | 4
.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_4_4.xml | 6
.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml | 4
.gradle/4.1/javaCompile/javaCompile.lock | 0
.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml | 6
.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml | 6
.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml | 6
.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml | 6
57 files changed, 188 insertions(+), 138 deletions(-)
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
index 9b9fcb8..a8e0c93 100644
--- a/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
index 31ea4af..772dc81 100644
--- a/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/.gradle/4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.1/fileHashes/resourceHashesCache.bin
index 3f8b815..4d85397 100644
--- a/.gradle/4.1/fileHashes/resourceHashesCache.bin
+++ b/.gradle/4.1/fileHashes/resourceHashesCache.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
index 6da8fd2..d94f5ec 100644
--- a/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/jarAnalysis.bin b/.gradle/4.1/javaCompile/jarAnalysis.bin
index 4702177..445c844 100644
--- a/.gradle/4.1/javaCompile/jarAnalysis.bin
+++ b/.gradle/4.1/javaCompile/jarAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
index 589480d..6a2bf1f 100644
--- a/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
index 850562f..f49ecaa 100644
--- a/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskJars.bin b/.gradle/4.1/javaCompile/taskJars.bin
index 60979af..c0227e3 100644
--- a/.gradle/4.1/javaCompile/taskJars.bin
+++ b/.gradle/4.1/javaCompile/taskJars.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
index a4c62ea..b028efe 100644
--- a/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
index 4d0bbb8..3ed3d7b 100644
--- a/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
index 89a6218..2f9eb1e 100644
--- a/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
diff --git a/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_4_4.xml b/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_4_4.xml
index 3695aae..5f966bc 100644
--- a/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_4_4.xml
+++ b/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_4_4.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.afollestad.material-dialogs:commons-0.9.4.4">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/fddeae04668658ba55286c5959082dde/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/fddeae04668658ba55286c5959082dde/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/fddeae04668658ba55286c5959082dde/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_4_4.xml b/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_4_4.xml
index e5d95e9..10e801d 100644
--- a/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_4_4.xml
+++ b/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_4_4.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.afollestad.material-dialogs:core-0.9.4.4">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5808c912607c9c0fb6b286b9b73df3df/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5808c912607c9c0fb6b286b9b73df3df/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5ba88eb32d0546b9e23d9f51bc86dc37/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5ba88eb32d0546b9e23d9f51bc86dc37/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml
index 3571e39..3e82619 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:animated-vector-drawable-25.3.1">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c159abf01a50a246e9de7a0a9a9adf0a/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c159abf01a50a246e9de7a0a9a9adf0a/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c4011cba5a71933834a45253eb9d00b6/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c4011cba5a71933834a45253eb9d00b6/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml
index 2aad8cc..ea1f2bc 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:appcompat-v7-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/03306f7c55bbcea5d1165fc1b466b7ee/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/03306f7c55bbcea5d1165fc1b466b7ee/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/03306f7c55bbcea5d1165fc1b466b7ee/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_25_3_1.xml
index d37e808..18f63f7 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_25_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:cardview-v7-25.3.1">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/1f8af644fc17cfef1d5357e2b3facbb1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/1f8af644fc17cfef1d5357e2b3facbb1/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/2ccf5973c93a4ec53b8f3815d1977e8c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/2ccf5973c93a4ec53b8f3815d1977e8c/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml
index aacf634..79f3424 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout-1.0.2">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/df3a5952978da9d0f2bec9fe644dbf8d/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/df3a5952978da9d0f2bec9fe644dbf8d/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/5d314d3a87f8bde335969af5a4547056/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/5d314d3a87f8bde335969af5a4547056/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
index ad06ba8..e8e7659 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:multidex-1.0.1">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/b1501bdfebb153757df2c15eb485907c/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/b1501bdfebb153757df2c15eb485907c/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/4dc9467b0770c79acc4ceccc7a61c55b/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/4dc9467b0770c79acc4ceccc7a61c55b/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_3_1.xml
index 7191692..9acff56 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:recyclerview-v7-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/0d2c5960817ddd389787732d61995687/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/0d2c5960817ddd389787732d61995687/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/0d2c5960817ddd389787732d61995687/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml
index 0dc4e04..c3e2365 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-compat-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/f6fe5b88e919f2f233f16662b09121f4/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/f6fe5b88e919f2f233f16662b09121f4/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/f6fe5b88e919f2f233f16662b09121f4/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml
index 4ce5f4b..01e5750 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-ui-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/0fd5530f2437c763ebc33721eb44068c/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/0fd5530f2437c763ebc33721eb44068c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/0fd5530f2437c763ebc33721eb44068c/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml
index 945edf4..73f8776 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-utils-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/42ec7f868c6d56691752965ca1bcb191/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/42ec7f868c6d56691752965ca1bcb191/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/42ec7f868c6d56691752965ca1bcb191/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml
index 2124538..4eed284 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-fragment-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/4091358fd996a8cbe9b0f4d51e9fe0e9/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/4091358fd996a8cbe9b0f4d51e9fe0e9/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/4091358fd996a8cbe9b0f4d51e9fe0e9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml
index 3bf3469..dc3a93a 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat-25.3.1">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/6d249c224fb3674af1b8cba02689742b/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/6d249c224fb3674af1b8cba02689742b/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/6d249c224fb3674af1b8cba02689742b/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v13_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_v13_25_3_1.xml
index e891ff3..64016de 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v13_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v13_25_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v13-25.3.1">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/ddcbb506878adf055b411c6b579eeb42/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/ddcbb506878adf055b411c6b579eeb42/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/3f5e41ecffaf6897d5a4315a5e2baaff/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/3f5e41ecffaf6897d5a4315a5e2baaff/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml
index 05709bd..5bac122 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v4-25.3.1">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/c18892df0bf0298343eff658187baca5/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/c18892df0bf0298343eff658187baca5/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/9803afb728b3e086b4f7a547b2ffb612/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/9803afb728b3e086b4f7a547b2ffb612/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml
index 02ef29a..d764ea3 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-vector-drawable-25.3.1">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/5873f37203123af57396d823c55cbcf4/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/5873f37203123af57396d823c55cbcf4/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/e02e421bd05304dbd65c310ccad4a24d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/e02e421bd05304dbd65c310ccad4a24d/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
index c08112a..5f2eca1 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/8582a660a4109e21b7e303682ea46a85/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/8582a660a4109e21b7e303682ea46a85/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/da50d0aa65b608a9b719306c6ca1f757/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-2.2.2.aar/da50d0aa65b608a9b719306c6ca1f757/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/test/espresso/espresso-core/2.2.2/espresso-core-2.2.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
index e052d01..0f99680 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/be02ce9692e456eb6c9d786503ac3f3c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/be02ce9692e456eb6c9d786503ac3f3c/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/a67b5485c53251f992ac4a7d224cc803/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-2.2.2.aar/a67b5485c53251f992ac4a7d224cc803/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
index 734f100..7d6b6c8 100644
--- a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/e5dcbe52691fe80af7f3f6e6774f08df/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/e5dcbe52691fe80af7f3f6e6774f08df/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/8a1ad9fb1c07707bfde90a30ad053f0e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/exposed-instrumentation-api-publish-0.5.aar/8a1ad9fb1c07707bfde90a30ad053f0e/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
index e6acff4..dc4ba91 100644
--- a/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:rules-0.5">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/33c535b9bfeb0d0733d348f547617885/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/cacee9ded483161b5c0a3080ea4f6c2e/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/33c535b9bfeb0d0733d348f547617885/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/33c535b9bfeb0d0733d348f547617885/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/cacee9ded483161b5c0a3080ea4f6c2e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-0.5.aar/cacee9ded483161b5c0a3080ea4f6c2e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/test/rules/0.5/rules-0.5-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
index eccae77..bc33297 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:runner-0.5">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/51e2f325be732064d5a40958ceac211f/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/3b8264a20ab629d6d8e2c4861a6f4af0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/51e2f325be732064d5a40958ceac211f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/51e2f325be732064d5a40958ceac211f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/3b8264a20ab629d6d8e2c4861a6f4af0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-0.5.aar/3b8264a20ab629d6d8e2c4861a6f4af0/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/test/runner/0.5/runner-0.5-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_contrarywind_Android_PickerView_3_1_2.xml b/.idea/libraries/Gradle__com_contrarywind_Android_PickerView_3_1_2.xml
index da7d64d..521d96f 100644
--- a/.idea/libraries/Gradle__com_contrarywind_Android_PickerView_3_1_2.xml
+++ b/.idea/libraries/Gradle__com_contrarywind_Android_PickerView_3_1_2.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.contrarywind:Android-PickerView-3.1.2">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/1abad93f184fb2e61fd67e128b2da37f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/1abad93f184fb2e61fd67e128b2da37f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/e85ecab0a533f649d05f98f8b850f5d3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/e85ecab0a533f649d05f98f8b850f5d3/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_daimajia_numberprogressbar_library_1_4.xml b/.idea/libraries/Gradle__com_daimajia_numberprogressbar_library_1_4.xml
index 42e26d1..5f21615 100644
--- a/.idea/libraries/Gradle__com_daimajia_numberprogressbar_library_1_4.xml
+++ b/.idea/libraries/Gradle__com_daimajia_numberprogressbar_library_1_4.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.daimajia.numberprogressbar:library-1.4">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/e8a706eaa0bbee30b9abdbc71c78abaf/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/e8a706eaa0bbee30b9abdbc71c78abaf/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/99d315fe676bfcc05353d691f1801bc3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/99d315fe676bfcc05353d691f1801bc3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_github_lecho_hellocharts_library_1_5_8.xml b/.idea/libraries/Gradle__com_github_lecho_hellocharts_library_1_5_8.xml
index 4017f11..146c224 100644
--- a/.idea/libraries/Gradle__com_github_lecho_hellocharts_library_1_5_8.xml
+++ b/.idea/libraries/Gradle__com_github_lecho_hellocharts_library_1_5_8.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.github.lecho:hellocharts-library-1.5.8">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/3efe85d3c8193133205e59a9b0ab7704/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/3efe85d3c8193133205e59a9b0ab7704/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/a8803351f14a433311a733a488f1eb17/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/a8803351f14a433311a733a488f1eb17/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_lzy_net_okgo_2_1_4.xml b/.idea/libraries/Gradle__com_lzy_net_okgo_2_1_4.xml
index af49698..0e81237 100644
--- a/.idea/libraries/Gradle__com_lzy_net_okgo_2_1_4.xml
+++ b/.idea/libraries/Gradle__com_lzy_net_okgo_2_1_4.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.lzy.net:okgo-2.1.4">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/96f97a5f3317096675d235a351d4b0ee/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/96f97a5f3317096675d235a351d4b0ee/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/ca2d2e10b7b0b56a4a4b520b61d8aaef/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/ca2d2e10b7b0b56a4a4b520b61d8aaef/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_lzy_net_okserver_1_1_3.xml b/.idea/libraries/Gradle__com_lzy_net_okserver_1_1_3.xml
index 869caae..1bd0add 100644
--- a/.idea/libraries/Gradle__com_lzy_net_okserver_1_1_3.xml
+++ b/.idea/libraries/Gradle__com_lzy_net_okserver_1_1_3.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.lzy.net:okserver-1.1.3">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okserver-1.1.3.aar/4756b58038e66fa48f6f5a183970ad3c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okserver-1.1.3.aar/4756b58038e66fa48f6f5a183970ad3c/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okserver-1.1.3.aar/a6029cb7fe309a66e16d4786828c404e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/okserver-1.1.3.aar/a6029cb7fe309a66e16d4786828c404e/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_pnikosis_materialish_progress_1_0.xml b/.idea/libraries/Gradle__com_pnikosis_materialish_progress_1_0.xml
index 5259262..c485fa7 100644
--- a/.idea/libraries/Gradle__com_pnikosis_materialish_progress_1_0.xml
+++ b/.idea/libraries/Gradle__com_pnikosis_materialish_progress_1_0.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.pnikosis:materialish-progress-1.0">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/b24cd27d4154b26e3d30f146b762e3a8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/b24cd27d4154b26e3d30f146b762e3a8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/47318a0846dad2620b6a6f088a40762b/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/47318a0846dad2620b6a6f088a40762b/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_tencent_bugly_crashreport_upgrade_1_3_6.xml b/.idea/libraries/Gradle__com_tencent_bugly_crashreport_upgrade_1_3_6.xml
index 985b8f4..61be6f0 100644
--- a/.idea/libraries/Gradle__com_tencent_bugly_crashreport_upgrade_1_3_6.xml
+++ b/.idea/libraries/Gradle__com_tencent_bugly_crashreport_upgrade_1_3_6.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.tencent.bugly:crashreport_upgrade-1.3.6">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/41c79bfd3fe1ad8eeaf4312a672eb42c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/41c79bfd3fe1ad8eeaf4312a672eb42c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/1d6811a9c8233f4f3b961871a67d0e09/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/1d6811a9c8233f4f3b961871a67d0e09/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_tencent_bugly_nativecrashreport_3_3_1.xml b/.idea/libraries/Gradle__com_tencent_bugly_nativecrashreport_3_3_1.xml
index 4cbced8..b5fcbca 100644
--- a/.idea/libraries/Gradle__com_tencent_bugly_nativecrashreport_3_3_1.xml
+++ b/.idea/libraries/Gradle__com_tencent_bugly_nativecrashreport_3_3_1.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.tencent.bugly:nativecrashreport-3.3.1">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/dbf30888a466adc38f72b3667bf822c2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/dbf30888a466adc38f72b3667bf822c2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/8c1147deab124761102cb679027a8bd2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/8c1147deab124761102cb679027a8bd2/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_tencent_mm_opensdk_wechat_sdk_android_with_mta_5_1_6_jar.xml b/.idea/libraries/Gradle__com_tencent_mm_opensdk_wechat_sdk_android_with_mta_5_1_6_jar.xml
new file mode 100644
index 0000000..060b6a9
--- /dev/null
+++ b/.idea/libraries/Gradle__com_tencent_mm_opensdk_wechat_sdk_android_with_mta_5_1_6_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.tencent.mm.opensdk/wechat-sdk-android-with-mta/5.1.6/2a867edf0fb47c112e512e8d6440554b1cf67ac6/wechat-sdk-android-with-mta-5.1.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.tencent.mm.opensdk/wechat-sdk-android-with-mta/5.1.6/8bda2617c1006822721047d4c6f7441a186b2af1/wechat-sdk-android-with-mta-5.1.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_lib_1_9_9.xml b/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_lib_1_9_9.xml
index ccafd94..ecd845f 100644
--- a/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_lib_1_9_9.xml
+++ b/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_lib_1_9_9.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.tencent.tinker:tinker-android-lib-1.9.9">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/a0020a86c4c2280c3480403bedb56e08/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/a0020a86c4c2280c3480403bedb56e08/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/a0020a86c4c2280c3480403bedb56e08/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_loader_1_9_9.xml b/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_loader_1_9_9.xml
index 72430d9..39b6cf5 100644
--- a/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_loader_1_9_9.xml
+++ b/.idea/libraries/Gradle__com_tencent_tinker_tinker_android_loader_1_9_9.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.tencent.tinker:tinker-android-loader-1.9.9">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/5132ed48694f724e8dac239d9f48c3a9/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/5132ed48694f724e8dac239d9f48c3a9/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/5132ed48694f724e8dac239d9f48c3a9/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__in_srain_cube_ultra_ptr_1_0_11.xml b/.idea/libraries/Gradle__in_srain_cube_ultra_ptr_1_0_11.xml
index af57517..fc69865 100644
--- a/.idea/libraries/Gradle__in_srain_cube_ultra_ptr_1_0_11.xml
+++ b/.idea/libraries/Gradle__in_srain_cube_ultra_ptr_1_0_11.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: in.srain.cube:ultra-ptr-1.0.11">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/a1615e8c075418694cf92e560439e752/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/a1615e8c075418694cf92e560439e752/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/237107df99156e18cd87665c8a1b29c0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/237107df99156e18cd87665c8a1b29c0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_0.xml b/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_0.xml
index 3279b29..326a763 100644
--- a/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_0.xml
+++ b/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_0.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: me.zhanghai.android.materialprogressbar:library-1.4.0">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/874fd925032d2e919aec185d8ce5a313/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/874fd925032d2e919aec185d8ce5a313/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/874fd925032d2e919aec185d8ce5a313/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__pub_devrel_easypermissions_0_4_0.xml b/.idea/libraries/Gradle__pub_devrel_easypermissions_0_4_0.xml
index 5e89458..5c6914d 100644
--- a/.idea/libraries/Gradle__pub_devrel_easypermissions_0_4_0.xml
+++ b/.idea/libraries/Gradle__pub_devrel_easypermissions_0_4_0.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: pub.devrel:easypermissions-0.4.0">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/180f91394749c55f5209568adcee238b/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/180f91394749c55f5209568adcee238b/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/7ec5bffcdf49e15b0906e5e3ab0fe5b2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/7ec5bffcdf49e15b0906e5e3ab0fe5b2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a245da9..f0821af 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -108,7 +108,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/FastBleLib/FastBleLib.iml b/FastBleLib/FastBleLib.iml
index 0dbeb6a..9a2ba05 100644
--- a/FastBleLib/FastBleLib.iml
+++ b/FastBleLib/FastBleLib.iml
@@ -94,7 +94,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
diff --git a/andbrickslib/andbrickslib.iml b/andbrickslib/andbrickslib.iml
index e2fe7a9..1cfb37d 100644
--- a/andbrickslib/andbrickslib.iml
+++ b/andbrickslib/andbrickslib.iml
@@ -94,7 +94,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
diff --git a/app/app.iml b/app/app.iml
index c2878df..125691a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
<compilerSettings />
<compilerArguments>
<option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
- <option name="classpath" value="$MODULE_DIR$/libs/BaiduLBS_Android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/andbrickslib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/7ec5bffcdf49e15b0906e5e3ab0fe5b2/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/47318a0846dad2620b6a6f088a40762b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5ba88eb32d0546b9e23d9f51bc86dc37/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/5d314d3a87f8bde335969af5a4547056/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/2ccf5973c93a4ec53b8f3815d1977e8c/jars/classes.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/FastBleLib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/237107df99156e18cd87665c8a1b29c0/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/9e9eeaf9948ee4d6c3ab354e8dc14368f16994a4/glide-3.7.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/ca2d2e10b7b0b56a4a4b520b61d8aaef/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/99d315fe676bfcc05353d691f1801bc3/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/ddd99896e9569eaababbe81b35d80e1b91c4ad85/eventbus-3.0.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/a8803351f14a433311a733a488f1eb17/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/e85ecab0a533f649d05f98f8b850f5d3/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/4dc9467b0770c79acc4ceccc7a61c55b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/1d6811a9c8233f4f3b961871a67d0e09/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/8c1147deab124761102cb679027a8bd2/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/3f5e41ecffaf6897d5a4315a5e2baaff/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/9803afb728b3e086b4f7a547b2ffb612/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c4011cba5a71933834a45253eb9d00b6/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/e02e421bd05304dbd65c310ccad4a24d/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/jars/classes.jar:/Users/chenqi/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar:/Users/chenqi/Library/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.56.android/4eef0ac3ef5e18db7af5d44ca0228ca5c29dd2f6/fastjson-1.1.56.android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.4.1/c7c4f9e35c2fd5900da24f9872e3971801f08ce0/okhttp-3.4.1.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-commons/1.9.9/4af248b2b39ac366d6ca8b1f10a0630e092d92cf/tinker-commons-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.9.0/f824591a0016efbaeddb8300bee54832a1398cfa/okio-1.9.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/aosp-dexutils/1.9.9/a63b69047bc0041cfb9b8f120eb81b7630eb224b/aosp-dexutils-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/bsdiff-util/1.9.9/9ae926031682ef387ec5afdef12229b4f03270f5/bsdiff-util-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-ziputils/1.9.9/57894244db33610ceb85ed1f8751a8a6c814e385/tinker-ziputils-1.9.9.jar:/Users/chenqi/Library/Android/sdk/platforms/android-25/android.jar" />
+ <option name="classpath" value="$MODULE_DIR$/libs/BaiduLBS_Android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/andbrickslib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/easypermissions-0.4.0.aar/7ec5bffcdf49e15b0906e5e3ab0fe5b2/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/commons-0.9.4.4.aar/ed195ff1215287f8764097a9f77b74fa/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/materialish-progress-1.0.aar/47318a0846dad2620b6a6f088a40762b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/core-0.9.4.4.aar/5ba88eb32d0546b9e23d9f51bc86dc37/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.0.aar/741c5a4f444d2335c11c39c0fa4f8733/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.3.1.aar/004797fc059d6c2b644fc0d2d344825e/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/5d314d3a87f8bde335969af5a4547056/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/cardview-v7-25.3.1.aar/2ccf5973c93a4ec53b8f3815d1977e8c/jars/classes.jar:/Users/chenqi/AndroidStudioProjects/pregnancy_guard_android/FastBleLib/build/intermediates/intermediate-jars/debug/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/ultra-ptr-1.0.11.aar/237107df99156e18cd87665c8a1b29c0/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/9e9eeaf9948ee4d6c3ab354e8dc14368f16994a4/glide-3.7.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/okgo-2.1.4.aar/ca2d2e10b7b0b56a4a4b520b61d8aaef/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/library-1.4.aar/99d315fe676bfcc05353d691f1801bc3/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/ddd99896e9569eaababbe81b35d80e1b91c4ad85/eventbus-3.0.0.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/hellocharts-library-1.5.8.aar/a8803351f14a433311a733a488f1eb17/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/Android-PickerView-3.1.2.aar/e85ecab0a533f649d05f98f8b850f5d3/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/multidex-1.0.1.aar/4dc9467b0770c79acc4ceccc7a61c55b/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/crashreport_upgrade-1.3.6.aar/1d6811a9c8233f4f3b961871a67d0e09/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-lib-1.9.9.aar/b5d911d2f76c2d84e8171c34add0c40f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/nativecrashreport-3.3.1.aar/8c1147deab124761102cb679027a8bd2/jars/classes.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.mm.opensdk/wechat-sdk-android-with-mta/5.1.6/2a867edf0fb47c112e512e8d6440554b1cf67ac6/wechat-sdk-android-with-mta-5.1.6.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-25.3.1.aar/76f9f0853f745b43cd24835fca799002/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/tinker-android-loader-1.9.9.aar/d69fb323e6ad62f1c0c917078115c614/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v13-25.3.1.aar/3f5e41ecffaf6897d5a4315a5e2baaff/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-v4-25.3.1.aar/9803afb728b3e086b4f7a547b2ffb612/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-fragment-25.3.1.aar/11331fad33afd3888cbf7e2af9cc224f/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-ui-25.3.1.aar/d5b698634a26f4108f509f2d5c552ca9/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-media-compat-25.3.1.aar/373b78f6b6e858945cfbdcd19599a654/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-core-utils-25.3.1.aar/6b892c7815a11e7e749b06b041d942f8/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-25.3.1.aar/c4011cba5a71933834a45253eb9d00b6/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-25.3.1.aar/e02e421bd05304dbd65c310ccad4a24d/jars/classes.jar:/Users/chenqi/.gradle/caches/transforms-1/files-1.1/support-compat-25.3.1.aar/ac0b9c2a12df9075292b07110ae937ba/jars/classes.jar:/Users/chenqi/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar:/Users/chenqi/Library/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.56.android/4eef0ac3ef5e18db7af5d44ca0228ca5c29dd2f6/fastjson-1.1.56.android.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.4.1/c7c4f9e35c2fd5900da24f9872e3971801f08ce0/okhttp-3.4.1.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-commons/1.9.9/4af248b2b39ac366d6ca8b1f10a0630e092d92cf/tinker-commons-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.9.0/f824591a0016efbaeddb8300bee54832a1398cfa/okio-1.9.0.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/aosp-dexutils/1.9.9/a63b69047bc0041cfb9b8f120eb81b7630eb224b/aosp-dexutils-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/bsdiff-util/1.9.9/9ae926031682ef387ec5afdef12229b4f03270f5/bsdiff-util-1.9.9.jar:/Users/chenqi/.gradle/caches/modules-2/files-2.1/com.tencent.tinker/tinker-ziputils/1.9.9/57894244db33610ceb85ed1f8751a8a6c814e385/tinker-ziputils-1.9.9.jar:/Users/chenqi/Library/Android/sdk/platforms/android-25/android.jar" />
<option name="noStdlib" value="true" />
<option name="noReflect" value="true" />
<option name="moduleName" value="app_debug" />
@@ -106,7 +106,6 @@
<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/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/bakApk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -116,7 +115,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -127,7 +125,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tinker_intermediates" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
@@ -143,6 +140,7 @@
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.6@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" name="Gradle: com.tencent.bugly:nativecrashreport-3.3.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 087181f..9a92f5d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,6 +93,7 @@
implementation 'com.tencent.tinker:tinker-android-lib:1.9.9'
implementation 'com.tencent.bugly:nativecrashreport:latest.release'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
}
repositories {
mavenCentral()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c1f951..9b4f0b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="com.huawei.android.launcher.permission.WRITE_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
@@ -42,6 +43,10 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
<application
android:name="com.moral.yunfushao.MainApp"
@@ -102,7 +107,6 @@
android:name="com.tencent.bugly.beta.ui.BetaActivity"
android:configChanges="keyboardHidden|orientation|screenSize|locale"
android:theme="@android:style/Theme.Translucent" />
-
<!--API 24������������-->
<provider
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 291b3f3..8074f2b 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -20,6 +20,9 @@
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.User;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import java.util.HashMap;
import java.util.Map;
@@ -29,9 +32,11 @@
*/
public class LoginActivity extends BaseActivity {
- private Button bt_sure;
- private TextView tv_forget,tv_register;
+ private Button bt_sure, weixinlogin;
+ private TextView tv_forget, tv_register;
private EditText et_phone, et_pwd;
+ private IWXAPI iwxapi;
+
@Override
protected void getBundleExtras(Bundle extras) {
@@ -41,7 +46,23 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.translucentStatusBar(LoginActivity.this);
+ regToWx();
}
+
+ private void regToWx() {
+ iwxapi = WXAPIFactory.createWXAPI(this, "app_id", true);
+ iwxapi.registerApp("app_id");
+ }
+
+ private void sendReq() {
+ //������
+ SendAuth.Req req = new SendAuth.Req();
+ req.scope = "snsapi_userinfo";
+ req.state = "wechat_sdk_demo_test";
+ iwxapi.sendReq(req);
+ System.out.println("chenqi fasongcehngqo");
+ }
+
@Override
protected int getLayoutId() {
@@ -55,6 +76,7 @@
tv_register = findView(R.id.tv_register);
et_phone = findView(R.id.et_phone);
et_pwd = findView(R.id.et_pwd);
+ weixinlogin = findView(R.id.weixinlogin);
// et_phone.setText("18362724160");
// et_pwd.setText("123456");
}
@@ -73,7 +95,7 @@
@Override
protected void processClick(View view) {
- switch (view.getId()){
+ switch (view.getId()) {
case R.id.bt_sure:
String userphone = et_phone.getText().toString().trim();
String password = et_pwd.getText().toString().trim();
@@ -85,17 +107,24 @@
mToatUtils.showSingletonToast("���������������");
return;
}
- login(userphone,password);
+ login(userphone, password);
break;
case R.id.tv_forget:
- Intent intent = new Intent(LoginActivity.this,ForgetPasswordActivity.class);
+ Intent intent = new Intent(LoginActivity.this, ForgetPasswordActivity.class);
startActivity(intent);
break;
case R.id.tv_register:
- Intent intentRgister = new Intent(LoginActivity.this,RegisterActivity.class);
+ Intent intentRgister = new Intent(LoginActivity.this, RegisterActivity.class);
startActivity(intentRgister);
break;
+ case R.id.weixinlogin:
+ weixinlogin();
+ break;
}
+ }
+
+ private void weixinlogin() {
+ sendReq();
}
@Override
@@ -115,13 +144,13 @@
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
- User user = FastJsonTools.getJson(res,User.class);
- if(user!=null){
+ User user = FastJsonTools.getJson(res, User.class);
+ if (user != null) {
MainApp.theApp.sharedPreferencesUtil.saveLoginInfo(user);
MainApp.theApp.userId = user.get_id();
Intent intent = new Intent(getApplicationContext(), MainActivity.class);
Bundle bundle = new Bundle();
- bundle.putBoolean("islogin",true);
+ bundle.putBoolean("islogin", true);
intent.putExtras(bundle);
startActivity(intent);
finish();
@@ -135,7 +164,7 @@
}
@Override
- public void onFail(int errno,String s) {
+ 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/ui/PanelView.java b/app/src/main/java/com/moral/yunfushao/ui/PanelView.java
index 5929488..20de007 100644
--- a/app/src/main/java/com/moral/yunfushao/ui/PanelView.java
+++ b/app/src/main/java/com/moral/yunfushao/ui/PanelView.java
@@ -14,6 +14,7 @@
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
+import android.view.animation.Animation;
import com.moral.yunfushao.R;
@@ -76,7 +77,7 @@
private Bitmap mBitmap;
private float percent = 0;//���������������
- private float percent2 = (float) 0.27;//���������������
+ private float percent2 = 0;//���������������
private String statusStr = "���������";
@@ -88,14 +89,8 @@
}
public void setPercent(float percent) {
- this.percent = percent;
-// this.percent2 = percent;
- postInvalidate();
-// if (anim.isStarted() || anim.isRunning()) {
-// anim.end();
-// anim.cancel();
-// }
-// anim.start();
+ this.percent2 = percent;
+ startAnimation();
}
public PanelView(Context context) {
@@ -160,7 +155,6 @@
mBitPaint.setFilterBitmap(true);
mBitPaint.setDither(true);
mBitmap = ((BitmapDrawable) mContext.getResources().getDrawable(R.mipmap.zhizhen)).getBitmap();
-// startAnimation();
}
@Override
@@ -184,19 +178,19 @@
setMeasuredDimension(mmWidth, mmHeight);
}
-// private void startAnimation() {
-// anim = ValueAnimator.ofObject(new CustomPointEvaluator(),(float)0, percent2);
-// anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-// @Override
-// public void onAnimationUpdate(ValueAnimator animation) {
-// percent = (float) animation.getAnimatedValue();
-// System.out.println("chenqi rotato " + percent + " all -> " + percent2 * 300);
-//// invalidate();
-// }
-// });
-// anim.setDuration(3000L);
-// anim.setRepeatCount(Animation.INFINITE);
-// }
+ private void startAnimation() {
+ anim = ValueAnimator.ofFloat((float) percent, percent2);
+ anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ percent = (float) animation.getAnimatedValue();
+ postInvalidate();
+ }
+ });
+ anim.setDuration(3000L);
+ anim.setRepeatCount(Animation.INFINITE);
+ anim.start();
+ }
//
// private class CustomPointEvaluator implements TypeEvaluator<Float> {
// @Override
diff --git a/app/src/main/res/layout/ac_login_layout.xml b/app/src/main/res/layout/ac_login_layout.xml
index f61bfa9..d5a903d 100644
--- a/app/src/main/res/layout/ac_login_layout.xml
+++ b/app/src/main/res/layout/ac_login_layout.xml
@@ -1,10 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_login"
android:fitsSystemWindows="true"
android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tv_register"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginTop="@dimen/x10"
+ android:layout_marginRight="@dimen/x10"
+ android:layout_marginBottom="@dimen/x30"
+ android:gravity="center|center_horizontal"
+ android:text="������"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
<ImageView
android:layout_width="100dp"
@@ -17,8 +31,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/x40"
- android:layout_marginRight="@dimen/x40"
android:layout_marginTop="@dimen/x24"
+ android:layout_marginRight="@dimen/x40"
android:layout_marginBottom="@dimen/x20"
android:background="@mipmap/bg_edit"
android:padding="@dimen/x14">
@@ -43,13 +57,13 @@
android:id="@+id/et_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
android:layout_toRightOf="@+id/line1"
android:background="@null"
android:hint="���������������������"
android:inputType="number"
android:paddingLeft="@dimen/x10"
android:paddingRight="@dimen/x10"
- android:layout_centerVertical="true"
android:textColor="@color/blue_txt"
android:textColorHint="@color/blue_txt"
android:textSize="16sp" />
@@ -83,8 +97,8 @@
android:id="@+id/et_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/line2"
android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/line2"
android:background="@null"
android:hint="���������������"
android:inputType="textPassword"
@@ -94,36 +108,37 @@
android:textColorHint="@color/blue_txt"
android:textSize="16sp" />
</RelativeLayout>
+
<TextView
android:id="@+id/tv_forget"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:text="���������������"
- android:layout_marginRight="@dimen/x40"
android:layout_marginTop="@dimen/x24"
+ android:layout_marginRight="@dimen/x40"
android:gravity="right"
+ android:text="���������������"
android:textColor="@color/dark_gray_txt"
android:textSize="15sp" />
+
<Button
android:id="@+id/bt_sure"
android:layout_width="match_parent"
android:layout_height="@dimen/x40"
android:layout_marginLeft="@dimen/x40"
+ android:layout_marginTop="@dimen/x12"
android:layout_marginRight="@dimen/x40"
- android:layout_marginTop="@dimen/x24"
android:background="@mipmap/bt_blue"
android:text="������"
- android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp" />
- <TextView
- android:id="@+id/tv_register"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="���������������"
- android:gravity="bottom|center_horizontal"
- android:textColor="@color/blue_txt"
- android:layout_marginBottom="@dimen/x30"
- android:textSize="16sp" />
+
+ <Button
+ android:id="@+id/weixinlogin"
+ android:layout_width="@dimen/x44"
+ android:layout_height="@dimen/x44"
+ android:layout_gravity="bottom|center"
+ android:layout_marginTop="@dimen/x2"
+ android:background="@mipmap/weixin"
+ android:stateListAnimator="@anim/progress" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/weixin.png b/app/src/main/res/mipmap-xhdpi/weixin.png
new file mode 100644
index 0000000..144fdfc
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/weixin.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/weixin.png b/app/src/main/res/mipmap-xxhdpi/weixin.png
new file mode 100644
index 0000000..144fdfc
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/weixin.png
Binary files differ
--
Gitblit v1.8.0