diff --git a/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 1b3e08d..9ecd75d 100644 Binary files a/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ diff --git a/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index e068339..010015d 100644 Binary files a/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/2.14.1/tasks/_listviewlibrary_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 952a90d..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/BaiduLBS_Android.xml b/.idea/libraries/BaiduLBS_Android.xml deleted file mode 100644 index a254f13..0000000 --- a/.idea/libraries/BaiduLBS_Android.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_Msc_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_Msc_jar_unspecified_jar.xml new file mode 100644 index 0000000..c081997 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_Msc_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_com_baidu_tts_2_2_9_20161020_154fa02_release_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_com_baidu_tts_2_2_9_20161020_154fa02_release_jar_unspecified_jar.xml new file mode 100644 index 0000000..0d09417 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_com_baidu_tts_2_2_9_20161020_154fa02_release_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_galaxy_v2_0_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_galaxy_v2_0_jar_unspecified_jar.xml new file mode 100644 index 0000000..0ebad43 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_galaxy_v2_0_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_juniversalchardet_1_0_3_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_juniversalchardet_1_0_3_jar_unspecified_jar.xml new file mode 100644 index 0000000..ca5de00 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___E__reading_android_asProjects_app_libs_juniversalchardet_1_0_3_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml new file mode 100644 index 0000000..9869803 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml new file mode 100644 index 0000000..bf16fff --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0_aar.xml new file mode 100644 index 0000000..c94dd6b --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..0c55e27 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml new file mode 100644 index 0000000..29c0049 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml new file mode 100644 index 0000000..27b1867 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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..c36c954 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0_aar.xml new file mode 100644 index 0000000..15c6ce9 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..2ef25cf --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0_aar.xml new file mode 100644 index 0000000..e14841e --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..782343d --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0_aar.xml new file mode 100644 index 0000000..a355fe7 --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..049507c --- /dev/null +++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml new file mode 100644 index 0000000..3fea121 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml new file mode 100644 index 0000000..83e1a45 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml new file mode 100644 index 0000000..2fee65b --- /dev/null +++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml new file mode 100644 index 0000000..15635ee --- /dev/null +++ b/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml new file mode 100644 index 0000000..f2e418b --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml new file mode 100644 index 0000000..7ba2ddb --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml new file mode 100644 index 0000000..2d8f2ee --- /dev/null +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_core_1_2_1_aar.xml b/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_core_1_2_1_aar.xml new file mode 100644 index 0000000..d936058 --- /dev/null +++ b/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_core_1_2_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_zxing_1_2_1_aar.xml b/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_zxing_1_2_1_aar.xml new file mode 100644 index 0000000..37b3772 --- /dev/null +++ b/.idea/libraries/Gradle__cn_bingoogolapple_bga_qrcode_zxing_1_2_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_0_aar.xml new file mode 100644 index 0000000..370d4e0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..d6b7841 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_0_aar.xml new file mode 100644 index 0000000..07161f6 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..bf2e38a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..bb6dd4d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_0_aar.xml new file mode 100644 index 0000000..d066481 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..f40ec3b --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml new file mode 100644 index 0000000..80e4d73 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml new file mode 100644 index 0000000..4ba760c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml new file mode 100644 index 0000000..65c3bdf --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml new file mode 100644 index 0000000..8d517a0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml new file mode 100644 index 0000000..c0adf88 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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..a6a8bef --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..3ebe406 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..ed53fb6 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_design_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_27_1_0_aar.xml new file mode 100644 index 0000000..a60d8c8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_design_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..605cf73 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..2c0f701 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..b283a4d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..fa7598a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..765537a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..f002ce0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..d7a2636 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_0_aar.xml new file mode 100644 index 0000000..05c93a8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..f4af6cc --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..79d6293 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_0_jar.xml new file mode 100644 index 0000000..0553925 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml new file mode 100644 index 0000000..0fdecce --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_0_aar.xml new file mode 100644 index 0000000..4c01baf --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..5f51b62 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_0_aar.xml new file mode 100644 index 0000000..15dfe7d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..c54479a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_0_aar.xml new file mode 100644 index 0000000..7408bf5 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..2104b57 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_0_aar.xml new file mode 100644 index 0000000..2b34715 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..c79db08 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_0_aar.xml new file mode 100644 index 0000000..621d53e --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml new file mode 100644 index 0000000..950e84b --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_0_aar.xml new file mode 100644 index 0000000..5fe93a4 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml new file mode 100644 index 0000000..f9f3154 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_0_aar.xml new file mode 100644 index 0000000..c77d66d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..3ee0f66 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..9319b71 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1_aar.xml new file mode 100644 index 0000000..f7a2e9f --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..12c1f6f --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml new file mode 100644 index 0000000..2073301 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..e431751 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..3a18a45 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1_aar.xml new file mode 100644 index 0000000..49a7aa9 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1_aar.xml new file mode 100644 index 0000000..91ba9d7 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..c771b01 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_transition_27_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_27_1_0_aar.xml new file mode 100644 index 0000000..0e62c54 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_transition_27_1_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..f9908e1 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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..2b6594d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ 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..ad4f19a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml b/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml new file mode 100644 index 0000000..cdd528a --- /dev/null +++ b/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_facebook_conceal_conceal_1_1_3_aar.xml b/.idea/libraries/Gradle__com_facebook_conceal_conceal_1_1_3_aar.xml new file mode 100644 index 0000000..a79b931 --- /dev/null +++ b/.idea/libraries/Gradle__com_facebook_conceal_conceal_1_1_3_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_35_aar.xml b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_35_aar.xml new file mode 100644 index 0000000..14773b5 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_CymChad_BaseRecyclerViewAdapterHelper_2_9_35_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_6_1_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_6_1_jar.xml new file mode 100644 index 0000000..55f70c3 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_6_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_6_1_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_6_1_jar.xml new file mode 100644 index 0000000..e4fcf74 --- /dev/null +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_6_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_6_1_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_6_1_aar.xml new file mode 100644 index 0000000..8b4562a --- /dev/null +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_6_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_5_2_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_5_2_jar.xml new file mode 100644 index 0000000..4a8629e --- /dev/null +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_5_2_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_6_1_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_6_1_aar.xml new file mode 100644 index 0000000..d8be78a --- /dev/null +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_6_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml new file mode 100644 index 0000000..2f5eebc --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml new file mode 100644 index 0000000..bc71380 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_5_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_2_11_jar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_2_11_jar.xml new file mode 100644 index 0000000..80269b4 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_dagger_dagger_2_11_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_zxing_core_3_3_1_jar.xml b/.idea/libraries/Gradle__com_google_zxing_core_3_3_1_jar.xml new file mode 100644 index 0000000..a28980f --- /dev/null +++ b/.idea/libraries/Gradle__com_google_zxing_core_3_3_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_10_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_10_0_0_aar.xml new file mode 100644 index 0000000..39125b2 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_10_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_8_5_1_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_8_5_1_aar.xml new file mode 100644 index 0000000..2be0e11 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_8_5_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1_aar.xml new file mode 100644 index 0000000..fd924cd --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml new file mode 100644 index 0000000..69da454 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..f64e836 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_10_0_0_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_10_0_0_jar.xml new file mode 100644 index 0000000..59665e3 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_10_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_5_1_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_5_1_jar.xml new file mode 100644 index 0000000..639e46b --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_5_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_8_1_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_8_1_jar.xml new file mode 100644 index 0000000..18477cf --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_8_8_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml new file mode 100644 index 0000000..d8be830 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_jar.xml new file mode 100644 index 0000000..fb916fa --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_10_0_0_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_10_0_0_aar.xml new file mode 100644 index 0000000..103ae75 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_10_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml new file mode 100644 index 0000000..85b1b7d --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ 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..d090ca2 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml b/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml new file mode 100644 index 0000000..056c316 --- /dev/null +++ b/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_rxjava2_adapter_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_lzy_net_okgo_3_0_4_aar.xml b/.idea/libraries/Gradle__com_lzy_net_okgo_3_0_4_aar.xml new file mode 100644 index 0000000..b56ec05 --- /dev/null +++ b/.idea/libraries/Gradle__com_lzy_net_okgo_3_0_4_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_lzy_net_okrx2_2_0_2_aar.xml b/.idea/libraries/Gradle__com_lzy_net_okrx2_2_0_2_aar.xml new file mode 100644 index 0000000..c80b79b --- /dev/null +++ b/.idea/libraries/Gradle__com_lzy_net_okrx2_2_0_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_orhanobut_hawk_2_0_1_aar.xml b/.idea/libraries/Gradle__com_orhanobut_hawk_2_0_1_aar.xml new file mode 100644 index 0000000..c64bbac --- /dev/null +++ b/.idea/libraries/Gradle__com_orhanobut_hawk_2_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_0_4_aar.xml b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_0_4_aar.xml new file mode 100644 index 0000000..fbf2fb7 --- /dev/null +++ b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_0_4_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_haha_haha_2_0_3_jar.xml b/.idea/libraries/Gradle__com_squareup_haha_haha_2_0_3_jar.xml new file mode 100644 index 0000000..6e2aff9 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_haha_haha_2_0_3_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_analyzer_1_5_4_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_analyzer_1_5_4_aar.xml new file mode 100644 index 0000000..9623edd --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_analyzer_1_5_4_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_1_5_4_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_1_5_4_aar.xml new file mode 100644 index 0000000..1b0df9e --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_1_5_4_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_watcher_1_5_4_jar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_watcher_1_5_4_jar.xml new file mode 100644 index 0000000..341e004 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_watcher_1_5_4_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_3_1_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_3_1_jar.xml new file mode 100644 index 0000000..36d0d97 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_3_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_9_1_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_9_1_jar.xml new file mode 100644 index 0000000..cd0ee32 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_9_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml new file mode 100644 index 0000000..3e834aa --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_8_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_8_0_jar.xml new file mode 100644 index 0000000..7c0a96f --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_8_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0_jar.xml new file mode 100644 index 0000000..dcfdbc7 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_3_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml new file mode 100644 index 0000000..3981ae6 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_umeng_analytics_analytics_6_1_4_jar.xml b/.idea/libraries/Gradle__com_umeng_analytics_analytics_6_1_4_jar.xml new file mode 100644 index 0000000..df44d1e --- /dev/null +++ b/.idea/libraries/Gradle__com_umeng_analytics_analytics_6_1_4_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_umeng_fb_5_4_0_aar.xml b/.idea/libraries/Gradle__com_umeng_fb_5_4_0_aar.xml new file mode 100644 index 0000000..4b89648 --- /dev/null +++ b/.idea/libraries/Gradle__com_umeng_fb_5_4_0_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_umeng_message_2_4_1_aar.xml b/.idea/libraries/Gradle__com_umeng_message_2_4_1_aar.xml new file mode 100644 index 0000000..73ae6f0 --- /dev/null +++ b/.idea/libraries/Gradle__com_umeng_message_2_4_1_aar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_youth_banner_banner_1_4_10_aar.xml b/.idea/libraries/Gradle__com_youth_banner_banner_1_4_10_aar.xml new file mode 100644 index 0000000..d474bd4 --- /dev/null +++ b/.idea/libraries/Gradle__com_youth_banner_banner_1_4_10_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_yqritc_recyclerview_flexibledivider_1_4_0_aar.xml b/.idea/libraries/Gradle__com_yqritc_recyclerview_flexibledivider_1_4_0_aar.xml new file mode 100644 index 0000000..42f849c --- /dev/null +++ b/.idea/libraries/Gradle__com_yqritc_recyclerview_flexibledivider_1_4_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_zhy_okhttputils_2_6_2_aar.xml b/.idea/libraries/Gradle__com_zhy_okhttputils_2_6_2_aar.xml new file mode 100644 index 0000000..74b0474 --- /dev/null +++ b/.idea/libraries/Gradle__com_zhy_okhttputils_2_6_2_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml new file mode 100644 index 0000000..2fbd816 --- /dev/null +++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_1_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_1_jar.xml new file mode 100644 index 0000000..aa4a22b --- /dev/null +++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__me_yokeyword_fragmentation_core_1_3_3_aar.xml b/.idea/libraries/Gradle__me_yokeyword_fragmentation_core_1_3_3_aar.xml new file mode 100644 index 0000000..578d912 --- /dev/null +++ b/.idea/libraries/Gradle__me_yokeyword_fragmentation_core_1_3_3_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__me_yokeyword_fragmentation_swipeback_1_3_2_aar.xml b/.idea/libraries/Gradle__me_yokeyword_fragmentation_swipeback_1_3_2_aar.xml new file mode 100644 index 0000000..4c2f939 --- /dev/null +++ b/.idea/libraries/Gradle__me_yokeyword_fragmentation_swipeback_1_3_2_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml new file mode 100644 index 0000000..5855a29 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml b/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml new file mode 100644 index 0000000..e29d235 --- /dev/null +++ b/.idea/libraries/Gradle__org_greenrobot_eventbus_3_1_1_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_litepal_android_core_1_3_1_aar.xml b/.idea/libraries/Gradle__org_litepal_android_core_1_3_1_aar.xml new file mode 100644 index 0000000..f0531f0 --- /dev/null +++ b/.idea/libraries/Gradle__org_litepal_android_core_1_3_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml new file mode 100644 index 0000000..f4fcefc --- /dev/null +++ b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_xutils_xutils_3_3_36_aar.xml b/.idea/libraries/Gradle__org_xutils_xutils_3_3_36_aar.xml new file mode 100644 index 0000000..e7d2ab4 --- /dev/null +++ b/.idea/libraries/Gradle__org_xutils_xutils_3_3_36_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_xutils_xutils_3_5_0_aar.xml b/.idea/libraries/Gradle__org_xutils_xutils_3_5_0_aar.xml new file mode 100644 index 0000000..72cbc54 --- /dev/null +++ b/.idea/libraries/Gradle__org_xutils_xutils_3_5_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_QQZone_1.xml b/.idea/libraries/SocialSDK_QQZone_1.xml deleted file mode 100644 index 307cd67..0000000 --- a/.idea/libraries/SocialSDK_QQZone_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_QQZone_2.xml b/.idea/libraries/SocialSDK_QQZone_2.xml deleted file mode 100644 index f10dcd0..0000000 --- a/.idea/libraries/SocialSDK_QQZone_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_QQZone_3.xml b/.idea/libraries/SocialSDK_QQZone_3.xml deleted file mode 100644 index 04b24de..0000000 --- a/.idea/libraries/SocialSDK_QQZone_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_Sina.xml b/.idea/libraries/SocialSDK_Sina.xml deleted file mode 100644 index 3c868f3..0000000 --- a/.idea/libraries/SocialSDK_Sina.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_WeiXin_1.xml b/.idea/libraries/SocialSDK_WeiXin_1.xml deleted file mode 100644 index 1a41cd6..0000000 --- a/.idea/libraries/SocialSDK_WeiXin_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_WeiXin_2.xml b/.idea/libraries/SocialSDK_WeiXin_2.xml deleted file mode 100644 index 68fbfd2..0000000 --- a/.idea/libraries/SocialSDK_WeiXin_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_tencentWB_1.xml b/.idea/libraries/SocialSDK_tencentWB_1.xml deleted file mode 100644 index cd75306..0000000 --- a/.idea/libraries/SocialSDK_tencentWB_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_tencentWB_2.xml b/.idea/libraries/SocialSDK_tencentWB_2.xml deleted file mode 100644 index 0eb2c3e..0000000 --- a/.idea/libraries/SocialSDK_tencentWB_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SocialSDK_tencentWB_3.xml b/.idea/libraries/SocialSDK_tencentWB_3.xml deleted file mode 100644 index caae209..0000000 --- a/.idea/libraries/SocialSDK_tencentWB_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/SpeechApi.xml b/.idea/libraries/SpeechApi.xml deleted file mode 100644 index 6183e94..0000000 --- a/.idea/libraries/SpeechApi.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/achartengine_1_1_0.xml b/.idea/libraries/achartengine_1_1_0.xml deleted file mode 100644 index b0ac0b4..0000000 --- a/.idea/libraries/achartengine_1_1_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_async_http_1_4_6.xml b/.idea/libraries/android_async_http_1_4_6.xml deleted file mode 100644 index 7dc761c..0000000 --- a/.idea/libraries/android_async_http_1_4_6.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/conceal_android.xml b/.idea/libraries/conceal_android.xml deleted file mode 100644 index 74e0c18..0000000 --- a/.idea/libraries/conceal_android.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/gridlayout_v7_22_2_1.xml b/.idea/libraries/gridlayout_v7_22_2_1.xml deleted file mode 100644 index 1795f8d..0000000 --- a/.idea/libraries/gridlayout_v7_22_2_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/gson_2_8_0.xml b/.idea/libraries/gson_2_8_0.xml deleted file mode 100644 index cbabd72..0000000 --- a/.idea/libraries/gson_2_8_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/httpmime_4_1_3.xml b/.idea/libraries/httpmime_4_1_3.xml deleted file mode 100644 index c6357df..0000000 --- a/.idea/libraries/httpmime_4_1_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/libconceal.xml b/.idea/libraries/libconceal.xml deleted file mode 100644 index 13e8829..0000000 --- a/.idea/libraries/libconceal.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/locSDK_6_13.xml b/.idea/libraries/locSDK_6_13.xml deleted file mode 100644 index 525975c..0000000 --- a/.idea/libraries/locSDK_6_13.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/nineoldandroids_2_4_0.xml b/.idea/libraries/nineoldandroids_2_4_0.xml deleted file mode 100644 index b8f043d..0000000 --- a/.idea/libraries/nineoldandroids_2_4_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_21_0_3.xml b/.idea/libraries/support_annotations_21_0_3.xml deleted file mode 100644 index 4cd7174..0000000 --- a/.idea/libraries/support_annotations_21_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_22_2_1.xml b/.idea/libraries/support_annotations_22_2_1.xml deleted file mode 100644 index 6c43d1c..0000000 --- a/.idea/libraries/support_annotations_22_2_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml deleted file mode 100644 index f178327..0000000 --- a/.idea/libraries/support_v4_21_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_22_2_1.xml b/.idea/libraries/support_v4_22_2_1.xml deleted file mode 100644 index bc16853..0000000 --- a/.idea/libraries/support_v4_22_2_1.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/swipelistview_1_0_20130701_103547_12_jar_with_dependencies.xml b/.idea/libraries/swipelistview_1_0_20130701_103547_12_jar_with_dependencies.xml deleted file mode 100644 index b14c3a3..0000000 --- a/.idea/libraries/swipelistview_1_0_20130701_103547_12_jar_with_dependencies.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/umeng_analytics_v6_0_3.xml b/.idea/libraries/umeng_analytics_v6_0_3.xml deleted file mode 100644 index 3b151bd..0000000 --- a/.idea/libraries/umeng_analytics_v6_0_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/umeng_social_sdk.xml b/.idea/libraries/umeng_social_sdk.xml deleted file mode 100644 index 4c525a6..0000000 --- a/.idea/libraries/umeng_social_sdk.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/umeng_update_v2_6_0_1.xml b/.idea/libraries/umeng_update_v2_6_0_1.xml deleted file mode 100644 index e5ce8d1..0000000 --- a/.idea/libraries/umeng_update_v2_6_0_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/universal_image_loader_1_9_2.xml b/.idea/libraries/universal_image_loader_1_9_2.xml deleted file mode 100644 index f73755e..0000000 --- a/.idea/libraries/universal_image_loader_1_9_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..703e5d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,43 +1,11 @@ - - + + + + - - - - - - - - - - - - - - - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml new file mode 100644 index 0000000..46fc8de --- /dev/null +++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml new file mode 100644 index 0000000..f8bb0b5 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 0000000..6efc167 --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml new file mode 100644 index 0000000..f4de4f8 --- /dev/null +++ b/app/src/main/res/menu/navigation.xml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/asProjects.iml b/asProjects.iml index c95d3f2..baca9b0 100644 --- a/asProjects.iml +++ b/asProjects.iml @@ -8,7 +8,7 @@ - + diff --git a/build.gradle b/build.gradle index 5c5013d..6a6d31f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,22 +2,43 @@ buildscript { repositories { jcenter() + google() + // maven { + // name 'Sonatype SNAPSHOTs' + // url 'https://oss.sonatype.org/content/repositories/snapshots/' + // } + } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.3.0' + //classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0' + classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0' + // classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } } allprojects { - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { + // gradle.projectsEvaluated { + // tasks.withType(JavaCompile) { // options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } - } + + // } + // } repositories { jcenter() + google() + maven { + url "https://raw.githubusercontent.com/umeng/mvn-repo-umeng/master/repository" } + + // maven { + // name 'Sonatype SNAPSHOTs' + // url 'https://oss.sonatype.org/content/repositories/snapshots/' + // } } } +task clean(type: Delete) { + delete rootProject.buildDir +} //tasks.withType(JavaCompile) { // options.encoding = "GBK" //} \ No newline at end of file diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/listviewlibrary/build.gradle b/listviewlibrary/build.gradle index 59d6a2e..81b34d3 100644 --- a/listviewlibrary/build.gradle +++ b/listviewlibrary/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 26 + buildToolsVersion "28.0.3" defaultConfig { - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 15 + targetSdkVersion 26 } buildTypes { @@ -18,5 +18,5 @@ android { } dependencies { -compile 'com.android.support:support-v4:21.0.3' +api 'com.android.support:support-v4:26.1.0' } diff --git a/listviewlibrary/src/main/AndroidManifest.xml b/listviewlibrary/src/main/AndroidManifest.xml index 70389ae..58e435c 100644 --- a/listviewlibrary/src/main/AndroidManifest.xml +++ b/listviewlibrary/src/main/AndroidManifest.xml @@ -3,6 +3,6 @@ package="com.mobeta.android.dslv" android:versionCode="4" android:versionName="0.6.1"> - + diff --git a/local.properties b/local.properties index 152d301..89dcada 100644 --- a/local.properties +++ b/local.properties @@ -2,6 +2,8 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Mon Dec 12 22:52:27 CST 2016 -sdk.dir=/Volumes/workingspace/android/adt-bundle-mac-x86_64-20140702/sdk +# For customization when using a Version Control System, please read the +# header note. +#Tue Jan 29 20:05:42 CST 2019 +#ndk.dir=D\:\\android\\sdk\\ndk-bundle +sdk.dir=D\:\\android\\sdk diff --git a/qy/build.gradle b/qy/build.gradle index a63cd68..8f6d795 100644 --- a/qy/build.gradle +++ b/qy/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" - + compileSdkVersion 26 + buildToolsVersion "28.0.3" + useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "com.qiyou.mb.android" - minSdkVersion 9 - targetSdkVersion 22 + minSdkVersion 15 + targetSdkVersion 26 testApplicationId "com.qiyou.mb.android.test" testInstrumentationRunner "android.test.InstrumentationTestRunner" @@ -22,39 +22,39 @@ android { } dependencies { - compile project(':listviewlibrary') - compile 'com.android.support:support-v4:22.+' - compile 'com.android.support:gridlayout-v7:22.+' - compile files('libs/BaiduLBS_Android.jar') - compile files('libs/SocialSDK_QQZone_1.jar') - compile files('libs/SocialSDK_QQZone_2.jar') - compile files('libs/SocialSDK_QQZone_3.jar') - compile files('libs/SocialSDK_Sina.jar') - compile files('libs/SocialSDK_WeiXin_1.jar') - compile files('libs/SocialSDK_WeiXin_2.jar') - compile files('libs/SocialSDK_tencentWB_1.jar') - compile files('libs/SocialSDK_tencentWB_2.jar') - compile files('libs/SocialSDK_tencentWB_3.jar') -// compile files('libs/SpeechApi.jar') - compile files('libs/achartengine-1.1.0.jar') - compile files('libs/android-async-http-1.4.6.jar') - compile files('libs/conceal_android.jar') - compile files('libs/httpmime-4.1.3.jar') - compile files('libs/libconceal.jar') - compile files('libs/locSDK_6.13.jar') - compile files('libs/nineoldandroids-2.4.0.jar') - compile files('libs/swipelistview-1.0-20130701.103547-12-jar-with-dependencies.jar') - compile files('libs/umeng-analytics-v6.0.3.jar') - compile files('libs/umeng-update-v2.6.0.1.jar') - compile files('libs/umeng_social_sdk.jar') - compile files('libs/universal-image-loader-1.9.2.jar') + api project(':listviewlibrary') + api 'com.android.support:support-v4:26.+' + api 'com.android.support:gridlayout-v7:26.+' + api files('libs/BaiduLBS_Android.jar') + api files('libs/SocialSDK_QQZone_1.jar') + api files('libs/SocialSDK_QQZone_2.jar') + api files('libs/SocialSDK_QQZone_3.jar') + api files('libs/SocialSDK_Sina.jar') + api files('libs/SocialSDK_WeiXin_1.jar') + api files('libs/SocialSDK_WeiXin_2.jar') + api files('libs/SocialSDK_tencentWB_1.jar') + api files('libs/SocialSDK_tencentWB_2.jar') + api files('libs/SocialSDK_tencentWB_3.jar') + // compile files('libs/SpeechApi.jar') + api files('libs/achartengine-1.1.0.jar') + api files('libs/android-async-http-1.4.6.jar') + api files('libs/conceal_android.jar') + api files('libs/httpmime-4.1.3.jar') + api files('libs/libconceal.jar') + api files('libs/locSDK_6.13.jar') + api files('libs/nineoldandroids-2.4.0.jar') + api files('libs/swipelistview-1.0-20130701.103547-12-jar-with-dependencies.jar') + api files('libs/umeng-analytics-v6.0.3.jar') + api files('libs/umeng-update-v2.6.0.1.jar') + api files('libs/umeng_social_sdk.jar') + api files('libs/universal-image-loader-1.9.2.jar') // compile files('libs/utdid4all-1.0.4.jar') - compile 'com.google.code.gson:gson:2.8.0' - compile project(':PushSDK') - compile 'me.dm7.barcodescanner:zxing:1.9' -// compile files('libs/core-3.2.0.jar') - compile files('libs/javase-2.3-SNAPSHOT.jar') - compile files('libs/com.baidu.tts_2.3.0.jar') + api 'com.google.code.gson:gson:2.8.0' + api project(':PushSDK') + api 'me.dm7.barcodescanner:zxing:1.9' + // api files('libs/core-3.2.0.jar') + api files('libs/javase-2.3-SNAPSHOT.jar') + api files('libs/com.baidu.tts_2.3.0.jar') } //tasks.withType(JavaCompile) { // options.encoding = "GBK" diff --git a/qy/libs/javase-2.3-SNAPSHOT.jar b/qy/libs/javase-2.3-SNAPSHOT.jar old mode 100755 new mode 100644 diff --git a/qy/src/main/AndroidManifest.xml b/qy/src/main/AndroidManifest.xml index f6f6f34..c20f80f 100644 --- a/qy/src/main/AndroidManifest.xml +++ b/qy/src/main/AndroidManifest.xml @@ -6,8 +6,7 @@ android:versionName="1.29.3" > @@ -73,10 +72,10 @@ - - - - + diff --git a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java index d7a2746..7f19d26 100644 --- a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java +++ b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java @@ -16,8 +16,8 @@ public final static String BASE_STATIC_URL = BASE_URL +"staticmap/"; public final static String TENCENT_APP_ID = "1104563148"; // TODO Turn off when deploying. public static boolean DEVELOPER_MODE = false; - -public static boolean PLAYBACK_CAN_RECORD = false /*DEVELOPER_MODE*/ ; +//public final static float POINT_RD = 500; //used in route_fragment for checkWps +public static boolean PLAYBACK_CAN_RECORD = false ;//DEVELOPER_MODE ; public static boolean STRICT_MODE =false;//DEVELOPER_MODE; // public static boolean STRICT_MODE =false; diff --git a/qy/src/main/java/com/qiyou/mb/android/beans/.gitignore b/qy/src/main/java/com/qiyou/mb/android/beans/.gitignore old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/service/QNaviSvc.java b/qy/src/main/java/com/qiyou/mb/android/service/QNaviSvc.java index 50a09b0..a20119a 100644 --- a/qy/src/main/java/com/qiyou/mb/android/service/QNaviSvc.java +++ b/qy/src/main/java/com/qiyou/mb/android/service/QNaviSvc.java @@ -1,9 +1,5 @@ package com.qiyou.mb.android.service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import android.app.Service; import android.content.Context; import android.content.Intent; @@ -12,7 +8,6 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Vibrator; import android.text.TextUtils; -import android.util.Log; import com.qiyou.mb.android.QiYouApplication; import com.qiyou.mb.android.QiYouConstant; @@ -22,6 +17,8 @@ import com.qiyou.mb.android.utils.Utils; import com.qiyou.mb.android.utils.enums.TrackStatus; import com.qiyou.mb.android.utils.enums.wpFlag; import com.qiyou.mb.android.utils.log.QLog; +import java.util.ArrayList; +import java.util.HashMap; //import com.qiyou.mb.android.receivers.ProximIntentReceiver; public class QNaviSvc extends Service { @@ -194,8 +191,10 @@ public class QNaviSvc extends Service { if(gpxTrack!=null){ alertWbs.addAll(gpxTrack.getTrackBean().getRoadWps()); - app.rd= gpxTrack.getTrackBean().getDistance()/gpxTrack.getTrackBean().getTrkseg().size() >100?100f:1000f; - if(gpxTrack.getTrackBean().getIsCheckedIn()==0){ //骑行最大睡觉时间为2分钟 +// app.rd= gpxTrack.getTrackBean().getDistance()/gpxTrack.getTrackBean().getTrkseg().size() >100?100f:1000f; + app.rd= gpxTrack.getTrackBean().getDistance()/gpxTrack.getTrackBean().getTrkseg().size() >100?app.rd/5:app.rd; + + if(gpxTrack.getTrackBean().getIsCheckedIn()==0){ //骑行最大睡觉时间为2分钟 maxSleeptime = maxSleeptime*2; } } @@ -1451,9 +1450,9 @@ private void speachNav(String words,int priority){ /* avDist =(targetWb.getSumDist() - startWb.getSumDist())/wpsCnt;*/ if(checkWps.keySet()!=null && checkWps.keySet().size()>0) avDist =(gpxTrack.getTrackBean().getDistance())/checkWps.keySet().size(); -// // // QLog.getLogger().dLog(TAG, "build chkwps cost time:(s) " +(System.currentTimeMillis()-starttime)/1000); -// // // QLog.getLogger().dLog(TAG, " build wps size: " +checkWps.keySet().size()); - // QLog.getLogger().dLog(TAG, String.format(" track wps size: %s ,check key size %s,avDist: %s " ,gpxTrack.getTrackBean().getTrkseg().size(),checkWps.keySet().size(),avDist)); + QLog.getLogger().dLog(TAG, "build chkwps cost time:(s) " +(System.currentTimeMillis()-starttime)/1000); + QLog.getLogger().dLog(TAG, " build wps size: " +checkWps.keySet().size()); + QLog.getLogger().dLog(TAG, String.format(" track wps size: %s ,check key size %s,avDist: %s " ,gpxTrack.getTrackBean().getTrkseg().size(),checkWps.keySet().size(),avDist)); minDistPlus =/*(avDist/100f)**/avDist; } @@ -1481,47 +1480,62 @@ private void speachNav(String words,int priority){ String key=getStringKey(midWb.getLatitude() ,midWb.getLongitude()); float nextd = (float)Utils.getDistanceFromXtoY(wb.getLatitude(), wb.getLongitude(), midWb.getLatitude(),midWb.getLongitude()); - + + QLog.getLogger().dLog(TAG, String.format(" add mid wb key 0: %s, sumdist %s,nextd %s " , key,wb.getSumDist(),nextd)); - if(nextd<500 && nextd>200 && (!checkWps.containsKey(key) || checkWps.get(key)[0] 100 && (!checkWps.containsKey(key) || checkWps.get(key)[0] =500){ + if(nextd<5000 && nextd>=300){ insertMoreKeys(wb,midWb ); } + + Waypoint_bean midWb2 = new Waypoint_bean(); + midWb2.setLatitude((midWb.getLatitude()+nextWb.getLatitude())/2); + midWb2.setLongitude((midWb.getLongitude()+nextWb.getLongitude())/2); + midWb2.setSumDist(midWb.getSumDist()+(nextWb.getSumDist()-midWb.getSumDist())/2); - key=getStringKey(midWb.getLatitude() ,midWb.getLongitude()); + key=getStringKey(midWb2.getLatitude() ,midWb2.getLongitude()); nextd = (float)Utils.getDistanceFromXtoY(midWb.getLatitude(),midWb.getLongitude() - ,nextWb.getLatitude(), nextWb.getLongitude()) ; - - - if(nextd<500 && nextd>200 &&(!checkWps.containsKey(key) || checkWps.get(key)[0]100 &&(!checkWps.containsKey(key) || checkWps.get(key)[0]=500){ + if(nextd<5000 && nextd>=300){ - insertMoreKeys(midWb, nextWb); + insertMoreKeys(midWb, midWb2); } - - + + nextd = (float)Utils.getDistanceFromXtoY(midWb2.getLatitude(),midWb2.getLongitude() + ,nextWb.getLatitude(), nextWb.getLongitude()) ; + + if(nextd<5000 && nextd>=300){ + + insertMoreKeys(midWb2, nextWb); + } + } private String getStringKey(float lat,float lng){ - float rd=1000f; + float rd=app.rd;//500f; String rt=Math.round((lat*rd))/ rd +"-"+ Math.round((lng*rd))/ rd; // String rt=Math.round((lat*app.rd))/app.rd +"-"+ Math.round((lng*app.rd))/app.rd; diff --git a/qy/src/main/java/com/qiyou/mb/android/service/TimtickService.java b/qy/src/main/java/com/qiyou/mb/android/service/TimtickService.java index 46f2e3f..3e8f463 100644 --- a/qy/src/main/java/com/qiyou/mb/android/service/TimtickService.java +++ b/qy/src/main/java/com/qiyou/mb/android/service/TimtickService.java @@ -135,8 +135,7 @@ public class TimtickService extends Service /*implements Runnable*/ { mNotification.flags = Notification.FLAG_ONGOING_EVENT; // mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - mNotification.setLatestEventInfo(getApplicationContext(), "运动中", text, - pendingIntent); + // mNotification.setLatestEventInfo(getApplicationContext(), "运动中", text, pendingIntent); /* Notification noti = new Notification.Builder(this) .setContentTitle("运动中") diff --git a/qy/src/main/java/com/qiyou/mb/android/service/TrackPlaybackService.java b/qy/src/main/java/com/qiyou/mb/android/service/TrackPlaybackService.java old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java index f4d8bbb..ab21dee 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java @@ -246,7 +246,7 @@ public class MainActivity extends Activity_qiyouBase{ com.umeng.socialize.utils.Log.LOG = QiYouConstant.DEVELOPER_MODE; String key ="550aa4e4fd98c5a25c000284" ; //old "4eaee02c527015373b000003" if (!QiYouConstant.DEVELOPER_MODE){ - UMAnalyticsConfig config = new UMAnalyticsConfig(this,key , "i7lv"); + UMAnalyticsConfig config = new UMAnalyticsConfig(this,key , "huawei"); MobclickAgent. startWithConfigure(config); MobclickAgent.openActivityDurationTrack(false); } @@ -1691,8 +1691,8 @@ public void showNoteDetail(Note note,NoteMessage noteMsg) { /* Intent shareIntent=getShareIntent(); mShareActionProvider.setShareIntent(shareIntent);*/ - if(isMapActive){ - ToastMsg("对不起，暂不支持分享地图",Toast.LENGTH_SHORT); + if(isMapActive){ + ToastMsg("对不起，暂不支持分享地图",Toast.LENGTH_SHORT); }else defaultShare(); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/.gitignore b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/.gitignore old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/NoteNew.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/NoteNew.java old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/QiyouFragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/QiyouFragment.java index 454ebd4..33da9e7 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/QiyouFragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/QiyouFragment.java @@ -1,47 +1,12 @@ package com.qiyou.mb.android.ui.fragments; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.http.Header; -import org.apache.http.client.CookieStore; -import org.apache.http.client.protocol.ClientContext; -import org.apache.http.cookie.Cookie; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.cookie.BasicClientCookie; -import org.apache.http.message.BasicHeader; -import org.apache.http.protocol.HTTP; -import org.apache.http.protocol.HttpContext; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.annotation.TargetApi; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.res.ColorStateList; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.graphics.Canvas; @@ -60,23 +25,18 @@ import android.text.TextUtils; import android.util.Log; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; -import android.view.View.OnTouchListener; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; +import android.view.View.OnTouchListener; import android.view.ViewConfiguration; import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.LinearLayout.LayoutParams; -import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.ListView; import android.widget.ProgressBar; -import android.widget.RelativeLayout; import android.widget.ScrollView; import android.widget.SimpleAdapter.ViewBinder; import android.widget.TabHost; @@ -90,12 +50,10 @@ import com.loopj.android.http.AsyncHttpClient; import com.loopj.android.http.AsyncHttpResponseHandler; import com.loopj.android.http.JsonHttpResponseHandler; import com.loopj.android.http.MySSLSocketFactory; -import com.loopj.android.http.PersistentCookieStore; import com.loopj.android.http.RequestParams; import com.qiyou.mb.android.QiYouApplication; import com.qiyou.mb.android.QiYouConstant; import com.qiyou.mb.android.R; -import com.qiyou.mb.android.R.color; import com.qiyou.mb.android.beans.Track; import com.qiyou.mb.android.beans.basic.Activity_bean; import com.qiyou.mb.android.beans.basic.Group_bean; @@ -119,6 +77,38 @@ import com.qiyou.mb.android.utils.log.QLog; import com.qiyou.mb.android.utils.server.RestMethods; import com.umeng.analytics.MobclickAgent; +import org.apache.http.Header; +import org.apache.http.client.CookieStore; +import org.apache.http.client.protocol.ClientContext; +import org.apache.http.cookie.Cookie; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicHeader; +import org.apache.http.protocol.HTTP; +import org.apache.http.protocol.HttpContext; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; +import java.security.cert.CertificateException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public abstract class QiyouFragment extends Fragment { public static String TAG ="need to be replaced"; @@ -582,14 +572,32 @@ public abstract class QiyouFragment extends Fragment { - + void hideWebDialog(){ + if(prgDialog!=null) { + prgDialog.hide(); + } + + if (mSwipeLayout!=null){ + mSwipeLayout.setRefreshing(false); + } + + } void showWebDialog(){ try{ - if(this.isAdded()) - prgDialog.show(); + if(this.isAdded()) { + + if (mSwipeLayout!=null){ + mSwipeLayout.setRefreshing(true); + } else { + + prgDialog.show(); + } + } + + }catch(Exception er){ } @@ -610,7 +618,8 @@ public abstract class QiyouFragment extends Fragment { public void onSuccess(int statusCode, Header[] header, byte[] paramAnonymousArrayOfByte) { - if(prgDialog!=null)prgDialog.hide(); +// if(prgDialog!=null)prgDialog.hide(); + hideWebDialog(); // QLog.getLogger().d(dTAG, TAG + ", response is " + new String(paramAnonymousArrayOfByte)); if (paramAnonymousArrayOfByte != null) { processTxtOnSuccess(paramAnonymousArrayOfByte); @@ -728,7 +737,8 @@ public abstract class QiyouFragment extends Fragment { public void onSuccess(int paramAnonymousInt, Header[] paramAnonymousArrayOfHeader, byte[] paramAnonymousArrayOfByte) { - QiyouFragment.this.prgDialog.hide(); +// QiyouFragment.this.prgDialog.hide(); + hideWebDialog(); // // QLog.getLogger().d(dTAG, TAG + ", response is " + new String(paramAnonymousArrayOfByte)); if (paramAnonymousArrayOfByte != null) { processTxtOnSuccess(paramAnonymousArrayOfByte); @@ -741,7 +751,8 @@ public abstract class QiyouFragment extends Fragment { JsonHttpResponseHandler getJsonResponseHandler = new JsonHttpResponseHandler() { @Override public void onSuccess(int statusCode, Header[] headers, JSONObject response) { - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); // QLog.getLogger().d(dTAG, TAG+", onSuccess(int statusCode, Header[] headers, JSONObject response) was received"); String method =""; // if (response != null) { @@ -784,7 +795,8 @@ public abstract class QiyouFragment extends Fragment { @Override public void onSuccess(int statusCode, Header[] headers, JSONArray response) { - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); // QLog.getLogger().d(dTAG, TAG+", onSuccess(int statusCode, Header[] headers, JSONArray response) was received"); // if (response != null) { @@ -840,8 +852,9 @@ public abstract class QiyouFragment extends Fragment { } if(prgDialog==null)initPrgDialog(); // if(this.isAdded()) prgDialog.show(); - if(!isInsilence) + if(!isInsilence) { showWebDialog(); + } hideNotes(); @@ -875,7 +888,8 @@ public abstract class QiyouFragment extends Fragment { @Override public void onSuccess(int statusCode, Header[] headers, JSONObject response) { - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); // QLog.getLogger().d(dTAG, TAG+", onSuccess(int statusCode, Header[] headers, JSONObject response) was received"); // QLog.getLogger().d(dTAG, TAG+", response from qq:" +response.toString()); try { @@ -955,7 +969,8 @@ public abstract class QiyouFragment extends Fragment { new JsonHttpResponseHandler(){ @Override public void onSuccess(int statusCode, org.apache.http.Header[] headers, JSONObject response){ - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); if (response != null) { try { // JSONObject jsonObject= response.getJSONObject(QiYouConstant.JSONOBJECT_KEY) ; @@ -1086,7 +1101,8 @@ public abstract class QiyouFragment extends Fragment { String msg="《无》"; @Override public void onSuccess(int statusCode, org.apache.http.Header[] headers, JSONObject response){ - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); mdUploaded=true; // // QLog.getLogger().dLog(dTAG, TAG+" mdUploading return result ,uploading success,start next... "); if (response != null) { @@ -1126,7 +1142,8 @@ public abstract class QiyouFragment extends Fragment { @Override public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { // // QLog.getLogger().d(dTAG, TAG+", onFailure(int, Header[], Throwable, JSONObject) was received"); - prgDialog.hide(); +// prgDialog.hide(); + hideWebDialog(); mdUploaded=true; // // QLog.getLogger().dLog(dTAG, TAG+" mdUploading return result ,uploading failure,start next... "); @@ -1206,8 +1223,9 @@ public abstract class QiyouFragment extends Fragment { QLog.getLogger().d(dTAG, TAG+" failure msg: "+ msg); QLog.getLogger().d(dTAG, TAG+" failure statusCode: "+ statusCode); // Hide Progress Dialog - if(prgDialog!=null) - prgDialog.hide(); +// if(prgDialog!=null) +// prgDialog.hide(); + hideWebDialog(); // When Http response code is '404' if (statusCode == 401) { // Toast.makeText(activity, diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Route_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Route_fragment.java index 4e54b5d..96eaa01 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Route_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Route_fragment.java @@ -426,6 +426,8 @@ public class Route_fragment extends TrackTabs_fragment implements IlocationFra } };*/ + + @Override protected void initViewMap(){ initialMapview(); @@ -1090,7 +1092,7 @@ public class Route_fragment extends TrackTabs_fragment implements IlocationFra btnNavi.setEnabled(canNavi()); btnSNav.setEnabled(canNavi()); if(!Utils.isNetworkConnected(activity)){ - showMsg("制作路书需要链接互联网，请检查网络链接。"); + showMsg("制作路书需要连接互联网，请检查网络链接。"); return; } if(this.startPt==null || this.endPt==null ){ @@ -1714,8 +1716,17 @@ public class Route_fragment extends TrackTabs_fragment implements IlocationFra if(startItem!=null &&endItem!=null){//if the end==start, then give start point more 50 lat if(startItem.getPosition().latitude==endItem.getPosition().latitude && startItem.getPosition().longitude==endItem.getPosition().longitude){ - - startItem.position(new LatLng(startItem.getPosition().latitudeE6+100,startItem.getPosition().longitudeE6+100)); + +// double lat = startItem.getPosition().latitudeE6; +// double lng = startItem.getPosition().longitudeE6; +// +// double lat1 = startItem.getPosition().latitude; +// double lng1 = startItem.getPosition().longitude; + + LatLng ll = new LatLng(startItem.getPosition().latitude + 0.0000100,startItem.getPosition().longitude+0.0000100); +// startItem.position(ll); + buildStart(ll,icon_start); +// startItem.anchor(100,100); /* if(startMarker!=null){ startMarker.remove(); } diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackMap_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackMap_fragment.java index c86384a..15fba73 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackMap_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackMap_fragment.java @@ -420,19 +420,7 @@ protected void showPoints(int which){ } - void initialMapview(){ - mMapView = (MapView) vContainer.findViewById(R.id.tm_bmapView); - mBaiduMap = mMapView.getMap(); - - mZoomControlView = (ZoomControlView) vContainer.findViewById(R.id.ZoomControlView); - mZoomControlView.setMapView(mMapView); - mMapView.showZoomControls(false); - - refreshScaleAndZoomControl(); - - initialLiveViews(); - - } + @TargetApi(Build.VERSION_CODES.HONEYCOMB) protected void initialLiveViews(){ @@ -485,125 +473,146 @@ protected void initialLiveViews(){ } + + void initialMapview(){ + mMapView = (MapView) vContainer.findViewById(R.id.tm_bmapView); + mBaiduMap = mMapView.getMap(); + + mZoomControlView = (ZoomControlView) vContainer.findViewById(R.id.ZoomControlView); + mZoomControlView.setMapView(mMapView); + mMapView.showZoomControls(false); + + refreshScaleAndZoomControl(); + + initialLiveViews(); + + } + + protected void initViewMap() { - alpha = 50; + initialMapview(); - top_sptime = (TextView) vContainer.findViewById(R.id.tm_textView_top_sptime); - top_dist = (TextView) vContainer.findViewById(R.id.tm_textView_top_dist); - top_speed =(TextView) vContainer.findViewById(R.id.tm_textView_top_speed); + initialSportMapViews(); + + } + + protected void initialSportMapViews(){ + alpha = 50; + top_sptime = (TextView) vContainer.findViewById(R.id.tm_textView_top_sptime); + top_dist = (TextView) vContainer.findViewById(R.id.tm_textView_top_dist); + top_speed =(TextView) vContainer.findViewById(R.id.tm_textView_top_speed); // popupText=(TextView) vContainer.findViewById(R.id.textcache); // popupInfo = (View) vContainer.findViewById(R.id.popinfo); - wpNumText=(TextView) vContainer.findViewById(R.id.txt_custWpNum); - - btnAutoZoom=(ImageButton) vContainer.findViewById(R.id.tm_btnAutozoom); - btnAutoZoom.setVisibility(View.GONE); + wpNumText=(TextView) vContainer.findViewById(R.id.txt_custWpNum); + + btnAutoZoom=(ImageButton) vContainer.findViewById(R.id.tm_btnAutozoom); + btnAutoZoom.setVisibility(View.GONE); // btnAutoZoom.setOnClickListener(ButtonOnClickListener); - - - btnRotation=(ImageButton) vContainer.findViewById(R.id.tm_btnRotaiton); - btnRotation.setOnClickListener(ButtonOnClickListener); - if(!isPlaying){ - btnLocation =(ImageButton) vContainer.findViewById(R.id.tm_btnLocaiton); - if(this.btnLocation!=null) btnLocation.setOnClickListener(ButtonOnClickListener); - } - btnKmpoints=(ImageButton) vContainer.findViewById(R.id.tbs_btnKMpoints); -// btnTurnPoints=(Button) vContainer.findViewById(R.id.tbs_btnTurnPoints); - btnSaveScreen=(ImageButton) vContainer.findViewById(R.id.tm_btnSaveScreen); - btnSataliteMap=(ImageButton) vContainer.findViewById(R.id.tm_btnSatalite);// - btnMapWayinstruction=(ImageButton) vContainer.findViewById(R.id.tbs_btnwayinstruction);// - btnMapWayinstruction.getBackground().setAlpha(alpha); - btnMapPicture=(ImageButton) vContainer.findViewById(R.id.tbs_btnpicture);// - btnMapPicture.getBackground().setAlpha(alpha); - btnMapLoadRoadbook =(ImageButton) vContainer.findViewById(R.id.map_btnLoadRoadbook); - btnMapLive =(ImageButton) vContainer.findViewById(R.id.map_btnLive); - btnMapLive.getBackground().setAlpha(alpha); - - btnLiveList = (ImageButton) vContainer.findViewById(R.id.map_btnSharelist); - btnLiveList.getBackground().setAlpha(alpha); - - btnMapLoadRoadbook.getBackground().setAlpha(alpha); - if(this.btnMapLive!=null){ - btnMapLive.setOnClickListener( ButtonOnClickListener); - btnMapLoadRoadbook.setOnClickListener( ButtonOnClickListener); - btnLiveList.setOnClickListener( ButtonOnClickListener); - } - - if(this.btnMapWayinstruction!=null){ - - btnMapWayinstruction.setOnClickListener( ButtonOnClickListener); - btnMapPicture.setOnClickListener( ButtonOnClickListener); - } - if(this.btnSaveScreen!=null){ + + + btnRotation=(ImageButton) vContainer.findViewById(R.id.tm_btnRotaiton); + btnRotation.setOnClickListener(ButtonOnClickListener); + if(!isPlaying){ + btnLocation =(ImageButton) vContainer.findViewById(R.id.tm_btnLocaiton); + if(this.btnLocation!=null) btnLocation.setOnClickListener(ButtonOnClickListener); + } + btnKmpoints=(ImageButton) vContainer.findViewById(R.id.tbs_btnKMpoints); +// btnTurnPoints=(Button) vContainer.findViewById(R.id.tbs_btnTurnPoints); + btnSaveScreen=(ImageButton) vContainer.findViewById(R.id.tm_btnSaveScreen); + btnSataliteMap=(ImageButton) vContainer.findViewById(R.id.tm_btnSatalite);// + btnMapWayinstruction=(ImageButton) vContainer.findViewById(R.id.tbs_btnwayinstruction);// + btnMapWayinstruction.getBackground().setAlpha(alpha); + btnMapPicture=(ImageButton) vContainer.findViewById(R.id.tbs_btnpicture);// + btnMapPicture.getBackground().setAlpha(alpha); + btnMapLoadRoadbook =(ImageButton) vContainer.findViewById(R.id.map_btnLoadRoadbook); + btnMapLive =(ImageButton) vContainer.findViewById(R.id.map_btnLive); + btnMapLive.getBackground().setAlpha(alpha); + + btnLiveList = (ImageButton) vContainer.findViewById(R.id.map_btnSharelist); + btnLiveList.getBackground().setAlpha(alpha); + + btnMapLoadRoadbook.getBackground().setAlpha(alpha); + if(this.btnMapLive!=null){ + btnMapLive.setOnClickListener( ButtonOnClickListener); + btnMapLoadRoadbook.setOnClickListener( ButtonOnClickListener); + btnLiveList.setOnClickListener( ButtonOnClickListener); + } + + if(this.btnMapWayinstruction!=null){ + + btnMapWayinstruction.setOnClickListener( ButtonOnClickListener); + btnMapPicture.setOnClickListener( ButtonOnClickListener); + } + if(this.btnSaveScreen!=null){ // btnSaveScreen.setVisibility(View.VISIBLE); - btnSaveScreen.setOnClickListener( ButtonOnClickListener); - } - if(this.btnSataliteMap!=null){ - btnSataliteMap.setOnClickListener( ButtonOnClickListener); - - } - - if(this.btnKmpoints!=null) - btnKmpoints.setOnClickListener( ButtonOnClickListener); + btnSaveScreen.setOnClickListener( ButtonOnClickListener); + } + if(this.btnSataliteMap!=null){ + btnSataliteMap.setOnClickListener( ButtonOnClickListener); + + } + + if(this.btnKmpoints!=null) + btnKmpoints.setOnClickListener( ButtonOnClickListener); // if(this.btnTurnPoints!=null) -// btnTurnPoints.setOnClickListener( ButtonOnClickListener); - - // activity.app.getmBMapManager().start(); +// btnTurnPoints.setOnClickListener( ButtonOnClickListener); + + // activity.app.getmBMapManager().start(); // mMapView = (MapView) vContainer.findViewById(R.id.tm_bmapView); - -// gpKMpointsOverlay = new GraphicsOverlay(mMapView); - /* - gpTurnPointsOverlay =new GraphicsOverlay(mMapView); - - endOverlay=getItemizedOverlay(R.drawable.icon_send); + +// gpKMpointsOverlay = new GraphicsOverlay(mMapView); + /* + gpTurnPointsOverlay =new GraphicsOverlay(mMapView); + + endOverlay=getItemizedOverlay(R.drawable.icon_send); startOverlay=getItemizedOverlay(R.drawable.icon_sstart); bearStartOverlay =getItemizedOverlay(R.drawable.icon_bstart); - bearEndOverlay =getItemizedOverlay(R.drawable.icon_bend); + bearEndOverlay =getItemizedOverlay(R.drawable.icon_bend); gpxStartOverlay =getItemizedOverlay(R.drawable.icon_bstart); - gpxEndOverlay=getItemizedOverlay(R.drawable.icon_bend); - kmOverlay=getItemizedOverlay(R.drawable.icon_bend); + gpxEndOverlay=getItemizedOverlay(R.drawable.icon_bend); + kmOverlay=getItemizedOverlay(R.drawable.icon_bend); if( isPlayback){ - gpPlaybackOverlay = new GraphicsOverlay(mMapView); + gpPlaybackOverlay = new GraphicsOverlay(mMapView); mMapView.getOverlays().add(gpPlaybackOverlay); - } - + } + if( activity.app.isNaving){ - gpNaviOverlay = new GraphicsOverlay(mMapView); + gpNaviOverlay = new GraphicsOverlay(mMapView); mMapView.getOverlays().add(gpNaviOverlay); - } - + } + gpRecordingOverlay = new GraphicsOverlay(mMapView); - - - + + + mMapView.getOverlays().add(gpRecordingOverlay); gpxOverlay =new GraphicsOverlay(mMapView); mMapView.getOverlays().add(gpxOverlay);*/ - - - - - handler = new Handler(){ - @Override - public void handleMessage(Message msg) { - if(msg.what==1){ - btnMapWayinstruction.setVisibility(View.VISIBLE); - if(mTrack_bean.getType()==TrackType.GPX) - showWayinstructions(); - }else if(msg.what==0){ - btnMapPicture.setVisibility(View.VISIBLE); - } else if(msg.what==3){ - - } - }}; - - + + + + + handler = new Handler(){ + @Override + public void handleMessage(Message msg) { + if(msg.what==1){ + btnMapWayinstruction.setVisibility(View.VISIBLE); + if(mTrack_bean.getType()==TrackType.GPX) + showWayinstructions(); + }else if(msg.what==0){ + btnMapPicture.setVisibility(View.VISIBLE); + } else if(msg.what==3){ + + } + }}; + + // showMapPicture(); - - + + // if(mTrack_bean.getType()==TrackType.GPX) // showWayinstructions(); - } - + } /*PopupClickListener popMdListener2 = new PopupClickListener(){ @Override public void onClickedPopup(int index) { diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java index 2ce1d87..13927f0 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java @@ -1,19 +1,12 @@ package com.qiyou.mb.android.ui.fragments; -import java.util.ArrayList; - import android.app.AlertDialog; -import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.os.Handler; -import android.os.Message; import android.support.v7.widget.GridLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TabHost; @@ -21,14 +14,9 @@ import android.widget.TextView; import com.qiyou.mb.android.QiYouConstant; import com.qiyou.mb.android.R; -import com.qiyou.mb.android.beans.basic.Media; -import com.qiyou.mb.android.beans.basic.Waypoint_bean; import com.qiyou.mb.android.utils.base.IlocationFragment; import com.qiyou.mb.android.utils.enums.TrackStatus; import com.qiyou.mb.android.utils.enums.WorkingTrackType; -import com.qiyou.mb.android.utils.enums.mediaType; -import com.qiyou.mb.android.utils.image.QimageView; -import com.qiyou.mb.android.utils.log.QLog; public class Track_fragment extends TrackTabs_fragment implements IlocationFragment { // public static final String TAG ="com.qiyou.track_fragment"; @@ -122,9 +110,16 @@ public class Track_fragment extends TrackTabs_fragment implements IlocationFr btnMapLoadRoadbook.setVisibility(View.VISIBLE); } - - - @Override + @Override + protected void initViewMap() { + + initialMapview(); + initialSportMapViews(); + + } + + + @Override protected void showMapViews(){ super.showMapViews(); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java old mode 100755 new mode 100644 diff --git a/qy/src/main/java/com/qiyou/mb/android/utils/TextDrawableView.java b/qy/src/main/java/com/qiyou/mb/android/utils/TextDrawableView.java index 815e142..bc3961c 100644 --- a/qy/src/main/java/com/qiyou/mb/android/utils/TextDrawableView.java +++ b/qy/src/main/java/com/qiyou/mb/android/utils/TextDrawableView.java @@ -14,7 +14,7 @@ public class TextDrawableView extends LinearLayout{ public TextDrawableView(Context context, String text,int width,int height) { super(context); this.setOrientation(VERTICAL); - getTv(context,text,12); + getTv(context,text,11); // tv.setPadding(-5.0, -5.0, -5.0, 2); tv.setBackgroundColor(Color.RED); tv.setTextColor(Color.WHITE); diff --git a/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java b/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java index 803d4c8..e37d718 100644 --- a/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java +++ b/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java @@ -1994,8 +1994,7 @@ public static ArrayList zipPathPoints( Track_bean track,int tar +"&markers=%s&markerStyles=-1,https://www.i7lv.net/icon_start.png|-1,https://www.i7lv.net/icon_end.png" ; - - return baiduUrl+String.format(format, width,height,buildPathPoints( wps, track, is4Baidu, size),pathStyle, startpoint +"|"+endpoint); + return baiduUrl+String.format(format, width,height,buildPathPoints( wps, track, is4Baidu, size),pathStyle, startpoint +"|"+endpoint); } public static String getBaiduStaticMapUrl( Track track ){ diff --git a/qy/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java b/qy/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java index b6ec140..61042da 100644 --- a/qy/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java +++ b/qy/src/main/java/uk/co/senab/photoview/PhotoViewAttacher.java @@ -331,7 +331,7 @@ public class PhotoViewAttacher implements IPhotoView, View.OnTouchListener, @Override public float getScale() { - return FloatMath.sqrt((float) Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + (float) Math.pow(getValue(mSuppMatrix, Matrix.MSKEW_Y), 2)); + return (float)Math.sqrt((float) Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + (float) Math.pow(getValue(mSuppMatrix, Matrix.MSKEW_Y), 2)); } @Override diff --git a/qy/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java b/qy/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java index ddc0346..eca6964 100644 --- a/qy/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java +++ b/qy/src/main/java/uk/co/senab/photoview/gestures/CupcakeGestureDetector.java @@ -84,7 +84,7 @@ public class CupcakeGestureDetector implements GestureDetector { if (!mIsDragging) { // Use Pythagoras to see if drag length is larger than // touch slop - mIsDragging = FloatMath.sqrt((dx * dx) + (dy * dy)) >= mTouchSlop; + mIsDragging = (float)Math.sqrt((dx * dx) + (dy * dy)) >= mTouchSlop; } if (mIsDragging) { diff --git a/qy/src/main/res/anim/push_left_in.xml b/qy/src/main/res/anim/push_left_in.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/push_left_in_bak.xml b/qy/src/main/res/anim/push_left_in_bak.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/push_left_out.xml b/qy/src/main/res/anim/push_left_out.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/push_up_in.xml b/qy/src/main/res/anim/push_up_in.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/push_up_out.xml b/qy/src/main/res/anim/push_up_out.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_fade_in.xml b/qy/src/main/res/anim/umeng_socialize_fade_in.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_fade_out.xml b/qy/src/main/res/anim/umeng_socialize_fade_out.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_shareboard_animation_in.xml b/qy/src/main/res/anim/umeng_socialize_shareboard_animation_in.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_shareboard_animation_out.xml b/qy/src/main/res/anim/umeng_socialize_shareboard_animation_out.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_slide_in_from_bottom.xml b/qy/src/main/res/anim/umeng_socialize_slide_in_from_bottom.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/umeng_socialize_slide_out_from_bottom.xml b/qy/src/main/res/anim/umeng_socialize_slide_out_from_bottom.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/anim/welcome_animation.xml b/qy/src/main/res/anim/welcome_animation.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/button_color.xml b/qy/src/main/res/drawable-hdpi/button_color.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/button_down.png b/qy/src/main/res/drawable-hdpi/button_down.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/button_on.png b/qy/src/main/res/drawable-hdpi/button_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/button_simple_style.xml b/qy/src/main/res/drawable-hdpi/button_simple_style.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/button_style.xml b/qy/src/main/res/drawable-hdpi/button_style.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/buttonlayout.xml b/qy/src/main/res/drawable-hdpi/buttonlayout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml b/qy/src/main/res/drawable-hdpi/custom_btn_beige.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/delete_x.png b/qy/src/main/res/drawable-hdpi/delete_x.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/drag.9.png b/qy/src/main/res/drawable-hdpi/drag.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/flatmap.png b/qy/src/main/res/drawable-hdpi/flatmap.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/head_linearlayout.xml b/qy/src/main/res/drawable-hdpi/head_linearlayout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/ic_launcher.png b/qy/src/main/res/drawable-hdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_arrowb.png b/qy/src/main/res/drawable-hdpi/icon_arrowb.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_auto_zoom.png b/qy/src/main/res/drawable-hdpi/icon_auto_zoom.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_auto_zoom_inactive.png b/qy/src/main/res/drawable-hdpi/icon_auto_zoom_inactive.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_bend.png b/qy/src/main/res/drawable-hdpi/icon_bend.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_bstart.png b/qy/src/main/res/drawable-hdpi/icon_bstart.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_busy.png b/qy/src/main/res/drawable-hdpi/icon_busy.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_chart2.png b/qy/src/main/res/drawable-hdpi/icon_chart2.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_check.png b/qy/src/main/res/drawable-hdpi/icon_check.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_cloud.png b/qy/src/main/res/drawable-hdpi/icon_cloud.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_clouds.png b/qy/src/main/res/drawable-hdpi/icon_clouds.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_cloudsearch.png b/qy/src/main/res/drawable-hdpi/icon_cloudsearch.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_comment.png b/qy/src/main/res/drawable-hdpi/icon_comment.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_cross.png b/qy/src/main/res/drawable-hdpi/icon_cross.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_databse.png b/qy/src/main/res/drawable-hdpi/icon_databse.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_dist.png b/qy/src/main/res/drawable-hdpi/icon_dist.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_dist_in.png b/qy/src/main/res/drawable-hdpi/icon_dist_in.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_edit.png b/qy/src/main/res/drawable-hdpi/icon_edit.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_en.png b/qy/src/main/res/drawable-hdpi/icon_en.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_geo.png b/qy/src/main/res/drawable-hdpi/icon_geo.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_group.png b/qy/src/main/res/drawable-hdpi/icon_group.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_hearts.png b/qy/src/main/res/drawable-hdpi/icon_hearts.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_km.png b/qy/src/main/res/drawable-hdpi/icon_km.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_livelist.png b/qy/src/main/res/drawable-hdpi/icon_livelist.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_livelistoff.png b/qy/src/main/res/drawable-hdpi/icon_livelistoff.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_lock.png b/qy/src/main/res/drawable-hdpi/icon_lock.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_novoice.png b/qy/src/main/res/drawable-hdpi/icon_novoice.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_pass.png b/qy/src/main/res/drawable-hdpi/icon_pass.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_play.png b/qy/src/main/res/drawable-hdpi/icon_play.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_plpause.png b/qy/src/main/res/drawable-hdpi/icon_plpause.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_plresume.png b/qy/src/main/res/drawable-hdpi/icon_plresume.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_plstop.png b/qy/src/main/res/drawable-hdpi/icon_plstop.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_plus.png b/qy/src/main/res/drawable-hdpi/icon_plus.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_radio.png b/qy/src/main/res/drawable-hdpi/icon_radio.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_radio_in.png b/qy/src/main/res/drawable-hdpi/icon_radio_in.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_rest.png b/qy/src/main/res/drawable-hdpi/icon_rest.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_riding64.png b/qy/src/main/res/drawable-hdpi/icon_riding64.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_roadbook.png b/qy/src/main/res/drawable-hdpi/icon_roadbook.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_roadbook1.png b/qy/src/main/res/drawable-hdpi/icon_roadbook1.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_rotation.png b/qy/src/main/res/drawable-hdpi/icon_rotation.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_rotation_inactive.png b/qy/src/main/res/drawable-hdpi/icon_rotation_inactive.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_scale.9.png b/qy/src/main/res/drawable-hdpi/icon_scale.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_score.png b/qy/src/main/res/drawable-hdpi/icon_score.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_search.png b/qy/src/main/res/drawable-hdpi/icon_search.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_send.png b/qy/src/main/res/drawable-hdpi/icon_send.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_sstart.png b/qy/src/main/res/drawable-hdpi/icon_sstart.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_st.png b/qy/src/main/res/drawable-hdpi/icon_st.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_star.png b/qy/src/main/res/drawable-hdpi/icon_star.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_statistics2.png b/qy/src/main/res/drawable-hdpi/icon_statistics2.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_stop.png b/qy/src/main/res/drawable-hdpi/icon_stop.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_tent.png b/qy/src/main/res/drawable-hdpi/icon_tent.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_track.png b/qy/src/main/res/drawable-hdpi/icon_track.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_upload.png b/qy/src/main/res/drawable-hdpi/icon_upload.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_user.png b/qy/src/main/res/drawable-hdpi/icon_user.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_voice.png b/qy/src/main/res/drawable-hdpi/icon_voice.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_waypoint.png b/qy/src/main/res/drawable-hdpi/icon_waypoint.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_welcome_48.png b/qy/src/main/res/drawable-hdpi/icon_welcome_48.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/icon_wgb.png b/qy/src/main/res/drawable-hdpi/icon_wgb.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/item_head.xml b/qy/src/main/res/drawable-hdpi/item_head.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/linearlayout.xml b/qy/src/main/res/drawable-hdpi/linearlayout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/linearlayout_horizontal.xml b/qy/src/main/res/drawable-hdpi/linearlayout_horizontal.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/linearlayoutborder1.xml b/qy/src/main/res/drawable-hdpi/linearlayoutborder1.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/location.png b/qy/src/main/res/drawable-hdpi/location.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/nolocation.png b/qy/src/main/res/drawable-hdpi/nolocation.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/note_linearlayout.xml b/qy/src/main/res/drawable-hdpi/note_linearlayout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/picture.png b/qy/src/main/res/drawable-hdpi/picture.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/picture_inactive.png b/qy/src/main/res/drawable-hdpi/picture_inactive.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/popup_down.png b/qy/src/main/res/drawable-hdpi/popup_down.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/popup_middle.9.png b/qy/src/main/res/drawable-hdpi/popup_middle.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/popup_middlea.png b/qy/src/main/res/drawable-hdpi/popup_middlea.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/satellite.png b/qy/src/main/res/drawable-hdpi/satellite.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/screenshot.png b/qy/src/main/res/drawable-hdpi/screenshot.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/small_linearlayout.xml b/qy/src/main/res/drawable-hdpi/small_linearlayout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/text_color.xml b/qy/src/main/res/drawable-hdpi/text_color.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_light_bar_bg_pad.9.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_light_bar_bg_pad.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_nav_bar_bg_pad.9.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_nav_bar_bg_pad.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_oauth_check_off.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_oauth_check_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_oauth_check_on.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_oauth_check_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_share_music.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_share_music.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_share_pic.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_share_pic.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_socialize_share_video.png b/qy/src/main/res/drawable-hdpi/umeng_socialize_share_video.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_focused_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_focused_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_pressed_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_off_pressed_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_focused_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_focused_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_pressed_holo_light.png b/qy/src/main/res/drawable-hdpi/umeng_update_btn_check_on_pressed_holo_light.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_close_bg_normal.png b/qy/src/main/res/drawable-hdpi/umeng_update_close_bg_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/umeng_update_close_bg_tap.png b/qy/src/main/res/drawable-hdpi/umeng_update_close_bg_tap.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/wayinstructions4.png b/qy/src/main/res/drawable-hdpi/wayinstructions4.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/wayinstructions_inactive.png b/qy/src/main/res/drawable-hdpi/wayinstructions_inactive.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomin_disable.png b/qy/src/main/res/drawable-hdpi/zoomin_disable.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomin_normal.png b/qy/src/main/res/drawable-hdpi/zoomin_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomin_press.png b/qy/src/main/res/drawable-hdpi/zoomin_press.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomout_disable.png b/qy/src/main/res/drawable-hdpi/zoomout_disable.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomout_normal.png b/qy/src/main/res/drawable-hdpi/zoomout_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-hdpi/zoomout_press.png b/qy/src/main/res/drawable-hdpi/zoomout_press.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable-nodpi/empty_photo.png b/qy/src/main/res/drawable-nodpi/empty_photo.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/background_view_rounded_single.xml b/qy/src/main/res/drawable/background_view_rounded_single.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/button_shape.xml b/qy/src/main/res/drawable/button_shape.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/progressbar.xml b/qy/src/main/res/drawable/progressbar.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_focus.9.png b/qy/src/main/res/drawable/tab_camera_focus.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_indicator.xml b/qy/src/main/res/drawable/tab_camera_indicator.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_indicatoraaa.xml b/qy/src/main/res/drawable/tab_camera_indicatoraaa.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_press.9.png b/qy/src/main/res/drawable/tab_camera_press.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_selected.9.png b/qy/src/main/res/drawable/tab_camera_selected.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_unselected.9.png b/qy/src/main/res/drawable/tab_camera_unselected.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_camera_unselectedbk.9.png b/qy/src/main/res/drawable/tab_camera_unselectedbk.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_focus.9.png b/qy/src/main/res/drawable/tab_focus.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_indicator.xml b/qy/src/main/res/drawable/tab_indicator.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_indicatorbka.xml b/qy/src/main/res/drawable/tab_indicatorbka.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_press.9.png b/qy/src/main/res/drawable/tab_press.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_selected.9.png b/qy/src/main/res/drawable/tab_selected.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tab_unselected.9.png b/qy/src/main/res/drawable/tab_unselected.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tb_munion_icon.xml b/qy/src/main/res/drawable/tb_munion_icon.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/tb_munion_item_selector.xml b/qy/src/main/res/drawable/tb_munion_item_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_common_gradient_green.xml b/qy/src/main/res/drawable/umeng_common_gradient_green.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_common_gradient_orange.xml b/qy/src/main/res/drawable/umeng_common_gradient_orange.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_common_gradient_red.xml b/qy/src/main/res/drawable/umeng_common_gradient_red.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_action_back.xml b/qy/src/main/res/drawable/umeng_socialize_action_back.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_action_back_normal.png b/qy/src/main/res/drawable/umeng_socialize_action_back_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_action_back_selected.png b/qy/src/main/res/drawable/umeng_socialize_action_back_selected.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_at_button.xml b/qy/src/main/res/drawable/umeng_socialize_at_button.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_at_normal.png b/qy/src/main/res/drawable/umeng_socialize_at_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_at_selected.png b/qy/src/main/res/drawable/umeng_socialize_at_selected.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_bind_bg.9.png b/qy/src/main/res/drawable/umeng_socialize_bind_bg.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_blue.9.png b/qy/src/main/res/drawable/umeng_socialize_button_blue.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_grey.9.png b/qy/src/main/res/drawable/umeng_socialize_button_grey.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_grey_blue.xml b/qy/src/main/res/drawable/umeng_socialize_button_grey_blue.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_login.xml b/qy/src/main/res/drawable/umeng_socialize_button_login.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_login_normal.png b/qy/src/main/res/drawable/umeng_socialize_button_login_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_login_pressed.png b/qy/src/main/res/drawable/umeng_socialize_button_login_pressed.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_red.9.png b/qy/src/main/res/drawable/umeng_socialize_button_red.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_red_blue.xml b/qy/src/main/res/drawable/umeng_socialize_button_red_blue.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_white.9.png b/qy/src/main/res/drawable/umeng_socialize_button_white.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_button_white_blue.xml b/qy/src/main/res/drawable/umeng_socialize_button_white_blue.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_default_avatar.png b/qy/src/main/res/drawable/umeng_socialize_default_avatar.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_douban_off.png b/qy/src/main/res/drawable/umeng_socialize_douban_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_douban_on.png b/qy/src/main/res/drawable/umeng_socialize_douban_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_facebook.png b/qy/src/main/res/drawable/umeng_socialize_facebook.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_fetch_image.png b/qy/src/main/res/drawable/umeng_socialize_fetch_image.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_follow_check.xml b/qy/src/main/res/drawable/umeng_socialize_follow_check.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_follow_off.png b/qy/src/main/res/drawable/umeng_socialize_follow_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_follow_on.png b/qy/src/main/res/drawable/umeng_socialize_follow_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_google.png b/qy/src/main/res/drawable/umeng_socialize_google.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_light_bar_bg.9.png b/qy/src/main/res/drawable/umeng_socialize_light_bar_bg.9.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_location_ic.png b/qy/src/main/res/drawable/umeng_socialize_location_ic.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_location_off.png b/qy/src/main/res/drawable/umeng_socialize_location_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_location_on.png b/qy/src/main/res/drawable/umeng_socialize_location_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_nav_bar_bg.png b/qy/src/main/res/drawable/umeng_socialize_nav_bar_bg.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_oauth_check.xml b/qy/src/main/res/drawable/umeng_socialize_oauth_check.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_oauth_check_off.png b/qy/src/main/res/drawable/umeng_socialize_oauth_check_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_oauth_check_on.png b/qy/src/main/res/drawable/umeng_socialize_oauth_check_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_qq_off.png b/qy/src/main/res/drawable/umeng_socialize_qq_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_qq_on.png b/qy/src/main/res/drawable/umeng_socialize_qq_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_qzone_off.png b/qy/src/main/res/drawable/umeng_socialize_qzone_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_qzone_on.png b/qy/src/main/res/drawable/umeng_socialize_qzone_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_refersh.png b/qy/src/main/res/drawable/umeng_socialize_refersh.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_renren_off.png b/qy/src/main/res/drawable/umeng_socialize_renren_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_renren_on.png b/qy/src/main/res/drawable/umeng_socialize_renren_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_search_icon.png b/qy/src/main/res/drawable/umeng_socialize_search_icon.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_shape_solid_black.xml b/qy/src/main/res/drawable/umeng_socialize_shape_solid_black.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_shape_solid_grey.xml b/qy/src/main/res/drawable/umeng_socialize_shape_solid_grey.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_share_to_button.xml b/qy/src/main/res/drawable/umeng_socialize_share_to_button.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_share_transparent_corner.xml b/qy/src/main/res/drawable/umeng_socialize_share_transparent_corner.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_shareboard_item_background.xml b/qy/src/main/res/drawable/umeng_socialize_shareboard_item_background.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_sidebar_normal.xml b/qy/src/main/res/drawable/umeng_socialize_sidebar_normal.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_sidebar_selected.xml b/qy/src/main/res/drawable/umeng_socialize_sidebar_selected.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_sidebar_selector.xml b/qy/src/main/res/drawable/umeng_socialize_sidebar_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_sina_off.png b/qy/src/main/res/drawable/umeng_socialize_sina_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_sina_on.png b/qy/src/main/res/drawable/umeng_socialize_sina_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_back_bt.xml b/qy/src/main/res/drawable/umeng_socialize_title_back_bt.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_back_bt_normal.png b/qy/src/main/res/drawable/umeng_socialize_title_back_bt_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_back_bt_selected.png b/qy/src/main/res/drawable/umeng_socialize_title_back_bt_selected.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_right_bt.xml b/qy/src/main/res/drawable/umeng_socialize_title_right_bt.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_right_bt_normal.png b/qy/src/main/res/drawable/umeng_socialize_title_right_bt_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_right_bt_selected.png b/qy/src/main/res/drawable/umeng_socialize_title_right_bt_selected.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_button_left.xml b/qy/src/main/res/drawable/umeng_socialize_title_tab_button_left.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_button_right.xml b/qy/src/main/res/drawable/umeng_socialize_title_tab_button_right.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_left_normal.png b/qy/src/main/res/drawable/umeng_socialize_title_tab_left_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_left_pressed.png b/qy/src/main/res/drawable/umeng_socialize_title_tab_left_pressed.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_right_normal.png b/qy/src/main/res/drawable/umeng_socialize_title_tab_right_normal.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_title_tab_right_pressed.png b/qy/src/main/res/drawable/umeng_socialize_title_tab_right_pressed.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_twitter.png b/qy/src/main/res/drawable/umeng_socialize_twitter.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_tx_off.png b/qy/src/main/res/drawable/umeng_socialize_tx_off.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_tx_on.png b/qy/src/main/res/drawable/umeng_socialize_tx_on.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_wechat.png b/qy/src/main/res/drawable/umeng_socialize_wechat.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_wechat_gray.png b/qy/src/main/res/drawable/umeng_socialize_wechat_gray.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_window_shadow_pad.xml b/qy/src/main/res/drawable/umeng_socialize_window_shadow_pad.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_wxcircle.png b/qy/src/main/res/drawable/umeng_socialize_wxcircle.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_wxcircle_gray.png b/qy/src/main/res/drawable/umeng_socialize_wxcircle_gray.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_socialize_x_button.png b/qy/src/main/res/drawable/umeng_socialize_x_button.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_cancel_bg_focused.xml b/qy/src/main/res/drawable/umeng_update_button_cancel_bg_focused.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_cancel_bg_normal.xml b/qy/src/main/res/drawable/umeng_update_button_cancel_bg_normal.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_cancel_bg_selector.xml b/qy/src/main/res/drawable/umeng_update_button_cancel_bg_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_cancel_bg_tap.xml b/qy/src/main/res/drawable/umeng_update_button_cancel_bg_tap.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_check_selector.xml b/qy/src/main/res/drawable/umeng_update_button_check_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_close_bg_selector.xml b/qy/src/main/res/drawable/umeng_update_button_close_bg_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_ok_bg_focused.xml b/qy/src/main/res/drawable/umeng_update_button_ok_bg_focused.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_ok_bg_normal.xml b/qy/src/main/res/drawable/umeng_update_button_ok_bg_normal.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_ok_bg_selector.xml b/qy/src/main/res/drawable/umeng_update_button_ok_bg_selector.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_button_ok_bg_tap.xml b/qy/src/main/res/drawable/umeng_update_button_ok_bg_tap.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_dialog_bg.xml b/qy/src/main/res/drawable/umeng_update_dialog_bg.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_title_bg.xml b/qy/src/main/res/drawable/umeng_update_title_bg.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/umeng_update_wifi_disable.png b/qy/src/main/res/drawable/umeng_update_wifi_disable.png old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/zoomin_seletor.xml b/qy/src/main/res/drawable/zoomin_seletor.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/drawable/zoomout_seletor.xml b/qy/src/main/res/drawable/zoomout_seletor.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout-sw550dp-large/umeng_socialize_full_alert_dialog.xml b/qy/src/main/res/layout-sw550dp-large/umeng_socialize_full_alert_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout-sw550dp-large/umeng_socialize_oauth_dialog.xml b/qy/src/main/res/layout-sw550dp-large/umeng_socialize_oauth_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout-sw550dp-large/umeng_socialize_post_share.xml b/qy/src/main/res/layout-sw550dp-large/umeng_socialize_post_share.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout-sw550dp-large/umeng_socialize_titile_bar.xml b/qy/src/main/res/layout-sw550dp-large/umeng_socialize_titile_bar.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout-v9/umeng_common_download_notification.xml b/qy/src/main/res/layout-v9/umeng_common_download_notification.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/.gitignore b/qy/src/main/res/layout/.gitignore old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/act_detail_edit.xml b/qy/src/main/res/layout/act_detail_edit.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/act_group_buttons.xml b/qy/src/main/res/layout/act_group_buttons.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/act_group_tabs.xml b/qy/src/main/res/layout/act_group_tabs.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/activity_detail.xml b/qy/src/main/res/layout/activity_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/activity_home.xml b/qy/src/main/res/layout/activity_home.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/activity_list_detail.xml b/qy/src/main/res/layout/activity_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/activity_main_new.xml b/qy/src/main/res/layout/activity_main_new.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/activity_test.xml b/qy/src/main/res/layout/activity_test.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/category_list_detail.xml b/qy/src/main/res/layout/category_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/chart_speekm.xml b/qy/src/main/res/layout/chart_speekm.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/cp_track_basic_ll.xml b/qy/src/main/res/layout/cp_track_basic_ll.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/date_picker.xml b/qy/src/main/res/layout/date_picker.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/date_type_picker.xml b/qy/src/main/res/layout/date_type_picker.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/footmark_list_detail.xml b/qy/src/main/res/layout/footmark_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_data_edit.xml b/qy/src/main/res/layout/gpx_data_edit.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_detail_buttons.xml b/qy/src/main/res/layout/gpx_detail_buttons.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_detail_data.xml b/qy/src/main/res/layout/gpx_detail_data.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_detail_fragment.xml b/qy/src/main/res/layout/gpx_detail_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_detail_tab.xml b/qy/src/main/res/layout/gpx_detail_tab.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_list_detail.xml b/qy/src/main/res/layout/gpx_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_lushu_data.xml b/qy/src/main/res/layout/gpx_lushu_data.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_lushu_fragment.xml b/qy/src/main/res/layout/gpx_lushu_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gpx_lushu_tab.xml b/qy/src/main/res/layout/gpx_lushu_tab.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/gridview_item.xml b/qy/src/main/res/layout/gridview_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/group_detail.xml b/qy/src/main/res/layout/group_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/group_detail_edit.xml b/qy/src/main/res/layout/group_detail_edit.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/group_home.xml b/qy/src/main/res/layout/group_home.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/group_list_detail.xml b/qy/src/main/res/layout/group_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/image_detail_fragment.xml b/qy/src/main/res/layout/image_detail_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/image_detail_pager.xml b/qy/src/main/res/layout/image_detail_pager.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/image_dialog.xml b/qy/src/main/res/layout/image_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/import_gpx.xml b/qy/src/main/res/layout/import_gpx.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/import_gpx_detail.xml b/qy/src/main/res/layout/import_gpx_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/list_item_click_remove.xml b/qy/src/main/res/layout/list_item_click_remove.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/live_list_detail.xml b/qy/src/main/res/layout/live_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/live_share_point.xml b/qy/src/main/res/layout/live_share_point.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/liveinfo.xml b/qy/src/main/res/layout/liveinfo.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/load_more.xml b/qy/src/main/res/layout/load_more.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/location_picker.xml b/qy/src/main/res/layout/location_picker.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/login.xml b/qy/src/main/res/layout/login.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/map_views.xml b/qy/src/main/res/layout/map_views.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/myspinner.xml b/qy/src/main/res/layout/myspinner.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notes_detail.xml b/qy/src/main/res/layout/notes_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notes_list.xml b/qy/src/main/res/layout/notes_list.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notes_list_detail.xml b/qy/src/main/res/layout/notes_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notes_list_detail_msg.xml b/qy/src/main/res/layout/notes_list_detail_msg.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notes_new.xml b/qy/src/main/res/layout/notes_new.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/notice.xml b/qy/src/main/res/layout/notice.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/offline_localmap_list.xml b/qy/src/main/res/layout/offline_localmap_list.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/offlinemaps_fragment.xml b/qy/src/main/res/layout/offlinemaps_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/qcode_fragment.xml b/qy/src/main/res/layout/qcode_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/readme.xml b/qy/src/main/res/layout/readme.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/register.xml b/qy/src/main/res/layout/register.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/route_fragment.xml b/qy/src/main/res/layout/route_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/setting_background.xml b/qy/src/main/res/layout/setting_background.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/sharelocation_dialog.xml b/qy/src/main/res/layout/sharelocation_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/simple_lv_detail.xml b/qy/src/main/res/layout/simple_lv_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/softupgrade_progress.xml b/qy/src/main/res/layout/softupgrade_progress.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/spinner_item.xml b/qy/src/main/res/layout/spinner_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tab_indicator.xml b/qy/src/main/res/layout/tab_indicator.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tab_indicator_camera.xml b/qy/src/main/res/layout/tab_indicator_camera.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tb_munion_aditem.xml b/qy/src/main/res/layout/tb_munion_aditem.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tb_munion_adview.xml b/qy/src/main/res/layout/tb_munion_adview.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tent_list_detail.xml b/qy/src/main/res/layout/tent_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/thinspinner.xml b/qy/src/main/res/layout/thinspinner.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/time_picker.xml b/qy/src/main/res/layout/time_picker.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_chart_detailfragment.xml b/qy/src/main/res/layout/track_chart_detailfragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_data_edit.xml b/qy/src/main/res/layout/track_data_edit.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_detail_buttons.xml b/qy/src/main/res/layout/track_detail_buttons.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_detail_data.xml b/qy/src/main/res/layout/track_detail_data.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_detail_tab.xml b/qy/src/main/res/layout/track_detail_tab.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_fragment.xml b/qy/src/main/res/layout/track_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_list.xml b/qy/src/main/res/layout/track_list.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_list_detail.xml b/qy/src/main/res/layout/track_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_statics.xml b/qy/src/main/res/layout/track_statics.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/track_tabs.xml b/qy/src/main/res/layout/track_tabs.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/tracklist_input.xml b/qy/src/main/res/layout/tracklist_input.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/ttsdemo.xml b/qy/src/main/res/layout/ttsdemo.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_bak_at_list.xml b/qy/src/main/res/layout/umeng_bak_at_list.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_bak_at_list_item.xml b/qy/src/main/res/layout/umeng_bak_at_list_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_bak_platform_item_simple.xml b/qy/src/main/res/layout/umeng_bak_platform_item_simple.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_bak_platform_selector_dialog.xml b/qy/src/main/res/layout/umeng_bak_platform_selector_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_common_download_notification.xml b/qy/src/main/res/layout/umeng_common_download_notification.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_at_item.xml b/qy/src/main/res/layout/umeng_socialize_at_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_at_overlay.xml b/qy/src/main/res/layout/umeng_socialize_at_overlay.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_at_view.xml b/qy/src/main/res/layout/umeng_socialize_at_view.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_base_alert_dialog.xml b/qy/src/main/res/layout/umeng_socialize_base_alert_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_base_alert_dialog_button.xml b/qy/src/main/res/layout/umeng_socialize_base_alert_dialog_button.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_bind_select_dialog.xml b/qy/src/main/res/layout/umeng_socialize_bind_select_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_composer_header.xml b/qy/src/main/res/layout/umeng_socialize_composer_header.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_failed_load_page.xml b/qy/src/main/res/layout/umeng_socialize_failed_load_page.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_full_alert_dialog.xml b/qy/src/main/res/layout/umeng_socialize_full_alert_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_full_alert_dialog_item.xml b/qy/src/main/res/layout/umeng_socialize_full_alert_dialog_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_full_curtain.xml b/qy/src/main/res/layout/umeng_socialize_full_curtain.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_oauth_dialog.xml b/qy/src/main/res/layout/umeng_socialize_oauth_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_post_share.xml b/qy/src/main/res/layout/umeng_socialize_post_share.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_shareboard_item.xml b/qy/src/main/res/layout/umeng_socialize_shareboard_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_simple_spinner_item.xml b/qy/src/main/res/layout/umeng_socialize_simple_spinner_item.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_socialize_titile_bar.xml b/qy/src/main/res/layout/umeng_socialize_titile_bar.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/umeng_update_dialog.xml b/qy/src/main/res/layout/umeng_update_dialog.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/user_detail_edit.xml b/qy/src/main/res/layout/user_detail_edit.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/user_fragment.xml b/qy/src/main/res/layout/user_fragment.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/user_home.xml b/qy/src/main/res/layout/user_home.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/user_list_detail.xml b/qy/src/main/res/layout/user_list_detail.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/web_list.xml b/qy/src/main/res/layout/web_list.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/web_list_headers.xml b/qy/src/main/res/layout/web_list_headers.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/web_site.xml b/qy/src/main/res/layout/web_site.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/welcomelogo.xml b/qy/src/main/res/layout/welcomelogo.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/layout/zoom_controls_layout.xml b/qy/src/main/res/layout/zoom_controls_layout.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/menu/main.xml b/qy/src/main/res/menu/main.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/menu/splash.xml b/qy/src/main/res/menu/splash.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-1280x720/dimens.xml b/qy/src/main/res/values-1280x720/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-800x480/dimens.xml b/qy/src/main/res/values-800x480/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-hdpi-533x320/dimens.xml b/qy/src/main/res/values-hdpi-533x320/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-hdpi-683x400/dimens.xml b/qy/src/main/res/values-hdpi-683x400/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-hdpi/dimens.xml b/qy/src/main/res/values-hdpi/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-mdpi-1024x600/dimens.xml b/qy/src/main/res/values-mdpi-1024x600/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-mdpi-800x480/dimens.xml b/qy/src/main/res/values-mdpi-800x480/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-mdpi/dimens.xml b/qy/src/main/res/values-mdpi/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-v11/styles.xml b/qy/src/main/res/values-v11/styles.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-v14/styles.xml b/qy/src/main/res/values-v14/styles.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-zh/umeng_common_strings.xml b/qy/src/main/res/values-zh/umeng_common_strings.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values-zh/umeng_update_string.xml b/qy/src/main/res/values-zh/umeng_update_string.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/colors.xml b/qy/src/main/res/values/colors.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/dimens.xml b/qy/src/main/res/values/dimens.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/ids.xml b/qy/src/main/res/values/ids.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/strings.xml b/qy/src/main/res/values/strings.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/strings_activity_settings.xml b/qy/src/main/res/values/strings_activity_settings.xml old mode 100755 new mode 100644 diff --git a/qy/src/main/res/values/styles.xml b/qy/src/main/res/values/styles.xml old mode 100755 new mode 100644 index 0e49123..84ce737 --- a/qy/src/main/res/values/styles.xml +++ b/qy/src/main/res/values/styles.xml @@ -556,7 +556,8 @@ - + diff --git a/zhuike/src/main/res/values/colors.xml b/zhuike/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/zhuike/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/zhuike/src/main/res/values/dimens.xml b/zhuike/src/main/res/values/dimens.xml new file mode 100644 index 0000000..ced71db --- /dev/null +++ b/zhuike/src/main/res/values/dimens.xml @@ -0,0 +1,34 @@ + + + + 16dp + 160dp + + 16dp + 16dp + 22dp + 256dp + + + 1dp + + 15dp + + 30dp + + 3dp + + 10dp + + 30dp + + 20sp + + 10sp + + 30sp + + 60dp + + + diff --git a/zhuike/src/main/res/values/drawables.xml b/zhuike/src/main/res/values/drawables.xml new file mode 100644 index 0000000..52c6a6c --- /dev/null +++ b/zhuike/src/main/res/values/drawables.xml @@ -0,0 +1,8 @@ + + @android:drawable/ic_menu_camera + @android:drawable/ic_menu_gallery + @android:drawable/ic_menu_slideshow + @android:drawable/ic_menu_manage + @android:drawable/ic_menu_share + @android:drawable/ic_menu_send + diff --git a/zhuike/src/main/res/values/strings.xml b/zhuike/src/main/res/values/strings.xml new file mode 100644 index 0000000..2308adc --- /dev/null +++ b/zhuike/src/main/res/values/strings.xml @@ -0,0 +1,19 @@ + + zhuike + Home + Dashboard + Notifications + test + + + Hello blank fragment + Main2Activity + Open navigation drawer + Close navigation drawer + Android Studio + android.studio@android.com + Navigation header + Settings + Main3Activity + Main4Activity + diff --git a/zhuike/src/main/res/values/styles.xml b/zhuike/src/main/res/values/styles.xml new file mode 100644 index 0000000..0b82409 --- /dev/null +++ b/zhuike/src/main/res/values/styles.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + +