From df3af70b33eb6372b56075bc9e45c23ccf3f82c6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 28 十月 2025 17:40:38 +0800
Subject: [PATCH] 2025.10.28 1. 新增巡查场景历史详情界面出版（完成）； 2. 巡查任务日历界面，任务条目中新增风险提示、巡查要点、应急巡查3种提示信息的提示图标逻辑（待完成）；
---
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml | 7
.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml | 5
.idea/misc.xml | 19
.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml | 6
.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml | 7
.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml | 6
.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml | 5
.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml | 6
.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml | 5
.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml | 5
.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml | 6
.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml | 8
app/src/main/res/drawable/bg_border_black_no_right.xml | 25
.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml | 7
.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml | 5
app/src/main/res/drawable/bg_border_black_no_top.xml | 25
.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml | 8
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt | 4
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml | 5
.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml | 5
.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml | 5
.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt | 100 ++
app/src/main/res/drawable/ic_emergency.png | 0
.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml | 5
app/src/main/res/layout/item_task_list_2.xml | 87 ++
.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt | 76 ++
.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml | 8
.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml | 5
.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/util/push/LoginInitializer.kt | 12
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml | 5
.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml | 8
.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml | 6
.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml | 7
.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml | 5
.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml | 5
.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml | 8
.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml | 8
.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt | 6
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt | 6
.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml | 7
.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml | 6
.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml | 5
app/build.gradle | 2
.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml | 7
.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageIntentService.kt | 192 +++---
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/MonitorDataVo.kt | 8
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml | 5
.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/util/push/PushService.kt | 106 +-
.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml | 8
app/src/main/res/drawable/bg_border_black_no_top_right.xml | 24
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml | 5
.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml | 5
.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml | 5
.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ProblemRecurrenceVo.kt | 10
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml | 7
.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageReceiver.kt | 144 ++--
.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/EmergencyInspectionVo.kt | 8
.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml | 5
.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml | 5
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml | 5
app/src/main/res/layout/dialog_scene_history.xml | 415 ++++++++++++
build.gradle | 2
.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml | 5
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml | 6
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ConstructionPhaseVo.kt | 14
app/src/main/AndroidManifest.xml | 28
app/src/main/res/drawable/bg_border_black.xml | 26
.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml | 5
.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/JointLawEnforcementVo.kt | 16
.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml | 6
.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml | 5
.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml | 7
app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java | 3
/dev/null | 12
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml | 5
.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml | 5
.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml | 5
app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListHolder.java | 14
116 files changed, 1,376 insertions(+), 504 deletions(-)
diff --git a/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml b/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
index 72e06b7..cdcad70 100644
--- a/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
+++ b/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: am.widget:circleprogressbar:1.0.3@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/541ad86651b52056868ff476ecf5e024/transformed/circleprogressbar-1.0.3/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/541ad86651b52056868ff476ecf5e024/transformed/circleprogressbar-1.0.3/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/541ad86651b52056868ff476ecf5e024/transformed/circleprogressbar-1.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bd7100736e887667593333e1c9db10fd/transformed/circleprogressbar-1.0.3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/am.widget/circleprogressbar/1.0.3/950fc6fb417ed78bc42aa231b79f59f2836ba64a/circleprogressbar-1.0.3-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
index 369eefd..e0dcb85 100644
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.core:runtime:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/214bdc9cac88e976195e46d761ee1538/runtime-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/498bbf373388df26213731ad42aa4963/transformed/runtime-1.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/498bbf373388df26213731ad42aa4963/transformed/runtime-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/498bbf373388df26213731ad42aa4963/transformed/runtime-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1bc989b9a041d5059b8c8431150441e1/transformed/runtime-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
index c65b7e1..902d752 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.lifecycle:extensions:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/365f657fde1f3785888e75af4aa4ee10/extensions-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/86245674e276514b3ad3fba9660594ee/transformed/extensions-1.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/86245674e276514b3ad3fba9660594ee/transformed/extensions-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/86245674e276514b3ad3fba9660594ee/transformed/extensions-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/609c54361791a3c8ed1e8de15e1e6206/transformed/extensions-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index a215f32..c53a29b 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3150690e8713e02e5e032dcb88719575/livedata-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e5eb335208cb35b31d1c7e66715f435d/transformed/livedata-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e5eb335208cb35b31d1c7e66715f435d/transformed/livedata-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e5eb335208cb35b31d1c7e66715f435d/transformed/livedata-1.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/74393a8ccc7a98a53a226928871e7918/transformed/livedata-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
index 9fed7d4..fdd9dbf 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d2442638d1d59660bcc6af7e7e0088f/livedata-core-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c87a5180f9fddccc2e9b6d3f136f2b9a/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c87a5180f9fddccc2e9b6d3f136f2b9a/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c87a5180f9fddccc2e9b6d3f136f2b9a/transformed/livedata-core-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e7984d6cf38f8c95f14a44e66223e52/transformed/livedata-core-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index cbae35c..b371a95 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd9a24a47ad2242a8fea2d4cb485f7f4/runtime-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0141c50c861245fe11e6dcaa98a9117e/transformed/runtime-1.1.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0141c50c861245fe11e6dcaa98a9117e/transformed/runtime-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0141c50c861245fe11e6dcaa98a9117e/transformed/runtime-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0238a0f25fb680b25d84c24613447f2f/transformed/runtime-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index dd85b11..1b96cba 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a574c2236445212ad229f69a1894781/viewmodel-1.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a46dd2c6a315d0bf67b853ecbbf41a14/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a46dd2c6a315d0bf67b853ecbbf41a14/transformed/viewmodel-1.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a46dd2c6a315d0bf67b853ecbbf41a14/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/495d1d00226704a2128b2f02ca801527/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml b/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
index 21c08ec..2c28c8a 100644
--- a/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: cn.carbswang.android:NumberPickerView:1.1.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef686d15520e802dc9131e0f83752a62/transformed/NumberPickerView-1.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef686d15520e802dc9131e0f83752a62/transformed/NumberPickerView-1.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef686d15520e802dc9131e0f83752a62/transformed/NumberPickerView-1.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/304b39f67142bcb855b10342eaa79578/transformed/NumberPickerView-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.carbswang.android/NumberPickerView/1.1.1/5580870c5c11b0b43b79a58e8c7b0f3f6f0eb262/NumberPickerView-1.1.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_alibaba_fastjson_1_1_54_android.xml b/.idea/libraries/Gradle__com_alibaba_fastjson_1_1_54_android.xml
deleted file mode 100644
index 45b5e1c..0000000
--- a/.idea/libraries/Gradle__com_alibaba_fastjson_1_1_54_android.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.alibaba:fastjson:1.1.54.android">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.54.android/de873c13032fff0b1dcab39a6fb14a3505bc92bb/fastjson-1.1.54.android.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.54.android/be1a8f52ec8be69483fd65cb0c7a7196b1b7b2b8/fastjson-1.1.54.android-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.54.android/c4cd7adc6912cdda3a1feb989f8eeca23569a961/fastjson-1.1.54.android-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_agoo_4_0_4_emas_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_agoo_4_0_4_emas_aar.xml
deleted file mode 100644
index dc2ebde..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_agoo_4_0_4_emas_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-agoo:4.0.4-emas@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80ead45c1317d862f94285af5d97cca9/alicloud-android-agoo-4.0.4-emas/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6a391382ebd4c9f30a2b8caef66c9264/transformed/alicloud-android-agoo-4.0.4-emas/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6a391382ebd4c9f30a2b8caef66c9264/transformed/alicloud-android-agoo-4.0.4-emas/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6a391382ebd4c9f30a2b8caef66c9264/transformed/alicloud-android-agoo-4.0.4-emas/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_apm_1_0_8_2_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_apm_1_0_8_2_open_aar.xml
deleted file mode 100644
index 38250e5..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_apm_1_0_8_2_open_aar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-apm:1.0.8.2-open@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/classes.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/AliHADataHub-1.0.0.23.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/network_lifecycle-1.0.1.2.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/applicationmonitor_weex-1.0.1.10.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/applicationmonitor-1.0.5.4.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/phenix_lifecycle-1.0.1.1.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/application_common-1.0.1.2.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/applicationmonitor_interface-1.0.4.6.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/jars/libs/DeviceEvaluator-1.0.0.21.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/28d5b73e4ae004e4ecea7b8ef0856f96/transformed/alicloud-android-apm-1.0.8.2-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_beacon_1_0_4_3.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_beacon_1_0_4_3.xml
deleted file mode 100644
index d213cce..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_beacon_1_0_4_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-beacon:1.0.4.3">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-beacon/1.0.4.3/b6fb16d562c3fca37e61a73cc841c1b55940873/alicloud-android-beacon-1.0.4.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_feedback_3_3_2_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_feedback_3_3_2_aar.xml
deleted file mode 100644
index 6c22688..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_feedback_3_3_2_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-feedback:3.3.2@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a9a313b0e4e5c0f26625b08d2f524683/transformed/alicloud-android-feedback-3.3.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a9a313b0e4e5c0f26625b08d2f524683/transformed/alicloud-android-feedback-3.3.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a9a313b0e4e5c0f26625b08d2f524683/transformed/alicloud-android-feedback-3.3.2/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_adapter_1_1_3_8_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_adapter_1_1_3_8_open_aar.xml
deleted file mode 100644
index e2fa791..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_adapter_1_1_3_8_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-adapter:1.1.3.8-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c9dde55c8c468767304a26bf90867f42/transformed/alicloud-android-ha-adapter-1.1.3.8-open/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c9dde55c8c468767304a26bf90867f42/transformed/alicloud-android-ha-adapter-1.1.3.8-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c9dde55c8c468767304a26bf90867f42/transformed/alicloud-android-ha-adapter-1.1.3.8-open/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_apm_impl_1_0_7_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_apm_impl_1_0_7_1_open_aar.xml
deleted file mode 100644
index 9b6c4d4..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_apm_impl_1_0_7_1_open_aar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-apm-impl:1.0.7.1-open@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b18f967566475a8a77871a69fc6a7be0/transformed/alicloud-android-ha-apm-impl-1.0.7.1-open/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b18f967566475a8a77871a69fc6a7be0/transformed/alicloud-android-ha-apm-impl-1.0.7.1-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b18f967566475a8a77871a69fc6a7be0/transformed/alicloud-android-ha-apm-impl-1.0.7.1-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b18f967566475a8a77871a69fc6a7be0/transformed/alicloud-android-ha-apm-impl-1.0.7.1-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_core_1_1_0_6_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_core_1_1_0_6_1_open_aar.xml
deleted file mode 100644
index 84d83bb..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_core_1_1_0_6_1_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-core:1.1.0.6.1-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a49c8c47e7d2f1f7d9229eea3a36f54d/transformed/alicloud-android-ha-core-1.1.0.6.1-open/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a49c8c47e7d2f1f7d9229eea3a36f54d/transformed/alicloud-android-ha-core-1.1.0.6.1-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a49c8c47e7d2f1f7d9229eea3a36f54d/transformed/alicloud-android-ha-core-1.1.0.6.1-open/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml
deleted file mode 100644
index 53bf6bf..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-fulltrace:1.0.1.11@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/14d85c1d9b4576af26ac9fe7b253d449/transformed/alicloud-android-ha-fulltrace-1.0.1.11/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/14d85c1d9b4576af26ac9fe7b253d449/transformed/alicloud-android-ha-fulltrace-1.0.1.11/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/14d85c1d9b4576af26ac9fe7b253d449/transformed/alicloud-android-ha-fulltrace-1.0.1.11/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_protocol_1_1_1_0_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_protocol_1_1_1_0_open_aar.xml
deleted file mode 100644
index 4db375f..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_protocol_1_1_1_0_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-protocol:1.1.1.0-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/997f085c21787e91c24d9c2606f8bd6d/transformed/alicloud-android-ha-protocol-1.1.1.0-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/997f085c21787e91c24d9c2606f8bd6d/transformed/alicloud-android-ha-protocol-1.1.1.0-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/997f085c21787e91c24d9c2606f8bd6d/transformed/alicloud-android-ha-protocol-1.1.1.0-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tbrest_1_1_1_0_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tbrest_1_1_1_0_open_aar.xml
deleted file mode 100644
index 45a8192..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tbrest_1_1_1_0_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tbrest:1.1.1.0-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/78b55bccf6576b4c7c3e1ce8ee5b1b1a/transformed/alicloud-android-ha-tbrest-1.1.1.0-open/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/78b55bccf6576b4c7c3e1ce8ee5b1b1a/transformed/alicloud-android-ha-tbrest-1.1.1.0-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/78b55bccf6576b4c7c3e1ce8ee5b1b1a/transformed/alicloud-android-ha-tbrest-1.1.1.0-open/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml
deleted file mode 100644
index eebddce..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-telescopebase:1.1.1-open@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2d89e3c236c6c1e952ac906556678f40/transformed/alicloud-android-ha-telescopebase-1.1.1-open/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2d89e3c236c6c1e952ac906556678f40/transformed/alicloud-android-ha-telescopebase-1.1.1-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2d89e3c236c6c1e952ac906556678f40/transformed/alicloud-android-ha-telescopebase-1.1.1-open/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2d89e3c236c6c1e952ac906556678f40/transformed/alicloud-android-ha-telescopebase-1.1.1-open/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml
deleted file mode 100644
index 4a3a156..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-telescopesdk:1.1.3-open@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e120d2e08f4dbd27b27c1eb196449b9a/transformed/alicloud-android-ha-telescopesdk-1.1.3-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e120d2e08f4dbd27b27c1eb196449b9a/transformed/alicloud-android-ha-telescopesdk-1.1.3-open/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e120d2e08f4dbd27b27c1eb196449b9a/transformed/alicloud-android-ha-telescopesdk-1.1.3-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_message_rpc_1_1_3_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_message_rpc_1_1_3_1_open_aar.xml
deleted file mode 100644
index 80f524c..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_message_rpc_1_1_3_1_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-message-rpc:1.1.3.1-open@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ac0f908eeee8b5cec79cf293e681dcbd/transformed/alicloud-android-ha-tlog-message-rpc-1.1.3.1-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ac0f908eeee8b5cec79cf293e681dcbd/transformed/alicloud-android-ha-tlog-message-rpc-1.1.3.1-open/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ac0f908eeee8b5cec79cf293e681dcbd/transformed/alicloud-android-ha-tlog-message-rpc-1.1.3.1-open/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_native_1_1_0_7_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_native_1_1_0_7_open_aar.xml
deleted file mode 100644
index fe2dcee..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_native_1_1_0_7_open_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-native:1.1.0.7-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a65d495cfbe022f084a323a336fecfc/alicloud-android-ha-tlog-native-1.1.0.7-open/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a63ca64def27cde6c8369892675b9142/transformed/alicloud-android-ha-tlog-native-1.1.0.7-open/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a63ca64def27cde6c8369892675b9142/transformed/alicloud-android-ha-tlog-native-1.1.0.7-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a63ca64def27cde6c8369892675b9142/transformed/alicloud-android-ha-tlog-native-1.1.0.7-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_protocol_1_1_0_8_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_protocol_1_1_0_8_open_aar.xml
deleted file mode 100644
index f9283a1..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_protocol_1_1_0_8_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-protocol:1.1.0.8-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/08433eb14d541954629a6136426eed78/transformed/alicloud-android-ha-tlog-protocol-1.1.0.8-open/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/08433eb14d541954629a6136426eed78/transformed/alicloud-android-ha-tlog-protocol-1.1.0.8-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/08433eb14d541954629a6136426eed78/transformed/alicloud-android-ha-tlog-protocol-1.1.0.8-open/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_uploader_oss_1_1_0_6_3_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_uploader_oss_1_1_0_6_3_open_aar.xml
deleted file mode 100644
index 81dab56..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_uploader_oss_1_1_0_6_3_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-uploader-oss:1.1.0.6.3-open@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0ee3c8f7a685ef795c9fb5d3951a321b/transformed/alicloud-android-ha-tlog-uploader-oss-1.1.0.6.3-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0ee3c8f7a685ef795c9fb5d3951a321b/transformed/alicloud-android-ha-tlog-uploader-oss-1.1.0.6.3-open/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0ee3c8f7a685ef795c9fb5d3951a321b/transformed/alicloud-android-ha-tlog-uploader-oss-1.1.0.6.3-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_hotfix_3_2_17_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_hotfix_3_2_17_aar.xml
deleted file mode 100644
index 1664aa1..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_hotfix_3_2_17_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-hotfix:3.2.17@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2df042acee20e78a4197bf91a18cb2ff/alicloud-android-hotfix-3.2.17/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d83fb3f321461e5e49e7d5bdd2c35323/transformed/alicloud-android-hotfix-3.2.17/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d83fb3f321461e5e49e7d5bdd2c35323/transformed/alicloud-android-hotfix-3.2.17/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d83fb3f321461e5e49e7d5bdd2c35323/transformed/alicloud-android-hotfix-3.2.17/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_httpdns_2_0_0_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_httpdns_2_0_0_aar.xml
deleted file mode 100644
index ce6d228..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_httpdns_2_0_0_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-httpdns:2.0.0@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ca958ad5cde07af4488d19da2ac96825/transformed/alicloud-android-httpdns-2.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ca958ad5cde07af4488d19da2ac96825/transformed/alicloud-android-httpdns-2.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ca958ad5cde07af4488d19da2ac96825/transformed/alicloud-android-httpdns-2.0.0/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_man_1_2_5_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_man_1_2_5_aar.xml
deleted file mode 100644
index 2a747cc..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_man_1_2_5_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-man:1.2.5@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b0a15794d97e8b6de6e364e3166967ab/transformed/alicloud-android-man-1.2.5/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b0a15794d97e8b6de6e364e3166967ab/transformed/alicloud-android-man-1.2.5/jars/libs/alicloud-android-man-1.2.4.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b0a15794d97e8b6de6e364e3166967ab/transformed/alicloud-android-man-1.2.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b0a15794d97e8b6de6e364e3166967ab/transformed/alicloud-android-man-1.2.5/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml
deleted file mode 100644
index 1d81c53..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-networkmonitor:1.4.0@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5c458bb8c09cfac8316164a8648d7c0f/transformed/alicloud-android-networkmonitor-1.4.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5c458bb8c09cfac8316164a8648d7c0f/transformed/alicloud-android-networkmonitor-1.4.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5c458bb8c09cfac8316164a8648d7c0f/transformed/alicloud-android-networkmonitor-1.4.0/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_push_3_2_5_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_push_3_2_5_aar.xml
deleted file mode 100644
index ba05981..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_push_3_2_5_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-push:3.2.5@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7f2cfcf44833ab83ea5435c102c5ddbc/transformed/alicloud-android-push-3.2.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7f2cfcf44833ab83ea5435c102c5ddbc/transformed/alicloud-android-push-3.2.5/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7f2cfcf44833ab83ea5435c102c5ddbc/transformed/alicloud-android-push-3.2.5/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_rest_1_4_0_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_rest_1_4_0_open_aar.xml
deleted file mode 100644
index 2406109..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_rest_1_4_0_open_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-rest:1.4.0-open@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cc0bf60aef4644f140dd780ae8917cd1/transformed/alicloud-android-rest-1.4.0-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc0bf60aef4644f140dd780ae8917cd1/transformed/alicloud-android-rest-1.4.0-open/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc0bf60aef4644f140dd780ae8917cd1/transformed/alicloud-android-rest-1.4.0-open/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_tlog_1_1_3_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_tlog_1_1_3_1_open_aar.xml
deleted file mode 100644
index 52d75be..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_tlog_1_1_3_1_open_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-tlog:1.1.3.1-open@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1f0ae649d87bdf99dcf81101e85d287/alicloud-android-tlog-1.1.3.1-open/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1e0a22385bbda43fab234303fdee46b1/transformed/alicloud-android-tlog-1.1.3.1-open/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1e0a22385bbda43fab234303fdee46b1/transformed/alicloud-android-tlog-1.1.3.1-open/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1e0a22385bbda43fab234303fdee46b1/transformed/alicloud-android-tlog-1.1.3.1-open/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml
deleted file mode 100644
index 5bba2b4..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-ut:5.4.4">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-ut/5.4.4/173299847eb2c241efabc83015230142af2c3f25/alicloud-android-ut-5.4.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utdid_2_5_1_proguard.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utdid_2_5_1_proguard.xml
deleted file mode 100644
index 629f85b..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utdid_2_5_1_proguard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-utdid:2.5.1-proguard">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-utdid/2.5.1-proguard/11b0a315de754c94a1c86dafe12c01a56900a352/alicloud-android-utdid-2.5.1-proguard.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utils_1_1_6_4.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utils_1_1_6_4.xml
deleted file mode 100644
index 6dd8977..0000000
--- a/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utils_1_1_6_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.ams:alicloud-android-utils:1.1.6.4">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.ams/alicloud-android-utils/1.1.6.4/a9afca2de7820da004003340f184ba644be2f174/alicloud-android-utils-1.1.6.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_aliyun_dpa_oss_android_sdk_2_9_3_aar.xml b/.idea/libraries/Gradle__com_aliyun_dpa_oss_android_sdk_2_9_3_aar.xml
deleted file mode 100644
index 467130c..0000000
--- a/.idea/libraries/Gradle__com_aliyun_dpa_oss_android_sdk_2_9_3_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.aliyun.dpa:oss-android-sdk:2.9.3@aar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8df41982516cd5e7d9f6b57e3356f4ff/transformed/oss-android-sdk-2.9.3/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8df41982516cd5e7d9f6b57e3356f4ff/transformed/oss-android-sdk-2.9.3/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8df41982516cd5e7d9f6b57e3356f4ff/transformed/oss-android-sdk-2.9.3/res" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.dpa/oss-android-sdk/2.9.3/926aedef4c814c2f6911b84f44b9e4a06993049e/oss-android-sdk-2.9.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.aliyun.dpa/oss-android-sdk/2.9.3/f1b6bcafc8f1a1a0517faafa6d08f49c6d8eccdb/oss-android-sdk-2.9.3-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index fe05d15..de2a4e2 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a6d52ee5d429d4b8844b4e139bec139/animated-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/554ff06c493a298991412a1a180c9621/transformed/animated-vector-drawable-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/554ff06c493a298991412a1a180c9621/transformed/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/554ff06c493a298991412a1a180c9621/transformed/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b3c246c4ca3b474316a944d0e79ca67f/transformed/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
index d56742a..e29ffdc 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/36b8db302963902b5a2b95ab7c37f4d7/transformed/appcompat-v7-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/36b8db302963902b5a2b95ab7c37f4d7/transformed/appcompat-v7-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/36b8db302963902b5a2b95ab7c37f4d7/transformed/appcompat-v7-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/36b8db302963902b5a2b95ab7c37f4d7/transformed/appcompat-v7-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b27b73ab2f28d9f4b37d016824f8c4bc/transformed/appcompat-v7-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 6027420..952ff97 100644
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24157e7ed0db220c3ca463df4d44e01f/asynclayoutinflater-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/caac66f9697c632af85e1a065896eef1/transformed/asynclayoutinflater-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/caac66f9697c632af85e1a065896eef1/transformed/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/caac66f9697c632af85e1a065896eef1/transformed/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f2e01e227281e0b1a892456c30af8d82/transformed/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
index 22e7438..9448e36 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/97c50fc5b2e53fa7b32a79fb74294d13/transformed/cardview-v7-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/97c50fc5b2e53fa7b32a79fb74294d13/transformed/cardview-v7-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/97c50fc5b2e53fa7b32a79fb74294d13/transformed/cardview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8b00b81dac0168f2a7ede1aa44a44ff/transformed/cardview-v7-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
index 91b1b90..548a273 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout:2.0.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f8c95e93a68ba6a028515e94bdd9bc3e/transformed/constraint-layout-2.0.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f8c95e93a68ba6a028515e94bdd9bc3e/transformed/constraint-layout-2.0.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f8c95e93a68ba6a028515e94bdd9bc3e/transformed/constraint-layout-2.0.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/743f52f1f35b77d129d02815488e7c75/transformed/constraint-layout-2.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index 1cbd50f..7abc47d 100644
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/11b338e4b730a0b24a09bab68548b8a2/transformed/coordinatorlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11b338e4b730a0b24a09bab68548b8a2/transformed/coordinatorlayout-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11b338e4b730a0b24a09bab68548b8a2/transformed/coordinatorlayout-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/11b338e4b730a0b24a09bab68548b8a2/transformed/coordinatorlayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6edbdbed12df33f714620ceb7ca6ae17/transformed/coordinatorlayout-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
index e78a51c..f3e91be 100644
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6cc43be649d8dd54e1d15f575f0cd14/cursoradapter-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/788b34836e0f164ad96486a33b499c60/transformed/cursoradapter-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/788b34836e0f164ad96486a33b499c60/transformed/cursoradapter-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/788b34836e0f164ad96486a33b499c60/transformed/cursoradapter-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e49c7ebb05a901273e89122d61c495a7/transformed/cursoradapter-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index 084a3f7..b90084f 100644
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:customview:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ddd7d7c45259fdb153c0cfa2948bc245/customview-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c45304e2fcc51011033118debaf998af/transformed/customview-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c45304e2fcc51011033118debaf998af/transformed/customview-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c45304e2fcc51011033118debaf998af/transformed/customview-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e800cc5b069eb4b38923eb970653192f/transformed/customview-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
index bc20afe..34e5272 100644
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:design:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f1cda99d608f7f249c4e7fc96e4b0bbb/transformed/design-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f1cda99d608f7f249c4e7fc96e4b0bbb/transformed/design-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f1cda99d608f7f249c4e7fc96e4b0bbb/transformed/design-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f1cda99d608f7f249c4e7fc96e4b0bbb/transformed/design-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/04ce8d5bc87b32952d199ba29bea31d0/transformed/design-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
index a4fc717..4e34075 100644
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:documentfile:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8204f1ad54e41652bd4dbd721d396274/documentfile-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dbef811cb3aa2691936a21f657daa34c/transformed/documentfile-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dbef811cb3aa2691936a21f657daa34c/transformed/documentfile-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dbef811cb3aa2691936a21f657daa34c/transformed/documentfile-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8a679302623e9adc970e103a30b86f17/transformed/documentfile-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index 841136d..5e068f2 100644
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/698f4336a751ba68a07e750167beb85c/transformed/drawerlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ef6e3aadf804389ce0c62ed72f3bf0d4/drawerlayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/698f4336a751ba68a07e750167beb85c/transformed/drawerlayout-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/698f4336a751ba68a07e750167beb85c/transformed/drawerlayout-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/698f4336a751ba68a07e750167beb85c/transformed/drawerlayout-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b6d60de56376f5e893579c1d4afd19bb/transformed/drawerlayout-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
index 98296a4..c7ce6a6 100644
--- a/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:exifinterface:27.1.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/869616d23c633d46b6693acce001d972/exifinterface-27.1.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a2ace5e749873c6f1ebaa8ecb40f2420/transformed/exifinterface-27.1.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a2ace5e749873c6f1ebaa8ecb40f2420/transformed/exifinterface-27.1.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a2ace5e749873c6f1ebaa8ecb40f2420/transformed/exifinterface-27.1.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cfb5321af2f54c8e7c93dfe2be765b4e/transformed/exifinterface-27.1.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
index 6da0b81..00fbf5a 100644
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:interpolator:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/67d601c9415c6ae4d6b122735ccaf4ce/interpolator-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7d069aa86c075a5d149cab0f53f5e681/transformed/interpolator-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7d069aa86c075a5d149cab0f53f5e681/transformed/interpolator-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7d069aa86c075a5d149cab0f53f5e681/transformed/interpolator-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dec77fafdbdbedf8f5b765781aeb7d8c/transformed/interpolator-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index 4383217..939837b 100644
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:loader:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3452d014ce283284210b51f6887641f2/loader-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4be0d0cedb829b31bf59e46645d88156/transformed/loader-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4be0d0cedb829b31bf59e46645d88156/transformed/loader-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4be0d0cedb829b31bf59e46645d88156/transformed/loader-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c67cd2ce23f0bec9f5902558b4fbb7c2/transformed/loader-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
index 059f0d8..fe44b68 100644
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a125e3af23bb8cf90053ec749ee694cb/localbroadcastmanager-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8f97de2948d3d8ed5d37712b1dea2464/transformed/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f97de2948d3d8ed5d37712b1dea2464/transformed/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f97de2948d3d8ed5d37712b1dea2464/transformed/localbroadcastmanager-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5705b56c0e97222216d1160008ce77b2/transformed/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
index c27d89a..be4ef3f 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58de6b06336b3dfb9158c724464024c3/multidex-1.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d43bcf9c59c74b32b40012d26b833801/transformed/multidex-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d43bcf9c59c74b32b40012d26b833801/transformed/multidex-1.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d43bcf9c59c74b32b40012d26b833801/transformed/multidex-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c89c4a25c24afadb85f0bfae29045a9c/transformed/multidex-1.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
index eb773d6..4cb40b7 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6a560bf17bcf59b8695329809abb663/multidex-instrumentation-1.0.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/08f644ac23a7411872e4dfb27792578b/transformed/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/08f644ac23a7411872e4dfb27792578b/transformed/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/08f644ac23a7411872e4dfb27792578b/transformed/multidex-instrumentation-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/02a21e377512f2a0f2f6a44ab6d04b06/transformed/multidex-instrumentation-1.0.2/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index 7b3b5c2..cf92bea 100644
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:print:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d424c3280964773c21aef0ac325384b6/transformed/print-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d424c3280964773c21aef0ac325384b6/transformed/print-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d424c3280964773c21aef0ac325384b6/transformed/print-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d424c3280964773c21aef0ac325384b6/transformed/print-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/77b0f42df0ecb47ba965663d65919fe1/transformed/print-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
index d813dce..ce715f0 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/63b3f22d47389f3f29985173f5a385fe/transformed/recyclerview-v7-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/63b3f22d47389f3f29985173f5a385fe/transformed/recyclerview-v7-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63b3f22d47389f3f29985173f5a385fe/transformed/recyclerview-v7-28.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/63b3f22d47389f3f29985173f5a385fe/transformed/recyclerview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/405a1a56a710d05c5813e6bcf697e407/transformed/recyclerview-v7-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
index fcb1c76..f1d59b7 100644
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1a5a137e6ce3152575f648e5cea55d09/slidingpanelayout-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/048f06e17906c5afdcee20fe20237983/transformed/slidingpanelayout-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/048f06e17906c5afdcee20fe20237983/transformed/slidingpanelayout-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/048f06e17906c5afdcee20fe20237983/transformed/slidingpanelayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e28e65bef49e43ec9b500206094c4b64/transformed/slidingpanelayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
index af8d0bf..7d4b3fd 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-compat:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/16fcb134180388c8be35d5fd33212c69/transformed/support-compat-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/16fcb134180388c8be35d5fd33212c69/transformed/support-compat-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/16fcb134180388c8be35d5fd33212c69/transformed/support-compat-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/16fcb134180388c8be35d5fd33212c69/transformed/support-compat-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d8203b7584783a078a01f62a683c77ce/transformed/support-compat-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
index 078a46b..e97fcdd 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc07ec053600effd49d7785fd8d03f15/support-core-ui-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/38f529275f5d537e09d7f0bd4ce3a648/transformed/support-core-ui-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/38f529275f5d537e09d7f0bd4ce3a648/transformed/support-core-ui-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/38f529275f5d537e09d7f0bd4ce3a648/transformed/support-core-ui-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7b5458f4844bdb6604d2e5f48279a783/transformed/support-core-ui-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
index dacfe12..485b8c1 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2133d2345213f984f4d8b75590468157/support-core-utils-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a5b20bd76144aa159f66c26c03ab2f32/transformed/support-core-utils-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a5b20bd76144aa159f66c26c03ab2f32/transformed/support-core-utils-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a5b20bd76144aa159f66c26c03ab2f32/transformed/support-core-utils-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/eb6f01f1a1dee4764d39fabacd10ad98/transformed/support-core-utils-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
index bbe7a47..7f445e9 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/83779b6767ac1403b92e395c5d7b2a0b/transformed/support-fragment-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c53a57167873d78d8a6b9240f5676e0/support-fragment-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/83779b6767ac1403b92e395c5d7b2a0b/transformed/support-fragment-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/83779b6767ac1403b92e395c5d7b2a0b/transformed/support-fragment-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/83779b6767ac1403b92e395c5d7b2a0b/transformed/support-fragment-28.0.0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/edd366c3e6ed5b11e01b10c7f981c883/transformed/support-fragment-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
index 249ddaf..803735b 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat:27.1.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bf4fc973dfe3d65886586cafae2b041f/transformed/support-media-compat-27.1.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bf4fc973dfe3d65886586cafae2b041f/transformed/support-media-compat-27.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bf4fc973dfe3d65886586cafae2b041f/transformed/support-media-compat-27.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4026b074905ddb397cfb59c424c90b25/transformed/support-media-compat-27.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
index c9f39e5..178a905 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:support-v4:27.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e744014cbe53e02fac8bb3352a93881/support-v4-27.1.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7849fbad2497efb537a227ed5de0cc0d/transformed/support-v4-27.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7849fbad2497efb537a227ed5de0cc0d/transformed/support-v4-27.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7849fbad2497efb537a227ed5de0cc0d/transformed/support-v4-27.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c016565183f682b24af480ffcf7f6056/transformed/support-v4-27.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index 0c86e69..ed79651 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5c9150aea796b21a4ce35a83210d456/support-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e42d2d1301d513ea74d47ed2b24750cb/transformed/support-vector-drawable-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e42d2d1301d513ea74d47ed2b24750cb/transformed/support-vector-drawable-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e42d2d1301d513ea74d47ed2b24750cb/transformed/support-vector-drawable-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/451b4ebdce79bd5672cf26ced5c3332c/transformed/support-vector-drawable-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
index 5e80bfe..2327aec 100644
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/385c0ec07b1fdd272a5950d2e2309cd9/transformed/swiperefreshlayout-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d8db5e47744bf18c3e813a1a5f7b2d3a/swiperefreshlayout-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/385c0ec07b1fdd272a5950d2e2309cd9/transformed/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/385c0ec07b1fdd272a5950d2e2309cd9/transformed/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/385c0ec07b1fdd272a5950d2e2309cd9/transformed/swiperefreshlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef0770a7491d6e0a26d918948a73e4ae/transformed/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
index 40f7849..8b8d3bf 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882f32cb5c0fe42cb3a95594204714ac/espresso-core-2.2.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3467a2a09f9920fa607f14c49202020e/transformed/espresso-core-2.2.2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3467a2a09f9920fa607f14c49202020e/transformed/espresso-core-2.2.2/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3467a2a09f9920fa607f14c49202020e/transformed/espresso-core-2.2.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e75d5efc7d7ccd23998421cbf9d783b/transformed/espresso-core-2.2.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
index 967065f..69bdce6 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7212a59c1274725c320b564d60bbf332/espresso-core-3.0.2/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/fb685ab65f80134572dd290a822fca87/transformed/espresso-core-3.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fb685ab65f80134572dd290a822fca87/transformed/espresso-core-3.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fb685ab65f80134572dd290a822fca87/transformed/espresso-core-3.0.2/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b8b6ab4bf4a8a9a1a4d1c60178f4c82e/transformed/espresso-core-3.0.2/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
index 330a577..f89a62e 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b61b82c1194157efa6579f8072a3799/espresso-idling-resource-2.2.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4d5a4f4fda609ef68184286f9a7ef2d4/transformed/espresso-idling-resource-2.2.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4d5a4f4fda609ef68184286f9a7ef2d4/transformed/espresso-idling-resource-2.2.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4d5a4f4fda609ef68184286f9a7ef2d4/transformed/espresso-idling-resource-2.2.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/70685e1d88682503b58ee9cd43162998/transformed/espresso-idling-resource-2.2.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
index 69343a0..4500134 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc0ee972a26cbb196b210a41cbb4cdb2/espresso-idling-resource-3.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/255727b43f2fdbab4d4c503374990227/transformed/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/255727b43f2fdbab4d4c503374990227/transformed/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/255727b43f2fdbab4d4c503374990227/transformed/espresso-idling-resource-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f257f8bfbfa9981bc1d1c1f800ca2512/transformed/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
index 3008e9d..94b1908 100644
--- a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35cd66ca96906e8a383954b558e602b7/exposed-instrumentation-api-publish-0.5/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7424f89b0673e5a7514bad2110965866/transformed/exposed-instrumentation-api-publish-0.5/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7424f89b0673e5a7514bad2110965866/transformed/exposed-instrumentation-api-publish-0.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7424f89b0673e5a7514bad2110965866/transformed/exposed-instrumentation-api-publish-0.5/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ec78aeb367dd752f933bbae375463a36/transformed/exposed-instrumentation-api-publish-0.5/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
index 8f8e623..8b725d7 100644
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b906a897bc011a888300e60662c89f53/monitor-1.0.2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5ada80b3e7aa4c564b178bd2729f8a0c/transformed/monitor-1.0.2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ada80b3e7aa4c564b178bd2729f8a0c/transformed/monitor-1.0.2/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ada80b3e7aa4c564b178bd2729f8a0c/transformed/monitor-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2df5be13ad0ed01116353c74c6a0444f/transformed/monitor-1.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
index 6550aec..d84297c 100644
--- a/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:rules:0.5@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4e9c5b1a44b89e116562a88f70af7a55/transformed/rules-0.5/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4e9c5b1a44b89e116562a88f70af7a55/transformed/rules-0.5/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4e9c5b1a44b89e116562a88f70af7a55/transformed/rules-0.5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4e9c5b1a44b89e116562a88f70af7a55/transformed/rules-0.5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6620adb875e6104d7685a74c2de76627/transformed/rules-0.5/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
index 84165c3..2052db9 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:runner:0.5@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1421e6b55605b8d346f4d43adfb07dad/transformed/runner-0.5/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/549ede95b915811ff42181c4f3c808b9/runner-0.5/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1421e6b55605b8d346f4d43adfb07dad/transformed/runner-0.5/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1421e6b55605b8d346f4d43adfb07dad/transformed/runner-0.5/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/1421e6b55605b8d346f4d43adfb07dad/transformed/runner-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/55284df9a96d7bb1d143f54a31cbe743/transformed/runner-0.5/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
index 85d80ac..5f2e3d8 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support.test:runner:1.0.2@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ed375459ac2d938fa4746c6fdaad28f/runner-1.0.2/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0f3169bbf23bb5910ee5412402a39b6a/transformed/runner-1.0.2/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0f3169bbf23bb5910ee5412402a39b6a/transformed/runner-1.0.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0f3169bbf23bb5910ee5412402a39b6a/transformed/runner-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b51552d38dce496ca21124a63ab08a2f/transformed/runner-1.0.2/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
index cf383d0..edd05ec 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:transition:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/df6f073d0f76012cd5ba0c6dd3d890f9/transformed/transition-28.0.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/df6f073d0f76012cd5ba0c6dd3d890f9/transformed/transition-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/df6f073d0f76012cd5ba0c6dd3d890f9/transformed/transition-28.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/df6f073d0f76012cd5ba0c6dd3d890f9/transformed/transition-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5dd2f923772c4f2463030b571ca3bf45/transformed/transition-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
index 95c042b..1bb2b7f 100644
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5055a8610d8c18d271af376ee6e30056/versionedparcelable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f72f2bc0016c83fe4b587b852d45d0c0/transformed/versionedparcelable-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f72f2bc0016c83fe4b587b852d45d0c0/transformed/versionedparcelable-28.0.0/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f72f2bc0016c83fe4b587b852d45d0c0/transformed/versionedparcelable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5ebf141afb00d09fcbcacab20ef5e161/transformed/versionedparcelable-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
index 399db32..64a9f64 100644
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.android.support:viewpager:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3238a73b099cc2f23a65aa60617d746/viewpager-28.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/470b838fb3f5d61b43153ec13fe544a4/transformed/viewpager-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/470b838fb3f5d61b43153ec13fe544a4/transformed/viewpager-28.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/470b838fb3f5d61b43153ec13fe544a4/transformed/viewpager-28.0.0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/abdb601812d99ba7a4aafc5c95569652/transformed/viewpager-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml b/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
index 90807fd..ab95d30 100644
--- a/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
+++ b/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.bm.photoview:library:1.4.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/344918dc3dd99eb4677517c11390c932/library-1.4.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0c5cfd47bfa42b79bbb72a6d75e1a741/transformed/library-1.4.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/0c5cfd47bfa42b79bbb72a6d75e1a741/transformed/library-1.4.1/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0c5cfd47bfa42b79bbb72a6d75e1a741/transformed/library-1.4.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/31650650350cab988091fd20d8c0ba21/transformed/library-1.4.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.bm.photoview/library/1.4.1/1443677c523f07ad6024e247cd54bdd2ad3b8235/library-1.4.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
index 87d52dc..e7ae536 100644
--- a/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
+++ b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4ec66daf4a79d5ba75d7c02b9bf0e427/transformed/BaseRecyclerViewAdapterHelper-2.9.46/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4ec66daf4a79d5ba75d7c02b9bf0e427/transformed/BaseRecyclerViewAdapterHelper-2.9.46/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4ec66daf4a79d5ba75d7c02b9bf0e427/transformed/BaseRecyclerViewAdapterHelper-2.9.46/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/4ec66daf4a79d5ba75d7c02b9bf0e427/transformed/BaseRecyclerViewAdapterHelper-2.9.46/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e9d3092d52e9fcf4d7170787c5a3aac/transformed/BaseRecyclerViewAdapterHelper-2.9.46/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.CymChad/BaseRecyclerViewAdapterHelper/2.9.46/39d920bc306c1a2b22a9eaf0ab0e1ae0d78932f7/BaseRecyclerViewAdapterHelper-2.9.46-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
index 912443c..c25e4ac 100644
--- a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.github.bumptech.glide:gifdecoder:4.9.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/15bc637a134c18a5d0cc9959c6843ecd/transformed/gifdecoder-4.9.0/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/15bc637a134c18a5d0cc9959c6843ecd/transformed/gifdecoder-4.9.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/15bc637a134c18a5d0cc9959c6843ecd/transformed/gifdecoder-4.9.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/15bc637a134c18a5d0cc9959c6843ecd/transformed/gifdecoder-4.9.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/21d60ef8e66e46ac0d1502eee830bcfa/transformed/gifdecoder-4.9.0/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/gifdecoder/4.9.0/5a535e1ca9189de869e65c35ebf5f76b565e6c07/gifdecoder-4.9.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
index 733f126..ab03ec0 100644
--- a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.bumptech.glide:glide:4.9.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/30b8c35875e85add0bae7bd1bd36f026/transformed/glide-4.9.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/30b8c35875e85add0bae7bd1bd36f026/transformed/glide-4.9.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/30b8c35875e85add0bae7bd1bd36f026/transformed/glide-4.9.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/628c441e9c3d1fea5e72a137e52e75d3/transformed/glide-4.9.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/4.9.0/b53be1dd9e86c008d96d319510846282f95c49f/glide-4.9.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml b/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
index dfa5e89..74609fc 100644
--- a/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.cazaea:sweet-alert-dialog:1.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7c21dbb95c8ffdf745cd9308ef992392/transformed/sweet-alert-dialog-1.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c21dbb95c8ffdf745cd9308ef992392/transformed/sweet-alert-dialog-1.0.0/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c21dbb95c8ffdf745cd9308ef992392/transformed/sweet-alert-dialog-1.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3b87fe3d4d7c4143cc05fcb0b463ab29/transformed/sweet-alert-dialog-1.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.cazaea/sweet-alert-dialog/1.0.0/72c400c2dc8d649addb18112514b40148bbf0fa/sweet-alert-dialog-1.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml b/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
index a812cae..9389973 100644
--- a/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
+++ b/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.github.chrisbanes:PhotoView:2.1.4@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39e2acb3c99bf2e370d4797ba7b22289/PhotoView-2.1.4/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/634faa410421b8b7c3c5dcaaaf34fada/transformed/PhotoView-2.1.4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/634faa410421b8b7c3c5dcaaaf34fada/transformed/PhotoView-2.1.4/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/634faa410421b8b7c3c5dcaaaf34fada/transformed/PhotoView-2.1.4/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2845b60570c514053d43a16c64915f3/transformed/PhotoView-2.1.4/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.chrisbanes/PhotoView/2.1.4/79245178a16570a2cf316758247e3d0f62a78a99/PhotoView-2.1.4-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
index 9c6fe1b..3dfde11 100644
--- a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.github.gzu-liyujiang.AndroidPicker:Common:1.5.6.20181018@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a4b06fdbe15be4c3d180b455880a2f19/transformed/Common-1.5.6.20181018/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7d3bb394491bf68112e1dd6189f00e08/Common-1.5.6.20181018/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4b06fdbe15be4c3d180b455880a2f19/transformed/Common-1.5.6.20181018/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a4b06fdbe15be4c3d180b455880a2f19/transformed/Common-1.5.6.20181018/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4b06fdbe15be4c3d180b455880a2f19/transformed/Common-1.5.6.20181018/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0379d93be49831df00ffa073831ca188/transformed/Common-1.5.6.20181018/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/Common/1.5.6.20181018/991715da4703a5165cf0a2d1de6c3ac5ae49e0aa/Common-1.5.6.20181018-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
index 073b49e..c4ffa00 100644
--- a/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
@@ -1,13 +1,14 @@
<component name="libraryTable">
<library name="Gradle: com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.6.20181018@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef5cf0eadb88cf5967945626fcd085a3/transformed/WheelPicker-1.5.6.20181018/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b703219a2644e98bc1dc32b72e7dd04d/WheelPicker-1.5.6.20181018/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef5cf0eadb88cf5967945626fcd085a3/transformed/WheelPicker-1.5.6.20181018/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef5cf0eadb88cf5967945626fcd085a3/transformed/WheelPicker-1.5.6.20181018/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef5cf0eadb88cf5967945626fcd085a3/transformed/WheelPicker-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/090bf49f305081f5eeb8686164f4660b/transformed/WheelPicker-1.5.6.20181018/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/WheelPicker/1.5.6.20181018/2d7aefc2207f4e1bab14b7fc5c5e8545c5db1796/WheelPicker-1.5.6.20181018-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml b/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
index 9b2f87a..b100651 100644
--- a/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
+++ b/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.github.razerdp:BasePopup:2.1.8@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/251d67b0170e117b1ab71998e4668b89/transformed/BasePopup-2.1.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/251d67b0170e117b1ab71998e4668b89/transformed/BasePopup-2.1.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/251d67b0170e117b1ab71998e4668b89/transformed/BasePopup-2.1.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3c7e27656d9467513caf8392755f7095/transformed/BasePopup-2.1.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.razerdp/BasePopup/2.1.8/f541ddeb201a633108b8280a3d33daca0114267c/BasePopup-2.1.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml b/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
index 7a6c1d8..b172c78 100644
--- a/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
+++ b/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.haibin:calendarview:3.5.8@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bc1057353f9e8ad171fe9279e7cf03ce/transformed/calendarview-3.5.8/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bc1057353f9e8ad171fe9279e7cf03ce/transformed/calendarview-3.5.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bc1057353f9e8ad171fe9279e7cf03ce/transformed/calendarview-3.5.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5cd3d54f17dbbe3a21e50235331ee6d0/transformed/calendarview-3.5.8/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.haibin/calendarview/3.5.8/807aff0291aafde92fa664e02f9a2183371d77a7/calendarview-3.5.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
index ca2ad1b..87a07be 100644
--- a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.jakewharton:butterknife:9.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99dfa8cc60e86385f2c6c1b6ee2347ca/butterknife-9.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2a92a237be5667bc447a426e4e83784a/transformed/butterknife-9.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2a92a237be5667bc447a426e4e83784a/transformed/butterknife-9.0.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2a92a237be5667bc447a426e4e83784a/transformed/butterknife-9.0.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f840029a5424444e58e2a3450ff7c5d0/transformed/butterknife-9.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/9.0.0/905cc58569caf8a949f943d1ecd022ff8a401faa/butterknife-9.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
index 50422f6..14825bb 100644
--- a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/76cf613c76451ed596a65892c4242a83/butterknife-runtime-9.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c500a2c33a4a7714635be1ffd83ef865/transformed/butterknife-runtime-9.0.0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c500a2c33a4a7714635be1ffd83ef865/transformed/butterknife-runtime-9.0.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c500a2c33a4a7714635be1ffd83ef865/transformed/butterknife-runtime-9.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3c933b488a54e002914919e6bc88fc6d/transformed/butterknife-runtime-9.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-runtime/9.0.0/39ea68f6fcd783603c7d5dc36263aa191d5a84e5/butterknife-runtime-9.0.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml b/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
index f9a03f9..1b1c5fa 100644
--- a/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
+++ b/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.lcw.library:imagepicker:2.2.7@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ebc6f32ebfc6d8cc5a5ab750d1d4c20d/transformed/imagepicker-2.2.7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ebc6f32ebfc6d8cc5a5ab750d1d4c20d/transformed/imagepicker-2.2.7/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ebc6f32ebfc6d8cc5a5ab750d1d4c20d/transformed/imagepicker-2.2.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/22ac5632427f126061a1915eacd63f39/transformed/imagepicker-2.2.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.lcw.library/imagepicker/2.2.7/a45290c39e2abbb24d4e6b2572ee901d08f685d/imagepicker-2.2.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
index 6e689bf..1686ec8 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.liulishuo.okdownload:filedownloader:1.0.7@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc698ffa27cfff306bc4fa9593205d99/filedownloader-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/87fd533ea2b009aac48f6746a72be8bb/transformed/filedownloader-1.0.7/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/87fd533ea2b009aac48f6746a72be8bb/transformed/filedownloader-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/87fd533ea2b009aac48f6746a72be8bb/transformed/filedownloader-1.0.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ff6d3747b02e47940af298aff37824ff/transformed/filedownloader-1.0.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/filedownloader/1.0.7/e8bdbcd1676cb3c183cb14a899027e0111e2e2b0/filedownloader-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
index 2466389..375a54e 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.liulishuo.okdownload:ktx:1.0.7@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b18a8c91e0e59e24fef3e0a2086651f7/ktx-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/576d291e9ca56efd21c2ec711644a90d/transformed/ktx-1.0.7/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/576d291e9ca56efd21c2ec711644a90d/transformed/ktx-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/576d291e9ca56efd21c2ec711644a90d/transformed/ktx-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/761f7ff292629d2c97c276e782e2c02e/transformed/ktx-1.0.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/ktx/1.0.7/b851247f10eb4a9adfbc062d7c62f6448b196629/ktx-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
index 4818ae8..10ec76e 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fed2534cc6b6b9f2e91f6fcbec67c7c/okdownload-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/577292347259320f558d159ecaccff40/transformed/okdownload-1.0.7/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/577292347259320f558d159ecaccff40/transformed/okdownload-1.0.7/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/577292347259320f558d159ecaccff40/transformed/okdownload-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f4fba7476e041db31790e0039423f6f4/transformed/okdownload-1.0.7/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okdownload/1.0.7/95b2ee357b77cfb046b5f0727aa673c625b2eff7/okdownload-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
index 0ca6cdd..690b116 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f536f4e5c0ae54a7d52598849fccd88/okhttp-1.0.7/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/af046c0a33f42fa34b5790aa7118457e/transformed/okhttp-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/af046c0a33f42fa34b5790aa7118457e/transformed/okhttp-1.0.7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/af046c0a33f42fa34b5790aa7118457e/transformed/okhttp-1.0.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3ce34f67ce3f5e9c963503ec068b0b55/transformed/okhttp-1.0.7/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okhttp/1.0.7/1159a0b702fd02294eeecfb81d71557448402684/okhttp-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml b/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
index fa56f03..6fc8b6a 100644
--- a/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: com.liulishuo.okdownload:sqlite:1.0.7@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab674b8bcaea1137b5f5a6409730ef21/sqlite-1.0.7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b2b62e10ddadeef47280cf4c57e3356e/transformed/sqlite-1.0.7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2b62e10ddadeef47280cf4c57e3356e/transformed/sqlite-1.0.7/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/b2b62e10ddadeef47280cf4c57e3356e/transformed/sqlite-1.0.7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/939ba57e6a1bf6c6ad7eadcc6b4b1359/transformed/sqlite-1.0.7/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/sqlite/1.0.7/8d34be4d58c1a13c41237b0a5ed8895ca4585da0/sqlite-1.0.7-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml b/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
index 6a5bf7d..dbcd1dd 100644
--- a/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
+++ b/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.mikhaellopez:circularprogressbar:3.0.3@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d540d1525444c5bcd5ad89b9e118d572/transformed/circularprogressbar-3.0.3/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d540d1525444c5bcd5ad89b9e118d572/transformed/circularprogressbar-3.0.3/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d540d1525444c5bcd5ad89b9e118d572/transformed/circularprogressbar-3.0.3/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/50b26e201bb95b157802fe6e51b69df8/transformed/circularprogressbar-3.0.3/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
index 5507f29..e7c18b9 100644
--- a/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
+++ b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: com.orhanobut:dialogplus:1.11@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5fd4fdb8427888c4b3cc29e1c7061338/transformed/dialogplus-1.11/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5fd4fdb8427888c4b3cc29e1c7061338/transformed/dialogplus-1.11/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5fd4fdb8427888c4b3cc29e1c7061338/transformed/dialogplus-1.11/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/11d751c10183a969aed3c73f686402bd/transformed/dialogplus-1.11/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.orhanobut/dialogplus/1.11/56e6feff7f932fdd9308821b59da17d3987bec3/dialogplus-1.11-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml b/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
index 50c23d3..aead77d 100644
--- a/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
+++ b/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Gradle: com.otaliastudios:cameraview:1.6.1@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3264fa9b93068f0d0f4fe3d1b25492a0/transformed/cameraview-1.6.1/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3264fa9b93068f0d0f4fe3d1b25492a0/transformed/cameraview-1.6.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3264fa9b93068f0d0f4fe3d1b25492a0/transformed/cameraview-1.6.1/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3264fa9b93068f0d0f4fe3d1b25492a0/transformed/cameraview-1.6.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/82df51e642828049cbd9f8f7f53bcbf8/transformed/cameraview-1.6.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.otaliastudios/cameraview/1.6.1/efad8342aae95ea8c4da59cd8ab05801ec631cfd/cameraview-1.6.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml
deleted file mode 100644
index 88ce630..0000000
--- a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.squareup.okhttp3:okhttp:3.11.0">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.11.0/75966e05a49046ca2ae734e5626f28837a8d1e82/okhttp-3.11.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.11.0/746512619e9c200a0ed8d08d96e43d7bbb7916c6/okhttp-3.11.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.11.0/cf16b99519850b1adc3b259c90fd8566a0f592f3/okhttp-3.11.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
index 2ebff3f..439c741 100644
--- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
+++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82657aef97067ce375c2bf61a048685/picasso-2.71828/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/38b2538fd1ffe882218216167a6217fb/transformed/picasso-2.71828/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/38b2538fd1ffe882218216167a6217fb/transformed/picasso-2.71828/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/38b2538fd1ffe882218216167a6217fb/transformed/picasso-2.71828/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8f1c0069b310d5ac9432cec55514a0c3/transformed/picasso-2.71828/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.71828/2843564e6bac90b1e125104d7c842c87a96a8ee9/picasso-2.71828-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_taobao_android_accs_sdk_taobao_4_0_4_emas_aar.xml b/.idea/libraries/Gradle__com_taobao_android_accs_sdk_taobao_4_0_4_emas_aar.xml
deleted file mode 100644
index f9e4828..0000000
--- a/.idea/libraries/Gradle__com_taobao_android_accs_sdk_taobao_4_0_4_emas_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.taobao.android:accs_sdk_taobao:4.0.4-emas@aar">
- <ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/aad04931d8583cb3420b7f8f9033cd39/transformed/accs_sdk_taobao-4.0.4-emas/annotations.zip!/" />
- </ANNOTATIONS>
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a61e7f9e3a1eed703ecd10ec09d6c6ec/accs_sdk_taobao-4.0.4-emas/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/aad04931d8583cb3420b7f8f9033cd39/transformed/accs_sdk_taobao-4.0.4-emas/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/aad04931d8583cb3420b7f8f9033cd39/transformed/accs_sdk_taobao-4.0.4-emas/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/aad04931d8583cb3420b7f8f9033cd39/transformed/accs_sdk_taobao-4.0.4-emas/AndroidManifest.xml" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_taobao_android_networksdk_3_5_5_5_open.xml b/.idea/libraries/Gradle__com_taobao_android_networksdk_3_5_5_5_open.xml
deleted file mode 100644
index 8c8eee3..0000000
--- a/.idea/libraries/Gradle__com_taobao_android_networksdk_3_5_5_5_open.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.taobao.android:networksdk:3.5.5.5-open">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.taobao.android/networksdk/3.5.5.5-open/abeb1ad7d4bd2d9d866a7c3bca86810258e30902/networksdk-3.5.5.5-open.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_taobao_android_tnet4android_3_1_14_7_all_aar.xml b/.idea/libraries/Gradle__com_taobao_android_tnet4android_3_1_14_7_all_aar.xml
deleted file mode 100644
index fd2e128..0000000
--- a/.idea/libraries/Gradle__com_taobao_android_tnet4android_3_1_14_7_all_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.taobao.android:tnet4android:3.1.14.7-all@aar">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0dcfa63349b09e8f921e0d1b5e08cad9/tnet4android-3.1.14.7-all/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9b255d26e8654a5b2759fa126de76751/transformed/tnet4android-3.1.14.7-all/AndroidManifest.xml" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/9b255d26e8654a5b2759fa126de76751/transformed/tnet4android-3.1.14.7-all/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9b255d26e8654a5b2759fa126de76751/transformed/tnet4android-3.1.14.7-all/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
index 36f6231..a8ba808 100644
--- a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle: de.hdodenhof:circleimageview:2.2.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/acf628a0d2f6d9435af045851ac86c13/transformed/circleimageview-2.2.0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/acf628a0d2f6d9435af045851ac86c13/transformed/circleimageview-2.2.0/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/acf628a0d2f6d9435af045851ac86c13/transformed/circleimageview-2.2.0/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2e5a2eb4ce8d3641da9d1ce8add12e3a/transformed/circleimageview-2.2.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/2.2.0/5c68ac4974e0c1cf827ec184dda9ea2523f74347/circleimageview-2.2.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
index 59f4dba..c50de1a 100644
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71f415848bc775ea1dd2468a7a88130c/rxandroid-2.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/6af95461822020b052a845ddd21667b3/transformed/rxandroid-2.1.1/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6af95461822020b052a845ddd21667b3/transformed/rxandroid-2.1.1/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6af95461822020b052a845ddd21667b3/transformed/rxandroid-2.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/363d0b1958be66d858d3cb97a84bedbf/transformed/rxandroid-2.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxandroid/2.1.1/634c77382eff415441853908e7e1429c786f6320/rxandroid-2.1.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
index bfa7e78..48aa7e8 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1b998faff9a565b73514325b2f711e3/anko-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2877f687fe9e0cb3617e7b2702d02131/transformed/anko-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/2877f687fe9e0cb3617e7b2702d02131/transformed/anko-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2877f687fe9e0cb3617e7b2702d02131/transformed/anko-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8b6626463cc4b052c1fdaf87cc4e9bae/transformed/anko-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
index 776f016..d327a39 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-appcompat-v7:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d59222d2c00d6351318cbf13135aab4/anko-appcompat-v7-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/acc3a7bd9b754c4077d54cadb9db1913/transformed/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/acc3a7bd9b754c4077d54cadb9db1913/transformed/anko-appcompat-v7-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/acc3a7bd9b754c4077d54cadb9db1913/transformed/anko-appcompat-v7-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/db58113964f8aae071af4e4ba10b3e05/transformed/anko-appcompat-v7-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
index f266333..98dc262 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-commons:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/611301734d9108b6972b1c6cab05f2e5/anko-appcompat-v7-commons-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/458d3f0fbba7f46ce869eb56c76d78f5/transformed/anko-appcompat-v7-commons-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/458d3f0fbba7f46ce869eb56c76d78f5/transformed/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/458d3f0fbba7f46ce869eb56c76d78f5/transformed/anko-appcompat-v7-commons-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a4c59e3f97e37e24ebb0ff01ab3ac69d/transformed/anko-appcompat-v7-commons-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
index 4c56915..e4e9444 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-coroutines:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/483c9d3d9c865b5e94db32b69d20986f/anko-appcompat-v7-coroutines-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d10c288b6202ada1aa4057dd850cc010/transformed/anko-appcompat-v7-coroutines-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/d10c288b6202ada1aa4057dd850cc010/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d10c288b6202ada1aa4057dd850cc010/transformed/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/df252b77fab8302f6683dbd52f545234/transformed/anko-appcompat-v7-coroutines-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
index 310cdd8..a0d7c9d 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9fee3b4a9eb4ab8e4662fdc3b9c9b87/anko-commons-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ae677cd708c0c8c8ae339d506b036d37/transformed/anko-commons-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ae677cd708c0c8c8ae339d506b036d37/transformed/anko-commons-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ae677cd708c0c8c8ae339d506b036d37/transformed/anko-commons-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8b4dc4a44e125281f5225458fbd9a014/transformed/anko-commons-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
index 690dbf5..8a92e27 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-coroutines:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37592c687aa237f8f9fe22da0a0d80dc/anko-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bcd8739fba412370af6a80ca33b79ec3/transformed/anko-coroutines-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bcd8739fba412370af6a80ca33b79ec3/transformed/anko-coroutines-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/bcd8739fba412370af6a80ca33b79ec3/transformed/anko-coroutines-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2f70e400098068ecc840cc70780bc525/transformed/anko-coroutines-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
index 69811ef..1f2dbfc 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10c59ec38127e89f14e98bedf4b111d1/anko-sdk27-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a7deacfb81be9e633d405695d0cab9ab/transformed/anko-sdk27-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a7deacfb81be9e633d405695d0cab9ab/transformed/anko-sdk27-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/a7deacfb81be9e633d405695d0cab9ab/transformed/anko-sdk27-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b45f1bd20f286b9f30df79b0cb1a0a08/transformed/anko-sdk27-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
index 1a32d93..ce9182c 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-sdk27-coroutines:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ca0a5c7cdd7cd1b0787ab9986293cad0/anko-sdk27-coroutines-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/37f8b03d9576bfc5a3622c43f991b5b1/transformed/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/37f8b03d9576bfc5a3622c43f991b5b1/transformed/anko-sdk27-coroutines-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/37f8b03d9576bfc5a3622c43f991b5b1/transformed/anko-sdk27-coroutines-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6ac8dc2fd5a075012a25b8f02450280b/transformed/anko-sdk27-coroutines-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
index 8dfaaee..7c325f6 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/277be98df7376e47830b3c63f1309727/anko-sqlite-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e32bfd9c3be93d27121b189d229ac281/transformed/anko-sqlite-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e32bfd9c3be93d27121b189d229ac281/transformed/anko-sqlite-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e32bfd9c3be93d27121b189d229ac281/transformed/anko-sqlite-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3d8255ba581822d779c89f48ce29bcf5/transformed/anko-sqlite-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
index cd7df95..718cc25 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e638b8911f58df453497a665afdb16c3/anko-support-v4-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc8ffdf4f6130ce12f952b1ac9b3552e/transformed/anko-support-v4-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cc8ffdf4f6130ce12f952b1ac9b3552e/transformed/anko-support-v4-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cc8ffdf4f6130ce12f952b1ac9b3552e/transformed/anko-support-v4-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e896d7275b78bb2464cb3ee843bd2783/transformed/anko-support-v4-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
index 4f4c345..062f9c9 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:anko-support-v4-commons:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee51b0e2b7849768d5bef54763d1769/anko-support-v4-commons-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/98a5a26bb13ef7a4c3f19b5719d7bf42/transformed/anko-support-v4-commons-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/98a5a26bb13ef7a4c3f19b5719d7bf42/transformed/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/98a5a26bb13ef7a4c3f19b5719d7bf42/transformed/anko-support-v4-commons-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/dddf6ecfae36c3d72727b06a910880f5/transformed/anko-support-v4-commons-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
index 7bfa531..557aa5f 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:appcompatV7-base:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfd59b2b993035c5588bd8d1bc371382/appcompatV7-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/14fbdec2cf602f8b6ea4bceee6357c1e/transformed/appcompatV7-base-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/14fbdec2cf602f8b6ea4bceee6357c1e/transformed/appcompatV7-base-0.10.8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/14fbdec2cf602f8b6ea4bceee6357c1e/transformed/appcompatV7-base-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/ade1b4c385117725a999e0ca571c2f59/transformed/appcompatV7-base-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
index d85ce92..8b5b174 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7f95eebb8fa36bd9da40a39a4e09560/commons-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/fd7cdd1fd38e386d670a9c49bcea3a7c/transformed/commons-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/fd7cdd1fd38e386d670a9c49bcea3a7c/transformed/commons-base-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/fd7cdd1fd38e386d670a9c49bcea3a7c/transformed/commons-base-0.10.8/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/e663b03c10e219bd4a3e20b6d0e90241/transformed/commons-base-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
index 300cc5d..550c3b8 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
@@ -2,9 +2,10 @@
<library name="Gradle: org.jetbrains.anko:platform-base:0.10.8@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75c7188d7e599d9bbd40874405e1304e/platform-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/508bb90d5ca2a494b83213bf6b6a59a1/transformed/platform-base-0.10.8/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/508bb90d5ca2a494b83213bf6b6a59a1/transformed/platform-base-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/508bb90d5ca2a494b83213bf6b6a59a1/transformed/platform-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c519796eb46b6177d517d865ccc9e11f/transformed/platform-base-0.10.8/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
index 037fc0a..3425539 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/368cfb9ed90e14e74a3d9407d59f49e9/sqlite-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/6551a2ab2b4f39fc1ab2363861199773/transformed/sqlite-base-0.10.8/res" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/6551a2ab2b4f39fc1ab2363861199773/transformed/sqlite-base-0.10.8/AndroidManifest.xml" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/6551a2ab2b4f39fc1ab2363861199773/transformed/sqlite-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/cd9d062b5da914892876c43c1bca4a70/transformed/sqlite-base-0.10.8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
index cc3ebe2..7ac37ec 100644
--- a/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
@@ -3,8 +3,9 @@
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22bad94d5c91dcad379d703cfc88354f/supportV4-base-0.10.8/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/5b7bb738ea789e260a50ff1071897701/transformed/supportV4-base-0.10.8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/5b7bb738ea789e260a50ff1071897701/transformed/supportV4-base-0.10.8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-3/5b7bb738ea789e260a50ff1071897701/transformed/supportV4-base-0.10.8/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8c4e0079c1c1ef986314e5c6fc203384/transformed/supportV4-base-0.10.8/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index afd7dff..8f2f33c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,13 +5,25 @@
<map>
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable-xhdpi/bg_ripple.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_border_black.xml" value="0.2705" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_border_black_no_left.xml" value="0.2705" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_border_black_no_right.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_border_black_no_top.xml" value="0.2705" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_border_black_no_top_right.xml" value="0.2705" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_btngroup.xml" value="0.175" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_btngroup_2.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_combtn_sel.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_layerlist_1.xml" value="0.222" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_baseline_backspace_24.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_baseline_content_copy_24.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_group_black_24dp.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_playlist_add_check_blue_400_24dp.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_unfold_more_black_20dp.xml" value="0.175" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/image_bg_add_photo.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/layerlist_1.xml" value="0.222" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/point_background.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/point_bg_enable.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/point_bg_normal.xml" value="0.222" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_bg_blue_or_white.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_bg_gray_or_white.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_bg_green_or_yellow.xml" value="0.336" />
@@ -24,15 +36,20 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_show_hide_white.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shap_stroke_bottom.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_bg_gradient_reverse.xml" value="0.31145833333333334" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_black.xml" value="0.222" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_black_no_left.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_black_no_right.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_blue.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_button_green.xml" value="0.309375" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_circle_board.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_gray.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_green.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_line_white.xml" value="0.264" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_oval_blue.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_red_board.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_red_task_check.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_yellow.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/vector_1.xml" value="0.222" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_base_map.xml" value="0.29739583333333336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_camera.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_main.xml" value="0.3338541666666667" />
@@ -62,7 +79,7 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_new_photo.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_problem_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_account.xml" value="0.3338541666666667" />
- <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_history.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_history.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_subinfo.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_take_evidence.xml" value="0.3338541666666667" />
diff --git a/app/build.gradle b/app/build.gradle
index c3b0898..d90d03d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@
apply plugin: 'kotlin-android-extensions' // apply plugin
apply plugin: 'kotlin-kapt'
apply plugin: 'com.jakewharton.butterknife'
-apply plugin: 'com.aliyun.ams.emas-services'
+//apply plugin: 'com.aliyun.ams.emas-services'
android {
compileSdkVersion 28
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 22f1d18..792cef5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,19 +70,19 @@
</intent-filter>
</receiver>
- <receiver
- android:name="cn.flightfeather.thirdappmodule.util.push.MyMessageReceiver"
- android:exported="false"> <!-- 涓轰繚璇乺eceiver瀹夊叏锛屽缓璁缃笉鍙鍑猴紝濡傞渶瀵瑰叾浠栧簲鐢ㄥ紑鏀惧彲閫氳繃android锛歱ermission杩涜闄愬埗 -->
- <intent-filter>
- <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
- </intent-filter>
- <intent-filter>
- <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
- </intent-filter>
- <intent-filter>
- <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
- </intent-filter>
- </receiver>
+<!-- <receiver-->
+<!-- android:name="cn.flightfeather.thirdappmodule.util.push.MyMessageReceiver"-->
+<!-- android:exported="false"> <!– 涓轰繚璇乺eceiver瀹夊叏锛屽缓璁缃笉鍙鍑猴紝濡傞渶瀵瑰叾浠栧簲鐢ㄥ紑鏀惧彲閫氳繃android锛歱ermission杩涜闄愬埗 –>-->
+<!-- <intent-filter>-->
+<!-- <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />-->
+<!-- </intent-filter>-->
+<!-- <intent-filter>-->
+<!-- <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />-->
+<!-- </intent-filter>-->
+<!-- <intent-filter>-->
+<!-- <action android:name="com.alibaba.sdk.android.push.RECEIVE" />-->
+<!-- </intent-filter>-->
+<!-- </receiver>-->
<activity
@@ -232,6 +232,8 @@
android:theme="@style/TransparentTheme" />
<activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneAccountActivity"
android:theme="@style/TransparentTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneHistoryActivity"
+ android:theme="@style/TransparentTheme" />
<activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneInfoActivity"
android:theme="@style/TransparentTheme" />
<activity android:name="cn.flightfeather.thirdappmodule.module.inspection.ShareProblemActivity"
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
index 40ea2b1..c104abd 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListAdapter.java
@@ -129,8 +129,9 @@
//瀹℃牳鐘舵��
if (Objects.equals(subTask.getRemark(), Domain.PROBLEM_UNCHECKED)) {
holder.mtv_check_status.setText("鏈鏍�");
+ holder.mtv_check_status.setVisibility(View.VISIBLE);
} else {
- holder.mtv_check_status.setText("");
+ holder.mtv_check_status.setVisibility(View.GONE);
}
holder.slideLayout.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListHolder.java b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListHolder.java
index f90c95d..cdb13b2 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListHolder.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/TaskListHolder.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.support.constraint.ConstraintLayout;
+import android.support.constraint.Group;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
@@ -31,6 +32,13 @@
TextView mtv_staff;
TextView mtv_check_status;
ImageView img_status;
+ Group group_risk_warn;
+ TextView tv_risk_warn;
+ Group group_inspection_key_point;
+ TextView tv_inspection_key_point;
+ Group group_emergency_inspection;
+ TextView tv_emergency_inspection;
+
public ConstraintLayout slideLayout;
public TaskListHolder(View itemView, Context context, int viewType) {
@@ -49,6 +57,12 @@
img_status = itemView.findViewById(R.id.img_task_status);
slideLayout = itemView.findViewById(R.id.cl_item);
mtv_check_status = itemView.findViewById(R.id.tv_check_status);
+ group_risk_warn = itemView.findViewById(R.id.group_risk_warn);
+ tv_risk_warn = itemView.findViewById(R.id.tv_risk_warn);
+ group_inspection_key_point = itemView.findViewById(R.id.group_inspection_key_point);
+ tv_inspection_key_point = itemView.findViewById(R.id.tv_inspection_key_point);
+ group_emergency_inspection = itemView.findViewById(R.id.group_emergency_inspection);
+ tv_emergency_inspection = itemView.findViewById(R.id.tv_emergency_inspection);
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ConstructionPhaseVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ConstructionPhaseVo.kt
new file mode 100644
index 0000000..b63d491
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ConstructionPhaseVo.kt
@@ -0,0 +1,14 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+import java.util.*
+
+/**
+ * 宸ュ湴鏂藉伐闃舵鏇存柊鎯呭喌
+ * @author riku
+ * Date: 2025/10/28
+ */
+class ConstructionPhaseVo {
+
+ var lastUpdateTime: Date? = null
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/EmergencyInspectionVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/EmergencyInspectionVo.kt
new file mode 100644
index 0000000..f467c99
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/EmergencyInspectionVo.kt
@@ -0,0 +1,8 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+/**
+ * @author riku
+ * Date: 2025/10/28
+ */
+class EmergencyInspectionVo {
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/JointLawEnforcementVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/JointLawEnforcementVo.kt
new file mode 100644
index 0000000..eef7663
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/JointLawEnforcementVo.kt
@@ -0,0 +1,16 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+import java.util.*
+
+/**
+ * 鍦烘櫙鑱斿悎鎵ф硶鎯呭喌
+ * 鍦烘櫙鍦ㄥ綋鏈堟槸鍚﹁鍒楀叆
+ * @author feiyu
+ * Date: 2025/10/27
+ */
+class JointLawEnforcementVo {
+ // 鏃堕棿
+ var time: Date? = null
+ // 鏄惁灞炰簬鑱斿悎鎵ф硶娓呭崟
+ var whether: Boolean = false
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/MonitorDataVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/MonitorDataVo.kt
new file mode 100644
index 0000000..a8210be
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/MonitorDataVo.kt
@@ -0,0 +1,8 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+/**
+ * @author riku
+ * Date: 2025/10/28
+ */
+class MonitorDataVo {
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ProblemRecurrenceVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ProblemRecurrenceVo.kt
new file mode 100644
index 0000000..d108976
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ProblemRecurrenceVo.kt
@@ -0,0 +1,10 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+/**
+ * 鍦烘櫙闂澶嶅彂鎯呭喌
+ * @author feiyu
+ * Date: 2025/10/28
+ */
+class ProblemRecurrenceVo {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt
index 04d4684..f31f221 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt
@@ -4,12 +4,12 @@
/**
* 鍦烘櫙鍏稿瀷宸ュ湴鎯呭喌
- * @author riku
+ * @author feiyu
* Date: 2025/10/27
*/
class TypicalSceneVo {
// 璇勯�夋椂闂�
var time: Date? = null
- // 鏄惁鏃跺吀鍨嬪伐鍦�
- var typical: Boolean = false
+ // 鏄惁鏄吀鍨嬪伐鍦�
+ var whether: Boolean = false
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
index 709906b..5522c5d 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
@@ -468,6 +468,7 @@
} else {
scene_status.visibility = View.GONE
}
+ scene_detail.setOnClickListener(this)
}
/**
@@ -828,7 +829,10 @@
override fun onClick(v: View?) {
when (v?.id) {
R.id.scene_detail -> {
-
+ val intent = Intent(this, MenuSceneHistoryActivity::class.java).apply {
+ putExtra("scene", viewModel.scene.value)
+ }
+ startActivity(intent)
}
// 淇敼宸ュ湴鏂藉伐闃舵
R.id.scene_status ->{
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
index 2c6ef7a..9cc8097 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
@@ -1,17 +1,25 @@
package cn.flightfeather.thirdappmodule.module.inspection
+import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
+import android.support.v4.content.ContextCompat
import android.view.View
+import android.widget.TextView
import cn.flightfeather.thirdappmodule.R
import cn.flightfeather.thirdappmodule.bean.entity.Scense
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
-import cn.flightfeather.thirdappmodule.module.task.SceneDetailViewModel
import kotlinx.android.synthetic.main.dialog_scene_history.*
import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
+/**
+ * 鍦烘櫙鍘嗗彶鎯呭喌鎻愮ず鐣岄潰
+ * Date: 2025/10/27
+ */
class MenuSceneHistoryActivity : BaseActivity() {
+ inner class HistoryItemView(val title: String, val show: Boolean, val parentView: View, val titleView: TextView)
+ // 浼犲叆鐨勫満鏅璞�
private var scene: Scense? = null
override fun getLayoutId(): Int = R.layout.dialog_scene_history
@@ -21,7 +29,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- viewModel = ViewModelProviders.of(this).get(SceneDetailViewModel::class.java)
+ viewModel = ViewModelProviders.of(this).get(MenuSceneHistoryViewModel::class.java)
scene = intent.getSerializableExtra("scene") as Scense?
@@ -29,26 +37,98 @@
initObserver()
initListener()
- viewModel.getSceneStatus {
- scene?.let { viewModel.getSceneDetail(it) }
- }
+// viewModel.getSceneStatus {
+// scene?.let { viewModel.getSceneDetail(it) }
+// }
}
private fun initUI() {
- view_waiting.visibility = View.VISIBLE
+ // 缁熻椤圭洰
+ val itemList = listOf(
+ HistoryItemView("鐜板満璇勫垎", true, cl_1, tv_title_1),
+ HistoryItemView("鍏稿瀷宸ュ湴", true, cl_2, tv_title_2),
+ HistoryItemView("閲嶇偣鍖哄煙", true, cl_3, tv_title_3),
+ HistoryItemView("鑱斿悎鎵ф硶", true, cl_4, tv_title_4),
+ HistoryItemView("鏁存敼鏁堢巼", true, cl_5, tv_title_5),
+ HistoryItemView("闂澶嶅彂", true, cl_6, tv_title_6),
+ HistoryItemView("鏂藉伐闃舵", true, cl_7, tv_title_7),
+ HistoryItemView("鐩戞祴鏁版嵁", true, cl_8, tv_title_8),
+ HistoryItemView("搴旀�ュ贰鏌�", false, cl_9, tv_title_9)
+ )
+
+ // 鏄剧ず 鍔犺浇鍥炬爣
+ view_waiting.visibility = View.GONE
+
+ // 鏍规嵁閰嶇疆鏄剧ず瀵瑰簲鐨勯」鐩紝骞惰嚜鍔ㄥ尮閰嶅簭鍙�
+ var index = 1
+ itemList.forEach { item ->
+ if (item.show) {
+ val title = "${index}. ${item.title}"
+ item.parentView.visibility = View.VISIBLE
+ item.titleView.text = title
+ index++
+ } else {
+ item.parentView.visibility = View.GONE
+ }
+ }
+
+ // 鏄剧ず 鍦烘櫙鍚嶇О
scene?.let {
- tv_status.text = StringBuilder(it.type + getString(R.string.scene_status))
+ tv_title.text = it.name
}
}
private fun initObserver() {
+ // 鍘嗗彶璇勪及鎯呭喌
+ viewModel.evaluationList.observe(this, Observer {
+ })
+
+ // 鍏稿瀷鍦烘櫙鎯呭喌
+ viewModel.typicalScene.observe(this, Observer {
+
+ })
+ tv_title_2.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 閲嶇偣鍖哄煙锛堝湪鍥芥帶鐐广�佸競鎺х偣鍛ㄨ竟锛�
+ viewModel.keyArea.observe(this, Observer {
+
+ })
+ tv_title_3.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 鑱斿悎鎵ф硶
+ viewModel.jointLawEnforcement.observe(this, Observer {
+
+ })
+ tv_title_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ tv_summary_4.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ // 鏁存敼鏁堢巼
+ viewModel.changeRate.observe(this, Observer {
+
+ })
+ tv_title_5.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 闂澶嶅彂
+ viewModel.problemRecurrence.observe(this, Observer {
+
+ })
+ tv_title_6.setTextColor(ContextCompat.getColor(this, R.color.red_btn_bg_color))
+ // 鏂藉伐闃舵
+ viewModel.constructionPhase.observe(this, Observer {
+
+ })
+ tv_title_7.setTextColor(ContextCompat.getColor(this, R.color.main_color_2))
+ // 鍦ㄧ嚎鐩戞祴鏁版嵁
+ viewModel.monitorData.observe(this, Observer {
+
+ })
+ tv_title_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ tv_summary_8.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
+ // 搴旀�ュ贰鏌�
+ viewModel.emergencyInspection.observe(this, Observer {
+
+ })
+ tv_title_9.setTextColor(ContextCompat.getColor(this, R.color.main_color_3))
}
private fun initListener() {
-
-
-
fab_close.setOnClickListener {
this.finish()
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt
index 97489ee..2b3ead1 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt
@@ -2,8 +2,7 @@
import android.arch.lifecycle.MutableLiveData
import cn.flightfeather.thirdappmodule.bean.entity.Evaluation
-import cn.flightfeather.thirdappmodule.bean.vo.ChangeRateVo
-import cn.flightfeather.thirdappmodule.bean.vo.TypicalSceneVo
+import cn.flightfeather.thirdappmodule.bean.vo.*
import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
import cn.flightfeather.thirdappmodule.module.base.BaseViewModel
import cn.flightfeather.thirdappmodule.repository.EvaluationRepository
@@ -16,12 +15,11 @@
class MenuSceneHistoryViewModel : BaseViewModel() {
private val evaluationRepository = EvaluationRepository.instance
- // 1. 鍘嗗彶璇勪及鎯呭喌
- val evaluationList = MutableLiveData<List<Evaluation>>()
-
/**
- * 鑾峰彇鍓嶄笁涓湀鐨勮瘎浼版�诲垎
+ * 1.鍘嗗彶璇勪及鎯呭喌
+ * 灞曠ず鍦烘櫙鍓�3涓湀鐨勭幇鍦哄贰鏌ュ緱鍒嗭紙鍘婚櫎鐩戞祴鏁版嵁寰楀垎锛夈��
*/
+ val evaluationList = MutableLiveData<List<Evaluation>>()
fun getEvaluationList(sceneId:String) {
evaluationRepository.getEvaluationByScene(sceneId, resultCallBack = object : ResultCallBack<List<Evaluation>> {
override fun onSuccess(result: List<Evaluation>?) {
@@ -34,17 +32,77 @@
})
}
- // 2. 鍏稿瀷宸ュ湴鎯呭喌
+ /**
+ * 2.鍏稿瀷鍦烘櫙鎯呭喌
+ * 灞曠ず鍦烘櫙鍓�3涓湀鏄惁灞炰簬鍏稿瀷鍦烘櫙娓呭崟涓��
+ */
val typicalScene = MutableLiveData<List<TypicalSceneVo>>()
-
fun getTypicalScene(sceneId: String) {
typicalScene.value = listOf()
}
- // 3. 鏁存敼鏁堢巼
+ /**
+ * 3.閲嶇偣鍖哄煙锛堝湪鍥芥帶鐐广�佸競鎺х偣鍛ㄨ竟锛�
+ * 灞曠ず鍦烘櫙浣嶇疆鏄惁鍦ㄥ浗鎺х偣銆佸競鎺х偣鍛ㄨ竟2鍏噷鑼冨洿鍐咃紝鏄惁灞炰簬閲嶇偣鍖哄煙銆�
+ */
+ val keyArea = MutableLiveData<Boolean>()
+ fun getKeyArea(sceneId: String) {
+
+ }
+
+ /**
+ * 4.鑱斿悎鎵ф硶
+ * 杩�3涓湀鏄惁琚垪鍏ユ竻鍗曪紝璀︾ず銆�
+ */
+ val jointLawEnforcement = MutableLiveData<List<JointLawEnforcementVo>>()
+ fun getJointLawEnforcement(sceneId: String) {
+
+ }
+
+ /**
+ * 5.鏁存敼鏁堢巼
+ * 灞曠ず鍦烘櫙鍓�3涓湀鐨勬暣鏀圭巼鍜岀患鍚堟暣鏀圭巼锛堜娇鐢ㄩ鑹插尯鍒嗭級浠ュ強鏁存敼鏁堢巼锛堟樉绀烘暣鏀规椂闂村拰闂鏃堕棿鐩稿樊澶氬皯澶╋級銆�
+ */
val changeRate = MutableLiveData<List<ChangeRateVo>>()
fun getChangeRate() {
}
+ /**
+ * 6.闂澶嶅彂
+ * 杩�3涓湀闂澶嶅彂鎯呭喌鏄惁鏄庢樉
+ */
+ val problemRecurrence = MutableLiveData<List<ProblemRecurrenceVo>>()
+ fun getProblemRecurrence() {
+
+ }
+
+ /**
+ * 7.鏂藉伐闃舵锛堝彧閽堝宸ュ湴绫诲瀷鐨勫満鏅級
+ * 鑷冲皯2涓湀鏂藉伐闃舵娌℃湁纭鏇存柊杩囷紝鎻愰啋鍘荤‘璁ゆ洿鏂�
+ */
+ val constructionPhase = MutableLiveData<List<ConstructionPhaseVo>>()
+ fun getConstructionPhaseV() {
+
+ }
+
+ /**
+ * 8.鍦ㄧ嚎鐩戞祴鏁版嵁
+ * 杩�3涓湀鐨勬帓鍚嶆槸鍚﹀湪鍏ㄥ尯鍓嶅崄锛屾垨鑰呭钩鍧囨祿搴﹂珮浜庡尯鍧囧�硷紝璀︾ず鏄剧ず
+ */
+ val monitorData = MutableLiveData<List<MonitorDataVo>>()
+ fun getMonitorData() {
+
+ }
+
+
+ /**
+ * 9.搴旀�ュ贰鏌�
+ * 杩�3涓湀鏄惁娑夊強閬撹矾宸℃煡锛屾湁鍒欒绀�
+ */
+ val emergencyInspection = MutableLiveData<List<EmergencyInspectionVo>>()
+ fun getEmergencyInspection() {
+
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
index d635164..eb5a8d0 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
@@ -20,6 +20,10 @@
import kotlinx.android.synthetic.main.dialog_scene_subinfo.*
import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
+/**
+ * 鍦烘櫙鏂藉伐闃舵绠＄悊鐣岄潰
+ * Date: 2025/10/27
+ */
class MenuSceneInfoActivity : BaseActivity() {
private var scene: Scense? = null
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/LoginInitializer.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/LoginInitializer.kt
index 43b72f6..6b3025b 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/LoginInitializer.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/LoginInitializer.kt
@@ -19,15 +19,15 @@
if (isLogin) {
if (!isBindAccount) {
- PushService.bindAccount(accountName) {
- sharedPre.edit().putBoolean("isBindAccount", true).apply()
- }
+// PushService.bindAccount(accountName) {
+// sharedPre.edit().putBoolean("isBindAccount", true).apply()
+// }
}
} else {
if (isBindAccount) {
- PushService.unBindAccount {
- sharedPre.edit().putBoolean("isBindAccount", false).apply()
- }
+// PushService.unBindAccount {
+// sharedPre.edit().putBoolean("isBindAccount", false).apply()
+// }
}
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageIntentService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageIntentService.kt
index 728d9de..cda83d1 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageIntentService.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageIntentService.kt
@@ -1,96 +1,96 @@
-package cn.flightfeather.thirdappmodule.util.push
-
-import android.content.Context
-import android.util.Log
-
-import com.alibaba.sdk.android.push.AliyunMessageIntentService
-import com.alibaba.sdk.android.push.notification.CPushMessage
-
-/**
- * 涓洪伩鍏嶆帹閫佸箍鎾绯荤粺鎷︽埅鐨勫皬姒傜巼浜嬩欢,鎴戜滑鎺ㄨ崘鐢ㄦ埛閫氳繃IntentService澶勭悊娑堟伅浜掕皟,鎺ュ叆姝ラ:
- * 璇︾粏鐢ㄦ埛鍙弬鑰�:https://help.aliyun.com/document_detail/30066.html#h2-2-messagereceiver-aliyunmessageintentservice
- */
-
-class MyMessageIntentService : AliyunMessageIntentService() {
-
- companion object {
- private const val REC_TAG = "MyMessageIntentService"
- }
-
- /**
- * 鎺ㄩ�侀�氱煡鐨勫洖璋冩柟娉�
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- override fun onNotification(context: Context, title: String, summary: String, extraMap: Map<String, String>) {
- Log.i(REC_TAG, "鏀跺埌涓�鏉℃帹閫侀�氱煡 锛� $title, summary:$summary")
- }
-
- /**
- * 鎺ㄩ�佹秷鎭殑鍥炶皟鏂规硶
- * @param context
- * @param cPushMessage
- */
- override fun onMessage(context: Context, cPushMessage: CPushMessage) {
- Log.i(REC_TAG, "鏀跺埌涓�鏉℃帹閫佹秷鎭� 锛� " + cPushMessage.title + ", content:" + cPushMessage.content)
- }
-
- /**
- * 浠庨�氱煡鏍忔墦寮�閫氱煡鐨勬墿灞曞鐞�
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- override fun onNotificationOpened(context: Context, title: String, summary: String, extraMap: String) {
- Log.i(REC_TAG, "onNotificationOpened 锛� : $title : $summary : $extraMap")
-
- }
-
- /**
- * 鏃犲姩浣滈�氱煡鐐瑰嚮鍥炶皟銆傚綋鍦ㄥ悗鍙版垨闃块噷浜戞帶鍒跺彴鎸囧畾鐨勯�氱煡鍔ㄤ綔涓烘棤閫昏緫璺宠浆鏃�,閫氱煡鐐瑰嚮鍥炶皟涓簅nNotificationClickedWithNoAction鑰屼笉鏄痮nNotificationOpened
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- */
- override fun onNotificationClickedWithNoAction(context: Context, title: String, summary: String, extraMap: String) {
- Log.i(REC_TAG, "onNotificationClickedWithNoAction 锛� : $title : $summary : $extraMap")
- }
-
- /**
- * 閫氱煡鍒犻櫎鍥炶皟
- * @param context
- * @param messageId
- */
- override fun onNotificationRemoved(context: Context, messageId: String) {
- Log.i(REC_TAG, "onNotificationRemoved 锛� $messageId")
- }
-
- /**
- * 搴旂敤澶勪簬鍓嶅彴鏃堕�氱煡鍒拌揪鍥炶皟銆傛敞鎰�:璇ユ柟娉曚粎瀵硅嚜瀹氫箟鏍峰紡閫氱煡鏈夋晥,鐩稿叧璇︽儏璇峰弬鑰僪ttps://help.aliyun.com/document_detail/30066.html#h3-3-4-basiccustompushnotification-api
- * @param context
- * @param title
- * @param summary
- * @param extraMap
- * @param openType
- * @param openActivity
- * @param openUrl
- */
- override fun onNotificationReceivedInApp(
- context: Context,
- title: String,
- summary: String,
- extraMap: Map<String, String>,
- openType: Int,
- openActivity: String,
- openUrl: String
- ) {
- Log.i(
- REC_TAG,
- "onNotificationReceivedInApp 锛� : $title : $summary $extraMap : $openType : $openActivity : $openUrl"
- )
- }
-}
+//package cn.flightfeather.thirdappmodule.util.push
+//
+//import android.content.Context
+//import android.util.Log
+//
+//import com.alibaba.sdk.android.push.AliyunMessageIntentService
+//import com.alibaba.sdk.android.push.notification.CPushMessage
+//
+///**
+// * 涓洪伩鍏嶆帹閫佸箍鎾绯荤粺鎷︽埅鐨勫皬姒傜巼浜嬩欢,鎴戜滑鎺ㄨ崘鐢ㄦ埛閫氳繃IntentService澶勭悊娑堟伅浜掕皟,鎺ュ叆姝ラ:
+// * 璇︾粏鐢ㄦ埛鍙弬鑰�:https://help.aliyun.com/document_detail/30066.html#h2-2-messagereceiver-aliyunmessageintentservice
+// */
+//
+//class MyMessageIntentService : AliyunMessageIntentService() {
+//
+// companion object {
+// private const val REC_TAG = "MyMessageIntentService"
+// }
+//
+// /**
+// * 鎺ㄩ�侀�氱煡鐨勫洖璋冩柟娉�
+// * @param context
+// * @param title
+// * @param summary
+// * @param extraMap
+// */
+// override fun onNotification(context: Context, title: String, summary: String, extraMap: Map<String, String>) {
+// Log.i(REC_TAG, "鏀跺埌涓�鏉℃帹閫侀�氱煡 锛� $title, summary:$summary")
+// }
+//
+// /**
+// * 鎺ㄩ�佹秷鎭殑鍥炶皟鏂规硶
+// * @param context
+// * @param cPushMessage
+// */
+// override fun onMessage(context: Context, cPushMessage: CPushMessage) {
+// Log.i(REC_TAG, "鏀跺埌涓�鏉℃帹閫佹秷鎭� 锛� " + cPushMessage.title + ", content:" + cPushMessage.content)
+// }
+//
+// /**
+// * 浠庨�氱煡鏍忔墦寮�閫氱煡鐨勬墿灞曞鐞�
+// * @param context
+// * @param title
+// * @param summary
+// * @param extraMap
+// */
+// override fun onNotificationOpened(context: Context, title: String, summary: String, extraMap: String) {
+// Log.i(REC_TAG, "onNotificationOpened 锛� : $title : $summary : $extraMap")
+//
+// }
+//
+// /**
+// * 鏃犲姩浣滈�氱煡鐐瑰嚮鍥炶皟銆傚綋鍦ㄥ悗鍙版垨闃块噷浜戞帶鍒跺彴鎸囧畾鐨勯�氱煡鍔ㄤ綔涓烘棤閫昏緫璺宠浆鏃�,閫氱煡鐐瑰嚮鍥炶皟涓簅nNotificationClickedWithNoAction鑰屼笉鏄痮nNotificationOpened
+// * @param context
+// * @param title
+// * @param summary
+// * @param extraMap
+// */
+// override fun onNotificationClickedWithNoAction(context: Context, title: String, summary: String, extraMap: String) {
+// Log.i(REC_TAG, "onNotificationClickedWithNoAction 锛� : $title : $summary : $extraMap")
+// }
+//
+// /**
+// * 閫氱煡鍒犻櫎鍥炶皟
+// * @param context
+// * @param messageId
+// */
+// override fun onNotificationRemoved(context: Context, messageId: String) {
+// Log.i(REC_TAG, "onNotificationRemoved 锛� $messageId")
+// }
+//
+// /**
+// * 搴旂敤澶勪簬鍓嶅彴鏃堕�氱煡鍒拌揪鍥炶皟銆傛敞鎰�:璇ユ柟娉曚粎瀵硅嚜瀹氫箟鏍峰紡閫氱煡鏈夋晥,鐩稿叧璇︽儏璇峰弬鑰僪ttps://help.aliyun.com/document_detail/30066.html#h3-3-4-basiccustompushnotification-api
+// * @param context
+// * @param title
+// * @param summary
+// * @param extraMap
+// * @param openType
+// * @param openActivity
+// * @param openUrl
+// */
+// override fun onNotificationReceivedInApp(
+// context: Context,
+// title: String,
+// summary: String,
+// extraMap: Map<String, String>,
+// openType: Int,
+// openActivity: String,
+// openUrl: String
+// ) {
+// Log.i(
+// REC_TAG,
+// "onNotificationReceivedInApp 锛� : $title : $summary $extraMap : $openType : $openActivity : $openUrl"
+// )
+// }
+//}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageReceiver.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageReceiver.kt
index d075624..892e5bc 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageReceiver.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/MyMessageReceiver.kt
@@ -1,72 +1,72 @@
-package cn.flightfeather.thirdappmodule.util.push
-
-import android.content.Context
-import android.util.Log
-import com.alibaba.sdk.android.push.MessageReceiver
-import com.alibaba.sdk.android.push.notification.CPushMessage
-
-/**
- * 闃块噷浜戞帹閫佹秷鎭帴鏀�
- * @author riku
- * Date: 2019/12/26
- */
-class MyMessageReceiver : MessageReceiver() {
- companion object {
- // 娑堟伅鎺ユ敹閮ㄥ垎鐨凩OG_TAG
- const val REC_TAG = "MyMessageReceiver"
- }
-
- override fun onNotification(
- context: Context?,
- title: String?,
- summary: String?,
- extraMap: Map<String, String>?
- ) {
- // TODO 澶勭悊鎺ㄩ�侀�氱煡
- Log.e(REC_TAG, "Receive notification, title: $title, summary: $summary, extraMap: $extraMap")
- }
-
- override fun onMessage(context: Context?, cPushMessage: CPushMessage) {
- Log.e(
- REC_TAG,
- "onMessage, messageId: " + cPushMessage.messageId + ", title: " + cPushMessage.title + ", content:" + cPushMessage.content
- )
-
-
- }
-
- override fun onNotificationOpened(context: Context?, title: String?, summary: String?, extraMap: String?) {
- Log.e(REC_TAG, "onNotificationOpened, title: $title, summary: $summary, extraMap:$extraMap")
- }
-
- override fun onNotificationClickedWithNoAction(
- context: Context?,
- title: String?,
- summary: String?,
- extraMap: String?
- ) {
- Log.e(
- REC_TAG,
- "onNotificationClickedWithNoAction, title: $title, summary: $summary, extraMap:$extraMap"
- )
- }
-
- override fun onNotificationReceivedInApp(
- context: Context?,
- title: String?,
- summary: String?,
- extraMap: Map<String, String>?,
- openType: Int,
- openActivity: String?,
- openUrl: String?
- ) {
- Log.e(
- REC_TAG,
- "onNotificationReceivedInApp, title: $title, summary: $summary, extraMap:$extraMap, openType:$openType, openActivity:$openActivity, openUrl:$openUrl"
- )
- }
-
- override fun onNotificationRemoved(context: Context?, messageId: String?) {
- Log.e(REC_TAG, "onNotificationRemoved")
- }
-}
\ No newline at end of file
+//package cn.flightfeather.thirdappmodule.util.push
+//
+//import android.content.Context
+//import android.util.Log
+//import com.alibaba.sdk.android.push.MessageReceiver
+//import com.alibaba.sdk.android.push.notification.CPushMessage
+//
+///**
+// * 闃块噷浜戞帹閫佹秷鎭帴鏀�
+// * @author riku
+// * Date: 2019/12/26
+// */
+//class MyMessageReceiver : MessageReceiver() {
+// companion object {
+// // 娑堟伅鎺ユ敹閮ㄥ垎鐨凩OG_TAG
+// const val REC_TAG = "MyMessageReceiver"
+// }
+//
+// override fun onNotification(
+// context: Context?,
+// title: String?,
+// summary: String?,
+// extraMap: Map<String, String>?
+// ) {
+// // TODO 澶勭悊鎺ㄩ�侀�氱煡
+// Log.e(REC_TAG, "Receive notification, title: $title, summary: $summary, extraMap: $extraMap")
+// }
+//
+// override fun onMessage(context: Context?, cPushMessage: CPushMessage) {
+// Log.e(
+// REC_TAG,
+// "onMessage, messageId: " + cPushMessage.messageId + ", title: " + cPushMessage.title + ", content:" + cPushMessage.content
+// )
+//
+//
+// }
+//
+// override fun onNotificationOpened(context: Context?, title: String?, summary: String?, extraMap: String?) {
+// Log.e(REC_TAG, "onNotificationOpened, title: $title, summary: $summary, extraMap:$extraMap")
+// }
+//
+// override fun onNotificationClickedWithNoAction(
+// context: Context?,
+// title: String?,
+// summary: String?,
+// extraMap: String?
+// ) {
+// Log.e(
+// REC_TAG,
+// "onNotificationClickedWithNoAction, title: $title, summary: $summary, extraMap:$extraMap"
+// )
+// }
+//
+// override fun onNotificationReceivedInApp(
+// context: Context?,
+// title: String?,
+// summary: String?,
+// extraMap: Map<String, String>?,
+// openType: Int,
+// openActivity: String?,
+// openUrl: String?
+// ) {
+// Log.e(
+// REC_TAG,
+// "onNotificationReceivedInApp, title: $title, summary: $summary, extraMap:$extraMap, openType:$openType, openActivity:$openActivity, openUrl:$openUrl"
+// )
+// }
+//
+// override fun onNotificationRemoved(context: Context?, messageId: String?) {
+// Log.e(REC_TAG, "onNotificationRemoved")
+// }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/PushService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/PushService.kt
index 7055c2f..1287c90 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/PushService.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/push/PushService.kt
@@ -2,9 +2,9 @@
import android.content.Context
import android.util.Log
-import com.alibaba.sdk.android.push.CloudPushService
-import com.alibaba.sdk.android.push.CommonCallback
-import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory
+//import com.alibaba.sdk.android.push.CloudPushService
+//import com.alibaba.sdk.android.push.CommonCallback
+//import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory
/**
* 绉诲姩鎺ㄩ�佹湇鍔￠厤缃被
@@ -12,54 +12,54 @@
* Date: 2019/12/26
*/
class PushService {
- companion object {
- const val TAG = "PushService"
-
- private var mPushService: CloudPushService? = null
-
- /**
- * 鍒濆鍖栦簯鎺ㄩ�侀�氶亾
- * @param applicationContext
- */
- fun init(applicationContext: Context) {
- PushServiceFactory.init(applicationContext)
- mPushService = PushServiceFactory.getCloudPushService()
- mPushService?.register(applicationContext, object : CommonCallback {
- override fun onSuccess(response: String) {
- Log.d(TAG, "init cloudChannel success")
- Log.d(TAG, response)
- }
-
- override fun onFailed(errorCode: String, errorMessage: String) {
- Log.d(TAG, "init cloudChannel failed -- errorCode:$errorCode -- errorMessage:$errorMessage")
- }
- })
- }
-
- fun bindAccount(account: String, s: () -> Unit) {
- mPushService?.bindAccount(account, object : CommonCallback {
- override fun onSuccess(p0: String?) {
- Log.d(TAG, "bind account $account success")
- s()
- }
-
- override fun onFailed(p0: String?, p1: String?) {
-
- }
- })
- }
-
- fun unBindAccount(s: () -> Unit) {
- mPushService?.unbindAccount(object : CommonCallback {
- override fun onSuccess(p0: String?) {
- Log.d(TAG, "unbind account success")
- s()
- }
-
- override fun onFailed(p0: String?, p1: String?) {
-
- }
- })
- }
- }
+// companion object {
+// const val TAG = "PushService"
+//
+// private var mPushService: CloudPushService? = null
+//
+// /**
+// * 鍒濆鍖栦簯鎺ㄩ�侀�氶亾
+// * @param applicationContext
+// */
+// fun init(applicationContext: Context) {
+// PushServiceFactory.init(applicationContext)
+// mPushService = PushServiceFactory.getCloudPushService()
+// mPushService?.register(applicationContext, object : CommonCallback {
+// override fun onSuccess(response: String) {
+// Log.d(TAG, "init cloudChannel success")
+// Log.d(TAG, response)
+// }
+//
+// override fun onFailed(errorCode: String, errorMessage: String) {
+// Log.d(TAG, "init cloudChannel failed -- errorCode:$errorCode -- errorMessage:$errorMessage")
+// }
+// })
+// }
+//
+// fun bindAccount(account: String, s: () -> Unit) {
+// mPushService?.bindAccount(account, object : CommonCallback {
+// override fun onSuccess(p0: String?) {
+// Log.d(TAG, "bind account $account success")
+// s()
+// }
+//
+// override fun onFailed(p0: String?, p1: String?) {
+//
+// }
+// })
+// }
+//
+// fun unBindAccount(s: () -> Unit) {
+// mPushService?.unbindAccount(object : CommonCallback {
+// override fun onSuccess(p0: String?) {
+// Log.d(TAG, "unbind account success")
+// s()
+// }
+//
+// override fun onFailed(p0: String?, p1: String?) {
+//
+// }
+// })
+// }
+// }
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_border_black.xml b/app/src/main/res/drawable/bg_border_black.xml
new file mode 100644
index 0000000..99d9b41
--- /dev/null
+++ b/app/src/main/res/drawable/bg_border_black.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/black" />
+
+ </shape>
+ </item>
+ <item
+ android:bottom="1dp"
+ android:left="1dp"
+ android:top="1dp"
+ android:right="1dp">
+ <shape>
+ <solid android:color="@color/white" />
+ <padding
+ android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="2dp" />
+ </shape>
+ </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_border_black_no_right.xml b/app/src/main/res/drawable/bg_border_black_no_right.xml
new file mode 100644
index 0000000..52222b8
--- /dev/null
+++ b/app/src/main/res/drawable/bg_border_black_no_right.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/black" />
+
+ </shape>
+ </item>
+ <item
+ android:bottom="1dp"
+ android:left="1dp"
+ android:top="1dp">
+ <shape>
+ <solid android:color="@color/white" />
+ <padding
+ android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="2dp" />
+ </shape>
+ </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_border_black_no_top.xml b/app/src/main/res/drawable/bg_border_black_no_top.xml
new file mode 100644
index 0000000..66e703b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_border_black_no_top.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/black" />
+
+ </shape>
+ </item>
+ <item
+ android:bottom="1dp"
+ android:left="1dp"
+ android:right="1dp">
+ <shape>
+ <solid android:color="@color/white" />
+ <padding
+ android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="1dp" />
+ </shape>
+ </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_border_black_no_top_right.xml b/app/src/main/res/drawable/bg_border_black_no_top_right.xml
new file mode 100644
index 0000000..fe1234e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_border_black_no_top_right.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="@color/black" />
+
+ </shape>
+ </item>
+ <item
+ android:bottom="1dp"
+ android:left="1dp">
+ <shape>
+ <solid android:color="@color/white" />
+ <padding
+ android:bottom="2dp"
+ android:left="2dp"
+ android:right="2dp"
+ android:top="1dp" />
+ </shape>
+ </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_emergency.png b/app/src/main/res/drawable/ic_emergency.png
new file mode 100644
index 0000000..71010a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emergency.png
Binary files differ
diff --git a/app/src/main/res/layout/dialog_scene_history.xml b/app/src/main/res/layout/dialog_scene_history.xml
index 462ae83..7716d49 100644
--- a/app/src/main/res/layout/dialog_scene_history.xml
+++ b/app/src/main/res/layout/dialog_scene_history.xml
@@ -17,21 +17,28 @@
app:cardCornerRadius="6dp"
app:cardElevation="7dp">
- <android.support.constraint.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginBottom="30dp">
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dimen16">
<TextView
android:id="@+id/tv_title"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="鍘嗗彶鎯呭喌"
android:textColor="@color/primary_text"
android:textSize="@dimen/textSize_18"
+ app:layout_constraintEnd_toStartOf="@id/view_waiting"
+ app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О鍦烘櫙鐨勫悕绉板満鏅殑鍚嶇О" />
<ProgressBar
android:id="@+id/view_waiting"
@@ -45,6 +52,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen16"
app:layout_constraintTop_toBottomOf="@id/tv_title">
<TextView
@@ -54,11 +62,81 @@
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
android:text="1. 鐜板満璇勫垎"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/tv1_title_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv1_title_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_1"
+ android:text="7鏈�" />
+ <TextView
+ android:id="@+id/tv1_content_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv1_content_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv1_title_1"
+ android:text="76鍒�" />
+
+ <TextView
+ android:id="@+id/tv1_title_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv1_title_3"
+ app:layout_constraintStart_toEndOf="@id/tv1_title_1"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_1"
+ android:text="8鏈�" />
+ <TextView
+ android:id="@+id/tv1_content_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv1_content_3"
+ app:layout_constraintStart_toEndOf="@id/tv1_content_1"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv1_content_1"
+ android:text="82鍒�" />
+
+ <TextView
+ android:id="@+id/tv1_title_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv1_title_2"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_1"
+ android:text="9鏈�" />
+ <TextView
+ android:id="@+id/tv1_content_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv1_content_2"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv1_content_1"
+ android:text="79鍒�" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
@@ -66,6 +144,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_1">
<TextView
@@ -75,10 +154,26 @@
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
android:text="2. 鍏稿瀷宸ュ湴"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/tv2_content_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦颁笂鏈堟暣鏀圭巼浠呬负57.1%锛岃鍒椾负鍏稿瀷宸ュ湴锛屾敞鎰忓姞寮虹幇鍦虹洃绠°��"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_2"
tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
@@ -87,6 +182,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_2">
<TextView
@@ -96,17 +192,35 @@
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
android:text="3. 閲嶇偣鍖哄煙"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/tv3_content_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦颁綅浜庡浗鎺х偣闈欏畨鐩戞祴绔欏懆杈�2鍏噷鑼冨洿鍐咃紝灞炰簬閲嶇偣绠℃帶鍖哄煙锛屾敞鎰忓姞寮虹幇鍦虹洃绠°��"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_3"
+ tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
+
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_3">
<TextView
@@ -116,17 +230,34 @@
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
android:text="4. 鑱斿悎鎵ф硶"
- android:textColor="@color/main_color_1"
+ android:textStyle="bold"
+ android:textColor="@color/main_color_3"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+ <TextView
+ android:id="@+id/tv_summary_4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦拌繎涓変釜鏈堟湭娑夊強鑱斿悎鎵ф硶銆�"
+ android:textColor="@color/main_color_3"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_4"
+ tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
+
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_4">
<TextView
@@ -136,17 +267,197 @@
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
android:text="5. 鏁存敼鏁堢巼"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/tv_summary_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦板墠涓変釜鏈堟暣鏀规儏鍐靛涓嬭〃锛岀患鍚堟暣鏀圭巼浠呬负79%锛屾暣鏀规儏鍐佃緝宸��"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_5"
+ tools:ignore="UnusedAttribute" />
+
+<!-- column 1 -->
+ <TextView
+ android:id="@+id/tv5_title_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ android:background="@drawable/bg_border_black_no_right"
+ app:layout_constraintEnd_toStartOf="@id/tv5_title_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_summary_5"
+ />
+ <TextView
+ android:id="@+id/tv5_content_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv5_title_1"
+ android:text="鏁存敼鐜�" />
+ <TextView
+ android:id="@+id/tv5_content1_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content1_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content_1"
+ android:text="鏁存敼鏁堢巼" />
+ <TextView
+ android:id="@+id/tv5_content2_1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content1_2"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content1_1"
+ android:text="缁煎悎鏁存敼鐜�" />
+
+ <!-- column 2 -->
+ <TextView
+ android:id="@+id/tv5_title_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_title_3"
+ app:layout_constraintStart_toEndOf="@id/tv5_title_1"
+ app:layout_constraintTop_toTopOf="@id/tv5_title_1"
+ android:text="7鏈�" />
+ <TextView
+ android:id="@+id/tv5_content_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content_3"
+ app:layout_constraintStart_toEndOf="@id/tv5_content_1"
+ app:layout_constraintTop_toBottomOf="@id/tv5_title_2"
+ android:text="100%" />
+ <TextView
+ android:id="@+id/tv5_content1_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content1_3"
+ app:layout_constraintStart_toEndOf="@id/tv5_content1_1"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content_2"
+ android:text="1澶╁唴" />
+ <TextView
+ android:id="@+id/tv5_content2_2"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv5_content2_1"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content1_2"
+ android:text="79%" />
+
+ <!-- column 3 -->
+ <TextView
+ android:id="@+id/tv5_title_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_title_4"
+ app:layout_constraintStart_toEndOf="@id/tv5_title_2"
+ app:layout_constraintTop_toTopOf="@id/tv5_title_1"
+ android:text="8鏈�" />
+ <TextView
+ android:id="@+id/tv5_content_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content_4"
+ app:layout_constraintStart_toEndOf="@id/tv5_content_2"
+ app:layout_constraintTop_toBottomOf="@id/tv5_title_3"
+ android:text="80%" />
+ <TextView
+ android:id="@+id/tv5_content1_3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top_right"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toStartOf="@id/tv5_content1_4"
+ app:layout_constraintStart_toEndOf="@id/tv5_content1_2"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content_3"
+ android:text="鏈暣鏀�" />
+
+ <!-- column 4 -->
+ <TextView
+ android:id="@+id/tv5_title_4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv5_title_3"
+ app:layout_constraintTop_toTopOf="@id/tv5_title_1"
+ android:text="9鏈�" />
+ <TextView
+ android:id="@+id/tv5_content_4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv5_content_3"
+ app:layout_constraintTop_toBottomOf="@id/tv5_title_4"
+ android:text="57.1%" />
+ <TextView
+ android:id="@+id/tv5_content1_4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_border_black_no_top"
+ android:textAlignment="center"
+ android:textColor="@color/main_color_1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv5_content1_3"
+ app:layout_constraintTop_toBottomOf="@id/tv5_content_4"
+ android:text="鏈暣鏀�" />
</android.support.constraint.ConstraintLayout>
+
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_5">
<TextView
@@ -155,18 +466,36 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
- android:text="6. 鏂藉伐闃舵"
+ android:text="6. 闂澶嶅彂"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/tv_summary_6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦板墠涓変釜鏈堟湁1涓棶棰樺娆″鍙戯紝涓衡�濆伐鍦板唴澶氭潯閬撹矾鏄庢樉娉ョ棔/娉ユ碁/绉皹/閬楁拻鈥溿��"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_6"
+ tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
+
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_6">
<TextView
@@ -175,18 +504,35 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
- android:text="7. 鐩戞祴鏁版嵁"
+ android:text="7. 鏂藉伐闃舵"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+ <TextView
+ android:id="@+id/tv_summary_7"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦颁笂涓�娆℃洿鏂版柦宸ラ樁娈典负2025骞�9鏈�10鏃ャ��"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_7"
+ tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
+
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
app:layout_constraintTop_toBottomOf="@id/cl_7">
<TextView
@@ -195,16 +541,69 @@
android:layout_height="wrap_content"
android:paddingTop="@dimen/dimen4"
android:paddingBottom="@dimen/dimen4"
- android:text="8. 搴旀�ュ贰鏌�"
+ android:text="8. 鐩戞祴鏁版嵁"
+ android:textStyle="bold"
android:textColor="@color/main_color_1"
android:textSize="@dimen/textSize_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
+ <TextView
+ android:id="@+id/tv_summary_8"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦拌繎涓変釜鏈堟壃灏樺湪绾跨洃娴嬫暟鎹帓鍚嶆湭杈惧叏鍖哄墠鍗侊紝涓婃湀骞冲潎娴撳害浣庝簬鍖哄潎鍊硷紝鏁版嵁鎯呭喌杈冨ソ銆�"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_8"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_9"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="@dimen/dimen8"
+ app:layout_constraintTop_toBottomOf="@id/cl_8">
+
+ <TextView
+ android:id="@+id/tv_title_9"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="9. 搴旀�ュ贰鏌�"
+ android:textStyle="bold"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ <TextView
+ android:id="@+id/tv_summary_9"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="璇ュ伐鍦拌繎涓変釜鏈堟湭娑夊強閬撹矾宸℃煡銆�"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="0dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_title_9"
+ tools:ignore="UnusedAttribute" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
+ </ScrollView>
</android.support.v7.widget.CardView>
<android.support.design.widget.FloatingActionButton
diff --git a/app/src/main/res/layout/item_task_list_2.xml b/app/src/main/res/layout/item_task_list_2.xml
index b4a4e0f..a9ea202 100644
--- a/app/src/main/res/layout/item_task_list_2.xml
+++ b/app/src/main/res/layout/item_task_list_2.xml
@@ -69,7 +69,7 @@
android:id="@+id/tv_item_task_list_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
- tools:text="浠诲姟鍦扮偣"
+ tools:text="浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣浠诲姟鍦扮偣"
style="@style/TextStyle.Abstract"
android:layout_marginStart="@dimen/dimen8"
app:layout_constraintTop_toTopOf="@id/img_task_address"
@@ -145,8 +145,91 @@
android:layout_height="40dp"
android:src="@mipmap/ic_task_ready_to_start"
android:layout_marginEnd="@dimen/dimen4"
+ app:layout_constraintHorizontal_bias="1"
+ app:layout_constraintStart_toStartOf="@id/guide_line_2"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@id/tv_item_task_list_name"/>
+ app:layout_constraintTop_toTopOf="@id/tv_item_task_list_name"
+ app:layout_constraintBottom_toTopOf="@id/img_risk_warn"/>
+
+ <android.support.constraint.Group
+ android:id="@+id/group_risk_warn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="img_risk_warn, tv_risk_warn"/>
+ <ImageView
+ android:id="@+id/img_risk_warn"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/icon_task_alert"
+ android:tint="@color/white"
+ android:layout_marginBottom="@dimen/dimen4"
+ app:layout_constraintTop_toBottomOf="@id/img_task_status"
+ app:layout_constraintBottom_toTopOf="@id/img_inspection_key_point"
+ app:layout_constraintEnd_toStartOf="@id/tv_risk_warn"/>
+
+ <TextView
+ android:id="@+id/tv_risk_warn"
+ android:layout_width="@dimen/dimen16"
+ android:layout_height="wrap_content"
+ tools:text="10"
+ style="@style/TextStyle.Abstract"
+ android:gravity="end"
+ android:layout_marginEnd="@dimen/dimen4"
+ app:layout_constraintTop_toTopOf="@id/img_risk_warn"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ <android.support.constraint.Group
+ android:id="@+id/group_inspection_key_point"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="img_risk_warn, tv_risk_warn"/>
+ <ImageView
+ android:id="@+id/img_inspection_key_point"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/icon_consult"
+ android:tint="@color/white"
+ android:padding="@dimen/dimen2"
+ android:layout_marginBottom="@dimen/dimen4"
+ app:layout_constraintBottom_toTopOf="@id/img_emergency_inspection"
+ app:layout_constraintEnd_toStartOf="@id/tv_inspection_key_point"/>
+
+ <TextView
+ android:id="@+id/tv_inspection_key_point"
+ android:layout_width="@dimen/dimen16"
+ android:layout_height="wrap_content"
+ tools:text="1"
+ style="@style/TextStyle.Abstract"
+ android:gravity="end"
+ android:layout_marginEnd="@dimen/dimen4"
+ app:layout_constraintTop_toTopOf="@id/img_inspection_key_point"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ <android.support.constraint.Group
+ android:id="@+id/group_emergency_inspection"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="img_risk_warn, tv_risk_warn"/>
+ <ImageView
+ android:id="@+id/img_emergency_inspection"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/ic_emergency"
+ android:tint="@color/white"
+ android:layout_marginBottom="@dimen/dimen8"
+ app:layout_constraintBottom_toTopOf="@id/tv_check_status"
+ app:layout_constraintEnd_toStartOf="@id/tv_emergency_inspection"/>
+
+ <TextView
+ android:id="@+id/tv_emergency_inspection"
+ android:layout_width="@dimen/dimen16"
+ android:layout_height="wrap_content"
+ tools:text="1"
+ style="@style/TextStyle.Abstract"
+ android:gravity="end"
+ android:layout_marginEnd="@dimen/dimen4"
+ app:layout_constraintTop_toTopOf="@id/img_emergency_inspection"
+ app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/tv_check_status"
diff --git a/build.gradle b/build.gradle
index 17f1bea..e65dff6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0'
// 娣诲姞emas-services鎻掍欢
- classpath 'com.aliyun.ams:emas-services:1.0.1'
+// classpath 'com.aliyun.ams:emas-services:1.0.1'
// classpath "gradle.plugin.ua.eshepelyuk:ManifestClasspath:1.0.0"
}
--
Gitblit v1.9.3