diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
new file mode 100644
index 0000000..d8359ec
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml
new file mode 100644
index 0000000..5b17db6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
new file mode 100644
index 0000000..5699a5d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
new file mode 100644
index 0000000..fbc5d2f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml
new file mode 100644
index 0000000..a7f501b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
new file mode 100644
index 0000000..0160fc0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
new file mode 100644
index 0000000..8496b8f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
new file mode 100644
index 0000000..28e1f2f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml
new file mode 100644
index 0000000..ecb16c3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
new file mode 100644
index 0000000..92fb87a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
new file mode 100644
index 0000000..f92fb42
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
new file mode 100644
index 0000000..97dde5d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_3_0_alpha02_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_3_0_alpha02_aar.xml
new file mode 100644
index 0000000..f3d4749
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_1_3_0_alpha02_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_0_alpha02_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_0_alpha02_aar.xml
new file mode 100644
index 0000000..5e76c9d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_0_alpha02_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
new file mode 100644
index 0000000..28a7b35
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
new file mode 100644
index 0000000..4cc4bd5
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
new file mode 100644
index 0000000..8a5bc37
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
new file mode 100644
index 0000000..2e221e2
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
new file mode 100644
index 0000000..4cd3aa1
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
new file mode 100644
index 0000000..ce3a880
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
new file mode 100644
index 0000000..7171558
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
new file mode 100644
index 0000000..166c1bc
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml
new file mode 100644
index 0000000..8c4384c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
new file mode 100644
index 0000000..84a2bc0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
new file mode 100644
index 0000000..10cc6a6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
new file mode 100644
index 0000000..210e161
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
new file mode 100644
index 0000000..90f77b0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
new file mode 100644
index 0000000..a6da170
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
new file mode 100644
index 0000000..d39cce2
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
new file mode 100644
index 0000000..4bd53bf
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
new file mode 100644
index 0000000..61b30af
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
new file mode 100644
index 0000000..90eb12f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
new file mode 100644
index 0000000..d4b76ee
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
new file mode 100644
index 0000000..179bdda
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_core_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_1_0_aar.xml
new file mode 100644
index 0000000..bd1f9ba
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_core_1_1_0_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
new file mode 100644
index 0000000..580546f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
new file mode 100644
index 0000000..8c1f6a8
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_0_aar.xml
new file mode 100644
index 0000000..8d0439e
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_0_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
new file mode 100644
index 0000000..829bdbb
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
new file mode 100644
index 0000000..0ccc77b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
new file mode 100644
index 0000000..085959d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
new file mode 100644
index 0000000..77bd45b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
new file mode 100644
index 0000000..282a427
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
new file mode 100644
index 0000000..70208b9
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__cn_jiguang_sdk_jcore_2_2_4_aar.xml b/.idea/libraries/Gradle__cn_jiguang_sdk_jcore_2_2_4_aar.xml
new file mode 100644
index 0000000..6619c10
--- /dev/null
+++ b/.idea/libraries/Gradle__cn_jiguang_sdk_jcore_2_2_4_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__cn_jiguang_sdk_jpush_3_4_1_aar.xml b/.idea/libraries/Gradle__cn_jiguang_sdk_jpush_3_4_1_aar.xml
new file mode 100644
index 0000000..266609b
--- /dev/null
+++ b/.idea/libraries/Gradle__cn_jiguang_sdk_jpush_3_4_1_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_alibaba_fastjson_1_2_21_jar.xml b/.idea/libraries/Gradle__com_alibaba_fastjson_1_2_21_jar.xml
new file mode 100644
index 0000000..972f702
--- /dev/null
+++ b/.idea/libraries/Gradle__com_alibaba_fastjson_1_2_21_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_arialyy_aria_annotations_3_7_7_jar.xml b/.idea/libraries/Gradle__com_arialyy_aria_annotations_3_7_7_jar.xml
new file mode 100644
index 0000000..9e78816
--- /dev/null
+++ b/.idea/libraries/Gradle__com_arialyy_aria_annotations_3_7_7_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_arialyy_aria_core_3_7_7_aar.xml b/.idea/libraries/Gradle__com_arialyy_aria_core_3_7_7_aar.xml
new file mode 100644
index 0000000..a2bfedc
--- /dev/null
+++ b/.idea/libraries/Gradle__com_arialyy_aria_core_3_7_7_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_arialyy_aria_httpComponent_3_7_7_aar.xml b/.idea/libraries/Gradle__com_arialyy_aria_httpComponent_3_7_7_aar.xml
new file mode 100644
index 0000000..665ca09
--- /dev/null
+++ b/.idea/libraries/Gradle__com_arialyy_aria_httpComponent_3_7_7_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_arialyy_aria_publicComponent_3_7_7_aar.xml b/.idea/libraries/Gradle__com_arialyy_aria_publicComponent_3_7_7_aar.xml
new file mode 100644
index 0000000..9513213
--- /dev/null
+++ b/.idea/libraries/Gradle__com_arialyy_aria_publicComponent_3_7_7_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_blankj_utilcode_1_23_7_aar.xml b/.idea/libraries/Gradle__com_blankj_utilcode_1_23_7_aar.xml
new file mode 100644
index 0000000..4c55da6
--- /dev/null
+++ b/.idea/libraries/Gradle__com_blankj_utilcode_1_23_7_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_flyco_tablayout_FlycoTabLayout_Lib_2_1_2_aar.xml b/.idea/libraries/Gradle__com_flyco_tablayout_FlycoTabLayout_Lib_2_1_2_aar.xml
new file mode 100644
index 0000000..16e8543
--- /dev/null
+++ b/.idea/libraries/Gradle__com_flyco_tablayout_FlycoTabLayout_Lib_2_1_2_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_10_0_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_10_0_jar.xml
new file mode 100644
index 0000000..1b5a279
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_10_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_10_0_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_10_0_jar.xml
new file mode 100644
index 0000000..96c7414
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_10_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_10_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_10_0_aar.xml
new file mode 100644
index 0000000..802b3b6
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_gifdecoder_4_10_0_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_10_0_aar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_10_0_aar.xml
new file mode 100644
index 0000000..5de166c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_4_10_0_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
new file mode 100644
index 0000000..947e251
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml
new file mode 100644
index 0000000..f82e31c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_hjq_xxpermissions_6_0_aar.xml b/.idea/libraries/Gradle__com_hjq_xxpermissions_6_0_aar.xml
new file mode 100644
index 0000000..a603acc
--- /dev/null
+++ b/.idea/libraries/Gradle__com_hjq_xxpermissions_6_0_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..f8d4718
--- /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_okrx_1_0_2_aar.xml b/.idea/libraries/Gradle__com_lzy_net_okrx_1_0_2_aar.xml
new file mode 100644
index 0000000..11ec8b9
--- /dev/null
+++ b/.idea/libraries/Gradle__com_lzy_net_okrx_1_0_2_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_lzy_net_okserver_2_0_5_aar.xml b/.idea/libraries/Gradle__com_lzy_net_okserver_2_0_5_aar.xml
new file mode 100644
index 0000000..94ec47f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_lzy_net_okserver_2_0_5_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshHeader_1_1_0_aar.xml b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshHeader_1_1_0_aar.xml
new file mode 100644
index 0000000..8bd21ba
--- /dev/null
+++ b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshHeader_1_1_0_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_1_0_aar.xml b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_1_0_aar.xml
new file mode 100644
index 0000000..69d29c5
--- /dev/null
+++ b/.idea/libraries/Gradle__com_scwang_smartrefresh_SmartRefreshLayout_1_1_0_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
new file mode 100644
index 0000000..f97c138
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml
new file mode 100644
index 0000000..1379d59
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..8dbb787
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava_2_1_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava_2_1_0_jar.xml
new file mode 100644
index 0000000..70408ef
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava_2_1_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_1_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_1_0_jar.xml
new file mode 100644
index 0000000..0063935
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_1_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
new file mode 100644
index 0000000..20468c7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_1_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_1_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_1_0_jar.xml
new file mode 100644
index 0000000..7f23f7a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_1_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_zhpan_library_bannerview_2_6_4_aar.xml b/.idea/libraries/Gradle__com_zhpan_library_bannerview_2_6_4_aar.xml
new file mode 100644
index 0000000..ed977d8
--- /dev/null
+++ b/.idea/libraries/Gradle__com_zhpan_library_bannerview_2_6_4_aar.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__io_reactivex_rxandroid_1_2_1_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxandroid_1_2_1_aar.xml
new file mode 100644
index 0000000..57d2453
--- /dev/null
+++ b/.idea/libraries/Gradle__io_reactivex_rxandroid_1_2_1_aar.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava_1_3_0_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava_1_3_0_jar.xml
new file mode 100644
index 0000000..f993540
--- /dev/null
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava_1_3_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
new file mode 100644
index 0000000..5ac7d7b
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
new file mode 100644
index 0000000..24e5b72
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..ddd2635
--- /dev/null
+++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
new file mode 100644
index 0000000..6b1e2e7
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
new file mode 100644
index 0000000..a8015c9
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
new file mode 100644
index 0000000..00bb125
--- /dev/null
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
new file mode 100644
index 0000000..56b3542
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_61_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_61_jar.xml
new file mode 100644
index 0000000..a94d064
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_61_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml
new file mode 100644
index 0000000..2442a80
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml
new file mode 100644
index 0000000..de466a1
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 76680f4..fd2cb26 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -31,7 +31,7 @@
-
+
@@ -142,10 +142,6 @@
-
-
-
-
@@ -163,10 +159,14 @@
-
+
+
+
+
+
-
+
@@ -187,16 +187,16 @@
-
+
+
+
+
-
-
-
diff --git a/app/build.gradle b/app/build.gradle
index ecfe2d9..e6f9a79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
applicationId "com.appstore.uiui"
minSdkVersion 23
targetSdkVersion 29
- versionCode 10
- versionName "1.1.0"
+ versionCode 13
+ versionName "1.1.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//极光
ndk {
@@ -109,7 +109,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
- //github第三方控件maven
+ //github第三方控件
implementation 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
//下拉刷新控件
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //1.0.5及以前版本的老用户升级需谨慎，API改动过大
@@ -146,7 +146,7 @@ dependencies {
implementation 'cn.jiguang.sdk:jcore:2.2.4' // 此处以JCore 2.2.4 版本为例。
implementation 'com.zhpan.library:bannerview:2.6.4'
- compile "androidx.core:core-ktx:+"
+ implementation "androidx.core:core-ktx:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bf681de..3b46cb9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,8 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
-
+
+
+
@@ -86,9 +88,7 @@
-
-
-
+
response) {
// Settings.System.putString(getApplicationContext().getContentResolver(), "qch_app_forbid", "com.baidu.video");
- ApkUtils.installApkInSilence(response.body().getAbsolutePath(), packages);
+ ApkUtils.installApkInSilence(app.getAppContext(), response.body().getAbsolutePath());
LogUtils.e("onSuccess", "download file successful,now installing");
}
@@ -391,7 +390,7 @@ public class MyApplication extends Application {
ToastUtil.debugShow("收到应用卸载消息：包名" + packageName);
if (!packageName.equals("") && !packageName.equals(getApplicationContext().getPackageName())) {
if (!ApkUtils.isAvailable(getApplicationContext(), packageName)) {
- OKGOPost.setAppuninstallInfo(sn_id, packageName);
+ OKGO.setAppuninstallInfo(sn_id, packageName);
} else {
ApkUtils.deleteApkInSilence(packageName);
}
diff --git a/app/src/main/java/com/appstore/uiui/activity/AboutActivity.java b/app/src/main/java/com/appstore/uiui/activity/AboutActivity.java
new file mode 100644
index 0000000..6f40d0b
--- /dev/null
+++ b/app/src/main/java/com/appstore/uiui/activity/AboutActivity.java
@@ -0,0 +1,43 @@
+package com.appstore.uiui.activity;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.appstore.uiui.BuildConfig;
+import com.appstore.uiui.R;
+import com.appstore.uiui.base.BaseActivity;
+
+public class AboutActivity extends BaseActivity {
+ private ImageView iv_exit;
+ private TextView tv_version;
+
+
+ @Override
+ protected int setLayoutResourceID() {
+ return R.layout.activity_about;
+ }
+
+ @Override
+ protected void initView() {
+ iv_exit = findViewById(R.id.iv_exit);
+ iv_exit.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ tv_version=findViewById(R.id.tv_version);
+ tv_version.setText("版本："+ BuildConfig.VERSION_NAME);
+ }
+
+ @Override
+ protected void initData() {
+
+ }
+
+ @Override
+ protected void setListener() {
+
+ }
+}
diff --git a/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java b/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java
index a0b24e5..98e721f 100644
--- a/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/KindDetailActivity.java
@@ -14,7 +14,7 @@ import com.appstore.uiui.adapter.AppAdapter;
import com.appstore.uiui.base.BaseActivity;
import com.appstore.uiui.base.RefreshManager;
import com.appstore.uiui.bean.AppInfo;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.SPUtils;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -67,10 +67,10 @@ public class KindDetailActivity extends BaseActivity implements RefreshManager.R
mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(RefreshLayout refreshlayout) {
- OKGOPost.getSortApp(handler, type, grade, subject);
+ OKGO.getSortApp(handler, type, grade, subject);
}
});
- OKGOPost.getSortApp(handler, type, grade, subject);
+ OKGO.getSortApp(handler, type, grade, subject);
}
@Override
diff --git a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
index a98625e..b64898d 100644
--- a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
@@ -4,11 +4,11 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
+import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
@@ -32,7 +32,7 @@ import com.appstore.uiui.fragment.RankFragment;
import com.appstore.uiui.jpush.ExampleUtil;
import com.appstore.uiui.jpush.LocalBroadcastManager;
import com.appstore.uiui.jpush.TagAliasOperatorHelper;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.service.MyDownloadService;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.LogUtils;
@@ -54,7 +54,6 @@ import java.util.List;
import java.util.Set;
import cn.jpush.android.api.JPushInterface;
-import cn.jpush.android.api.TagAliasCallback;
import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_ADD;
import static com.appstore.uiui.jpush.TagAliasOperatorHelper.ACTION_CHECK;
@@ -67,7 +66,7 @@ import static com.appstore.uiui.jpush.TagAliasOperatorHelper.sequence;
public class MainActivity extends BaseActivity {
private RelativeLayout search_layout;
- private ImageView iv_download;
+ private ImageView iv_download, iv_appicon;
private SlidingTabLayout mSlidingTabLayout;
private ViewPager mViewPager;
private long exitTime = 0;
@@ -88,7 +87,7 @@ public class MainActivity extends BaseActivity {
// ToastUtil.show("Get registration fail, JPush init failed!");
// Toast.makeText(this, "Get registration fail, JPush init failed!", Toast.LENGTH_SHORT).show();
}
- OKGOPost.getUserInfo(handler);
+ OKGO.getUserInfo(handler);
// PackageManager pm = getPackageManager();
// pm.setApplicationEnabledSetting("com.tencent.qqmusic", PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
startService(new Intent(MainActivity.this, MyDownloadService.class));
@@ -102,6 +101,13 @@ public class MainActivity extends BaseActivity {
@Override
protected void initView() {
+ iv_appicon = findViewById(R.id.iv_appicon);
+ iv_appicon.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(MainActivity.this, AboutActivity.class));
+ }
+ });
iv_download = findViewById(R.id.iv_download);
iv_download.setOnClickListener(new View.OnClickListener() {
@Override
@@ -145,7 +151,7 @@ public class MainActivity extends BaseActivity {
@Override
protected void initData() {
-
+ OKGO.getAllAppPackageName(handler);
}
@Override
@@ -154,7 +160,7 @@ public class MainActivity extends BaseActivity {
}
synchronized private void CheckUpdate() {
- OKGOPost.checkUpdateByPackage(handler, this.getPackageName(), String.valueOf(BuildConfig.VERSION_CODE));
+ OKGO.checkUpdateByPackage(handler, this.getPackageName(), String.valueOf(BuildConfig.VERSION_CODE));
}
// 初始化 JPush。如果已经初始化，但没有登录成功，则执行重新登录。
@@ -373,6 +379,16 @@ public class MainActivity extends BaseActivity {
String url = (String) msg.obj;
getFile(url);
break;
+ case 201:
+ String apppackage = (String) msg.obj;
+ Log.e("fht", Settings.System.getString(getContentResolver(), "qch_app_forbid")+"?");
+ if (Settings.System.putString(getContentResolver(), "qch_app_forbid", apppackage)) {
+ Log.e("fht", "app package write successful");
+ }
+
+ break;
+ case 202:
+ break;
}
}
};
@@ -383,7 +399,7 @@ public class MainActivity extends BaseActivity {
@Override
public void onSuccess(Response response) {
// Settings.System.putString(getApplicationContext().getContentResolver(), "qch_app_forbid", "com.baidu.video");
- ApkUtils.installApkInSilence(response.body().getAbsolutePath(), MainActivity.this.getPackageName());
+ ApkUtils.installApkInSilence(MainActivity.this, response.body().getAbsolutePath());
LogUtils.e("getFile", "download file successful,now installing");
}
diff --git a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
index 4ba5065..ab7ac8e 100644
--- a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
@@ -13,10 +13,9 @@ import com.appstore.uiui.R;
import com.appstore.uiui.adapter.AppAdapter;
import com.appstore.uiui.base.BaseActivity;
import com.appstore.uiui.bean.AppInfo;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.LogUtils;
-import com.appstore.uiui.utils.ToastUtil;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +53,7 @@ public class SearcherActivity extends BaseActivity {
@Override
public boolean onQueryTextSubmit(String query) {
LogUtils.e("search", query);
- OKGOPost.searchAppbyName(handler, query);
+ OKGO.searchAppbyName(handler, query);
return false;
}
diff --git a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
index 0101cb3..f30b5d2 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
@@ -1,10 +1,7 @@
package com.appstore.uiui.adapter;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.content.IntentFilter;
-import android.telecom.Call;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -13,16 +10,13 @@ import android.widget.ImageView;
import android.widget.RatingBar;
import android.widget.TextView;
-import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView;
import com.appstore.uiui.R;
import com.appstore.uiui.activity.DetailsActivity;
import com.appstore.uiui.bean.AppInfo;
import com.appstore.uiui.listener.LogDownloadListener;
-import com.appstore.uiui.network.OKGOPost;
import com.appstore.uiui.utils.ApkUtils;
-import com.appstore.uiui.utils.LogUtils;
import com.appstore.uiui.utils.ToastUtil;
import com.bumptech.glide.Glide;
import com.lzy.okgo.OkGo;
@@ -256,7 +250,7 @@ public class AppAdapter extends RecyclerView.Adapter {
@Override
public void onFinish(File file, Progress progress) {
ToastUtil.show(((AppInfo) progress.extra1).getApp_name() + "\t下载完成");
- ApkUtils.installApkInSilence(file.getAbsolutePath(), ((AppInfo) progress.extra1).getApp_package());
+ ApkUtils.installApkInSilence(mContext, file.getAbsolutePath());
}
@Override
diff --git a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
index 916b80c..0c5db03 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
@@ -184,7 +184,7 @@ public class UpdateAppAdapter extends RecyclerView.Adapter getLocalApp() {
diff --git a/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java b/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java
index b138116..80fdc90 100644
--- a/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java
+++ b/app/src/main/java/com/appstore/uiui/fragment/RankFragment.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.util.Log;
import android.view.View;
@@ -17,13 +16,11 @@ import com.appstore.uiui.adapter.AppAdapter;
import com.appstore.uiui.base.LazyLoadFragment;
import com.appstore.uiui.base.RefreshManager;
import com.appstore.uiui.bean.AppInfo;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.LogUtils;
-import com.lzy.okgo.OkGo;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import java.util.ArrayList;
@@ -62,7 +59,7 @@ public class RankFragment extends LazyLoadFragment implements RefreshManager.Ref
@Override
public void onStart() {
super.onStart();
- OKGOPost.getRankApp(handler);
+ OKGO.getRankApp(handler);
LogUtils.e("fht", "RankFragment onStart");
}
@@ -104,7 +101,7 @@ public class RankFragment extends LazyLoadFragment implements RefreshManager.Ref
mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(RefreshLayout refreshlayout) {
- OKGOPost.getRankApp(handler);
+ OKGO.getRankApp(handler);
}
});
}
diff --git a/app/src/main/java/com/appstore/uiui/network/OKGOPost.java b/app/src/main/java/com/appstore/uiui/network/OKGO.java
similarity index 91%
rename from app/src/main/java/com/appstore/uiui/network/OKGOPost.java
rename to app/src/main/java/com/appstore/uiui/network/OKGO.java
index b87887d..f5cb0e1 100644
--- a/app/src/main/java/com/appstore/uiui/network/OKGOPost.java
+++ b/app/src/main/java/com/appstore/uiui/network/OKGO.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.List;
-public class OKGOPost {
+public class OKGO {
private static final int GET_ALL_APPINFO = 0;
private static final int GET_USERINFO = 1;
private static final int GET_SORTAPP = 2;
@@ -88,6 +88,44 @@ public class OKGOPost {
});
}
+ synchronized public static void getAllAppPackageName(final Handler handler) {
+ OkGo.get(Url.GET_ALL_PACKAGENAME).execute(new StringCallback() {
+ @Override
+ public void onSuccess(Response response) {
+ String s = response.body();
+ try {
+ JSONObject body = JSON.parseObject(s);
+ int code = body.getInteger("code");
+ String msg = body.getString("msg");
+ String data = body.getString("data");
+ if (code == 200) {
+ List jsonArray = JSON.parseArray(data, JSONObject.class);
+ String packageList = "";
+ for (JSONObject jsonObject : jsonArray) {
+ packageList += jsonObject.getString("app_package") + ",";
+ }
+ if (!packageList.isEmpty()) {
+ Log.e("fht", packageList);
+ Message message = new Message();
+ message.what = 201;
+ message.obj = packageList;
+ handler.sendMessage(message);
+ } else {
+ handler.sendEmptyMessage(202);
+ }
+ }
+ } catch (Exception e) {
+
+ }
+ }
+
+ @Override
+ public void onError(Response response) {
+ super.onError(response);
+ }
+ });
+ }
+
synchronized public static void getRankApp(final Handler handler) {
OkGo.get(Url.GET_ALL_RANK).execute(new StringCallback() {
@Override
diff --git a/app/src/main/java/com/appstore/uiui/network/URLs/Url.java b/app/src/main/java/com/appstore/uiui/network/URLs/Url.java
index 3353667..a18860d 100644
--- a/app/src/main/java/com/appstore/uiui/network/URLs/Url.java
+++ b/app/src/main/java/com/appstore/uiui/network/URLs/Url.java
@@ -5,7 +5,7 @@ public class Url {
public final static String GET_ALL_APPINFO = NETWORK_HOME_ADDRESS + "/App/allInfo";
//获取所有应用
- public final static String GET_ALL_RANK = NETWORK_HOME_ADDRESS + "/App/rankings";
+ public final static String GET_ALL_RANK = NETWORK_HOME_ADDRESS + "/App/rankings";
//获取所有应用排行
public final static String GET_APPSEARCHE = NETWORK_HOME_ADDRESS + "/App/appSearch";
//搜索应用
@@ -20,5 +20,7 @@ public class Url {
public final static String GET_APP_UPDATE = NETWORK_HOME_ADDRESS + "/Update/update";
//根据包名获取更新
public final static String GET_BANNER_IMG = NETWORK_HOME_ADDRESS + "/Slideshow/getImg";
-
+ //获取banner图
+ public final static String GET_ALL_PACKAGENAME = NETWORK_HOME_ADDRESS + "/App/allPackage";
+ //获取所有应用包名
}
diff --git a/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java b/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java
index 3a83e01..b22bb11 100644
--- a/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java
+++ b/app/src/main/java/com/appstore/uiui/receiver/AppManagerReceiver.java
@@ -3,10 +3,9 @@ package com.appstore.uiui.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageInfo;
import android.util.Log;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.LogUtils;
import com.appstore.uiui.utils.SPUtils;
@@ -40,9 +39,9 @@ public class AppManagerReceiver extends BroadcastReceiver {
// ToastTool.show("安装成功");
if (!packageName.equals(context.getPackageName()) && !packageName.equals("com.android.uiuios") && !packageName.equals("com.info.sn")) {
if (member_id == -1 || sn_id.equals("-1")) {
- OKGOPost.getUserInfo(context);
+ OKGO.getUserInfo(context);
} else {
- OKGOPost.setAppinstallInfo(member_id, sn_id, name, packageName);
+ OKGO.setAppinstallInfo(member_id, sn_id, name, packageName);
}
}
}
@@ -55,9 +54,9 @@ public class AppManagerReceiver extends BroadcastReceiver {
context.sendBroadcast(intents);
if (!packageName.equals(context.getPackageName()) && !packageName.equals("com.android.uiuios")) {
if (member_id == -1 || sn_id.equals("-1")) {
- OKGOPost.getUserInfo(context);
+ OKGO.getUserInfo(context);
} else {
- OKGOPost.setAppuninstallInfo(sn_id, packageName);
+ OKGO.setAppuninstallInfo(sn_id, packageName);
}
}
}
diff --git a/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java b/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java
index 595bab3..d7b136f 100644
--- a/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java
+++ b/app/src/main/java/com/appstore/uiui/receiver/BootReceiver.java
@@ -3,9 +3,8 @@ package com.appstore.uiui.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.util.Log;
-import com.appstore.uiui.network.OKGOPost;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.service.GuardService;
import com.appstore.uiui.service.InitJpushServer;
import com.appstore.uiui.service.StepService;
@@ -15,12 +14,10 @@ public class BootReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
-
- Intent i = new Intent(context, InitJpushServer.class);
- context.startService(i);
+ context.startService(new Intent(context, InitJpushServer.class));
context.startService(new Intent(context, StepService.class));
context.startService(new Intent(context, GuardService.class));
- OKGOPost.getUserInfo(context);
+ OKGO.getUserInfo(context);
LogUtils.e("fht", "booting BootReceiver");
}
}
diff --git a/app/src/main/java/com/appstore/uiui/service/GuardService.java b/app/src/main/java/com/appstore/uiui/service/GuardService.java
index 5bbb621..a528f0c 100644
--- a/app/src/main/java/com/appstore/uiui/service/GuardService.java
+++ b/app/src/main/java/com/appstore/uiui/service/GuardService.java
@@ -12,20 +12,30 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.os.Handler;
import android.os.IBinder;
+import android.os.Message;
+import android.provider.Settings;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.appstore.uiui.KeepAliveConnection;
+import com.appstore.uiui.activity.MainActivity;
+import com.appstore.uiui.base.UserInfo;
+import com.appstore.uiui.network.OKGO;
import com.appstore.uiui.utils.ApkUtils;
import com.appstore.uiui.utils.LogUtils;
+import com.appstore.uiui.utils.SPUtils;
import com.appstore.uiui.utils.ServiceAliveUtils;
import com.arialyy.annotations.Download;
import com.arialyy.aria.core.Aria;
import com.arialyy.aria.core.task.DownloadTask;
import com.blankj.utilcode.util.ToastUtils;
+import java.io.File;
+
/**
* 守护进程 双进程通讯
@@ -44,6 +54,7 @@ public class GuardService extends Service {
Intent i = new Intent(GuardService.this, MyDownloadService.class);
startService(i);
}
+
}
@Override
@@ -69,27 +80,51 @@ public class GuardService extends Service {
Aria.init(this);
Aria.get(this).getDownloadConfig().setMaxTaskNum(1);
Aria.download(this).register();
+ OKGO.getAllAppPackageName(handler);
// startForeground(1, new Notification());
// 绑定建立链接
bindService(new Intent(this, StepService.class), mServiceConnection, Context.BIND_IMPORTANT);
return START_STICKY;
}
+ private Handler handler = new Handler() {
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ super.handleMessage(msg);
+ switch (msg.what) {
+
+ case 201:
+ String apppackage = (String) msg.obj;
+ Log.e("fht", Settings.System.getString(getContentResolver(), "qch_app_forbid")+"?");
+ if (Settings.System.putString(getContentResolver(), "qch_app_forbid", apppackage)) {
+ Log.e("fht", "app package write successful");
+ }
+ break;
+ case 202:
+ break;
+ }
+ }
+ };
+
//在这里处理任务执行中的状态，如进度进度条的刷新
@Download.onTaskRunning
- protected void running( DownloadTask task) {
- LogUtils.e("mjsheng", "我在下载=--------------::" + task.getState() + "-------" + task.getPercent()+ "-------" + task.getExtendField());
+ protected void running(DownloadTask task) {
+ LogUtils.e("mjsheng", "我在下载=--------------::" + task.getState() + "-------" + task.getPercent() + "-------" + task.getExtendField());
ToastUtils.showShort("我在下载=--------------::" + task.getExtendField() + "-------" + task.getPercent());
}
@Download.onTaskComplete
- void taskComplete( DownloadTask task) {
+ void taskComplete(DownloadTask task) {
//在这里处理任务完成的状态
String downloadPath = task.getFilePath();
String packageName = task.getExtendField();
LogUtils.e("mjsheng", "downloadPath::" + downloadPath);
LogUtils.e("mjsheng", "extendField::" + packageName);
- ApkUtils.installApkInSilence(downloadPath, packageName);
+ if (packageName.equalsIgnoreCase(this.getPackageName())) {
+ ApkUtils.install(this, new File(downloadPath));
+ } else {
+ ApkUtils.installApkInSilence(this, downloadPath);
+ }
}
}
diff --git a/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java b/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java
index fc4af0f..3ae72f7 100644
--- a/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java
+++ b/app/src/main/java/com/appstore/uiui/utils/ApkUtils.java
@@ -14,6 +14,7 @@ import android.widget.Toast;
import androidx.core.content.FileProvider;
+import com.appstore.uiui.BuildConfig;
import com.appstore.uiui.R;
import java.io.BufferedReader;
@@ -309,29 +310,72 @@ public class ApkUtils {
// }
//使用系统签名
- public static void installApkInSilence(String installPath, String packageName) {
+// public static void installApkInSilence(String installPath, String packageName) {
+// ToastUtil.show("正在安装应用...");
+// Class pmService;
+// Class activityTherad;
+// Method method;
+// try {
+// activityTherad = Class.forName("android.app.ActivityThread");
+// Class paramTypes[] = getParamTypes(activityTherad, "getPackageManager");
+// method = activityTherad.getMethod("getPackageManager", paramTypes);
+// Object PackageManagerService = method.invoke(activityTherad);
+// pmService = PackageManagerService.getClass();
+// Class paramTypes1[] = getParamTypes(pmService, "installPackageAsUser");
+// method = pmService.getMethod("installPackageAsUser", paramTypes1);
+// method.invoke(PackageManagerService, installPath, null, 0x00000040, packageName, getUserId(Binder.getCallingUid()));//getUserId
+// } catch (ClassNotFoundException e) {
+// e.printStackTrace();
+// } catch (NoSuchMethodException e) {
+// e.printStackTrace();
+// } catch (IllegalAccessException e) {
+// e.printStackTrace();
+// } catch (InvocationTargetException e) {
+// e.printStackTrace();
+// }
+// }
+ public static boolean installApkInSilence(Context context, String apkPath) {
ToastUtil.show("正在安装应用...");
- Class pmService;
- Class activityTherad;
- Method method;
+ Process process = null;
+ BufferedReader successResult = null;
+ BufferedReader errorResult = null;
+ StringBuilder successMsg = new StringBuilder();
+ StringBuilder errorMsg = new StringBuilder();
try {
- activityTherad = Class.forName("android.app.ActivityThread");
- Class paramTypes[] = getParamTypes(activityTherad, "getPackageManager");
- method = activityTherad.getMethod("getPackageManager", paramTypes);
- Object PackageManagerService = method.invoke(activityTherad);
- pmService = PackageManagerService.getClass();
- Class paramTypes1[] = getParamTypes(pmService, "installPackageAsUser");
- method = pmService.getMethod("installPackageAsUser", paramTypes1);
- method.invoke(PackageManagerService, installPath, null, 0x00000040, packageName, getUserId(Binder.getCallingUid()));//getUserId
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
+ process = new ProcessBuilder("pm", "install", "-i", BuildConfig.APPLICATION_ID, "--user", "0", apkPath).start();
+ successResult = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+ String s;
+ while ((s = successResult.readLine()) != null) {
+ successMsg.append(s);
+ }
+ while ((s = errorResult.readLine()) != null) {
+ errorMsg.append(s);
+ }
+ } catch (Exception e) {
+
+ } finally {
+ try {
+ if (successResult != null) {
+ successResult.close();
+ }
+ if (errorResult != null) {
+ errorResult.close();
+ }
+ } catch (Exception e) {
+
+ }
+ if (process != null) {
+ process.destroy();
+ }
}
+ Log.e("result", "" + errorMsg.toString());
+ //如果含有“success”认为安装成功
+ Log.e("installApp", successMsg.toString());
+// if (!successMsg.toString().equalsIgnoreCase("success")) {
+// ApkUtils.install(context, new File(apkPath));
+// }
+ return successMsg.toString().equalsIgnoreCase("success");
}
public static void deleteApkInSilence(String packageName) {
diff --git a/app/src/main/res/drawable/bt_return.png b/app/src/main/res/drawable/bt_return.png
new file mode 100644
index 0000000..9418385
Binary files /dev/null and b/app/src/main/res/drawable/bt_return.png differ
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..9ade039
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0df8249..2e21c59 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,6 +21,7 @@
-
+ android:layout_height="match_parent">
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fb516be..0e74733 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
+ ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
@@ -8,7 +9,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
-
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
diff --git a/应用市场.iml b/应用市场.iml
new file mode 100644
index 0000000..5673123
--- /dev/null
+++ b/应用市场.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file