From 3013b813e5df6977c0be921928f73b1a3adde290 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 02 七月 2025 15:52:04 +0800
Subject: [PATCH] ### 一、巡查模块相关
---
app/src/main/res/values/ids.xml | 4
multi-image-selector/build.gradle | 6
.idea/libraries/Gradle__junit_junit_4_13_2.xml | 13
.idea/libraries/Gradle__com_taobao_android_networksdk_3_5_5_5_open.xml | 9
.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml | 13
.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml | 13
.idea/misc.xml | 32
appsupervision/build.gradle | 4
.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml | 15
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_beacon_1_0_4_3.xml | 9
.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml | 13
.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/LedgerService.kt | 25
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_tlog_1_1_3_1_open_aar.xml | 11
.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml | 15
.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml | 15
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_rest_1_4_0_open_aar.xml | 11
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml | 13
.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml | 13
.idea/libraries/Gradle__E__androidsdk_sdk_new_build_tools_28_0_3_renderscript_lib_renderscript_v8_jar.xml | 9
.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml | 13
.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml | 15
.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml | 13
.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt | 20
.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml | 15
.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml | 14
.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml | 16
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml | 13
gradle/wrapper/gradle-wrapper.properties | 1
.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml | 14
.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml | 13
.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml | 9
app/src/main/java/cn/flightfeather/thirdappmodule/module/base/TabViewPagerSetInterface.kt | 5
.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml | 13
.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_apm_1_0_8_2_open_aar.xml | 22
app/src/main/java/cn/flightfeather/thirdappmodule/repository/UserInfoRepository.kt | 10
app/src/main/res/layout/fragment_office_file.xml | 10
.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/module/login/CardFragment.java | 1
app/src/main/res/layout/item_image_chose.xml | 38
.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml | 13
.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml | 14
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml | 11
.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml | 13
.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/task/CompressPhotoTask.java | 36
app/src/main/res/layout/item_spinner_drop_down_custom.xml | 31
.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml | 14
.idea/libraries/Gradle__javax_inject_javax_inject_1.xml | 13
.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml | 13
app/src/main/res/layout/fragment_setting.xml | 8
.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml | 15
.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml | 18
.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml | 18
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tbrest_1_1_1_0_open_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt | 63
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utils_1_1_6_4.xml | 9
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt | 211 ++
.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml | 11
.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml | 13
.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/view/BannerView.kt | 52
app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileManageActivity.kt | 3
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/LedgerRecord.kt | 30
.idea/libraries/Gradle__com_taobao_android_tnet4android_3_1_14_7_all_aar.xml | 11
.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_hotfix_3_2_17_aar.xml | 11
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml | 11
app/build.gradle | 13
app/src/main/java/cn/flightfeather/thirdappmodule/repository/dao/MediaTypeAliasDao.kt | 4
app/src/main/java/cn/flightfeather/thirdappmodule/util/crashreport/MyCrashHandler.kt | 2
.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml | 13
app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml | 5
.idea/libraries/Gradle__com_amap_api_location_4_6_0.xml | 13
.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/UserMap.kt | 17
.idea/libraries/Gradle__com_tencent_tbs_tbssdk_44213.xml | 9
.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml | 13
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml | 13
.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_6.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_man_1_2_5_aar.xml | 12
.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml | 13
.idea/libraries/Gradle__com_taobao_android_accs_sdk_taobao_4_0_4_emas_aar.xml | 14
.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml | 13
app/src/main/res/layout/page_patrol_icons_second.xml | 9
app/src/main/java/cn/flightfeather/thirdappmodule/CommonApplication.java | 22
.gitignore | 7
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_protocol_1_1_1_0_open_aar.xml | 11
app/src/main/res/layout/item_single_text.xml | 19
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/ShareProblemPreViewActivity.kt | 11
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utdid_2_5_1_proguard.xml | 9
.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_3_0.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceViewModel.kt | 106 +
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraViewModel.kt | 102
.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml | 11
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml | 13
.idea/modules.xml | 13
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_adapter_1_1_3_8_open_aar.xml | 11
app/src/main/res/layout/activity_test.xml | 18
build.gradle | 28
.idea/assetWizardSettings.xml | 11
.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml | 15
.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/util/tbs/Tbs.kt | 40
.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml | 13
app/src/main/res/layout/activity_pic_evidence.xml | 135 +
app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileReadFragment.kt | 24
app/src/main/AndroidManifest.xml | 6
.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml | 11
.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml | 9
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_feedback_3_3_2_aar.xml | 11
.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml | 18
.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt | 9
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_uploader_oss_1_1_0_6_3_open_aar.xml | 11
.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml | 15
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_core_1_1_0_6_1_open_aar.xml | 11
.idea/libraries/Gradle__com_aliyun_dpa_oss_android_sdk_2_9_3_aar.xml | 15
app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType.kt | 35
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml | 18
app/src/main/java/cn/flightfeather/thirdappmodule/activity/TestActivity.kt | 51
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt | 22
.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_9_0.xml | 13
.idea/libraries/Gradle__org_greenrobot_greendao_api_3_3_0.xml | 13
.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml | 15
.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml | 14
.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml | 13
.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml | 14
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_message_rpc_1_1_3_1_open_aar.xml | 11
.idea/jarRepositories.xml | 20
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceActivity.kt | 246 +++
.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml | 15
.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType_Backup.kt | 39
.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_0_2.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt | 28
.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml | 15
.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml | 13
.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml | 13
.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml | 14
.idea/libraries/Gradle__org_greenrobot_greendao_3_3_0.xml | 13
app/proguard-rules.pro | 12
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_native_1_1_0_7_open_aar.xml | 11
.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml | 14
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/UserInfoService.java | 4
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_agoo_4_0_4_emas_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/module/base/FragmentViewPagerAdapter.kt | 9
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_httpdns_2_0_0_aar.xml | 11
app/src/main/res/layout/activity_photo_viewer_2.xml | 27
.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml | 13
.idea/libraries/Gradle__com_amap_api_search_6_5_0_1.xml | 13
.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml | 11
.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml | 9
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml | 11
.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml | 15
.idea/libraries/Gradle__com_amap_api_3dmap_6_8_0.xml | 13
.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1.xml | 13
.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml | 14
.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml | 15
.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml | 15
.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0.xml | 13
.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/SceneType.kt | 16
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_2_0_1.xml | 9
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml | 13
.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0.xml | 13
.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml | 13
.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml | 11
.idea/libraries/Gradle__junit_junit_4_12.xml | 13
.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml | 15
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_apm_impl_1_0_7_1_open_aar.xml | 14
.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0.xml | 13
.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_9_0.xml | 13
.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml | 14
.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml | 15
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceFragment.kt | 180 ++
.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml | 16
.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/repository/LedgerRepository.kt | 49
.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml | 14
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml | 13
.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml | 11
moduleBase/build.gradle | 2
.idea/libraries/Gradle__com_alibaba_fastjson_1_1_54_android.xml | 13
.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml | 15
.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml | 18
.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml | 13
.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml | 15
.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml | 15
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_protocol_1_1_0_8_open_aar.xml | 11
app/src/main/java/cn/flightfeather/thirdappmodule/module/common/PhotoViewerActivity2.kt | 68
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspectioninfo/InspectionInfoFragment.kt | 2
app/.gitignore | 2
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml | 11
.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml | 9
.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0.xml | 13
.idea/caches/build_file_checksums.ser | 0
.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml | 15
.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml | 13
app/src/main/java/cn/flightfeather/thirdappmodule/adapter/PhotoPageAdapter.kt | 46
.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml | 13
.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml | 11
.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0.xml | 13
app/src/main/res/layout/recycler_item_section_head.xml | 22
.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_push_3_2_5_aar.xml | 11
.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml | 13
224 files changed, 3,872 insertions(+), 277 deletions(-)
diff --git a/.gitignore b/.gitignore
index fd45b12..57e05a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
*.iml
.gradle
/local.properties
-/.idea/caches/build_file_checksums.ser
-/.idea/libraries
-/.idea/modules.xml
+#/.idea/caches/build_file_checksums.ser
+#/.idea/libraries
+#/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild
+/app/release/
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 9d948fb..8f3f2fb 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -3,6 +3,11 @@
<component name="WizardSettings">
<option name="children">
<map>
+ <entry key="imageWizard">
+ <value>
+ <PersistentState />
+ </value>
+ </entry>
<entry key="vectorWizard">
<value>
<PersistentState>
@@ -18,7 +23,7 @@
<PersistentState>
<option name="values">
<map>
- <entry key="url" value="file:/$PROJECT_DIR$/../../../../androidsdk/sdk_new/icons/material/materialicons/backspace/baseline_backspace_24.xml" />
+ <entry key="url" value="jar:file:/E:/android/Android%20Studio/plugins/android/lib/android.jar!/images/material/icons/materialicons/arrow_drop_down/baseline_arrow_drop_down_24.xml" />
</map>
</option>
</PersistentState>
@@ -28,8 +33,8 @@
</option>
<option name="values">
<map>
- <entry key="color" value="ff6767" />
- <entry key="outputName" value="ic_baseline_backspace_24" />
+ <entry key="color" value="ffffff" />
+ <entry key="outputName" value="ic_baseline_arrow_drop_down_24" />
<entry key="sourceFile" value="C:\Users\feiyu" />
</map>
</option>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..5a12511
--- /dev/null
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4138fd6..9697102 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,25 @@
<option name="name" value="maven" />
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/releases/" />
</remote-repository>
+ <remote-repository>
+ <option name="id" value="maven3" />
+ <option name="name" value="maven3" />
+ <option name="url" value="https://maven.aliyun.com/repository/google" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven" />
+ <option name="name" value="maven" />
+ <option name="url" value="https://maven.aliyun.com/repository/public" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven2" />
+ <option name="name" value="maven2" />
+ <option name="url" value="https://maven.aliyun.com/repository/central" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven4" />
+ <option name="name" value="maven4" />
+ <option name="url" value="https://maven.aliyun.com/repository/gradle-plugin" />
+ </remote-repository>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__E__androidsdk_sdk_new_build_tools_28_0_3_renderscript_lib_renderscript_v8_jar.xml b/.idea/libraries/Gradle__E__androidsdk_sdk_new_build_tools_28_0_3_renderscript_lib_renderscript_v8_jar.xml
new file mode 100644
index 0000000..181eec6
--- /dev/null
+++ b/.idea/libraries/Gradle__E__androidsdk_sdk_new_build_tools_28_0_3_renderscript_lib_renderscript_v8_jar.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: E./androidsdk/sdk_new/build-tools/28.0.3/renderscript/lib/renderscript-v8.jar">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/../../../../androidsdk/sdk_new/build-tools/28.0.3/renderscript/lib/renderscript-v8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..056f31d
--- /dev/null
+++ b/.idea/libraries/Gradle__am_widget_circleprogressbar_1_0_3_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: am.widget:circleprogressbar:1.0.3@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/177ec19f5ae94f06d726947550498867/circleprogressbar-1.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/177ec19f5ae94f06d726947550498867/circleprogressbar-1.0.3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/177ec19f5ae94f06d726947550498867/circleprogressbar-1.0.3/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/am.widget/circleprogressbar/1.0.3/45883ccf7314156c744e27d22789bf03360700c6/circleprogressbar-1.0.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
new file mode 100644
index 0000000..1e06d96
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.core:common:1.1.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/ae9b923fc99c1fc5a7a9b6cedc6df8b2b8529c54/common-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..d7a7e97
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/214bdc9cac88e976195e46d761ee1538/runtime-1.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/214bdc9cac88e976195e46d761ee1538/runtime-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
new file mode 100644
index 0000000..f29b182
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:common:1.1.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/bcdaa509a856d1430e736b102f899aa9870a8f83/common-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..a4df0f6
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_extensions_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:extensions:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/365f657fde1f3785888e75af4aa4ee10/extensions-1.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/365f657fde1f3785888e75af4aa4ee10/extensions-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/extensions/1.1.1/d654e6aa2f4a7c33f2dfe6c8465ee9ad2a81c1aa/extensions-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..7795f42
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3150690e8713e02e5e032dcb88719575/livedata-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3150690e8713e02e5e032dcb88719575/livedata-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3150690e8713e02e5e032dcb88719575/livedata-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..cac7339
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d2442638d1d59660bcc6af7e7e0088f/livedata-core-1.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/6d2442638d1d59660bcc6af7e7e0088f/livedata-core-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..c1e3c3b
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd9a24a47ad2242a8fea2d4cb485f7f4/runtime-1.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/bd9a24a47ad2242a8fea2d4cb485f7f4/runtime-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..6db426e
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a574c2236445212ad229f69a1894781/viewmodel-1.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/9a574c2236445212ad229f69a1894781/viewmodel-1.1.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..c99f7e9
--- /dev/null
+++ b/.idea/libraries/Gradle__cn_carbswang_android_NumberPickerView_1_1_1_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: cn.carbswang.android:NumberPickerView:1.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a0f3c0dd9eb6f306094a6a7bc20c27c/NumberPickerView-1.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a0f3c0dd9eb6f306094a6a7bc20c27c/NumberPickerView-1.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a0f3c0dd9eb6f306094a6a7bc20c27c/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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/cn.carbswang.android/NumberPickerView/1.1.1/c550a45ff08c64c8760086b9a59cf2ba87146911/NumberPickerView-1.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..45b5e1c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_alibaba_fastjson_1_1_54_android.xml
@@ -0,0 +1,13 @@
+<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
new file mode 100644
index 0000000..ebd5b67
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_agoo_4_0_4_emas_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-agoo:4.0.4-emas@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80ead45c1317d862f94285af5d97cca9/alicloud-android-agoo-4.0.4-emas/jars/classes.jar!/" />
+ <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-2/files-2.1/80ead45c1317d862f94285af5d97cca9/alicloud-android-agoo-4.0.4-emas/AndroidManifest.xml" />
+ </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
new file mode 100644
index 0000000..fac5e79
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_apm_1_0_8_2_open_aar.xml
@@ -0,0 +1,22 @@
+<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-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/jars/libs/AliHADataHub-1.0.0.23.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/jars/libs/applicationmonitor-1.0.5.4.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/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-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/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-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/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-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/jars/libs/DeviceEvaluator-1.0.0.21.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/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-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/jars/libs/phenix_lifecycle-1.0.1.1.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/alicloud-android-apm-1.0.8.2-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33cf07910395574a95a4c17b6d43d18e/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
new file mode 100644
index 0000000..d213cce
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_beacon_1_0_4_3.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..a8af6d2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_feedback_3_3_2_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-feedback:3.3.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83e9f38c61266e99692304007253ec9f/alicloud-android-feedback-3.3.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83e9f38c61266e99692304007253ec9f/alicloud-android-feedback-3.3.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83e9f38c61266e99692304007253ec9f/alicloud-android-feedback-3.3.2/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_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
new file mode 100644
index 0000000..d2a92e7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_adapter_1_1_3_8_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-adapter:1.1.3.8-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3d6ee15cc531d27c6362a3f9f29c172/alicloud-android-ha-adapter-1.1.3.8-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3d6ee15cc531d27c6362a3f9f29c172/alicloud-android-ha-adapter-1.1.3.8-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3d6ee15cc531d27c6362a3f9f29c172/alicloud-android-ha-adapter-1.1.3.8-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_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
new file mode 100644
index 0000000..1ae71d5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_apm_impl_1_0_7_1_open_aar.xml
@@ -0,0 +1,14 @@
+<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-2/files-2.1/a5dbd97863a191fd9116ae01becee851/alicloud-android-ha-apm-impl-1.0.7.1-open/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5dbd97863a191fd9116ae01becee851/alicloud-android-ha-apm-impl-1.0.7.1-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5dbd97863a191fd9116ae01becee851/alicloud-android-ha-apm-impl-1.0.7.1-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5dbd97863a191fd9116ae01becee851/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
new file mode 100644
index 0000000..3960478
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_core_1_1_0_6_1_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-core:1.1.0.6.1-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/432931da02df957e218ab3be677c253c/alicloud-android-ha-core-1.1.0.6.1-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/432931da02df957e218ab3be677c253c/alicloud-android-ha-core-1.1.0.6.1-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/432931da02df957e218ab3be677c253c/alicloud-android-ha-core-1.1.0.6.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_fulltrace_1_0_1_11_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml
new file mode 100644
index 0000000..2d4678d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_fulltrace_1_0_1_11_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/aeb779e8767135bf2d5d4485a3a12776/alicloud-android-ha-fulltrace-1.0.1.11/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aeb779e8767135bf2d5d4485a3a12776/alicloud-android-ha-fulltrace-1.0.1.11/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aeb779e8767135bf2d5d4485a3a12776/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
new file mode 100644
index 0000000..9d741cd
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_protocol_1_1_1_0_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-protocol:1.1.1.0-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c79db12d099422f8e3471cdb4ae5959/alicloud-android-ha-protocol-1.1.1.0-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c79db12d099422f8e3471cdb4ae5959/alicloud-android-ha-protocol-1.1.1.0-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c79db12d099422f8e3471cdb4ae5959/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
new file mode 100644
index 0000000..aa864be
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tbrest_1_1_1_0_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tbrest:1.1.1.0-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0a454183c4a911d333a43649af407855/alicloud-android-ha-tbrest-1.1.1.0-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0a454183c4a911d333a43649af407855/alicloud-android-ha-tbrest-1.1.1.0-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0a454183c4a911d333a43649af407855/alicloud-android-ha-tbrest-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_telescopebase_1_1_1_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml
new file mode 100644
index 0000000..6cc5905
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopebase_1_1_1_open_aar.xml
@@ -0,0 +1,14 @@
+<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-2/files-2.1/eec5316a18298815f3e721d6b8fd39aa/alicloud-android-ha-telescopebase-1.1.1-open/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eec5316a18298815f3e721d6b8fd39aa/alicloud-android-ha-telescopebase-1.1.1-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eec5316a18298815f3e721d6b8fd39aa/alicloud-android-ha-telescopebase-1.1.1-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eec5316a18298815f3e721d6b8fd39aa/alicloud-android-ha-telescopebase-1.1.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_telescopesdk_1_1_3_open_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml
new file mode 100644
index 0000000..a51d853
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_telescopesdk_1_1_3_open_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/7c523c47aab5f0ae6cdba21c0260e067/alicloud-android-ha-telescopesdk-1.1.3-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c523c47aab5f0ae6cdba21c0260e067/alicloud-android-ha-telescopesdk-1.1.3-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c523c47aab5f0ae6cdba21c0260e067/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
new file mode 100644
index 0000000..8152eb3
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_message_rpc_1_1_3_1_open_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/76fc9a2a685c8d9446dae8d850f6b45f/alicloud-android-ha-tlog-message-rpc-1.1.3.1-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/76fc9a2a685c8d9446dae8d850f6b45f/alicloud-android-ha-tlog-message-rpc-1.1.3.1-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/76fc9a2a685c8d9446dae8d850f6b45f/alicloud-android-ha-tlog-message-rpc-1.1.3.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_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
new file mode 100644
index 0000000..81a8b05
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_native_1_1_0_7_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-native:1.1.0.7-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a65d495cfbe022f084a323a336fecfc/alicloud-android-ha-tlog-native-1.1.0.7-open/jars/classes.jar!/" />
+ <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-2/files-2.1/7a65d495cfbe022f084a323a336fecfc/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
new file mode 100644
index 0000000..a016c1a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_protocol_1_1_0_8_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-ha-tlog-protocol:1.1.0.8-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78676db746497a90ab9139dec63b7b6b/alicloud-android-ha-tlog-protocol-1.1.0.8-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78676db746497a90ab9139dec63b7b6b/alicloud-android-ha-tlog-protocol-1.1.0.8-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78676db746497a90ab9139dec63b7b6b/alicloud-android-ha-tlog-protocol-1.1.0.8-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_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
new file mode 100644
index 0000000..05748e2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ha_tlog_uploader_oss_1_1_0_6_3_open_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/7a1306a90b2734f07853d76adc0b5c31/alicloud-android-ha-tlog-uploader-oss-1.1.0.6.3-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a1306a90b2734f07853d76adc0b5c31/alicloud-android-ha-tlog-uploader-oss-1.1.0.6.3-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a1306a90b2734f07853d76adc0b5c31/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
new file mode 100644
index 0000000..961829c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_hotfix_3_2_17_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-hotfix:3.2.17@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2df042acee20e78a4197bf91a18cb2ff/alicloud-android-hotfix-3.2.17/jars/classes.jar!/" />
+ <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-2/files-2.1/2df042acee20e78a4197bf91a18cb2ff/alicloud-android-hotfix-3.2.17/AndroidManifest.xml" />
+ </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
new file mode 100644
index 0000000..d3e021c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_httpdns_2_0_0_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/6e8b38f4f20f63c6c4a11cdade3ddab4/alicloud-android-httpdns-2.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6e8b38f4f20f63c6c4a11cdade3ddab4/alicloud-android-httpdns-2.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6e8b38f4f20f63c6c4a11cdade3ddab4/alicloud-android-httpdns-2.0.0/AndroidManifest.xml" />
+ </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
new file mode 100644
index 0000000..d6c02fd
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_man_1_2_5_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-man:1.2.5@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f91bff490d113d9df4dbd020af5a2486/alicloud-android-man-1.2.5/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f91bff490d113d9df4dbd020af5a2486/alicloud-android-man-1.2.5/jars/libs/alicloud-android-man-1.2.4.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f91bff490d113d9df4dbd020af5a2486/alicloud-android-man-1.2.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f91bff490d113d9df4dbd020af5a2486/alicloud-android-man-1.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_networkmonitor_1_4_0_aar.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml
new file mode 100644
index 0000000..8f37d43
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_networkmonitor_1_4_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-networkmonitor:1.4.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10bce02a7687f8505fdc0b81945c27fe/alicloud-android-networkmonitor-1.4.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10bce02a7687f8505fdc0b81945c27fe/alicloud-android-networkmonitor-1.4.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10bce02a7687f8505fdc0b81945c27fe/alicloud-android-networkmonitor-1.4.0/AndroidManifest.xml" />
+ </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
new file mode 100644
index 0000000..0d3e695
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_push_3_2_5_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/1fab6a13b6904117ec31cb1c0d3bd7ed/alicloud-android-push-3.2.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1fab6a13b6904117ec31cb1c0d3bd7ed/alicloud-android-push-3.2.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1fab6a13b6904117ec31cb1c0d3bd7ed/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
new file mode 100644
index 0000000..6332491
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_rest_1_4_0_open_aar.xml
@@ -0,0 +1,11 @@
+<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-2/files-2.1/bed08549fedc118f90872a745670d537/alicloud-android-rest-1.4.0-open/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bed08549fedc118f90872a745670d537/alicloud-android-rest-1.4.0-open/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bed08549fedc118f90872a745670d537/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
new file mode 100644
index 0000000..afc9b73
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_tlog_1_1_3_1_open_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.aliyun.ams:alicloud-android-tlog:1.1.3.1-open@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1f0ae649d87bdf99dcf81101e85d287/alicloud-android-tlog-1.1.3.1-open/jars/classes.jar!/" />
+ <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-2/files-2.1/c1f0ae649d87bdf99dcf81101e85d287/alicloud-android-tlog-1.1.3.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_ut_5_4_4.xml b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml
new file mode 100644
index 0000000..5bba2b4
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_ut_5_4_4.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..629f85b
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utdid_2_5_1_proguard.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..6dd8977
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_ams_alicloud_android_utils_1_1_6_4.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..3a6d29f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_aliyun_dpa_oss_android_sdk_2_9_3_aar.xml
@@ -0,0 +1,15 @@
+<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-2/files-2.1/a1ee8af430bd8becc6e8c0bdab24a4b5/oss-android-sdk-2.9.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1ee8af430bd8becc6e8c0bdab24a4b5/oss-android-sdk-2.9.3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1ee8af430bd8becc6e8c0bdab24a4b5/oss-android-sdk-2.9.3/AndroidManifest.xml" />
+ </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_amap_api_3dmap_6_8_0.xml b/.idea/libraries/Gradle__com_amap_api_3dmap_6_8_0.xml
new file mode 100644
index 0000000..2134164
--- /dev/null
+++ b/.idea/libraries/Gradle__com_amap_api_3dmap_6_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.amap.api:3dmap:6.8.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/3dmap/6.8.0/b3a8b38209ac1b57c7335154a4f8371e722857f4/3dmap-6.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/3dmap/6.8.0/68bd9b753a694292bfc1ba95bf0612ae72a3688f/3dmap-6.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/3dmap/6.8.0/68bd9b753a694292bfc1ba95bf0612ae72a3688f/3dmap-6.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_amap_api_location_4_6_0.xml b/.idea/libraries/Gradle__com_amap_api_location_4_6_0.xml
new file mode 100644
index 0000000..d751234
--- /dev/null
+++ b/.idea/libraries/Gradle__com_amap_api_location_4_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.amap.api:location:4.6.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/location/4.6.0/2a2340085d36d3964f8dd3743d34b085de573bf3/location-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/location/4.6.0/d48bfcaf86b2983611a0bf42a23c3d25b83349df/location-4.6.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/location/4.6.0/d48bfcaf86b2983611a0bf42a23c3d25b83349df/location-4.6.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_amap_api_search_6_5_0_1.xml b/.idea/libraries/Gradle__com_amap_api_search_6_5_0_1.xml
new file mode 100644
index 0000000..79699b9
--- /dev/null
+++ b/.idea/libraries/Gradle__com_amap_api_search_6_5_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.amap.api:search:6.5.0.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/search/6.5.0.1/93c0e039096f1e2506aa5e4f7ee6b6dc066bb5e/search-6.5.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/search/6.5.0.1/b5c13db313a8c052f870e9fc9ff667b3699ad577/search-6.5.0.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.amap.api/search/6.5.0.1/b5c13db313a8c052f870e9fc9ff667b3699ad577/search-6.5.0.1-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
new file mode 100644
index 0000000..4bf96d0
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7a6d52ee5d429d4b8844b4e139bec139/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/7a6d52ee5d429d4b8844b4e139bec139/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..5cba5c3
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83a874e31fa3aa25e147965b5c0e2a23/appcompat-v7-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83a874e31fa3aa25e147965b5c0e2a23/appcompat-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83a874e31fa3aa25e147965b5c0e2a23/appcompat-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83a874e31fa3aa25e147965b5c0e2a23/appcompat-v7-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..aa18826
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24157e7ed0db220c3ca463df4d44e01f/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/24157e7ed0db220c3ca463df4d44e01f/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..231b7a7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cdec3d7997f114a36ab35dcfb1ecdd4/cardview-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cdec3d7997f114a36ab35dcfb1ecdd4/cardview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cdec3d7997f114a36ab35dcfb1ecdd4/cardview-v7-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
new file mode 100644
index 0000000..6ccf636
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:collections:28.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..7ab6180
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_2_0_1_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.constraint:constraint-layout:2.0.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f2a2c97bd9d8edde48218b493448c78/constraint-layout-2.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f2a2c97bd9d8edde48218b493448c78/constraint-layout-2.0.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f2a2c97bd9d8edde48218b493448c78/constraint-layout-2.0.1/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_2_0_1.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_2_0_1.xml
new file mode 100644
index 0000000..132da6f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_2_0_1.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.constraint:constraint-layout-solver:2.0.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/2.0.1/f5599fed8ee54f793209d7d3986e6792e71f3395/constraint-layout-solver-2.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..9706031
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/891539b3f03280c5a6080e1096a63c06/coordinatorlayout-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/891539b3f03280c5a6080e1096a63c06/coordinatorlayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/891539b3f03280c5a6080e1096a63c06/coordinatorlayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/891539b3f03280c5a6080e1096a63c06/coordinatorlayout-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..b23063a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6cc43be649d8dd54e1d15f575f0cd14/cursoradapter-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6cc43be649d8dd54e1d15f575f0cd14/cursoradapter-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f6cc43be649d8dd54e1d15f575f0cd14/cursoradapter-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..116940c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:customview:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ddd7d7c45259fdb153c0cfa2948bc245/customview-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ddd7d7c45259fdb153c0cfa2948bc245/customview-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ddd7d7c45259fdb153c0cfa2948bc245/customview-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..537e022
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:design:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cde9f4eafe1b546a081b214c23ec34fc/design-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cde9f4eafe1b546a081b214c23ec34fc/design-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cde9f4eafe1b546a081b214c23ec34fc/design-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cde9f4eafe1b546a081b214c23ec34fc/design-28.0.0/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..bb2c2b7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:documentfile:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8204f1ad54e41652bd4dbd721d396274/documentfile-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8204f1ad54e41652bd4dbd721d396274/documentfile-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8204f1ad54e41652bd4dbd721d396274/documentfile-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..6c7d172
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -0,0 +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-2/files-2.1/ef6e3aadf804389ce0c62ed72f3bf0d4/drawerlayout-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ef6e3aadf804389ce0c62ed72f3bf0d4/drawerlayout-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/ef6e3aadf804389ce0c62ed72f3bf0d4/drawerlayout-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e2b1a1c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_exifinterface_27_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:exifinterface:27.1.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/869616d23c633d46b6693acce001d972/exifinterface-27.1.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/869616d23c633d46b6693acce001d972/exifinterface-27.1.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/869616d23c633d46b6693acce001d972/exifinterface-27.1.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/exifinterface/27.1.0/c7140902caa70b53159e0f153c0584bbbbc88eb7/exifinterface-27.1.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..3ef4b7c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:interpolator:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/67d601c9415c6ae4d6b122735ccaf4ce/interpolator-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/67d601c9415c6ae4d6b122735ccaf4ce/interpolator-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/67d601c9415c6ae4d6b122735ccaf4ce/interpolator-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..7ce88e5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:loader:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3452d014ce283284210b51f6887641f2/loader-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3452d014ce283284210b51f6887641f2/loader-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3452d014ce283284210b51f6887641f2/loader-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..0aadb24
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a125e3af23bb8cf90053ec749ee694cb/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a125e3af23bb8cf90053ec749ee694cb/localbroadcastmanager-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a125e3af23bb8cf90053ec749ee694cb/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..c334d56
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:multidex:1.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/58de6b06336b3dfb9158c724464024c3/multidex-1.0.2/jars/classes.jar!/" />
+ <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-2/files-2.1/58de6b06336b3dfb9158c724464024c3/multidex-1.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..3ae1198
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6a560bf17bcf59b8695329809abb663/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6a560bf17bcf59b8695329809abb663/multidex-instrumentation-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6a560bf17bcf59b8695329809abb663/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..d3ed682
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -0,0 +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-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8eca30a5cb410362bcd219fcc9cd683c/print-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e7aa632
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c657ea2d92aa27b0af7fa46cf40ae97/recyclerview-v7-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c657ea2d92aa27b0af7fa46cf40ae97/recyclerview-v7-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c657ea2d92aa27b0af7fa46cf40ae97/recyclerview-v7-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c657ea2d92aa27b0af7fa46cf40ae97/recyclerview-v7-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..699f668
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1a5a137e6ce3152575f648e5cea55d09/slidingpanelayout-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1a5a137e6ce3152575f648e5cea55d09/slidingpanelayout-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1a5a137e6ce3152575f648e5cea55d09/slidingpanelayout-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
new file mode 100644
index 0000000..24e83bc
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-annotations:28.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..bb0abc4
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22b25fb08c73858bd3dfa8d846b86884/support-compat-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22b25fb08c73858bd3dfa8d846b86884/support-compat-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22b25fb08c73858bd3dfa8d846b86884/support-compat-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22b25fb08c73858bd3dfa8d846b86884/support-compat-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..f200478
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc07ec053600effd49d7785fd8d03f15/support-core-ui-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc07ec053600effd49d7785fd8d03f15/support-core-ui-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bc07ec053600effd49d7785fd8d03f15/support-core-ui-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..23bb396
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2133d2345213f984f4d8b75590468157/support-core-utils-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2133d2345213f984f4d8b75590468157/support-core-utils-28.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2133d2345213f984f4d8b75590468157/support-core-utils-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..aa005f3
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -0,0 +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-2/files-2.1/7c53a57167873d78d8a6b9240f5676e0/support-fragment-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c53a57167873d78d8a6b9240f5676e0/support-fragment-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/7c53a57167873d78d8a6b9240f5676e0/support-fragment-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..b01031d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-media-compat:27.1.1@aar">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da7e32b4af6e9626d12fced777e8db89/support-media-compat-27.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da7e32b4af6e9626d12fced777e8db89/support-media-compat-27.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da7e32b4af6e9626d12fced777e8db89/support-media-compat-27.1.1/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-media-compat/27.1.1/3ab3f968d7cd675d2f97e67a3e9fc0ac63618f46/support-media-compat-27.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..4907f8d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <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/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e744014cbe53e02fac8bb3352a93881/support-v4-27.1.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e744014cbe53e02fac8bb3352a93881/support-v4-27.1.1/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/27.1.1/5b8f86fea035328fc9e8c660773037a3401ce25f/support-v4-27.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..6e31ccc
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5c9150aea796b21a4ce35a83210d456/support-vector-drawable-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/b5c9150aea796b21a4ce35a83210d456/support-vector-drawable-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..082505d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -0,0 +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-2/files-2.1/d8db5e47744bf18c3e813a1a5f7b2d3a/swiperefreshlayout-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d8db5e47744bf18c3e813a1a5f7b2d3a/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/d8db5e47744bf18c3e813a1a5f7b2d3a/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..1a285ca
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882f32cb5c0fe42cb3a95594204714ac/espresso-core-2.2.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882f32cb5c0fe42cb3a95594204714ac/espresso-core-2.2.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/882f32cb5c0fe42cb3a95594204714ac/espresso-core-2.2.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/2.2.2/114039ff105fc481a629b55882f2c5c7a614e32a/espresso-core-2.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..4acc722
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7212a59c1274725c320b564d60bbf332/espresso-core-3.0.2/jars/classes.jar!/" />
+ <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-2/files-2.1/7212a59c1274725c320b564d60bbf332/espresso-core-3.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.2/433f4f601a3f3835691d80838dd7ff9414931b05/espresso-core-3.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..3a08f36
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b61b82c1194157efa6579f8072a3799/espresso-idling-resource-2.2.2/jars/classes.jar!/" />
+ <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-2/files-2.1/0b61b82c1194157efa6579f8072a3799/espresso-idling-resource-2.2.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/2.2.2/bc8e66874feb004144562e64053cf95b4c7b3eb7/espresso-idling-resource-2.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..832afb1
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc0ee972a26cbb196b210a41cbb4cdb2/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
+ <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-2/files-2.1/cc0ee972a26cbb196b210a41cbb4cdb2/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.2/6071e2b310c16836ba475a94df377e2f75928546/espresso-idling-resource-3.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..cab55d0
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35cd66ca96906e8a383954b558e602b7/exposed-instrumentation-api-publish-0.5/jars/classes.jar!/" />
+ <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-2/files-2.1/35cd66ca96906e8a383954b558e602b7/exposed-instrumentation-api-publish-0.5/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/exposed-instrumentation-api-publish/0.5/493e9b2f2905ddc7f1a152446cc1d9d00ded10b0/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..96defed
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b906a897bc011a888300e60662c89f53/monitor-1.0.2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b906a897bc011a888300e60662c89f53/monitor-1.0.2/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b906a897bc011a888300e60662c89f53/monitor-1.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/monitor/1.0.2/5764301056100b445e9ba31df7d1b554a55450f6/monitor-1.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..5ec0872
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test:rules:0.5@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b945423673f293623d1842778594aca/rules-0.5/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b945423673f293623d1842778594aca/rules-0.5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b945423673f293623d1842778594aca/rules-0.5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9b945423673f293623d1842778594aca/rules-0.5/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/0.5/eb0523edeca93697d4c4b767277b407ed5920258/rules-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e1b799e
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test:runner:0.5@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/549ede95b915811ff42181c4f3c808b9/runner-0.5/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/549ede95b915811ff42181c4f3c808b9/runner-0.5/jars/classes.jar!/" />
+ <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-2/files-2.1/549ede95b915811ff42181c4f3c808b9/runner-0.5/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/0.5/d13156b1f4d8dc7013cd8b3b1284b22bd3b44d23/runner-0.5-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..a7d35f2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.test:runner:1.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ed375459ac2d938fa4746c6fdaad28f/runner-1.0.2/jars/classes.jar!/" />
+ <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-2/files-2.1/8ed375459ac2d938fa4746c6fdaad28f/runner-1.0.2/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.2/b2ce2342744a66e935dbc4a298259709a4c1f042/runner-1.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..55da321
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:transition:28.0.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d6b1c5bc41af4d268288f1b629bf32d6/transition-28.0.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d6b1c5bc41af4d268288f1b629bf32d6/transition-28.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d6b1c5bc41af4d268288f1b629bf32d6/transition-28.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d6b1c5bc41af4d268288f1b629bf32d6/transition-28.0.0/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..2b562e5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5055a8610d8c18d271af376ee6e30056/versionedparcelable-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/5055a8610d8c18d271af376ee6e30056/versionedparcelable-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..6cc4f97
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3238a73b099cc2f23a65aa60617d746/viewpager-28.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/c3238a73b099cc2f23a65aa60617d746/viewpager-28.0.0/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..1392ed1
--- /dev/null
+++ b/.idea/libraries/Gradle__com_bm_photoview_library_1_4_1_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.bm.photoview:library:1.4.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/344918dc3dd99eb4677517c11390c932/library-1.4.1/jars/classes.jar!/" />
+ <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-2/files-2.1/344918dc3dd99eb4677517c11390c932/library-1.4.1/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.bm.photoview/library/1.4.1/d40bc6af03344c733e2c2865f2fc26212df9be6c/library-1.4.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..b187873
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_46_aar.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c47e083987e02b2d86df9dadf403941/BaseRecyclerViewAdapterHelper-2.9.46/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c47e083987e02b2d86df9dadf403941/BaseRecyclerViewAdapterHelper-2.9.46/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c47e083987e02b2d86df9dadf403941/BaseRecyclerViewAdapterHelper-2.9.46/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c47e083987e02b2d86df9dadf403941/BaseRecyclerViewAdapterHelper-2.9.46/res" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.CymChad/BaseRecyclerViewAdapterHelper/2.9.46/6e717460592fee53e450bf7f8a666cd6cee54f0e/BaseRecyclerViewAdapterHelper-2.9.46-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_0_2.xml b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_0_2.xml
new file mode 100644
index 0000000..a441dcd
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.PhilJay:MPAndroidChart:v3.0.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.2/aaf7e13197e925f4065ab9f39b1e4b826614b906/MPAndroidChart-v3.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.2/84d655620f393201a41cc2360a8043325da54fa0/MPAndroidChart-v3.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.0.2/ac793df650995ffac19502bbc18a3501e4202f48/MPAndroidChart-v3.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_9_0.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_9_0.xml
new file mode 100644
index 0000000..3d29431
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.bumptech.glide:annotations:4.9.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.9.0/ccdd6bc8b4f3c001fbddec29ecddd515a13203c4/annotations-4.9.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.9.0/c4186c0c015cf30cd671e927a44483fc769883e2/annotations-4.9.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.9.0/827aa034a86dc2dbe8a2daa6b9c99a5f1cec0e69/annotations-4.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_9_0.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_9_0.xml
new file mode 100644
index 0000000..79f97de
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.bumptech.glide:disklrucache:4.9.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.9.0/cbb185635e8f265d6391c7d43118d3856574dc3a/disklrucache-4.9.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.9.0/2ceb48326728d65df5cc403fcf775a4e21ff2b85/disklrucache-4.9.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.9.0/3814da9f6d7c75619f50c123fc907ffcfd997da1/disklrucache-4.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..d7af4a7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_9_0_aar.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.bumptech.glide:gifdecoder:4.9.0@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a42e7fa664adb156e50b65885c2bc189/gifdecoder-4.9.0/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/gifdecoder/4.9.0/5b2b5c315c48fdfef00435450d8366e498dba7de/gifdecoder-4.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..63e151f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_9_0_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.bumptech.glide:glide:4.9.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7dc10232d98e4cb4c2ba8792eed8c1c6/glide-4.9.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7dc10232d98e4cb4c2ba8792eed8c1c6/glide-4.9.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7dc10232d98e4cb4c2ba8792eed8c1c6/glide-4.9.0/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/4.9.0/5f95e3cc34b116a8024f2af42f66e257d2e28ccb/glide-4.9.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..46a563a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_cazaea_sweet_alert_dialog_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.cazaea:sweet-alert-dialog:1.0.0@aar">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08bb6fb769cfb19ca362e5239b084281/sweet-alert-dialog-1.0.0/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08bb6fb769cfb19ca362e5239b084281/sweet-alert-dialog-1.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08bb6fb769cfb19ca362e5239b084281/sweet-alert-dialog-1.0.0/res" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.cazaea/sweet-alert-dialog/1.0.0/6ae9026d7fccb5dce1c24e073424db1cb6b41b25/sweet-alert-dialog-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..513aede
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_chrisbanes_PhotoView_2_1_4_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <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/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39e2acb3c99bf2e370d4797ba7b22289/PhotoView-2.1.4/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/39e2acb3c99bf2e370d4797ba7b22289/PhotoView-2.1.4/res" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.chrisbanes/PhotoView/2.1.4/4f4190dff86a0e30470a903643156682c1d61525/PhotoView-2.1.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.chrisbanes/PhotoView/2.1.4/ef1b806347cd119a1c6d6f222f65e8bf7c96404b/PhotoView-2.1.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e96cda8
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_Common_1_5_6_20181018_aar.xml
@@ -0,0 +1,18 @@
+<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-2/files-2.1/7d3bb394491bf68112e1dd6189f00e08/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/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7d3bb394491bf68112e1dd6189f00e08/Common-1.5.6.20181018/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7d3bb394491bf68112e1dd6189f00e08/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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/Common/1.5.6.20181018/c48b2ed4013d36e7c0a1de570e02ac0ccc370431/Common-1.5.6.20181018-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..dfd7063
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_gzu_liyujiang_AndroidPicker_WheelPicker_1_5_6_20181018_aar.xml
@@ -0,0 +1,18 @@
+<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-2/files-2.1/b703219a2644e98bc1dc32b72e7dd04d/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/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b703219a2644e98bc1dc32b72e7dd04d/WheelPicker-1.5.6.20181018/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b703219a2644e98bc1dc32b72e7dd04d/WheelPicker-1.5.6.20181018/res" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.gzu-liyujiang.AndroidPicker/WheelPicker/1.5.6.20181018/936c8c80c19070c5af7e1222ed2a911f3e84552f/WheelPicker-1.5.6.20181018-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..c9c3ca2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_razerdp_BasePopup_2_1_8_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.github.razerdp:BasePopup:2.1.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce95a79147a0a77f443f823685af73c6/BasePopup-2.1.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce95a79147a0a77f443f823685af73c6/BasePopup-2.1.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce95a79147a0a77f443f823685af73c6/BasePopup-2.1.8/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.razerdp/BasePopup/2.1.8/d2479b3d50f6cd2686c4899132412d4f8f24a768/BasePopup-2.1.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml
new file mode 100644
index 0000000..2b834ea
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.code.findbugs:jsr305:2.0.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml
new file mode 100644
index 0000000..0a6ccc4
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.code.gson:gson:2.7">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/ceb1b728624941fdcc57d2c6d9aa10643bdd5d4c/gson-2.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/bbb63ca253b483da8ee53a50374593923e3de2e2/gson-2.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e2ac4c2
--- /dev/null
+++ b/.idea/libraries/Gradle__com_haibin_calendarview_3_5_8_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.haibin:calendarview:3.5.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc704d8fd460bf7c714a573e1df440e7/calendarview-3.5.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc704d8fd460bf7c714a573e1df440e7/calendarview-3.5.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cc704d8fd460bf7c714a573e1df440e7/calendarview-3.5.8/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.haibin/calendarview/3.5.8/9773b37057bd2f327a79523cd32483ee3b809573/calendarview-3.5.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..33391db
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.jakewharton:butterknife:9.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99dfa8cc60e86385f2c6c1b6ee2347ca/butterknife-9.0.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99dfa8cc60e86385f2c6c1b6ee2347ca/butterknife-9.0.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99dfa8cc60e86385f2c6c1b6ee2347ca/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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/9.0.0/487ec437fd0313b4a4f5f2069f90a92698ecca90/butterknife-9.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0.xml
new file mode 100644
index 0000000..f10ef99
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.jakewharton:butterknife-annotations:9.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/9.0.0/4491662975a6e2aaf8bcd1203a60ace1179c84ee/butterknife-annotations-9.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/9.0.0/c1fbb36e98e79cdf4294ddb2be9bd4f34c615b14/butterknife-annotations-9.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/9.0.0/f42deb278f1b079f4e9e2b91b1c0ca006576520d/butterknife-annotations-9.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..2161489
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.jakewharton:butterknife-runtime:9.0.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/76cf613c76451ed596a65892c4242a83/butterknife-runtime-9.0.0/jars/classes.jar!/" />
+ <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-2/files-2.1/76cf613c76451ed596a65892c4242a83/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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-runtime/9.0.0/94e78411c5db9cae9baf741ea83c5a64701a851a/butterknife-runtime-9.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..87893cf
--- /dev/null
+++ b/.idea/libraries/Gradle__com_lcw_library_imagepicker_2_2_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.lcw.library:imagepicker:2.2.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c5db14d8d78ea50b3f182a39e8faaca0/imagepicker-2.2.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c5db14d8d78ea50b3f182a39e8faaca0/imagepicker-2.2.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c5db14d8d78ea50b3f182a39e8faaca0/imagepicker-2.2.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.lcw.library/imagepicker/2.2.7/98b7bbc3a6ec2af5fd5932978615d87a1ecf1943/imagepicker-2.2.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..433d74c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_filedownloader_1_0_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.liulishuo.okdownload:filedownloader:1.0.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc698ffa27cfff306bc4fa9593205d99/filedownloader-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc698ffa27cfff306bc4fa9593205d99/filedownloader-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc698ffa27cfff306bc4fa9593205d99/filedownloader-1.0.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/filedownloader/1.0.7/870c39dc75f7d5fb4e71e36075daf85b5b92b63a/filedownloader-1.0.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..05fda80
--- /dev/null
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_ktx_1_0_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.liulishuo.okdownload:ktx:1.0.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b18a8c91e0e59e24fef3e0a2086651f7/ktx-1.0.7/jars/classes.jar!/" />
+ <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-2/files-2.1/b18a8c91e0e59e24fef3e0a2086651f7/ktx-1.0.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/ktx/1.0.7/6b0fea163dfa4db84619653a4bc93aac239057a2/ktx-1.0.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..3070969
--- /dev/null
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okdownload_1_0_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.liulishuo.okdownload:okdownload:1.0.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fed2534cc6b6b9f2e91f6fcbec67c7c/okdownload-1.0.7/jars/classes.jar!/" />
+ <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-2/files-2.1/7fed2534cc6b6b9f2e91f6fcbec67c7c/okdownload-1.0.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okdownload/1.0.7/8086d24518933de76cf8d17e71b458117ae2d497/okdownload-1.0.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..09f8624
--- /dev/null
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_okhttp_1_0_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.liulishuo.okdownload:okhttp:1.0.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f536f4e5c0ae54a7d52598849fccd88/okhttp-1.0.7/jars/classes.jar!/" />
+ <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-2/files-2.1/0f536f4e5c0ae54a7d52598849fccd88/okhttp-1.0.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/okhttp/1.0.7/ca5f91b97d0264c57a3ed31ed009e136523b87da/okhttp-1.0.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..38f164e
--- /dev/null
+++ b/.idea/libraries/Gradle__com_liulishuo_okdownload_sqlite_1_0_7_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.liulishuo.okdownload:sqlite:1.0.7@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab674b8bcaea1137b5f5a6409730ef21/sqlite-1.0.7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab674b8bcaea1137b5f5a6409730ef21/sqlite-1.0.7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab674b8bcaea1137b5f5a6409730ef21/sqlite-1.0.7/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.liulishuo.okdownload/sqlite/1.0.7/a151213cd53dcd51aabeec4e6f5eb82516793f48/sqlite-1.0.7-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..3481d22
--- /dev/null
+++ b/.idea/libraries/Gradle__com_mikhaellopez_circularprogressbar_3_0_3_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.mikhaellopez:circularprogressbar:3.0.3@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d00237f9b24ddd613b6a2b44df389445/circularprogressbar-3.0.3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d00237f9b24ddd613b6a2b44df389445/circularprogressbar-3.0.3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d00237f9b24ddd613b6a2b44df389445/circularprogressbar-3.0.3/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.mikhaellopez/circularprogressbar/3.0.3/84fcf61f9bfdd8a8a5eaab276779b328f92c6813/circularprogressbar-3.0.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
new file mode 100644
index 0000000..8f07aff
--- /dev/null
+++ b/.idea/libraries/Gradle__com_orhanobut_dialogplus_1_11_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.orhanobut:dialogplus:1.11@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c3f3f475b125c16eb66e131f995dba5/dialogplus-1.11/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c3f3f475b125c16eb66e131f995dba5/dialogplus-1.11/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2c3f3f475b125c16eb66e131f995dba5/dialogplus-1.11/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.orhanobut/dialogplus/1.11/dae75f1a1cd49e7334e10cfd8c02735c18e255c8/dialogplus-1.11-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..f70f6e5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_otaliastudios_cameraview_1_6_1_aar.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+ <library name="Gradle: com.otaliastudios:cameraview:1.6.1@aar">
+ <ANNOTATIONS>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53ec27c50472ad451d9e004c3f06a3e3/cameraview-1.6.1/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53ec27c50472ad451d9e004c3f06a3e3/cameraview-1.6.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53ec27c50472ad451d9e004c3f06a3e3/cameraview-1.6.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/53ec27c50472ad451d9e004c3f06a3e3/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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.otaliastudios/cameraview/1.6.1/52962590038866ec889ef5e3f03c347a50c7d1c1/cameraview-1.6.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
new file mode 100644
index 0000000..662b001
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup:javawriter:2.1.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/f591a105db78771d0a1e7a277b3747556c528c22/javawriter-2.1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0.xml
new file mode 100644
index 0000000..da94880
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.okhttp3:okhttp:3.10.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/340395260efeade793140f10c82fb1ecc6ce160c/okhttp-3.10.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/e99b7b608968f16b07104b93e62cb90701174d0/okhttp-3.10.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..88ce630
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_11_0.xml
@@ -0,0 +1,13 @@
+<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_okio_okio_1_14_0.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0.xml
new file mode 100644
index 0000000..7d8cf56
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.okio:okio:1.14.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/102d7be47241d781ef95f1581d414b0943053130/okio-1.14.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/d224a05c7368dc02ffefc74a8b628c86f0bea501/okio-1.14.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/e7c96b4fe5651490d8f3c022042940d743a3bdd9/okio-1.14.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
new file mode 100644
index 0000000..a981f07
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.picasso:picasso:2.71828@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d82657aef97067ce375c2bf61a048685/picasso-2.71828/jars/classes.jar!/" />
+ <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-2/files-2.1/d82657aef97067ce375c2bf61a048685/picasso-2.71828/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.71828/41874e20a4d17fd4ad2052ac217073e14d00c910/picasso-2.71828-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_3_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_3_0.xml
new file mode 100644
index 0000000..cfe6de5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/adapter-rxjava2/2.3.0/f436637f9500ab5b8bc32afe556373180894b4a5/adapter-rxjava2-2.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/adapter-rxjava2/2.3.0/dc906275a1a658a33da1718c97bedb61d0977e54/adapter-rxjava2-2.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/adapter-rxjava2/2.3.0/3c971dd26ffebdbcd99e7804bc833bbb9494aa25/adapter-rxjava2-2.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0.xml
new file mode 100644
index 0000000..dd8e268
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.retrofit2:converter-gson:2.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.3.0/9e09011e9767bb76b5e27c9b8223476b93b14631/converter-gson-2.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.3.0/9ed2c998e2833e191b99439d6faa6753ec73c913/converter-gson-2.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.3.0/438355cc604d9c87dedc84fd2c05924e4e6d2ce3/converter-gson-2.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml
new file mode 100644
index 0000000..9185989
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: com.squareup.retrofit2:retrofit:2.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/bcacde6a8ccedcc56c127403d26b76072fe6214d/retrofit-2.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/38a30cbb97721341a63588cd3ff732dabbd1ddae/retrofit-2.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..e02c7fe
--- /dev/null
+++ b/.idea/libraries/Gradle__com_taobao_android_accs_sdk_taobao_4_0_4_emas_aar.xml
@@ -0,0 +1,14 @@
+<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-2/files-2.1/a61e7f9e3a1eed703ecd10ec09d6c6ec/accs_sdk_taobao-4.0.4-emas/annotations.zip!/" />
+ </ANNOTATIONS>
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a61e7f9e3a1eed703ecd10ec09d6c6ec/accs_sdk_taobao-4.0.4-emas/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a61e7f9e3a1eed703ecd10ec09d6c6ec/accs_sdk_taobao-4.0.4-emas/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a61e7f9e3a1eed703ecd10ec09d6c6ec/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
new file mode 100644
index 0000000..8c8eee3
--- /dev/null
+++ b/.idea/libraries/Gradle__com_taobao_android_networksdk_3_5_5_5_open.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..a8bee1a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_taobao_android_tnet4android_3_1_14_7_all_aar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+ <library name="Gradle: com.taobao.android:tnet4android:3.1.14.7-all@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0dcfa63349b09e8f921e0d1b5e08cad9/tnet4android-3.1.14.7-all/jars/classes.jar!/" />
+ <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-2/files-2.1/0dcfa63349b09e8f921e0d1b5e08cad9/tnet4android-3.1.14.7-all/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_tencent_tbs_tbssdk_44213.xml b/.idea/libraries/Gradle__com_tencent_tbs_tbssdk_44213.xml
new file mode 100644
index 0000000..f084a9f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_tencent_tbs_tbssdk_44213.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.tencent.tbs:tbssdk:44213">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.tencent.tbs/tbssdk/44213/f9b704df9c95beb0dfbb56358054a29f444c755f/tbssdk-44213.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
new file mode 100644
index 0000000..60d0e63
--- /dev/null
+++ b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_2_2_0_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: de.hdodenhof:circleimageview:2.2.0@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/812edc50d27ca1c5df4b95c4023fd7a0/circleimageview-2.2.0/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/812edc50d27ca1c5df4b95c4023fd7a0/circleimageview-2.2.0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/812edc50d27ca1c5df4b95c4023fd7a0/circleimageview-2.2.0/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/2.2.0/58c303f955dad43f60470247ec211d646af5b4c/circleimageview-2.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..693eea1
--- /dev/null
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_1_1_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+ <library name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71f415848bc775ea1dd2468a7a88130c/rxandroid-2.1.1/jars/classes.jar!/" />
+ <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-2/files-2.1/71f415848bc775ea1dd2468a7a88130c/rxandroid-2.1.1/AndroidManifest.xml" />
+ </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!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxandroid/2.1.1/b7af9e13aaec7e9cd2e05b585a81ef7a27f16e16/rxandroid-2.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_6.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_6.xml
new file mode 100644
index 0000000..00fd1f9
--- /dev/null
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: io.reactivex.rxjava2:rxjava:2.2.6">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.2.6/c0df91c5b9c98ebd28eec6764cb3416c195aec20/rxjava-2.2.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.2.6/9b67c058bdfefbadef13a55d247d32608147b952/rxjava-2.2.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.2.6/2c70510784f92eba5ab6a41e47e91d476d1ebc0b/rxjava-2.2.6-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml
new file mode 100644
index 0000000..3c390d6
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: javax.annotation:javax.annotation-api:1.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/1064ee6b28b926dfa355f9db146a33d1111a7bf1/javax.annotation-api-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/ad18a02db08eaee697f812e333f692fc51129e4a/javax.annotation-api-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
new file mode 100644
index 0000000..62012ea
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: javax.inject:javax.inject:1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/70ec961c25111ed9015d1af77772d96383c2d238/javax.inject-1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
new file mode 100644
index 0000000..6c078d6
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: junit:junit:4.12">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/941a8be4506c65f0a9001c08812fb7da1e505e21/junit-4.12-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_13_2.xml b/.idea/libraries/Gradle__junit_junit_4_13_2.xml
new file mode 100644
index 0000000..c2cb45d
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_13_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: junit:junit:4.13.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.2/8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12/junit-4.13.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.2/f2f3f384dacd2ade2ddf7aa7e0f4360dfee38672/junit-4.13.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13.2/33987872a811fe4d4001ed494b07854822257f42/junit-4.13.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
new file mode 100644
index 0000000..fbe9697
--- /dev/null
+++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: net.sf.kxml:kxml2:2.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/ccbc77a5fd907ef863c29f3596c6f54ffa4e9442/kxml2-2.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/dcb10030b92be67fd9dd224ade52310e40bbaf33/kxml2-2.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/309cd2cff7260e465792fda3dcbb063b730d8050/kxml2-2.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1.xml b/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1.xml
new file mode 100644
index 0000000..ccade01
--- /dev/null
+++ b/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.greenrobot:eventbus:3.1.1">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.1.1/5cd91fd014f5b72292f959748c20a2cefefae77d/eventbus-3.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.1.1/b8995df411fc428f49797fbb9928ca79722628e1/eventbus-3.1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.1.1/29acbdd4c7d904e414d33955e367b9561b13079f/eventbus-3.1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_greenrobot_greendao_3_3_0.xml b/.idea/libraries/Gradle__org_greenrobot_greendao_3_3_0.xml
new file mode 100644
index 0000000..8b99426
--- /dev/null
+++ b/.idea/libraries/Gradle__org_greenrobot_greendao_3_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.greenrobot:greendao:3.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao/3.3.0/2d3db1b43b78db5514bfd31ee2c75cc65220427d/greendao-3.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao/3.3.0/3139b82d9f76e45cf080535a8a228b5372477f3e/greendao-3.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao/3.3.0/8db9c858043c01e733c389be995a5dfcf4162733/greendao-3.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_greenrobot_greendao_api_3_3_0.xml b/.idea/libraries/Gradle__org_greenrobot_greendao_api_3_3_0.xml
new file mode 100644
index 0000000..0592949
--- /dev/null
+++ b/.idea/libraries/Gradle__org_greenrobot_greendao_api_3_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.greenrobot:greendao-api:3.3.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao-api/3.3.0/f2275036ddb2ac1812d5bc78e2e877d585b25eaa/greendao-api-3.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao-api/3.3.0/9cea33902f379df9615fbf94fc91c816fa6f9563/greendao-api-3.3.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/greendao-api/3.3.0/38c1cc64db9102256a953d907be8efccd9eb4c38/greendao-api-3.3.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..09cf23d
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/ad09811315f1d4f5756986575b0ea16b99cd686f/hamcrest-core-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
new file mode 100644
index 0000000..1a77dd8
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.hamcrest:hamcrest-integration:1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/cc5884d4138d3376f574f6a3992acceedfc37bea/hamcrest-integration-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
new file mode 100644
index 0000000..3d45e8e
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.hamcrest:hamcrest-library:1.3">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4324046c5f99f3dc91b5370899fa3ae65fd137d2/hamcrest-library-1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
new file mode 100644
index 0000000..5d77cc0
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1b998faff9a565b73514325b2f711e3/anko-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1b998faff9a565b73514325b2f711e3/anko-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1b998faff9a565b73514325b2f711e3/anko-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko/0.10.8/eae69a965b0c7aafc34c5f8f5bff789a788f1803/anko-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..277a345
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d59222d2c00d6351318cbf13135aab4/anko-appcompat-v7-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d59222d2c00d6351318cbf13135aab4/anko-appcompat-v7-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d59222d2c00d6351318cbf13135aab4/anko-appcompat-v7-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-appcompat-v7/0.10.8/15fa7f66bab0a450fc83d80b4a9391e13287db09/anko-appcompat-v7-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..500a010
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_commons_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-commons:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/611301734d9108b6972b1c6cab05f2e5/anko-appcompat-v7-commons-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/611301734d9108b6972b1c6cab05f2e5/anko-appcompat-v7-commons-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-appcompat-v7-commons/0.10.8/3ae43f5caa019f634249ee004aa89704c2998e7e/anko-appcompat-v7-commons-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..b46396f
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_appcompat_v7_coroutines_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-appcompat-v7-coroutines:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/483c9d3d9c865b5e94db32b69d20986f/anko-appcompat-v7-coroutines-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/483c9d3d9c865b5e94db32b69d20986f/anko-appcompat-v7-coroutines-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-appcompat-v7-coroutines/0.10.8/5403d88999aa83bfdc782903338822cf0a364d3a/anko-appcompat-v7-coroutines-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..cbf2c84
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_commons_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-commons:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a9fee3b4a9eb4ab8e4662fdc3b9c9b87/anko-commons-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/a9fee3b4a9eb4ab8e4662fdc3b9c9b87/anko-commons-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-commons/0.10.8/696efd1161da944d0c30bb9181fbeeda2ea6bb64/anko-commons-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..2d4ebdc
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_coroutines_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-coroutines:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37592c687aa237f8f9fe22da0a0d80dc/anko-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37592c687aa237f8f9fe22da0a0d80dc/anko-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37592c687aa237f8f9fe22da0a0d80dc/anko-coroutines-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-coroutines/0.10.8/91cfd6a36cd717882e498db2f777328de12a0dbe/anko-coroutines-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..71d3c5b
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-sdk27:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/10c59ec38127e89f14e98bedf4b111d1/anko-sdk27-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/10c59ec38127e89f14e98bedf4b111d1/anko-sdk27-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-sdk27/0.10.8/48053c3985b44bacd3003713b0cfeb7b75cca232/anko-sdk27-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..41b2e3f
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sdk27_coroutines_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-sdk27-coroutines:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ca0a5c7cdd7cd1b0787ab9986293cad0/anko-sdk27-coroutines-0.10.8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ca0a5c7cdd7cd1b0787ab9986293cad0/anko-sdk27-coroutines-0.10.8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ca0a5c7cdd7cd1b0787ab9986293cad0/anko-sdk27-coroutines-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-sdk27-coroutines/0.10.8/77a3618734ea8367bb0224eaf2a66108b463c3f6/anko-sdk27-coroutines-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..2b15707
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_sqlite_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-sqlite:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/277be98df7376e47830b3c63f1309727/anko-sqlite-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/277be98df7376e47830b3c63f1309727/anko-sqlite-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-sqlite/0.10.8/5bf3f4c2bc1e657e1e607566be8d9706807b248e/anko-sqlite-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..8890359
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-support-v4:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e638b8911f58df453497a665afdb16c3/anko-support-v4-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/e638b8911f58df453497a665afdb16c3/anko-support-v4-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-support-v4/0.10.8/d0057281963bf8b85127a0fc954f681244b6f4b7/anko-support-v4-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..ce0c9d7
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_anko_support_v4_commons_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:anko-support-v4-commons:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee51b0e2b7849768d5bef54763d1769/anko-support-v4-commons-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/1ee51b0e2b7849768d5bef54763d1769/anko-support-v4-commons-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/anko-support-v4-commons/0.10.8/b358dbc75b511cbc20aa7ca162d8ed20295a7d8e/anko-support-v4-commons-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..076ac7b
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_appcompatV7_base_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:appcompatV7-base:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfd59b2b993035c5588bd8d1bc371382/appcompatV7-base-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/cfd59b2b993035c5588bd8d1bc371382/appcompatV7-base-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/appcompatV7-base/0.10.8/2df511598723f1b4637a50e2c067ebe1dbdc0c77/appcompatV7-base-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..88fa77c
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_commons_base_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:commons-base:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7f95eebb8fa36bd9da40a39a4e09560/commons-base-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/a7f95eebb8fa36bd9da40a39a4e09560/commons-base-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/commons-base/0.10.8/a7b9886dd34c114aebcbcd7c492855425b2300e1/commons-base-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..1d14b5f
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_platform_base_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:platform-base:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75c7188d7e599d9bbd40874405e1304e/platform-base-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/75c7188d7e599d9bbd40874405e1304e/platform-base-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/platform-base/0.10.8/841013cadd306eaf8e9e926bbcca7d0e20065f57/platform-base-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..991707d
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:sqlite-base:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/368cfb9ed90e14e74a3d9407d59f49e9/sqlite-base-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/368cfb9ed90e14e74a3d9407d59f49e9/sqlite-base-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/sqlite-base/0.10.8/a4ecb1c6e6298ac58b271a1dbe1b4d94c78e0d5d/sqlite-base-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000..75e5beb
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.anko:supportV4-base:0.10.8@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22bad94d5c91dcad379d703cfc88354f/supportV4-base-0.10.8/jars/classes.jar!/" />
+ <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-2/files-2.1/22bad94d5c91dcad379d703cfc88354f/supportV4-base-0.10.8/AndroidManifest.xml" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.anko/supportV4-base/0.10.8/7b9ca94d2ea897c899316add19f15592a53b526e/supportV4-base-0.10.8-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml
new file mode 100644
index 0000000..1fa0fa9
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains:annotations:13.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/73368c3b0887f3adc2c2730dd1b95d7c3781aaf3/annotations-13.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/5991ca87ef1fb5544943d9abc5a9a37583fabe03/annotations-13.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
new file mode 100644
index 0000000..7929d63
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.72">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/83423235971335be77d2ea025008bc9959738ffc/kotlin-android-extensions-runtime-1.3.72.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/f3399b71a83521b6a2d366daaf5dc11184518ff6/kotlin-android-extensions-runtime-1.3.72-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions-runtime/1.3.72/46492b02491d9b3fbe80dd89f4921a7e4aacd2ec/kotlin-android-extensions-runtime-1.3.72-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
new file mode 100644
index 0000000..cd57d89
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/b1d2ee58cf8c842c5143315cff20019a6173378d/kotlin-stdlib-1.3.72-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/28f81264fad20dd20cc692003f4a27d355632073/kotlin-stdlib-1.3.72-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
new file mode 100644
index 0000000..c769fec
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" type="kotlin.common">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/b1d2ee58cf8c842c5143315cff20019a6173378d/kotlin-stdlib-common-1.3.72-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/8c35588215bc56f828c189e9edc37ee51672cf5c/kotlin-stdlib-common-1.3.72-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0.xml
new file mode 100644
index 0000000..0ac06fb
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/1381306d9f78d32683c0c9dbf28319a13d95b1df/kotlinx-coroutines-android-1.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/b11571ee5deb9c8b47887a79070d0c6c0940a8f6/kotlinx-coroutines-android-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0.xml
new file mode 100644
index 0000000..04c230e
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/ba1a536f0ce46feb08939c83bc9851945bcde648/kotlinx-coroutines-core-1.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/25f38c379fd216bf66c638fc5f5b595650c1bd64/kotlinx-coroutines-core-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0.xml
new file mode 100644
index 0000000..6c0fd9e
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_1_0_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.0.0" type="kotlin.common">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/2de0788cf8e15f171aeff8c2ffcb1bf8240bbcd5/kotlinx-coroutines-core-common-1.0.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/fbe00e9f1a3138c7d138fe4e02724366e9e42f24/kotlinx-coroutines-core-common-1.0.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml
new file mode 100644
index 0000000..2d8f97a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Gradle: org.reactivestreams:reactive-streams:1.0.2">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/d33cbe63ae492cde692c59b0fded80c944590c39/reactive-streams-1.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/fb592a3d57b11e71eb7a6211dd12ba824c5dd037/reactive-streams-1.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9878c2d..6890200 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,7 @@
<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_unfold_more_black_20dp.xml" value="0.175" />
+ <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/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" />
@@ -23,23 +24,38 @@
<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/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.25" />
+ <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" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_new_month_task.xml" value="0.29739583333333336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_new_sub_task.xml" value="0.27239583333333334" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_night_work.xml" value="0.2989583333333333" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_night_work_manage.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_pic_evidence.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_problem_change_detail.xml" value="0.30364583333333334" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_problem_change_pollution_scene.xml" value="0.33489583333333334" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_problem_detail.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_scense_detail.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_scense_map.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_search.xml" value="0.25" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_share_problem.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_task.xml" value="0.29739583333333336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_alert.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_alert_2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_bottom_sheet.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera_2.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera_3.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_list.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" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_home.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_inspection2.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_office_file.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_rank_content.xml" value="0.21458333333333332" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_setting.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_share_problem.xml" value="0.2421875" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_task.xml" value="0.27239583333333334" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/function_card1.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/function_card5_competent.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/function_card5_scene.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_common_news.xml" value="0.3338541666666667" />
@@ -65,7 +81,13 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_scene_task.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_scense_detail_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_selector_head.xml" value="0.3338541666666667" />
- <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_take_photo.xml" value="0.24947916666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_single_text.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_area.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_area_custom.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_drop_down.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_drop_down_custom.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_spinner_simple_text.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_take_photo.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_list_2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_list_head.xml" value="0.27239583333333334" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/item_task_progress_2.xml" value="0.3338541666666667" />
@@ -78,11 +100,15 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_search_2.xml" value="0.5" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_search_bar.xml" value="0.21145833333333333" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/layout_search_title.xml" value="0.33" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/page_patrol_icons_first.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/page_patrol_icons_second.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/recycler_item_section_head.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/recyclerview_item.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/appDucha/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/appDucha/src/main/res/drawable/ic_bg_red.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/appDucha/src/main/res/drawable/ic_cloud_download_white_24dp.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/appDucha/src/main/res/drawable/ic_launcher_background.xml" value="0.175" />
+ <entry key="..\:/androidsdk/sdk_new/platforms/android-28/data/res/drawable/ratingbar_indicator_material.xml" value="0.336" />
</map>
</option>
</component>
@@ -137,7 +163,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
<map>
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..bcfe775
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/customer_pollution_scene.iml" filepath="$PROJECT_DIR$/.idea/customer_pollution_scene.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/customer_pollution_scene.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/customer_pollution_scene.app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/appDucha/customer_pollution_scene.appDucha.iml" filepath="$PROJECT_DIR$/.idea/modules/appDucha/customer_pollution_scene.appDucha.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/appsupervision/customer_pollution_scene.appsupervision.iml" filepath="$PROJECT_DIR$/.idea/modules/appsupervision/customer_pollution_scene.appsupervision.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/moduleBase/customer_pollution_scene.moduleBase.iml" filepath="$PROJECT_DIR$/.idea/modules/moduleBase/customer_pollution_scene.moduleBase.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/modules/multi-image-selector/customer_pollution_scene.multi-image-selector.iml" filepath="$PROJECT_DIR$/.idea/modules/multi-image-selector/customer_pollution_scene.multi-image-selector.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
index 72f62ab..9831450 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,8 +1,6 @@
*.iml
.gradle
/local.properties
-/.idea/workspace.xml
-/.idea/libraries
.DS_Store
/build
/captures
diff --git a/app/build.gradle b/app/build.gradle
index 32e3645..c3b0898 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,8 @@
android {
compileSdkVersion 28
-// buildToolsVersion '28.0.3'
+ buildToolsVersion '28.0.3'
+// buildToolsVersion = '29.0.2'
defaultConfig {
// applicationId "cn.flightfeather.thirdapp"
@@ -42,7 +43,6 @@
jniLibs.srcDirs = ['libs']
}
}
- buildToolsVersion = '29.0.2'
// Butterknife requires Java 8.
compileOptions {
@@ -79,7 +79,7 @@
//noinspection GradleCompatible
api 'com.android.support:appcompat-v7:28.0.0'
api 'com.android.support:design:28.0.0'
- api 'com.android.support:support-v4:28.0.0'
+// api 'com.android.support:support-v428.0.0'
api 'com.android.support:cardview-v7:28.0.0'
implementation 'org.greenrobot:greendao:3.3.0'
api 'com.squareup.retrofit2:retrofit:2.3.0'
@@ -137,7 +137,7 @@
api "org.jetbrains.anko:anko:$anko_version"
//鑵捐TBS鏂囦欢娴忚鏈嶅姟
- api 'com.tencent.tbs.tbssdk:sdk:43697'
+ implementation 'com.tencent.tbs:tbssdk:44213'
//鏂囦欢涓嬭浇
implementation "com.liulishuo.okdownload:okdownload:${file_download_version}"
@@ -148,6 +148,11 @@
//鍦嗗舰杩涘害鏉�
api "com.mikhaellopez:circularprogressbar:${progressbar_version}"
+
+ //閫夋嫨鍣ㄧ殑鍩虹绐椾綋
+ implementation 'com.github.gzu-liyujiang.AndroidPicker:Common:1.5.6.20181018'
+ //鍗曢」/鏁板瓧銆佷簩涓夌骇鑱斿姩銆佹棩鏈�/鏃堕棿绛夋粴杞�夋嫨鍣�
+ implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.5.6.20181018'
}
repositories {
mavenCentral()
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 59c89e3..1bdeb3a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -51,3 +51,15 @@
#-keepclasseswithmembers class * {
# public <init>(android.content.Context);
#}
+
+#x5
+-dontwarn dalvik.**
+-dontwarn com.tencent.smtt.**
+
+-keep class com.tencent.smtt.** {
+ *;
+}
+
+-keep class com.tencent.tbs.** {
+ *;
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11b717c..0d98e44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -236,10 +236,16 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name="cn.flightfeather.thirdappmodule.module.inspection.ShareProblemPreViewActivity"
android:theme="@style/AppTheme.NoActionBar" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.PicEvidenceActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
<activity android:name="cn.flightfeather.thirdappmodule.module.common.CameraActivity"
android:theme="@style/AppFullScreenTheme" />
<activity android:name="cn.flightfeather.thirdappmodule.module.common.SearchActivity"
android:theme="@style/AppTheme.NoActionBar" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.common.PhotoViewerActivity2"
+ android:theme="@style/AppTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.activity.TestActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/CommonApplication.java b/app/src/main/java/cn/flightfeather/thirdappmodule/CommonApplication.java
index adf715a..e05b837 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/CommonApplication.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/CommonApplication.java
@@ -29,13 +29,19 @@
*/
public class CommonApplication extends Application {
-// public final String ROOT_URL ="http://192.168.0.200:8080/";
-// public final String ROOT_URL_IMAGE ="http://192.168.0.200:8080/images/";
- public String ROOT_URL ="http://192.168.0.146:8081/";
- public String ROOT_URL_IMAGE ="http://192.168.0.146:8081/images/";
-
- public String ROOT_URL_RELEASE = "http://47.100.191.150:9005/";
+// public String ROOT_URL_RELEASE = "http://47.100.191.150:9005/";
+ public String ROOT_URL_RELEASE = "https://fyami.com.cn:447/";
public String ROOT_URL_RELEASE_IMAGE = ROOT_URL_RELEASE + "images/";
+
+ public String ROOT_URL ="http://192.168.0.103:9001/";
+// public String ROOT_URL_IMAGE = ROOT_URL + "images/";
+ public String ROOT_URL_IMAGE = ROOT_URL_RELEASE + "images/";
+
+ // 椋炵窘鐜绯荤粺鍚庣鎺ュ彛ip
+// public String ROOT_URL_RELEASE_2 = "http://47.100.191.150:9006/";
+ public String ROOT_URL_RELEASE_2 = "https://fyami.com.cn/";
+ public String ROOT_URL_RELEASE_IMAGE_2 = ROOT_URL_RELEASE_2 + "images/";
+
private Retrofit retrofit;
private Retrofit retrofitImage;
@@ -51,11 +57,11 @@
public void onCreate() {
super.onCreate();
- new MyCrashHandler(this).init();
-
//鍒濆鍖栫綉缁滆姹�
RetrofitFactory.init(this);
+ new MyCrashHandler(this).init();
+
//x5鍐呮牳鍒濆鍖�
Tbs.Companion.init(this);
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/activity/TestActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/TestActivity.kt
new file mode 100644
index 0000000..579ba94
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/TestActivity.kt
@@ -0,0 +1,51 @@
+package cn.flightfeather.thirdappmodule.activity
+
+import android.content.Intent
+import android.os.Bundle
+import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.bean.entity.Inspection
+import cn.flightfeather.thirdappmodule.bean.entity.Scense
+import cn.flightfeather.thirdappmodule.bean.entity.Subtask
+import cn.flightfeather.thirdappmodule.module.base.BaseActivity
+import cn.flightfeather.thirdappmodule.module.inspection.PicEvidenceActivity
+import kotlinx.android.synthetic.main.activity_test.*
+import java.util.*
+
+/**
+ * @author riku
+ * Date:2022/4/13
+ *
+ */
+class TestActivity : BaseActivity() {
+ override fun getLayoutId(): Int = R.layout.activity_test
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val subTask = Subtask().apply {
+ stguid = "bIWCguc3MMLqz5LJ"
+ typeno = 1
+ citycode = "3100"
+ districtcode = "310116"
+ executionstarttime = Date()
+ }
+ val inspection = Inspection().apply {
+ guid = "T125JcdGXmoIM3EF"
+ }
+ val scene = Scense().apply {
+ guid = "vwxBIriLXMqPecQu"
+ typeid = 1
+ }
+ val lat = 0f
+ val lng = 0f
+ btn_test.setOnClickListener {
+ val intent = Intent(this, PicEvidenceActivity::class.java).apply {
+ putExtra("subTask", subTask)
+ putExtra("inspection", inspection)
+ putExtra("scene", scene)
+ putExtra("lat", lat)
+ putExtra("lng", lng)
+ }
+ startActivity(intent)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/PhotoPageAdapter.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/PhotoPageAdapter.kt
new file mode 100644
index 0000000..3ca3723
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/adapter/PhotoPageAdapter.kt
@@ -0,0 +1,46 @@
+package cn.flightfeather.thirdappmodule.adapter
+
+import android.content.Context
+import android.net.Uri
+import android.support.v4.view.PagerAdapter
+import android.view.View
+import android.view.ViewGroup
+import com.bumptech.glide.Glide
+import com.github.chrisbanes.photoview.PhotoView
+import java.io.File
+
+/**
+ * @author riku
+ * Date: 2019/10/18
+ */
+class PhotoPageAdapter(private val paths: List<String>, private val context: Context, private val onViewClick: (view: View) -> Unit) : PagerAdapter() {
+ private val photoViewList = mutableListOf<PhotoView>()
+
+ init {
+ repeat(paths.size) {
+ photoViewList.add(PhotoView(context).apply {
+ setOnClickListener { view -> onViewClick(view) }
+ })
+ }
+ }
+
+ override fun isViewFromObject(p0: View, p1: Any): Boolean = p0 == p1
+
+ override fun getCount(): Int = paths.size
+
+ override fun instantiateItem(container: ViewGroup, position: Int): Any {
+ Glide.with(container)
+ .load(paths[position])
+ .into(photoViewList[position])
+ container.addView(photoViewList[position])
+
+ return photoViewList[position]
+ }
+
+ override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+ container.removeView(photoViewList[position])
+// photoViewList[position] = PhotoView(context).apply {
+// setOnClickListener { onViewClick() }
+// }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
index bc31f66..f895740 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/common/net/RetrofitFactory.kt
@@ -18,36 +18,41 @@
* Date: 2019/7/22
* 缃戠粶璇锋眰
*/
-class RetrofitFactory constructor(val application: CommonApplication){
-
+class RetrofitFactory constructor(val application: CommonApplication) {
+ // 鏈郴缁熼缇界洃绠″悗绔帴鍙p
val retrofit: Retrofit = application.retrofit
val retrofitImage: Retrofit = application.retrofitImage
- private fun newOkHttpClient(list: List<Interceptor>): OkHttpClient =
- OkHttpClient.Builder()
- .connectTimeout(20 * 1000L, TimeUnit.MILLISECONDS)
- .apply {
- list.forEach {
- addInterceptor(it)
- }
- }
- .build()
+ // 椋炵窘鐜绯荤粺鍚庣鎺ュ彛ip
+ lateinit var retrofit2: Retrofit
- private fun newRetrofit(mOkHttpClient: OkHttpClient): Retrofit =
- Retrofit.Builder()
- .apply {
- baseUrl(application.ROOT_URL_RELEASE)
- }
- .addConverterFactory(
- GsonConverterFactory.create(
- GsonBuilder()
- .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
- .create()
- )
- )
- .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
- .client(mOkHttpClient)
- .build()
+ init {
+ retrofit2 = newRetrofit(application.ROOT_URL_RELEASE_2)
+ }
+
+ private fun newOkHttpClient(list: List<Interceptor>): OkHttpClient =
+ OkHttpClient.Builder()
+ .connectTimeout(20 * 1000L, TimeUnit.MILLISECONDS)
+ .apply {
+ list.forEach {
+ addInterceptor(it)
+ }
+ }
+ .build()
+
+ private fun newRetrofit(url: String, mOkHttpClient: OkHttpClient? = null): Retrofit =
+ Retrofit.Builder()
+ .baseUrl(url)
+ .addConverterFactory(
+ GsonConverterFactory.create(
+ GsonBuilder()
+ .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+ .create()
+ )
+ )
+ .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+ .apply { mOkHttpClient?.let { client(it) } }
+ .build()
companion object {
@@ -65,8 +70,8 @@
*/
fun <T> executeResult(observable: Observable<Response<T>>, subscriber: ResultObserver<T>) {
observable.subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(subscriber)
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(subscriber)
}
fun withProgressListeningRetrofit(listener: NetWorkProgressListener?): Retrofit {
@@ -74,7 +79,7 @@
instance.retrofit
} else {
val c = instance.newOkHttpClient(listOf(NetWorkProgressInterceptor(listener)))
- instance.newRetrofit(c)
+ instance.newRetrofit(instance.application.ROOT_URL_RELEASE, c)
}
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
index b78fb62..849c125 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
@@ -12,6 +12,15 @@
*/
interface DomainItemService {
+ /**
+ * 鑾峰彇鍦烘櫙鐨勯棶棰樹綅缃泦鍚�
+ */
@GET("domainitem/location")
fun getLocation(@Query("sceneType") sceneType: Int): Observable<Response<ArrayList<Domainitem>>>
+
+ /**
+ * 鑾峰彇鍦烘櫙鐨勪换鎰忔媿鍥剧墖鍒嗙被
+ */
+ @GET("domainitem/mediaFileType")
+ fun getMediaFileType(@Query("sceneType") sceneType: Int): Observable<Response<Map<String?, String?>>>
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/LedgerService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/LedgerService.kt
new file mode 100644
index 0000000..afb7454
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/LedgerService.kt
@@ -0,0 +1,25 @@
+package cn.flightfeather.thirdappmodule.httpservice
+
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse
+import cn.flightfeather.thirdappmodule.model.bean.LedgerRecord
+import io.reactivex.Observable
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+/**
+ * @author riku
+ * Date: 2022/04/13
+ */
+interface LedgerService {
+ /**
+ * 鑾峰彇鐢ㄦ埛鏌愭湀鍙拌处璁板綍
+ */
+ @GET("ledger/{userId}/detail2")
+ fun getRecord(
+ @Path("userId") userId: String,
+ @Query("sceneType") sceneType: Int,
+ @Query("time") time: String
+ ): Observable<Response<List<LedgerRecord>>>
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/UserInfoService.java b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/UserInfoService.java
index 3dfd80e..a88c45a 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/UserInfoService.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/UserInfoService.java
@@ -3,6 +3,7 @@
import java.util.List;
import cn.flightfeather.thirdappmodule.bean.entity.Userinfo;
+import cn.flightfeather.thirdappmodule.model.bean.UserMap;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.POST;
@@ -28,4 +29,7 @@
@GET("userinfo/scene/get")
Call<Userinfo> getByScene(@Query("sceneId") String sceneId);
+
+ @GET("usermap")
+ Call<UserMap> getTZId(@Query("sceneId") String sceneId);
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/LedgerRecord.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/LedgerRecord.kt
new file mode 100644
index 0000000..cf2d415
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/LedgerRecord.kt
@@ -0,0 +1,30 @@
+package cn.flightfeather.thirdappmodule.model.bean
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import java.util.*
+
+/**
+ * @author riku
+ * Date:2022/4/13
+ * 鍙拌处璁板綍
+ */
+@Parcelize
+data class LedgerRecord(
+ //鏂囦欢绫诲瀷
+ var fileType: Int? = null,
+ var id: String? = null,
+ var ledgerFinished: Boolean? = null,
+ var ledgerName: String? = null,
+ var ledgerSubTypeId: Int? = null,
+ var ledgerType: String? = null,
+ var ledgerTypeId: Int? = null,
+ var path1: String? = null,
+ var path2: String? = null,
+ var remark1: String? = null,
+ var remark2: String? = null,
+ var sceneType: Int? = null,
+ var upLoad: Boolean? = null,
+ var updateDate: Date? = null,
+ var updateType: Int? = null
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/UserMap.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/UserMap.kt
new file mode 100644
index 0000000..93645d5
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/UserMap.kt
@@ -0,0 +1,17 @@
+package cn.flightfeather.thirdappmodule.model.bean
+
+/**
+ * @author riku
+ * Date:2022/4/13
+ * 椋炵窘鐜鍜岄缇界洃绠′袱涓郴缁熺殑鐢ㄦ埛id瀵瑰簲鍏崇郴
+ */
+data class UserMap (
+ //椋炵窘鐜鐢ㄦ埛id
+ val tzUserId:String,
+ //椋炵窘鐜鐢ㄦ埛鍚嶇О
+ val tzUserName:String,
+ //椋炵窘鐩戠鐢ㄦ埛id
+ val svUserId:String,
+ //椋炵窘鐩戠鐢ㄦ埛鍚嶇О
+ val svUserName:String
+)
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType.kt
index b93c32d..47d661f 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType.kt
@@ -1,38 +1,13 @@
package cn.flightfeather.thirdappmodule.model.enumreation
/**
+ * 浠绘剰鎷嶄腑鐨勫浘鐗囩被鍨�
* @author riku
- * Date: 2020/10/19
+ * @date: 2020/10/19 create
+ * 2025.7.1: 浠庢灇涓剧被淇敼涓烘櫘閫氱殑鏁版嵁绫伙紝鍊间粠鏈嶅姟绔姩鎬佽幏鍙�
*/
-enum class MediaFileType(val value: Int, val des: String) {
- Problem(1, "闂"),
- TechnicalPrevention(2,"鎶�闃叉帾鏂�"),
-
- MonitorDevice(3, "鐩戞祴璁惧"),
- ManageDevice(4, "娌荤悊璁惧"),
-
- RoutineRecord(5, "甯歌璁板綍"),
- Signature(6, "绛惧瓧"),
- Nameplate(7, "閾墝"),
-
- TYPE_1(51, "鎵╁睍绫讳竴"),
- TYPE_2(52, "鎵╁睍绫讳簩"),
- TYPE_3(53, "鎵╁睍绫讳笁"),
- TYPE_4(54, "鎵╁睍绫诲洓"),
- TYPE_5(55, "鎵╁睍绫讳簲"),
- TYPE_6(56, "鎵╁睍绫诲叚"),
- TYPE_7(57, "鎵╁睍绫讳竷"),
- TYPE_8(58, "鎵╁睍绫诲叓"),
- TYPE_9(59, "鎵╁睍绫讳節"),
- TYPE_10(60, "鎵╁睍绫诲崄"),
-
- Others(99,"鍏朵粬");
-
+data class MediaFileType(val value: Int, val des: String){
companion object {
- fun getList(sceneTypeId: Int) = when (sceneTypeId) {
- // FIXME: 2020/12/21 姝ゅ5浠ｈ〃椁愰ギ浼佷笟绫诲瀷锛屽悗缁簲璇ユ坊鍔犳灇涓剧被绛夎鑼冧唬鐮�
- 5 -> listOf(RoutineRecord, TYPE_1, TYPE_2, TYPE_3, TYPE_4, TYPE_5, TYPE_6, TYPE_7, TYPE_8, TYPE_9, TYPE_10)
- else -> listOf(RoutineRecord, MonitorDevice, Nameplate)
- }
+ val defaultType = MediaFileType(MediaFileType_Backup.RoutineRecord.value, MediaFileType_Backup.RoutineRecord.des)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType_Backup.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType_Backup.kt
new file mode 100644
index 0000000..ab575af
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/MediaFileType_Backup.kt
@@ -0,0 +1,39 @@
+package cn.flightfeather.thirdappmodule.model.enumreation
+
+/**
+ * 鍘焄MediaFileType]鐨勫浠斤紝鍘熸潵鐨勭被浠庢灇涓剧被鏀逛负涓�鑸殑鏁版嵁绫�
+ * @author riku
+ * Date: 2025/07/01
+ */
+enum class MediaFileType_Backup(val value: Int, val des: String) {
+ Problem(1, "闂"),
+ TechnicalPrevention(2,"鎶�闃叉帾鏂�"),
+
+ MonitorDevice(3, "鐩戞祴璁惧"),
+ ManageDevice(4, "娌荤悊璁惧"),
+
+ RoutineRecord(5, "甯歌璁板綍"),
+ Signature(6, "绛惧瓧"),
+ Nameplate(7, "閾墝"),
+
+ TYPE_1(51, "鎵╁睍绫讳竴"),
+ TYPE_2(52, "鎵╁睍绫讳簩"),
+ TYPE_3(53, "鎵╁睍绫讳笁"),
+ TYPE_4(54, "鎵╁睍绫诲洓"),
+ TYPE_5(55, "鎵╁睍绫讳簲"),
+ TYPE_6(56, "鎵╁睍绫诲叚"),
+ TYPE_7(57, "鎵╁睍绫讳竷"),
+ TYPE_8(58, "鎵╁睍绫诲叓"),
+ TYPE_9(59, "鎵╁睍绫讳節"),
+ TYPE_10(60, "鎵╁睍绫诲崄"),
+
+ Others(99,"鍏朵粬");
+
+ companion object {
+ fun getList(sceneTypeId: Int) = when (sceneTypeId) {
+ // FIXME: 2020/12/21 姝ゅ5浠ｈ〃椁愰ギ浼佷笟绫诲瀷锛屽悗缁簲璇ユ坊鍔犳灇涓剧被绛夎鑼冧唬鐮�
+ 5 -> listOf(RoutineRecord, TYPE_1, TYPE_2, TYPE_3, TYPE_4, TYPE_5, TYPE_6, TYPE_7, TYPE_8, TYPE_9, TYPE_10)
+ else -> listOf(RoutineRecord, MonitorDevice, Nameplate)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/SceneType.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/SceneType.kt
index f46565f..448969b 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/SceneType.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/enumreation/SceneType.kt
@@ -19,4 +19,20 @@
SCENE_TYPE12(12, "宸ヤ笟鍥尯"),
SCENE_TYPE13(13, "鏃犲浐瀹氬満鏅�"),
StorageYard(14, "鍫嗗満");
+
+ companion object {
+ /**
+ * 鏈郴缁熶腑鐨勫満鏅被鍨媔d瀵瑰簲椋炵窘鐜绯荤粺涓殑鍊�
+ */
+ fun typeMap(sceneTypeId: Int) = when (sceneTypeId) {
+ Construction.value -> 2
+ Wharf.value -> 3
+ MixingPlant.value -> 5
+ Industrial.value -> 6
+ Restaurant.value -> 1
+ VehicleRepair.value -> 7
+ StorageYard.value -> 4
+ else -> sceneTypeId
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/FragmentViewPagerAdapter.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/FragmentViewPagerAdapter.kt
index 2907d35..1fd465d 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/FragmentViewPagerAdapter.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/FragmentViewPagerAdapter.kt
@@ -3,6 +3,7 @@
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
+import android.support.v4.view.PagerAdapter
/**
* @author riku
@@ -11,11 +12,17 @@
*/
class FragmentViewPagerAdapter(fm: FragmentManager?, private val fragments: List<Fragment>, private val titles: List<String>) : FragmentPagerAdapter(fm) {
+ override fun getItemPosition(`object`: Any): Int {
+ if (`object` is BaseFragment) {
+ return PagerAdapter.POSITION_NONE
+ }
+ return super.getItemPosition(`object`)
+ }
+
override fun getItem(p0: Int): Fragment = fragments[p0]
override fun getCount(): Int = titles.size
override fun getPageTitle(position: Int): CharSequence? = titles[position]
-
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/TabViewPagerSetInterface.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/TabViewPagerSetInterface.kt
index ffddea8..d0e8fc3 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/TabViewPagerSetInterface.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/base/TabViewPagerSetInterface.kt
@@ -42,6 +42,11 @@
}
}
+ fun viewpagerNotify() {
+ getViewPager().adapter?.notifyDataSetChanged()
+ notifyTabChanged()
+ }
+
fun getMyTabMode(): Int = TabLayout.MODE_FIXED
fun getMyTabTextNormalColor(): Int = -1
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileManageActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileManageActivity.kt
index 00c0ef2..de7e327 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileManageActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileManageActivity.kt
@@ -34,7 +34,8 @@
override fun getInitFragment(): BaseFragment? =
if (isRemoteFile) {
- FileDownloadFragment.newInstance(filePos, filePath, fileName)
+// FileDownloadFragment.newInstance(filePos, filePath, fileName)
+ OfficeFileReadFragment.newInstance(filePos, filePath, fileName)
} else {
OfficeFileReadFragment.newInstance(filePos, filePath, fileName)
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileReadFragment.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileReadFragment.kt
index 91c3a8d..3d8f7aa 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileReadFragment.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/OfficeFileReadFragment.kt
@@ -14,6 +14,7 @@
import cn.flightfeather.thirdappmodule.util.file.FileUtils
import com.tencent.smtt.sdk.QbSdk
import com.tencent.smtt.sdk.TbsReaderView
+import com.tencent.smtt.sdk.WebView
import kotlinx.android.synthetic.main.fragment_office_file.*
import org.json.JSONException
import org.json.JSONObject
@@ -56,6 +57,7 @@
private var fileName: String? = ""
private lateinit var tbsReaderView: TbsReaderView
+ private lateinit var webView: WebView
override fun getLayoutId(): Int = R.layout.fragment_office_file
@@ -82,12 +84,16 @@
override fun onDetach() {
super.onDetach()
- tbsReaderView.onStop()
+// tbsReaderView.onStop()
+// web_view.stopLoading()
+ web_view.destroy()
}
override fun onDestroy() {
super.onDestroy()
- tbsReaderView.onStop()
+// tbsReaderView.onStop()
+// web_view.stopLoading()
+ web_view.destroy()
}
private fun init() {
@@ -107,8 +113,9 @@
}
private fun openLocalFile() {
- tbsReaderView = TbsReaderView(context, null)
- tbs_reader_container.addView(tbsReaderView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+// tbsReaderView = TbsReaderView(context, null)
+// tbs_reader_container.addView(tbsReaderView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+// tbs_reader_container.addView(web_view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
if (!filePath.isNullOrEmpty()) {
val tempFile = File("/storage/emulated/0/TbsReaderTemp")
if (!tempFile.exists()) {
@@ -122,10 +129,11 @@
"tempPath",
Environment.getExternalStorageDirectory().path + File.separator + "TbsReaderTemp"
)
- val result = tbsReaderView.preOpen(FileUtils.getExtensionName(filePath), false)
- if (result) {
- tbsReaderView.openFile(localBundle)
- }
+ web_view.loadUrl(filePath)
+// val result = tbsReaderView.preOpen(FileUtils.getExtensionName(filePath), false)
+// if (result) {
+// tbsReaderView.openFile(localBundle)
+// }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/PhotoViewerActivity2.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/PhotoViewerActivity2.kt
new file mode 100644
index 0000000..2329d2c
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/common/PhotoViewerActivity2.kt
@@ -0,0 +1,68 @@
+package cn.flightfeather.thirdappmodule.module.common
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.view.ViewPager
+import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.adapter.PhotoPageAdapter
+import cn.flightfeather.thirdappmodule.module.base.BaseActivity
+import kotlinx.android.synthetic.main.activity_photo_viewer_2.*
+
+/**
+ * @author riku
+ * Date: 2019/10/18
+ */
+class PhotoViewerActivity2 : BaseActivity() {
+
+ companion object {
+ fun goto(activity: Activity?, paths: ArrayList<String>, pos: Int) {
+ val intent = Intent(activity, PhotoViewerActivity2::class.java).apply {
+ putStringArrayListExtra("paths", paths)
+ putExtra("pos", pos)
+ }
+ activity?.startActivity(intent)
+ }
+ }
+
+ //鍥剧墖璺緞
+ private var paths = ArrayList<String>()
+
+ //榛樿灞曠ず鐨勫浘鐗囧簭鍙�
+ private var position = 0
+
+ override fun getLayoutId(): Int = R.layout.activity_photo_viewer_2
+
+ @SuppressLint("SetTextI18n")
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ getExtra()
+
+ tv_page.text = "${position + 1}/${paths.size}"
+
+ view_pager.adapter = PhotoPageAdapter(paths, this) {
+ finish()
+ }
+ view_pager.currentItem = position
+ view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ override fun onPageScrollStateChanged(p0: Int) {
+
+ }
+
+ override fun onPageScrolled(p0: Int, p1: Float, p2: Int) {
+
+ }
+
+ override fun onPageSelected(p0: Int) {
+ position = p0
+ tv_page.text = "${position + 1}/${paths.size}"
+ }
+ })
+ }
+
+ private fun getExtra() {
+ paths = intent.getStringArrayListExtra("paths")
+ position = intent.getIntExtra("pos", 0)
+ }
+}
\ 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 0323bba..5e9ece9 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
@@ -75,6 +75,22 @@
//鑿滃崟鎸夐挳鍒楄〃
protected val menuList = ArrayList<LinearLayout>()
+ private lateinit var ln_patrol_problem_recheck :LinearLayout
+ private lateinit var ln_patrol_take_evidence :LinearLayout
+ private lateinit var ln_patrol_problem_list :LinearLayout
+ private lateinit var ln_patrol_change :LinearLayout
+ private lateinit var ln_patrol_camera :LinearLayout
+ private lateinit var ln_patrol_newgit :LinearLayout
+ private lateinit var ln_patrol_promiss :LinearLayout
+ private lateinit var ln_patrol_rate :LinearLayout
+ private lateinit var ln_patrol_navi :LinearLayout
+ private lateinit var ln_patrol_chose_latlng :LinearLayout
+ private lateinit var ln_patrol_edit :LinearLayout
+ private lateinit var ln_patrol_share :LinearLayout
+ private lateinit var ln_patrol_check :LinearLayout
+ private lateinit var ln_patrol_change_check :LinearLayout
+ private lateinit var ln_patrol_pic_evidence :LinearLayout
+
private var problemEditable = false
private var timer = Timer("track")
@@ -260,26 +276,43 @@
val iconPage1 = View.inflate(this, R.layout.page_patrol_icons_first, null)
val iconPage2 = View.inflate(this, R.layout.page_patrol_icons_second, null)
+ ln_patrol_problem_recheck = iconPage1.findViewById(R.id.ln_patrol_problem_recheck)
+ ln_patrol_take_evidence = iconPage1.findViewById(R.id.ln_patrol_take_evidence)
+ ln_patrol_problem_list = iconPage1.findViewById(R.id.ln_patrol_problem_list)
+ ln_patrol_change = iconPage1.findViewById(R.id.ln_patrol_change)
+ ln_patrol_camera = iconPage1.findViewById(R.id.ln_patrol_camera)
+ ln_patrol_newgit = iconPage1.findViewById(R.id.ln_patrol_newgit)
+ ln_patrol_promiss = iconPage1.findViewById(R.id.ln_patrol_promiss)
+ ln_patrol_rate = iconPage1.findViewById(R.id.ln_patrol_rate)
+ ln_patrol_navi = iconPage2.findViewById(R.id.ln_patrol_navi)
+ ln_patrol_chose_latlng = iconPage2.findViewById(R.id.ln_patrol_chose_latlng)
+ ln_patrol_edit = iconPage2.findViewById(R.id.ln_patrol_edit)
+ ln_patrol_share = iconPage2.findViewById(R.id.ln_patrol_share)
+ ln_patrol_check = iconPage2.findViewById(R.id.ln_patrol_check)
+ ln_patrol_change_check = iconPage2.findViewById(R.id.ln_patrol_change_check)
+ ln_patrol_pic_evidence = iconPage2.findViewById(R.id.ln_patrol_pic_evidence)
menuList.apply{
- add(iconPage1.findViewById(R.id.ln_patrol_problem_recheck))
- add(iconPage1.findViewById(R.id.ln_patrol_take_evidence))
- add(iconPage1.findViewById(R.id.ln_patrol_problem_list))
- add(iconPage1.findViewById(R.id.ln_patrol_change))
- add(iconPage1.findViewById(R.id.ln_patrol_camera))
- add(iconPage1.findViewById(R.id.ln_patrol_newgit))
- add(iconPage1.findViewById(R.id.ln_patrol_promiss))
- add(iconPage1.findViewById(R.id.ln_patrol_rate))
- add(iconPage2.findViewById(R.id.ln_patrol_navi))
- add(iconPage2.findViewById(R.id.ln_patrol_chose_latlng))
- add(iconPage2.findViewById(R.id.ln_patrol_edit))
- add(iconPage2.findViewById(R.id.ln_patrol_share))
- add(iconPage2.findViewById(R.id.ln_patrol_check))
- add(iconPage2.findViewById(R.id.ln_patrol_change_check))
- //鍒ゆ柇鐢ㄦ埛鏉冮檺锛屽彧鏈夌鐞嗗憳鍙闂瀹℃牳鍥炬爣
- if (viewModel.userTypeId != Domain.USER_ADMIN.toByte()) {
- menuList[menuList.lastIndex - 1].visibility = View.INVISIBLE
- menuList.last().visibility = View.INVISIBLE
- }
+ add(ln_patrol_problem_recheck)
+ add(ln_patrol_take_evidence)
+ add(ln_patrol_problem_list)
+ add(ln_patrol_change)
+ add(ln_patrol_camera)
+ add(ln_patrol_newgit)
+ add(ln_patrol_promiss)
+ add(ln_patrol_rate)
+ add(ln_patrol_navi)
+ add(ln_patrol_chose_latlng)
+ add(ln_patrol_edit)
+ add(ln_patrol_share)
+ add(ln_patrol_check)
+ add(ln_patrol_change_check)
+ add(ln_patrol_pic_evidence)
+ }
+
+ //鍒ゆ柇鐢ㄦ埛鏉冮檺锛屽彧鏈夌鐞嗗憳鍙闂瀹℃牳鍥炬爣
+ if (viewModel.userTypeId != Domain.USER_ADMIN.toByte()) {
+ ln_patrol_check.visibility = View.INVISIBLE
+ ln_patrol_change_check.visibility = View.INVISIBLE
}
vp_patrol_icons.adapter = IconsPageAdapter(ArrayList<View>().apply {
@@ -453,15 +486,41 @@
menuList.let {m ->
when (status) {
Domain.TASK_STATUS_WAITING -> {
- for (i in m.indices) {
- if (i <= 7 || i == 12 || i == 13) {
- m[i].alpha = 0.2F
- m[i].setOnClickListener(showNeedStartTaskListener())
- } else {
- m[i].alpha = 1F
- m[i].setOnClickListener(this)
- }
+// for (i in m.indices) {
+// if (i <= 7 || i == 12 || i == 13) {
+// m[i].alpha = 0.2F
+// m[i].setOnClickListener(showNeedStartTaskListener())
+// } else {
+// m[i].alpha = 1F
+// m[i].setOnClickListener(this)
+// }
+// }
+ listOf(
+ ln_patrol_problem_recheck,
+ ln_patrol_take_evidence,
+ ln_patrol_problem_list,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_newgit,
+ ln_patrol_promiss,
+ ln_patrol_rate,
+ ln_patrol_check,
+ ln_patrol_change_check,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.setOnClickListener(showNeedStartTaskListener())
}
+ listOf(
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share
+ ).forEach {
+ it.alpha = 1F
+ it.setOnClickListener(this)
+ }
+
}
Domain.TASK_STATUS_RUNNING -> {
m.forEach {
@@ -470,25 +529,80 @@
}
}
Domain.TASK_STATUS_FINISHED -> {
- for (i in m.indices) {
- if (i == 1) {
- m[i].alpha = 0.2F
- m[i].isClickable = false
- } else {
- m[i].alpha = 1F
- m[i].setOnClickListener(this)
- }
+// for (i in m.indices) {
+// if (i == 1) {
+// m[i].alpha = 0.2F
+// m[i].isClickable = false
+// } else {
+// m[i].alpha = 1F
+// m[i].setOnClickListener(this)
+// }
+// }
+ listOf(
+ ln_patrol_take_evidence,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.isClickable = false
}
+ listOf(
+ ln_patrol_problem_recheck,
+ ln_patrol_problem_list,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_newgit,
+ ln_patrol_promiss,
+ ln_patrol_rate,
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share,
+ ln_patrol_check,
+ ln_patrol_change_check
+ ).forEach {
+ it.alpha = 1F
+ it.setOnClickListener(this)
+ }
+
}
}
if (viewModel.userTypeId == Domain.USER_COMPTENT.toByte()) {
- for (i in m.indices) {
- when (i) {
- 1, in 3..4, in 7..11 -> {
- m[i].alpha = 0.2F
- m[i].isClickable = false
- }
- }
+// for (i in m.indices) {
+// when (i) {
+// 1, in 3..4, in 7..11 -> {
+// m[i].alpha = 0.2F
+// m[i].isClickable = false
+// }
+// }
+// }
+// ln_patrol_problem_recheck
+// ln_patrol_take_evidence
+// ln_patrol_problem_list
+// ln_patrol_change
+// ln_patrol_camera
+// ln_patrol_newgit
+// ln_patrol_promiss
+// ln_patrol_rate
+// ln_patrol_navi
+// ln_patrol_chose_latlng
+// ln_patrol_edit
+// ln_patrol_share
+// ln_patrol_check
+// ln_patrol_change_check
+// ln_patrol_pic_evidence
+ listOf(
+ ln_patrol_take_evidence,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_rate,
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.isClickable = false
}
}
}
@@ -834,7 +948,7 @@
// fixme: 2020/8/3 姝ゅ浠ュ緪姹囧尯浣滀负娴嬭瘯锛岄鍏堜娇鐢ㄦ柊鐨勮瘎鍒嗚鍒欙紝涔嬪悗閫愭鏇挎崲
val intentEvaluation = if (viewModel.scene.value?.districtcode == "310104") {
Intent(this, MenuGradeActivity::class.java)
- }else {
+ } else {
Intent(this, GradeActivity::class.java)
}
intentEvaluation.putExtra("inspectionGuid", viewModel.inspection.value?.guid)
@@ -888,6 +1002,17 @@
}
startActivity(intent)
}
+ // 鏍规嵁浠绘剰鍥剧墖鍜岄缇界幆澧冪郴缁熶腑鐨勫彴璐﹀浘鐗囧垱寤洪棶棰�
+ R.id.ln_patrol_pic_evidence -> {
+ val intent = Intent(this, PicEvidenceActivity::class.java).apply {
+ putExtra("subTask", viewModel.subTask.value)
+ putExtra("inspection", viewModel.inspection.value)
+ putExtra("scene", viewModel.scene.value)
+ putExtra("lat", latitudeCurrent)
+ putExtra("lng", longitudeCurrent)
+ }
+ startActivity(intent)
+ }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
index 50e25a0..6e4af15 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
@@ -22,6 +22,7 @@
import cn.flightfeather.thirdappmodule.bean.entity.Scense
import cn.flightfeather.thirdappmodule.bean.entity.Subtask
import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType
+import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType_Backup
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
import cn.flightfeather.thirdappmodule.module.base.BaseTakePicActivity
import cn.flightfeather.thirdappmodule.module.base.TAKE_PHOTO
@@ -52,10 +53,10 @@
override fun getLayoutId(): Int = R.layout.dialog_camera_3
//椤甸潰鏀寔鐨勬媿鎽勫浘鐗囩被鍨�
- private val typeList = listOf(MediaFileType.RoutineRecord, MediaFileType.Nameplate, MediaFileType.MonitorDevice)
+ private val typeList = listOf<MediaFileType>()
//褰撳墠閫夋嫨鐨勬媿鐓х被鍨�
- private var currentType = MediaFileType.RoutineRecord
+ private var currentType = MediaFileType(MediaFileType_Backup.RoutineRecord.value, MediaFileType_Backup.RoutineRecord.des)
private var currentTypeName = currentType.des
lateinit var viewModel: MenuCameraViewModel
@@ -204,10 +205,14 @@
private fun initObserver() {
viewModel.fileList.observe(this, Observer {
it?.forEach { m ->
- initRecyclerView(m.dataList, m.type ?: MediaFileType.Others, m.alias)
+ initRecyclerView(m.dataList, m.type ?: MediaFileType.defaultType, m.alias)
+ }
+ val menus = it?.map { m->
+ m.type?.des ?: ""
}
if (viewList.isNotEmpty()) {
banner.dataList = viewList
+ menus?.let { m->banner.menus = m }
}
})
// typeList.forEach {
@@ -235,8 +240,8 @@
mediaFile.description = fileName
mediaFile.savetime = Date()
mediaFile.ischanged = false
- val exetension1 = scene?.citycode + "/" + scene?.districtcode + "/" + DateFormatter.dateFormat2.format(calendar.time) + "/" + scene?.guid + "/"
- mediaFile.extension1 = exetension1
+ val extension1 = scene?.citycode + "/" + scene?.districtcode + "/" + DateFormatter.dateFormat2.format(calendar.time) + "/" + scene?.guid + "/"
+ mediaFile.extension1 = extension1
mediaFile.remark = "鏈笂浼�"
viewModel.putMediaFile(mediaFile)
@@ -276,12 +281,5 @@
// notifyDataSetChanged()
// }
// }
- }
-
- private fun getDataSet(type: MediaFileType) = when (type) {
- MediaFileType.RoutineRecord -> Pair(viewModel.routineRecordList, rv_photo_list_1)
- MediaFileType.Nameplate -> Pair(viewModel.nameplateList, rv_photo_list_2)
- MediaFileType.MonitorDevice -> Pair(viewModel.monitorDeviceList, rv_photo_list_3)
- else -> Pair(viewModel.routineRecordList, rv_photo_list_1)
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraViewModel.kt
index 9b6d8fc..8cdb4f5 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraViewModel.kt
@@ -26,7 +26,7 @@
private val inspectionRepository = InspectionRepository()
private val problemRepository = ProblemRepository()
- private val commonRepository = CommonRepository()
+ private val commonRepository = CommonRepository.instance
//甯歌璁板綍鍥剧墖
val routineRecordList = MutableLiveData<ArrayList<Mediafile>>().apply { value = ArrayList() }
@@ -38,12 +38,6 @@
val fileList = MutableLiveData<MutableList<MediaData>>().apply { value = mutableListOf() }
private var loadedCount = 0
- private val dataSet = listOf(
- Pair(MediaFileType.RoutineRecord, routineRecordList),
- Pair(MediaFileType.Nameplate, nameplateList),
- Pair(MediaFileType.MonitorDevice, monitorDeviceList)
- )
-
/**
* 鑾峰彇浠绘剰鎷嶇収鍥剧墖
*/
@@ -52,19 +46,19 @@
override fun onSuccess(types: List<MediaFileType>?) {
fileList.value?.clear()
loadedCount = 0
- types?.forEachWithIndex { i, type ->
- inspectionRepository.getMediaFile(inspectionId, type.value, object : ResultCallBack<ArrayList<Mediafile>> {
+ types?.forEach { t ->
+ inspectionRepository.getMediaFile(inspectionId, t.value, object : ResultCallBack<ArrayList<Mediafile>> {
override fun onSuccess(result: ArrayList<Mediafile>?) {
- commonRepository.getAlias(sceneTypeId, type, object : ResultCallBack<String> {
+ commonRepository.getAlias(sceneTypeId, t.value, object : ResultCallBack<String> {
override fun onSuccess(alias: String?) {
result?.let {
fileList.value?.add(MediaData().apply {
- this.type = type
+ this.type = t
this.alias = if (alias.isNullOrBlank()) null else alias
dataList = it
dataList.add(0, Mediafile())
})
- onMediaFileGet(types.size, sceneTypeId)
+ onMediaFileGet(types.size, types)
}
}
@@ -85,11 +79,6 @@
}
})
-
-
- dataSet.forEach { p ->
-
- }
}
/**
@@ -121,43 +110,54 @@
})
}
- private fun onMediaFileGet(total: Int, sceneTypeId: Int) {
+ /**
+ * 灏嗕换鎰忔媿鐨勭粨鏋滄寜鐓х粰瀹氱殑鍒嗙被椤哄簭鎺掑垪
+ */
+ private fun onMediaFileGet(total: Int, types: List<MediaFileType>) {
loadedCount++
+ // 褰撴瘡绉嶇被鍨嬬殑鏁版嵁閮借幏鍙栧畬姣曞悗锛岃繘琛岄噸鎺掑簭鎿嶄綔
if (loadedCount == total) {
- val list = fileList.value?.sortedBy {
- it.type?.value
- }?.toMutableList() ?: mutableListOf()
- if (sceneTypeId == SceneType.Construction.value
- || sceneTypeId == SceneType.Wharf.value
- || sceneTypeId == SceneType.MixingPlant.value
- || sceneTypeId == SceneType.StorageYard.value) {
- fileList.value?.clear()
- for (i in list.indices) {
- if (list[i].type == MediaFileType.RoutineRecord) {
- fileList.value?.add(list[i])
- list.removeAt(i)
- break
- }
- }
- for (i in list.indices) {
- if (list[i].type == MediaFileType.MonitorDevice) {
- fileList.value?.add(list[i])
- list.removeAt(i)
- break
- }
- }
- for (i in list.indices) {
- if (list[i].type == MediaFileType.Nameplate) {
- fileList.value?.add(list[i])
- list.removeAt(i)
- break
- }
- }
- fileList.value?.addAll(list)
- fileList.value = fileList.value
- } else {
- fileList.value = list
+ val tempList = mutableListOf<MediaData>()
+ types.forEach { t ->
+ fileList.value?.find { it.type?.value == t.value }?.let { tempList.add(it) }
}
+ fileList.value = tempList
+
+// val list = fileList.value?.sortedBy {
+// it.type?.value
+// }?.toMutableList() ?: mutableListOf()
+
+// if (sceneTypeId == SceneType.Construction.value
+// || sceneTypeId == SceneType.Wharf.value
+// || sceneTypeId == SceneType.MixingPlant.value
+// || sceneTypeId == SceneType.StorageYard.value) {
+// fileList.value?.clear()
+// for (i in list.indices) {
+// if (list[i].type == MediaFileType.RoutineRecord) {
+// fileList.value?.add(list[i])
+// list.removeAt(i)
+// break
+// }
+// }
+// for (i in list.indices) {
+// if (list[i].type == MediaFileType.MonitorDevice) {
+// fileList.value?.add(list[i])
+// list.removeAt(i)
+// break
+// }
+// }
+// for (i in list.indices) {
+// if (list[i].type == MediaFileType.Nameplate) {
+// fileList.value?.add(list[i])
+// list.removeAt(i)
+// break
+// }
+// }
+// fileList.value?.addAll(list)
+// fileList.value = fileList.value
+// } else {
+// fileList.value = list
+// }
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
index bf1be53..1d9126a 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
@@ -17,8 +17,12 @@
import cn.flightfeather.thirdappmodule.module.base.BaseTakePicActivity
import cn.flightfeather.thirdappmodule.util.DateFormatter
import cn.flightfeather.thirdappmodule.util.Domain
+import cn.flightfeather.thirdappmodule.util.SystemServiceUtils
import cn.flightfeather.thirdappmodule.util.UUIDGenerator
import cn.flightfeather.thirdappmodule.util.file.FileUtil
+import cn.flightfeather.thirdappmodule.util.file.FileUtils
+import com.flightfeather.taizhang.common.utils.download.UpDownloadUtil
+import io.reactivex.Observable
import kotlinx.android.synthetic.main.dialog_take_evidence.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
@@ -26,6 +30,7 @@
import java.io.File
import java.io.IOException
import java.util.*
+import kotlin.collections.ArrayList
/**
* @author riku
@@ -47,6 +52,7 @@
var scene: Scense? = null
var lat = 0.0
var lng = 0.0
+ var picUrls: ArrayList<String>? = null
protected var submitTime = 0L//鎻愪氦鏃堕棿锛岄槻姝㈣繛缁彁浜わ紝澶氭璁板綍
@@ -61,7 +67,7 @@
getExtra()
initUI()
initObserver()
-
+ loadOnlinePic()
subTask?.let { t ->
scene?.let { s ->
viewModel.getLocationList(s.typeid.toInt())
@@ -77,6 +83,7 @@
scene = intent.getSerializableExtra("scene") as Scense?
lat = intent.getDoubleExtra("lat", 0.0)
lng = intent.getDoubleExtra("lng", 0.0)
+ picUrls = intent.getStringArrayListExtra("picUrls")
}
private fun initUI() {
@@ -172,6 +179,17 @@
}
+ private fun loadOnlinePic() {
+ picUrls?.forEach {
+ UpDownloadUtil.download(this, it, FileUtils.getFileName(it), {path ->
+ pathTempList.add(Pair(File(path), true))
+ refreshImageView()
+ }, {
+ toast("闂鍥剧墖涓嬭浇澶辫触")
+ })
+ }
+ }
+
protected fun updateUIByProblemType(visible: Int) {
sp_take_evidence_select_location.visibility = visible
et_take_evidence_location.visibility = visible
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceActivity.kt
new file mode 100644
index 0000000..8a40082
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceActivity.kt
@@ -0,0 +1,246 @@
+package cn.flightfeather.thirdappmodule.module.inspection
+
+import android.annotation.SuppressLint
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
+import android.content.Intent
+import android.os.Bundle
+import android.support.design.widget.TabLayout
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.view.ViewPager
+import android.support.v7.widget.LinearLayoutManager
+import android.view.View
+import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.adapter.AllRecyclerViewAdapter
+import cn.flightfeather.thirdappmodule.bean.entity.Inspection
+import cn.flightfeather.thirdappmodule.bean.entity.Scense
+import cn.flightfeather.thirdappmodule.bean.entity.Subtask
+import cn.flightfeather.thirdappmodule.model.bean.LedgerRecord
+import cn.flightfeather.thirdappmodule.model.event.ProblemEvent
+import cn.flightfeather.thirdappmodule.module.base.BaseActivity
+import cn.flightfeather.thirdappmodule.module.base.TabViewPagerSetInterface
+import cn.qqtheme.framework.picker.OptionPicker
+import kotlinx.android.synthetic.main.activity_pic_evidence.*
+import kotlinx.android.synthetic.main.layout_tab_viewpager.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.jetbrains.anko.toast
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * @author riku
+ * Date:2022/4/12
+ *
+ */
+@SuppressLint("SetTextI18n")
+class PicEvidenceActivity : BaseActivity(), TabViewPagerSetInterface {
+
+ companion object {
+ // 閫夊彇鍥剧墖鏈�澶ф暟閲�
+ const val MAX_PIC: Int = 3
+ }
+
+ override fun getLayoutId(): Int = R.layout.activity_pic_evidence
+
+ lateinit var viewModel: PicEvidenceViewModel
+
+ private val tabTitles = mutableListOf<String>()
+ private val tabFragments = mutableListOf<Fragment>()
+
+ private val months = listOf("01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12")
+ private var year: Int = 2022
+ private var month = months[0]
+ private lateinit var datePicker: OptionPicker
+
+ private var subTask: Subtask? = null
+ private var inspection: Inspection? = null
+ private var scene: Scense? = null
+ private var lat = 0.0
+ private var lng = 0.0
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ EventBus.getDefault().register(this)
+ viewModel = ViewModelProviders.of(this).get(PicEvidenceViewModel::class.java)
+
+ getExtra()
+ initUI()
+ initDatePicker()
+ initObserver()
+ initTab()
+ initViewPager()
+
+ scene?.let {
+ viewModel.searchLedgerRecord(it.guid, it.typeid.toInt(), "$year-$month")
+ }
+ }
+
+ private fun getExtra() {
+ subTask = intent.getSerializableExtra("subTask") as Subtask?
+ inspection = intent.getSerializableExtra("inspection") as Inspection?
+ scene = intent.getSerializableExtra("scene") as Scense?
+ lat = intent.getDoubleExtra("lat", 0.0)
+ lng = intent.getDoubleExtra("lng", 0.0)
+ }
+
+ private fun initUI() {
+ img_back.setOnClickListener { onBackPressed() }
+
+ val cal = Calendar.getInstance()
+ year = cal.get(Calendar.YEAR)
+ val mon = cal[Calendar.MONTH]
+ month = months[mon]
+ tv_menu.apply {
+ text = "${year}骞�"
+ setOnClickListener { datePicker.show() }
+ }
+ rv_month.apply {
+ val monthAdapter = object : AllRecyclerViewAdapter<String>(months, R.layout.item_single_text, this@PicEvidenceActivity) {
+ override fun bindView(holder: MyViewHolder?, obj: String?, isSelected: Boolean, position: Int) {
+ holder?.setText(R.id.tv_text, "${obj}鏈�")
+ ?.setSelected(R.id.tv_text, isSelected)
+ ?.setOnItemClickListener {
+ setAllFalse()
+ setSelected(true, position)
+ notifyDataSetChanged()
+ viewModel.clearPic()
+ viewModel.searchLedgerRecord(scene!!.guid, scene!!.typeid.toInt(), "$year-$obj")
+ }
+ }
+ }
+ monthAdapter.setSelected(true, mon)
+ adapter = monthAdapter
+ layoutManager = LinearLayoutManager(this@PicEvidenceActivity, LinearLayoutManager.HORIZONTAL, false)
+ adapter?.notifyDataSetChanged()
+ }
+
+ tv_selected.text = "宸查��(0/${MAX_PIC})"
+ btn_fail.apply {
+ visibility = View.GONE
+ setOnClickListener { viewModel.clearPic() }
+ }
+ btn_pass.apply {
+ visibility = View.VISIBLE
+ setOnClickListener { submit() }
+ }
+ }
+
+ private fun initObserver() {
+ // 鑾峰彇鍙拌处鎴愬姛鍚�,鍒濆鍖杤iewpager
+ viewModel.ledgerTypes.observe(this, Observer {
+ // 鏈夎褰曟椂鐢熸垚viewpager鐣岄潰
+ if (it?.isNotEmpty() == true) {
+ refreshTabViewPager(it)
+ viewpagerNotify()
+ layout_v.visibility = View.VISIBLE
+ layout_e.visibility = View.GONE
+ }
+ // 鏃犺褰曟椂鐢熸垚鏃犺褰曟彁閱掔晫闈�
+ else {
+ layout_v.visibility = View.GONE
+ layout_e.visibility = View.VISIBLE
+ }
+ })
+
+ // 鍥剧墖閫夊彇
+ viewModel.selectedImgUrls.observe(this, Observer {
+ it?.size?.let {s ->
+ tv_selected.text = "宸查��(${s}/${MAX_PIC})"
+ if (s > 0) {
+ btn_fail.visibility = View.VISIBLE
+ } else {
+ btn_fail.visibility = View.GONE
+ }
+ }
+ })
+ }
+
+ private fun initDatePicker() {
+ var thisYear = year
+ val yearList = mutableListOf<String>()
+ while (thisYear > 1990) {
+ yearList.add(thisYear.toString())
+ thisYear--
+ }
+ datePicker = OptionPicker(this, yearList).apply {
+ title = "骞翠唤"
+ setOnOptionPickListener(object : OptionPicker.OnOptionPickListener() {
+ override fun onOptionPicked(index: Int, item: String?) {
+ item?.let { year = it.toInt()}
+ tv_menu.text = "${year}骞�"
+ scene?.let {
+ viewModel.searchLedgerRecord(it.guid, it.typeid.toInt(), "$year-$month")
+ }
+ }
+ })
+ this.setCancelText("鍙栨秷")
+ this.setSubmitText("纭畾")
+ }
+ }
+ /**
+ * 鎻愪氦鎵�閫夊浘鐗囷紝璺宠浆闂鍙栬瘉鐣岄潰
+ */
+ private fun submit() {
+ viewModel.selectedImgUrls.value?.let {
+ when {
+ it.isEmpty() -> toast("璇烽�夋嫨鍥剧墖")
+ it.size > MAX_PIC -> toast("鎵�閫夊浘鐗囪秴杩囨渶澶ф暟閲忥紒")
+ else -> {
+ val intent = Intent(this, MenuEvidenceActivity::class.java).apply {
+ putExtra("subTask", subTask)
+ putExtra("inspection", inspection)
+ putExtra("scene", scene)
+ putExtra("lat", lat)
+ putExtra("lng", lng)
+ putStringArrayListExtra("picUrls", ArrayList(it))
+ }
+ startActivity(intent)
+ }
+ }
+ }
+ }
+
+ /**
+ * 鍒锋柊viewpager
+ */
+ private fun refreshTabViewPager(list: LinkedHashMap<String, MutableList<LedgerRecord>>) {
+ tabTitles.clear()
+ tabFragments.clear()
+ list.forEach { (k, v) ->
+ tabTitles.add(k)
+ tabFragments.add(PicEvidenceFragment.newInstance(ArrayList(v)))
+ }
+ }
+
+ override fun getMyTabMode(): Int = TabLayout.MODE_SCROLLABLE
+
+ override fun getTab(): TabLayout = tab
+
+ override fun getViewPager(): ViewPager = view_pager
+
+ override fun getTitles(): List<String> {
+ tabTitles.clear()
+ viewModel.ledgerTypes.value?.forEach { (k, _) ->
+ tabTitles.add(k)
+ }
+ return tabTitles
+ }
+
+ override fun getTabFragments(): List<Fragment> {
+ tabFragments.clear()
+ viewModel.ledgerTypes.value?.forEach { (_, v)->
+ tabFragments.add(PicEvidenceFragment.newInstance(ArrayList(v)))
+ }
+ return tabFragments
+ }
+
+ override fun getMyFragmentManager(): FragmentManager = supportFragmentManager
+
+ @Subscribe
+ fun onProSubmit(problemEvent: ProblemEvent) {
+ viewModel.clearPic()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceFragment.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceFragment.kt
new file mode 100644
index 0000000..b6a97ec
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceFragment.kt
@@ -0,0 +1,180 @@
+package cn.flightfeather.thirdappmodule.module.inspection
+
+import android.arch.lifecycle.Observer
+import android.arch.lifecycle.ViewModelProviders
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.widget.GridLayoutManager
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.StaggeredGridLayoutManager
+import android.view.View
+import android.widget.ImageView
+import cn.flightfeather.thirdappmodule.CommonApplication
+import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.model.bean.LedgerRecord
+import cn.flightfeather.thirdappmodule.module.base.BaseFragment
+import cn.flightfeather.thirdappmodule.module.common.PhotoViewerActivity2
+import cn.flightfeather.thirdappmodule.view.recyclerview.*
+import com.bumptech.glide.Glide
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import kotlinx.android.synthetic.main.layout_recycler_view_refresh.*
+import org.jetbrains.anko.support.v4.toast
+import java.util.ArrayList
+
+/**
+ * @author riku
+ * Date:2022/4/12
+ *
+ */
+class PicEvidenceFragment : BaseFragment() {
+
+ companion object {
+ const val ARG_PROBLEM = "ledgerList"
+
+ fun newInstance(ledgerRecords: ArrayList<LedgerRecord>): PicEvidenceFragment {
+ return PicEvidenceFragment().apply {
+ arguments = Bundle().apply {
+ putParcelableArrayList(ARG_PROBLEM, ledgerRecords)
+ }
+ }
+ }
+ }
+
+ lateinit var viewModel: PicEvidenceViewModel
+
+ private var ledgerRecords: List<LedgerRecord>? = null
+ private lateinit var recyclerViewPanel: RecyclerViewPanel<LedgerRecord>
+
+ override fun getLayoutId(): Int = R.layout.layout_recycler_view_refresh
+
+ override fun onCreateView() {
+ super.onCreateView()
+ ledgerRecords = arguments?.getParcelableArrayList(ARG_PROBLEM)
+ viewModel = ViewModelProviders.of(activity!!).get(PicEvidenceViewModel::class.java)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initUI()
+ initObserver()
+ }
+
+ private fun initUI() {
+ val dataModel = object : DataLoadModel<LedgerRecord>(context!!) {
+ override fun loadDataByRefresh() {
+ onSuccess(ledgerRecords)
+ }
+
+ override fun loadDataByLoadMore(page: Int) {
+ onPage(2, 1)
+ onSuccess(emptyList())
+ }
+ }
+ recyclerViewPanel = object : RecyclerViewPanel<LedgerRecord>(dataModel, recycler_view, context, refresh_layout) {
+ override fun getItemLayoutId(): Int? = R.layout.item_image_chose
+
+ override fun addSection(dataList: MutableList<MySection<LedgerRecord>>) {
+ super.addSection(dataList)
+ //姣忎釜LedgerRecord浠ｈ〃涓�椤瑰彴璐︼紝鍏朵腑鍖呭惈鎵�鏈夌殑鍥剧墖
+ // 灏嗘瘡椤瑰彴璐︾殑鍚嶇О浣滀负鍒嗛殧鏍囬
+ val result = mutableListOf<MySection<LedgerRecord>>()
+ dataList.forEach {
+ // 鍒嗗壊鏍囬
+ result.add(MySection(true, it.t.ledgerName, LedgerRecord()))
+ // 鍙拌处鍥剧墖
+ it.t.path1?.split(";")?.forEach { url ->
+ result.add(MySection(LedgerRecord(
+ path1 = viewModel.application.ROOT_URL_RELEASE_IMAGE_2 + url,
+ // FIXME: 2022/4/13 姝ゅ鍊熺敤璇ュ瓧娈佃褰曞浘鐗囨槸鍚﹁閫変腑锛屽搴旂晫闈㈠睍绀虹浉搴旈�変腑鏁堟灉
+ upLoad = false
+ )))
+ }
+ }
+ dataList.clear()
+ dataList.addAll(result)
+ }
+
+ override fun onBindSectionView(holder: BaseCustomViewHolder?, item: MySection<LedgerRecord>?) {
+ super.onBindSectionView(holder, item)
+ item?.let {
+ holder?.setText(R.id.tv_section_head, it.header)
+ }
+ }
+
+ override fun onBindView(holder: BaseCustomViewHolder, item: MySection<LedgerRecord>?) {
+ item?.let {
+ holder.addOnClickListener(R.id.img_photo)
+ .addOnClickListener(R.id.fl_chose)
+ //鍥剧墖鏄惁閫変腑鍒ゆ柇
+ .setImageResource(R.id.img_chose, if (it.t.upLoad == true) R.drawable.ic_check_green_a700_24dp else R.color.white)
+ .getView<ImageView>(R.id.img_photo).let { i ->
+ Glide.with(this@PicEvidenceFragment).load(it.t.path1).into(i)
+ }
+ }
+ }
+
+ override fun onItemChildClick(adapter: BaseQuickAdapter<Any?, BaseViewHolder>, view: View, position: Int, dataList: List<LedgerRecord>) {
+ super.onItemChildClick(adapter, view, position, dataList)
+ when (view.id) {
+ // 鏀惧ぇ鍥剧墖
+ R.id.img_photo -> {
+ val paths = ArrayList<String>()
+ var pos = position
+ for (i in dataList.indices) {
+ val d = dataList[i]
+ if (d.path1 == null) {
+ if (position > i) pos--
+ } else {
+ paths.add(d.path1!!)
+ }
+ }
+ PhotoViewerActivity2.goto(activity, paths, pos)
+ }
+ // 閫夋嫨鍥剧墖
+ R.id.fl_chose -> {
+ val d = dataList[position]
+ viewModel.chosePic(d.path1 ?: "",{
+ d.upLoad = it
+ adapter.notifyItemChanged(position)
+ },{ toast(it) })
+ }
+ }
+ }
+
+
+ override fun getMyLayoutManager(): RecyclerView.LayoutManager = StaggeredGridLayoutManager(3, LinearLayoutManager.VERTICAL)
+// GridLayoutManager(activity, 3, LinearLayoutManager.VERTICAL, false).apply {
+// spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+// override fun getSpanSize(p0: Int): Int {
+// return if (adapter?.getItemViewType(p0) == BaseRecyclerAdapter.SECTION_HEADER_VIEW) {
+// spanCount
+// } else {
+// 1
+// }
+// }
+// }
+// }
+
+ override fun needSwipeRefresh(): Boolean = false
+ }.also {
+ it.init()
+ it.startRefresh()
+ }
+ }
+
+ private fun initObserver() {
+ // 鐩戝惉娓呯┖鎸夐挳浜嬩欢
+ viewModel.selectedImgUrls.observe(this, Observer {
+ if (it?.size == 0) {
+ recyclerViewPanel.adapter?.apply {
+ data.forEach {s ->
+ s.t.upLoad = false
+ }
+ notifyDataSetChanged()
+ }
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceViewModel.kt
new file mode 100644
index 0000000..585bd80
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/PicEvidenceViewModel.kt
@@ -0,0 +1,106 @@
+package cn.flightfeather.thirdappmodule.module.inspection
+
+import android.arch.lifecycle.MutableLiveData
+import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
+import cn.flightfeather.thirdappmodule.model.bean.LedgerRecord
+import cn.flightfeather.thirdappmodule.model.bean.UserMap
+import cn.flightfeather.thirdappmodule.model.enumreation.SceneType
+import cn.flightfeather.thirdappmodule.module.base.BaseViewModel
+import cn.flightfeather.thirdappmodule.repository.LedgerRepository
+import cn.flightfeather.thirdappmodule.repository.UserInfoRepository
+
+/**
+ * @author riku
+ * Date:2022/4/12
+ *
+ */
+class PicEvidenceViewModel : BaseViewModel() {
+
+ private val userInfoRepository = UserInfoRepository.instance
+ private var ledgerRepository = LedgerRepository.instance
+
+ private var tzUserId: String? = null
+
+ // 鍙拌处璁板綍
+ val ledgerTypes = MutableLiveData<LinkedHashMap<String, MutableList<LedgerRecord>>>()
+
+ // 鐢ㄦ埛閫夋嫨鐨勯棶棰樺浘鐗�
+ val selectedImgUrls = MutableLiveData<MutableList<String>>().apply { value = mutableListOf() }
+
+ /**
+ * 鏍规嵁椋炵窘鐩戠鐨勫満鏅痠d锛岃幏鍙栭缇界幆澧冪郴缁熶腑瀵瑰簲鐨勭敤鎴穒d
+ */
+ private fun getTZUserId(sceneId: String, s: () -> Unit) {
+ userInfoRepository.getTZId(sceneId, object : ResultCallBack<UserMap> {
+ override fun onSuccess(result: UserMap?) {
+ result?.let {
+ this@PicEvidenceViewModel.tzUserId = it.tzUserId
+ s()
+ }
+ }
+
+ override fun onFailure() {
+ ledgerTypes.value = null
+ }
+ })
+ }
+
+ private fun getLedgerRecord(userId: String, sceneType: Int, time: String) {
+ ledgerRepository.getLedgerRecord(userId, sceneType, time, object : ResultCallBack<List<LedgerRecord>> {
+ override fun onSuccess(result: List<LedgerRecord>?) {
+ val map = linkedMapOf<String, MutableList<LedgerRecord>>()
+ result?.forEach {
+ if (!map.containsKey(it.ledgerType) && it.ledgerType != null) {
+ map[it.ledgerType!!] = mutableListOf()
+ }
+ map[it.ledgerType]?.add(it)
+ }
+ ledgerTypes.value = map
+ }
+
+ override fun onFailure() {
+ ledgerTypes.value = null
+ }
+ })
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏌愭湀鍙拌处璁板綍
+ */
+ fun searchLedgerRecord(sceneId: String, sceneType: Int, time: String) {
+ val tzSceneType = SceneType.typeMap(sceneType)
+ if (tzUserId == null) {
+ getTZUserId(sceneId) {
+ getLedgerRecord(tzUserId!!, tzSceneType, time)
+ }
+ } else {
+ getLedgerRecord(tzUserId!!, tzSceneType, time)
+ }
+ }
+
+ /**
+ * 閫夊彇鍥剧墖
+ */
+ fun chosePic(url: String, success: (isAdd: Boolean) -> Unit, fail: (err: String) -> Unit) {
+ if (selectedImgUrls.value?.contains(url) == true) {
+ selectedImgUrls.value?.remove(url)
+ success(false)
+ } else {
+ if (selectedImgUrls.value?.size == PicEvidenceActivity.MAX_PIC) {
+ fail("鍥剧墖鏈�澶氶�夊彇${PicEvidenceActivity.MAX_PIC}寮�")
+ } else {
+ selectedImgUrls.value?.add(url)
+ success(true)
+ }
+ }
+ selectedImgUrls.value = selectedImgUrls.value
+ }
+
+ /**
+ * 娓呯┖鎵�閫夊浘鐗�
+ */
+ fun clearPic() {
+ selectedImgUrls.value?.clear()
+ selectedImgUrls.value = selectedImgUrls.value
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/ShareProblemPreViewActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/ShareProblemPreViewActivity.kt
index c33cef2..b4a0789 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/ShareProblemPreViewActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/ShareProblemPreViewActivity.kt
@@ -23,6 +23,7 @@
import org.jetbrains.anko.doAsync
import java.io.File
import java.util.*
+import java.util.concurrent.TimeUnit
/**
* @author riku
@@ -59,6 +60,7 @@
}
private fun merge() {
+ Glide.get(this).clearMemory()
doAsync {
if (infoList.isNullOrEmpty()) {
return@doAsync
@@ -75,9 +77,9 @@
vo.mediaFileList?.forEach {
val url = it.second
val bitmap = Glide.with(this@ShareProblemPreViewActivity)
- .asBitmap()
- .load(url)
- .submit().get()
+ .asBitmap()
+ .load(url)
+ .submit().get(20L, TimeUnit.SECONDS)
if (it.first) {
changeImageList.add(bitmap)
} else {
@@ -122,7 +124,7 @@
when (v?.id) {
R.id.txt_back -> onBackPressed()
R.id.txt_share -> {
- Observable.create<File> {emitter ->
+ val d = Observable.create<File> {emitter ->
val path = getExternalFilesDir(DIRECTORY_PODCASTS)?.path
path?.let {
SystemServiceUtils.saveBitmap(it, resultBitmap)
@@ -143,6 +145,7 @@
intent.type = "image/*"
startActivity(Intent.createChooser(intent, "鍒嗕韩鍥剧墖"))
}
+ disposableList.add(d)
}
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspectioninfo/InspectionInfoFragment.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspectioninfo/InspectionInfoFragment.kt
index f1ffb83..61c35d0 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspectioninfo/InspectionInfoFragment.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspectioninfo/InspectionInfoFragment.kt
@@ -243,7 +243,7 @@
}
}
//闂鍒楄〃涓嶄负绌哄垯琛ㄧず鏈夊紓甯哥殑闂(鍙兘闂绫诲瀷涓嶅瓨鍦ㄦ垨涓虹┖), 閮藉綊绫讳负"鍏朵粬"绫诲瀷
- if (!problemlistVos!!.isEmpty()) {
+ if (problemlistVos!!.isNotEmpty()) {
val problemCategoryVo = problemCategories[problemCategories.size - 1] //寰楀埌鈥滃叾浠栤�濊繖涓棶棰樼被鍨嬶紙鏌ヨ鏃跺凡鎺掑簭锛�
problemCategoryVo.problemlistVos.addAll(problemlistVos)
//鎬婚棶棰樻暟绱姞
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/login/CardFragment.java b/app/src/main/java/cn/flightfeather/thirdappmodule/module/login/CardFragment.java
index db43ad9..0307155 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/login/CardFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/login/CardFragment.java
@@ -241,6 +241,7 @@
protected void loginSuccess() {
startActivity(new Intent(getActivity(), MainActivity.class));
+// startActivity(new Intent(getActivity(), TestActivity.class));
}
//鐧诲綍鎸夐挳鐨勭偣鍑讳簨浠�
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
index 0bcebe7..44dee2b 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
@@ -4,6 +4,7 @@
import cn.flightfeather.thirdappmodule.common.net.ResultObserver
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
import cn.flightfeather.thirdappmodule.httpservice.CommonService
+import cn.flightfeather.thirdappmodule.httpservice.DomainItemService
import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType
import cn.flightfeather.thirdappmodule.repository.dao.MediaTypeAliasDao
import io.reactivex.schedulers.Schedulers
@@ -18,7 +19,12 @@
* Date: 2020/4/23
*/
class CommonRepository {
+ companion object {
+ @JvmStatic
+ val instance: CommonRepository by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { CommonRepository()}
+ }
private val mediaTypeAliasDao = MediaTypeAliasDao()
+ val retrofit = RetrofitFactory.instance.retrofit
fun upLoadCrashInfo(accountName: String, file: File, resultCallBack: ResultCallBack<Boolean>) {
val builder = MultipartBody.Builder()
@@ -43,9 +49,27 @@
/**
* 鑾峰彇鈥滀换鎰忔媿鈥濇ā鍧楀睍绀虹殑鍥剧墖绫诲瀷
+ * @date 2025.7.1 淇敼涓轰粠鏈嶅姟绔繙绋嬭幏鍙栵紝骞朵慨鏀硅繑鍥炵被鍨�
*/
fun getMediaFileTypes(sceneTypeId: Int, resultCallBack: ResultCallBack<List<MediaFileType>>) {
- resultCallBack.onSuccess(MediaFileType.getList(sceneTypeId))
+// resultCallBack.onSuccess(MediaFileType.getList(sceneTypeId))
+
+ val service = retrofit.create(DomainItemService::class.java).getMediaFileType(sceneTypeId)
+
+ RetrofitFactory.executeResult(service, object : ResultObserver<Map<String?, String?>>() {
+ override fun onSuccess(result: Map<String?, String?>?) {
+ val res = mutableListOf<MediaFileType>()
+ result?.forEach { (t, u) ->
+ if (t == null || u == null) return@forEach
+ res.add(MediaFileType(t.toInt(), u))
+ }
+ resultCallBack.onSuccess(res)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
}
/**
@@ -53,7 +77,7 @@
* @param sceneTypeId 鍦烘櫙id
* @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
*/
- fun getAlias(sceneTypeId: Int, mediaFileType: MediaFileType, resultCallBack: ResultCallBack<String>) {
+ fun getAlias(sceneTypeId: Int, mediaFileType: Int, resultCallBack: ResultCallBack<String>) {
val dbService = mediaTypeAliasDao.getAlias(sceneTypeId, mediaFileType)
.map { Response.success(it) }
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/LedgerRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/LedgerRepository.kt
new file mode 100644
index 0000000..ac1d7e3
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/LedgerRepository.kt
@@ -0,0 +1,49 @@
+package cn.flightfeather.thirdappmodule.repository
+
+import cn.flightfeather.thirdappmodule.bean.entity.Userinfo
+import cn.flightfeather.thirdappmodule.common.net.ResponseBodyCallBack
+import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
+import cn.flightfeather.thirdappmodule.common.net.ResultObserver
+import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
+import cn.flightfeather.thirdappmodule.httpservice.LedgerService
+import cn.flightfeather.thirdappmodule.httpservice.UserInfoService
+import cn.flightfeather.thirdappmodule.model.bean.LedgerRecord
+import cn.flightfeather.thirdappmodule.model.bean.UserMap
+
+/**
+ * @author riku
+ * Date: 2021/7/21
+ * 杩炴帴椋炵窘鐜绯荤粺
+ * 鍙拌处鐩稿叧鏁版嵁鎺ュ彛
+ */
+class LedgerRepository private constructor(){
+
+ companion object {
+ @JvmStatic
+ val instance: LedgerRepository by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { LedgerRepository()}
+ }
+
+ private val retrofit = RetrofitFactory.instance.retrofit2
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏌愭湀鍙拌处璁板綍
+ * @param userId 锛堥缇界幆澧冪郴缁熶腑锛夌敤鎴穒d
+ * @param sceneType 锛堥缇界幆澧冪郴缁熶腑锛夊満鏅被鍨嬶紝涓庢湰绯荤粺涓嶅悓锛岄渶瑕佽浆鎹�
+ * @param time 鏌ヨ鏃堕棿锛寉yyy-mm
+ */
+ fun getLedgerRecord(userId: String, sceneType: Int, time: String, resultCallBack: ResultCallBack<List<LedgerRecord>>) {
+ val service = retrofit.create(LedgerService::class.java).getRecord(userId, sceneType, time)
+
+ RetrofitFactory.executeResult(service, object : ResultObserver<List<LedgerRecord>>() {
+ override fun onSuccess(result: List<LedgerRecord>?) {
+ resultCallBack.onSuccess(result)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
+
+// fun getLedgerType(sceneType: Int, resultCallBack: ResultCallBack<List<LedgerRecord>>)
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/UserInfoRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/UserInfoRepository.kt
index 2a8512b..c817047 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/UserInfoRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/UserInfoRepository.kt
@@ -5,6 +5,7 @@
import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
import cn.flightfeather.thirdappmodule.httpservice.UserInfoService
+import cn.flightfeather.thirdappmodule.model.bean.UserMap
/**
* @author riku
@@ -41,4 +42,13 @@
retrofit.create(UserInfoService::class.java).getUserByTypeId(userTypeId.toByte())
.enqueue(ResponseBodyCallBack(resultCallBack))
}
+
+
+ /**
+ * 鏍规嵁椋炵窘鐩戠鐨勫満鏅痠d锛岃幏鍙栭缇界幆澧冪郴缁熶腑瀵瑰簲鐨勭敤鎴穒d
+ */
+ fun getTZId(sceneId: String, resultCallBack: ResultCallBack<UserMap>) {
+ retrofit.create(UserInfoService::class.java).getTZId(sceneId)
+ .enqueue(ResponseBodyCallBack(resultCallBack))
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/dao/MediaTypeAliasDao.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/dao/MediaTypeAliasDao.kt
index 693c5ab..7af0ce2 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/dao/MediaTypeAliasDao.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/dao/MediaTypeAliasDao.kt
@@ -17,11 +17,11 @@
* @param sceneTypeId 鍦烘櫙id
* @param mediaFileType 濯掍綋鏂囦欢绫诲瀷id
*/
- fun getAlias(sceneTypeId: Int, mediaFileType: MediaFileType): Observable<String> {
+ fun getAlias(sceneTypeId: Int, mediaFileType: Int): Observable<String> {
return DbFactory.getGreenDaoObservable().map {
it.mediaTypeAliasDao.queryBuilder().where(
MediaTypeAliasDao.Properties.SceneTypeId.eq(sceneTypeId),
- MediaTypeAliasDao.Properties.TypeId.eq(mediaFileType.value)
+ MediaTypeAliasDao.Properties.TypeId.eq(mediaFileType)
).list()
}.map {
if (it.isEmpty()) {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/task/CompressPhotoTask.java b/app/src/main/java/cn/flightfeather/thirdappmodule/task/CompressPhotoTask.java
index 3bfa182..ad38672 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/task/CompressPhotoTask.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/task/CompressPhotoTask.java
@@ -47,38 +47,42 @@
String fileName = mediafile.getGuid()+".jpg";
File outputFile = new File(Environment.getExternalStorageDirectory(),path+fileName);
outputFile.getParentFile().mkdirs();
+
BitmapFactory.Options opts = new BitmapFactory.Options();
//灏嗗浘鐗囩殑闀垮缂╁皬涓�1/2
opts.inSampleSize = 2;
- Bitmap bm = BitmapFactory.decodeFile(file.getAbsolutePath(),opts);
+ Bitmap bm = BitmapFactory.decodeFile(file.getAbsolutePath(), opts);
int aa = bm.getHeight();
int bb = bm.getWidth();
- Log.i("bitmap",bm.getHeight()+" "+bm.getWidth());
+ Log.i("bitmap", bm.getHeight() + " " + bm.getWidth());
//鍘嬬缉缂╃暐鍥�
Bitmap bmSmall = null;
int normalSize = 1440;
- int width,height = 0;
- if (bm.getWidth()>=bm.getHeight()){
+ int width, height = 0;
+ if (bm.getWidth() >= bm.getHeight()) {
width = normalSize;
- height = normalSize*bm.getHeight()/bm.getWidth();
- }else {
- height =normalSize;
- width = normalSize*bm.getWidth()/bm.getHeight();
+ height = normalSize * bm.getHeight() / bm.getWidth();
+ } else {
+ height = normalSize;
+ width = normalSize * bm.getWidth() / bm.getHeight();
}
- if (bm!=null){
- bmSmall= Bitmap.createScaledBitmap(bm,width,height,true);
+ if (bm != null) {
+ bmSmall = Bitmap.createScaledBitmap(bm, width, height, true);
try {
- bmSmall.compress(Bitmap.CompressFormat.JPEG, 80, new FileOutputStream(outputFile.getAbsolutePath()));
- Log.i("compress success",outputFile.getAbsolutePath());
+ // 褰撳浘鐗囧ぇ浜�1MB鏃讹紝鎵嶄細杩涜鍘嬬缉澶勭悊
+ if (file.length() > 1024L * 1024) {
+ bmSmall.compress(Bitmap.CompressFormat.JPEG, 80, new FileOutputStream(outputFile.getAbsolutePath()));
+ } else {
+ bmSmall.compress(Bitmap.CompressFormat.JPEG, 100, new FileOutputStream(outputFile.getAbsolutePath()));
+ }
+ Log.i("compress success", outputFile.getAbsolutePath());
outputFIleList.add(outputFile);
- bm.recycle();
- bm=null;
+ bm.recycle();
bmSmall.recycle();
- bmSmall =null;
} catch (FileNotFoundException e) {
e.printStackTrace();
- Log.i("compress failure",outputFile.getAbsolutePath());
+ Log.i("compress failure", outputFile.getAbsolutePath());
}
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/crashreport/MyCrashHandler.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/crashreport/MyCrashHandler.kt
index f3e135d..7844acb 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/crashreport/MyCrashHandler.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/crashreport/MyCrashHandler.kt
@@ -35,7 +35,7 @@
private var mDefaultCrashHandler: Thread.UncaughtExceptionHandler? = null
- private val commonRepository: CommonRepository = CommonRepository()
+ private val commonRepository: CommonRepository = CommonRepository.instance
private var accountName = ""
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/util/tbs/Tbs.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/util/tbs/Tbs.kt
index fa73526..88819e3 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/util/tbs/Tbs.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/util/tbs/Tbs.kt
@@ -1,8 +1,10 @@
package cn.flightfeather.thirdappmodule.util.tbs
import android.content.Context
+import android.util.Log
import com.tencent.smtt.sdk.QbSdk
-
+import com.tencent.smtt.sdk.TbsDownloader
+import com.tencent.smtt.sdk.TbsListener
/**
@@ -13,6 +15,7 @@
class Tbs {
companion object {
+ private const val TAG = "Tbs"
fun init(applicationContext: Context) {
//鎼滈泦鏈湴tbs鍐呮牳淇℃伅骞朵笂鎶ユ湇鍔″櫒锛屾湇鍔″櫒杩斿洖缁撴灉鍐冲畾浣跨敤鍝釜鍐呮牳銆�
@@ -22,14 +25,47 @@
override fun onViewInitFinished(arg0: Boolean) {
// TODO Auto-generated method stub
//x5鍏ф牳鍒濆鍖栧畬鎴愮殑鍥炶皟锛屼负true琛ㄧずx5鍐呮牳鍔犺浇鎴愬姛锛屽惁鍒欒〃绀簒5鍐呮牳鍔犺浇澶辫触锛屼細鑷姩鍒囨崲鍒扮郴缁熷唴鏍搞��
-
+ println("QbSdk.initX5Environment---$arg0")
}
override fun onCoreInitFinished() {
// TODO Auto-generated method stub
+ println("QbSdk.initX5Environment---finished")
}
}
//x5鍐呮牳鍒濆鍖栨帴鍙�
+ QbSdk.setDownloadWithoutWifi(true)
+
+ /* SDK鍐呮牳鍒濆鍖栧懆鏈熷洖璋冿紝鍖呮嫭 涓嬭浇銆佸畨瑁呫�佸姞杞� */
+ QbSdk.setTbsListener(object : TbsListener {
+ /**
+ * @param stateCode 鐢ㄦ埛鍙鐞嗛敊璇爜璇峰弬鑰僛com.tencent.smtt.sdk.TbsCommonCode]
+ */
+ override fun onDownloadFinish(stateCode: Int) {
+ Log.i(TAG, "onDownloadFinished: $stateCode")
+ }
+
+ /**
+ * @param stateCode 鐢ㄦ埛鍙鐞嗛敊璇爜璇峰弬鑰僛com.tencent.smtt.sdk.TbsCommonCode]
+ */
+ override fun onInstallFinish(stateCode: Int) {
+ Log.i(TAG, "onInstallFinished: $stateCode")
+ }
+
+ /**
+ * 棣栨瀹夎搴旂敤锛屼細瑙﹀彂鍐呮牳涓嬭浇锛屾鏃朵細鏈夊唴鏍镐笅杞界殑杩涘害鍥炶皟銆�
+ * @param progress 0 - 100
+ */
+ override fun onDownloadProgress(progress: Int) {
+ Log.i(TAG, "Core Downloading: $progress")
+ }
+ })
+
+ val needDownLoad = TbsDownloader.needDownload(applicationContext, TbsDownloader.DOWNLOAD_OVERSEA_TBS)
+ if (needDownLoad) {
+ TbsDownloader.startDownload(applicationContext)
+ }
+
QbSdk.initX5Environment(applicationContext, cb)
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/view/BannerView.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/view/BannerView.kt
index d937b4c..6b7357f 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/view/BannerView.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/view/BannerView.kt
@@ -9,17 +9,20 @@
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import android.widget.TextView
+import android.widget.*
import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.adapter.AllListViewAdapter
+import cn.flightfeather.thirdappmodule.bean.entity.Province
import cn.flightfeather.thirdappmodule.util.dp
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.activity_scense_detail.*
import org.jetbrains.anko.alignParentBottom
import org.jetbrains.anko.alignParentEnd
+import org.jetbrains.anko.alignParentStart
import org.jetbrains.anko.backgroundResource
+import kotlin.collections.ArrayList
/**
@@ -29,15 +32,15 @@
*/
class BannerView : RelativeLayout {
- constructor(context: Context) : super(context){
+ constructor(context: Context) : super(context) {
mContext = context
}
- constructor(context: Context, attrs: AttributeSet?) : super(context, attrs){
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
mContext = context
}
- constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr){
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
mContext = context
}
@@ -46,6 +49,7 @@
private val viewPager = MyViewPager(context)
private val dots = LinearLayout(context)
private val index = LinearLayout(context)
+ private val spinner = Spinner(context)
private var currentIndex: TextView? = null
private var curPos = 0
private var lastPos = 0
@@ -62,6 +66,12 @@
initDots()
initIndex()
// initObservable()
+ }
+
+ var menus = listOf<String>()
+ set(value) {
+ field = value
+ initSpinner()
}
fun refresh() {
@@ -86,7 +96,7 @@
}.subscribe()
}
- private fun initViewPager(){
+ private fun initViewPager() {
val viewPagerParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
viewPager.adapter = ViewPagerAdapter(dataList)
viewPager.currentItem = 0
@@ -106,7 +116,9 @@
dots.getChildAt(newPos).isEnabled = true
lastPos = newPos
- (index.getChildAt(0) as TextView).text = "${p0 + 1}"
+ (index.getChildAt(0) as TextView).text = "${newPos + 1}"
+
+ spinner.setSelection(newPos)
}
})
@@ -171,4 +183,28 @@
addView(index)
}
+ private fun initSpinner() {
+ val spinnerParams = LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+ spinnerParams.alignParentBottom()
+ spinnerParams.alignParentStart()
+
+ spinner.apply {
+ adapter = object : AllListViewAdapter<String>(ArrayList(menus), R.layout.item_spinner_drop_down_custom) {
+ override fun bindView(holder: ViewHolder, obj: String) {
+ holder.setText(R.id.text1, obj)
+ }
+ }
+ onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+ override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+ override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+ viewPager.setCurrentItem(position, true)
+ }
+ }
+ layoutParams = spinnerParams
+ background = ContextCompat.getDrawable(context, R.drawable.shape_black_spinner)
+ setPadding(0, 0, 20.dp, 0)
+ }
+ addView(spinner)
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
new file mode 100644
index 0000000..a112af5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#FFFFFF" android:pathData="M7,10l5,5 5,-5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_photo_viewer_2.xml b/app/src/main/res/layout/activity_photo_viewer_2.xml
new file mode 100644
index 0000000..bfab466
--- /dev/null
+++ b/app/src/main/res/layout/activity_photo_viewer_2.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:background="@android:color/black">
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/view_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <TextView
+ android:id="@+id/tv_page"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/ToolbarTitleStyle"
+ tools:text="1/7"
+ android:padding="@dimen/dimen4"
+ android:background="@color/gray"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pic_evidence.xml b/app/src/main/res/layout/activity_pic_evidence.xml
new file mode 100644
index 0000000..d7a9bd2
--- /dev/null
+++ b/app/src/main/res/layout/activity_pic_evidence.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_toolbar"
+ android:visibility="visible"
+ android:layout_width="match_parent"
+ android:layout_height="46dp"
+ android:background="@color/colorPrimary"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/img_back"
+ android:layout_width="40dp"
+ android:layout_height="0dp"
+ android:padding="12dp"
+ android:clickable="true"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:src="@drawable/icon_back_white"
+ android:focusable="true" />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:textColor="@color/white"
+ android:gravity="center"
+ android:singleLine="true"
+ android:textSize="16sp"
+ android:text="鍥剧墖鍙栬瘉"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+ <TextView
+ android:id="@+id/tv_menu"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ tools:text="2022骞�"
+ android:gravity="center"
+ android:singleLine="true"
+ android:drawableEnd="@drawable/ic_baseline_arrow_drop_down_24"
+ android:textColor="@color/white"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:src="@drawable/selector_start_end_task" />
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/rv_month"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/cl_toolbar"
+ tools:listitem="@layout/item_single_text"
+ tools:itemCount="6"
+ app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+ android:orientation="horizontal"/>
+
+ <include
+ android:id="@+id/layout_v"
+ layout="@layout/layout_tab_viewpager"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@id/rv_month"
+ app:layout_constraintBottom_toTopOf="@id/cl_submit"/>
+
+ <include
+ android:id="@+id/layout_e"
+ android:visibility="gone"
+ layout="@layout/layout_empty_view"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@id/rv_month"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_submit"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:background="@android:color/white"
+ android:elevation="@dimen/dimen4"
+ tools:ignore="UnusedAttribute"
+ android:padding="@dimen/dimen8">
+
+ <TextView
+ android:id="@+id/tv_selected"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ tools:text="宸查��(0/3)"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"/>
+
+ <TextView
+ android:id="@+id/btn_fail"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toStartOf="@id/btn_pass"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:foreground="?attr/selectableItemBackground"
+ android:text="娓呯┖"
+ android:textSize="12sp"
+ android:layout_marginEnd="@dimen/dimen2"
+ android:elevation="@dimen/dimen4"
+ android:textStyle="bold">
+ </TextView>
+
+ <TextView
+ android:id="@+id/btn_pass"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ style="@style/TextButtonStyle.DialogPositive"
+ android:foreground="?attr/selectableItemBackground"
+ android:text="鎻愪氦"
+ android:textSize="12sp"
+ android:textStyle="bold">
+ </TextView>
+
+ </android.support.constraint.ConstraintLayout>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
new file mode 100644
index 0000000..3e5b4d3
--- /dev/null
+++ b/app/src/main/res/layout/activity_test.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <Button
+ android:id="@+id/btn_test"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:text="@string/yes"/>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_office_file.xml b/app/src/main/res/layout/fragment_office_file.xml
index a217b40..cd31e77 100644
--- a/app/src/main/res/layout/fragment_office_file.xml
+++ b/app/src/main/res/layout/fragment_office_file.xml
@@ -7,8 +7,14 @@
<include layout="@layout/tool_bar_layout"/>
- <FrameLayout
- android:id="@+id/tbs_reader_container"
+<!-- <FrameLayout-->
+<!-- android:id="@+id/tbs_reader_container"-->
+<!-- android:layout_width="match_parent"-->
+<!-- android:layout_height="match_parent"-->
+<!-- app:layout_behavior="@string/appbar_scrolling_view_behavior"/>-->
+
+ <com.tencent.smtt.sdk.WebView
+ android:id="@+id/web_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index 96f6523..065a4d1 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -24,13 +24,13 @@
android:id="@+id/text_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鐗堟湰 V1.1.7"
- android:textSize="@dimen/textSize_notes"
- android:textColor="@color/white"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="16dp"
- android:layout_marginBottom="@dimen/dimen8"/>
+ android:layout_marginBottom="@dimen/dimen8"
+ android:text="鐗堟湰 V1.1.7"
+ android:textColor="@color/white"
+ android:textSize="@dimen/textSize_notes" />
<LinearLayout
android:id="@+id/ll_container_usericon"
diff --git a/app/src/main/res/layout/item_image_chose.xml b/app/src/main/res/layout/item_image_chose.xml
new file mode 100644
index 0000000..de013ea
--- /dev/null
+++ b/app/src/main/res/layout/item_image_chose.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_height="@dimen/grid_image_size"
+ android:layout_width="@dimen/grid_image_size"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_gravity="center"
+ android:layout_marginBottom="@dimen/dimen4">
+ <ImageView
+ android:id="@+id/img_photo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ android:scaleType="centerCrop"
+ android:layout_gravity="center_horizontal" />
+
+ <FrameLayout
+ android:id="@+id/fl_chose"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingBottom="@dimen/dimen16"
+ tools:ignore="RtlSymmetry">
+ <ImageView
+ android:id="@+id/img_chose"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:visibility="visible"
+ android:src="@drawable/ic_check_green_a700_24dp"
+ android:background="@drawable/bg_btngroup_2"
+ android:elevation="@dimen/dimen2"
+ tools:ignore="UnusedAttribute" />
+ </FrameLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_single_text.xml b/app/src/main/res/layout/item_single_text.xml
new file mode 100644
index 0000000..bc5779c
--- /dev/null
+++ b/app/src/main/res/layout/item_single_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/tv_text"
+ tools:text="01鏈�"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="12dp"
+ android:paddingEnd="12dp"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:layout_margin="@dimen/dimen8"
+ android:textSize="12sp"
+ android:gravity="center"
+ android:textColor="@color/main_color_3"
+ android:background="@drawable/selector_bg_blue_or_white">
+</TextView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_spinner_drop_down_custom.xml b/app/src/main/res/layout/item_spinner_drop_down_custom.xml
new file mode 100644
index 0000000..94f4eac
--- /dev/null
+++ b/app/src/main/res/layout/item_spinner_drop_down_custom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/text1"
+ style="?android:attr/spinnerDropDownItemStyle"
+ android:singleLine="false"
+ android:textSize="14sp"
+ tools:text="@string/app_name"
+ android:maxLines="1"
+ android:padding="@dimen/dimen8"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end" />
diff --git a/app/src/main/res/layout/page_patrol_icons_second.xml b/app/src/main/res/layout/page_patrol_icons_second.xml
index 3c0d38e..78ec8a6 100644
--- a/app/src/main/res/layout/page_patrol_icons_second.xml
+++ b/app/src/main/res/layout/page_patrol_icons_second.xml
@@ -98,8 +98,6 @@
android:layout_height="0dp"
android:gravity="center_vertical"
android:layout_weight="1"
- android:clickable="true"
- android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<LinearLayout
@@ -140,7 +138,8 @@
android:text="鏁存敼瀹℃牳" />
</LinearLayout>
<LinearLayout
- android:visibility="invisible"
+ android:id="@+id/ln_patrol_pic_evidence"
+ android:visibility="visible"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -149,11 +148,11 @@
<ImageView
style="@style/patrol_img_item"
- android:background="@drawable/icon_patrol_rate" />
+ android:background="@drawable/icon_patrol_new_question" />
<TextView
style="@style/patrol_text_item"
- android:text="@string/colligate_score" />
+ android:text="鍥剧墖鍙栬瘉" />
</LinearLayout>
<LinearLayout
diff --git a/app/src/main/res/layout/recycler_item_section_head.xml b/app/src/main/res/layout/recycler_item_section_head.xml
index 62a8fb1..76096b5 100644
--- a/app/src/main/res/layout/recycler_item_section_head.xml
+++ b/app/src/main/res/layout/recycler_item_section_head.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4">
+ <TextView
+ android:id="@+id/tv_section_head"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen8"
- android:background="@color/lightGray">
- <TextView
- android:id="@+id/tv_section_head"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/app_name"
- android:background="@android:color/white"
- android:textColor="@color/gray"
- android:elevation="0.5dp">
+ android:text="@string/app_name"
+ android:textColor="@color/main_color_2"
+ android:padding="@dimen/dimen4">
</TextView>
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..dc0b75f
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <item name="spinner_item" type="id" />
+</resources>
\ No newline at end of file
diff --git a/appsupervision/build.gradle b/appsupervision/build.gradle
index b80d30d..b4daf8f 100644
--- a/appsupervision/build.gradle
+++ b/appsupervision/build.gradle
@@ -11,8 +11,8 @@
applicationId "cn.flightfeather.thirdapp"
minSdkVersion 19
targetSdkVersion 28
- versionCode 33
- versionName "1.1.14.17"
+ versionCode 34
+ versionName "1.1.14.18"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 25
diff --git a/build.gradle b/build.gradle
index ee7a446..e4eabf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,22 +16,21 @@
}
repositories {
- jcenter()
mavenCentral()
- google()
- maven {
- url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
- }
-// maven {
-// url "https://plugins.gradle.org/m2/"
-// }
+ maven { url 'https://maven.aliyun.com/repository/public'}
+ maven { url 'https://maven.aliyun.com/repository/central' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+ maven { url "https://jitpack.io" }
+// google()
+// jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' // add plugin
// NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
+ // in the individual module build.gradle files///////////////////////////////////////////////
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0'
@@ -46,11 +45,14 @@
allprojects {
repositories {
- maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+ mavenCentral()
+ maven { url 'https://maven.aliyun.com/repository/public' }
+ maven { url 'https://maven.aliyun.com/repository/central' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url "https://jitpack.io" }
- jcenter()
- google()
- maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
+// google()
+// jcenter()
}
// configurations.all {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 452a0c2..c5364c5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,3 +4,4 @@
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#distributionUrl=file\:///E:/android/gradle/gradle-5.6.4-all.zip
\ No newline at end of file
diff --git a/moduleBase/build.gradle b/moduleBase/build.gradle
index f76b913..cc44f3a 100644
--- a/moduleBase/build.gradle
+++ b/moduleBase/build.gradle
@@ -4,7 +4,7 @@
}
android {
- compileSdkVersion 30
+ compileSdkVersion 28
defaultConfig {
minSdkVersion 19
diff --git a/multi-image-selector/build.gradle b/multi-image-selector/build.gradle
index 6af7195..3152fa4 100644
--- a/multi-image-selector/build.gradle
+++ b/multi-image-selector/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 27
+ compileSdkVersion 28
defaultConfig {
minSdkVersion 12
- targetSdkVersion 27
+ targetSdkVersion 28
versionCode 1
versionName "1.1"
}
@@ -22,6 +22,6 @@
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:27.1.0'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.squareup.picasso:picasso:2.71828'
}
--
Gitblit v1.9.3