From 0a9bdeccaa503ac20f6664a48a9097ecb0ea3f17 Mon Sep 17 00:00:00 2001 From: Onelong Date: Wed, 14 Dec 2016 23:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 精简框架 --- .idea/compiler.xml | 22 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 6 + .idea/gradle.xml | 20 ++ .../animated_vector_drawable_25_0_1.xml | 14 ++ .idea/libraries/appcompat_v7_25_0_1.xml | 14 ++ .idea/libraries/cardview_v7_25_0_1.xml | 12 + .idea/libraries/converter_gson_2_1_0.xml | 11 + .idea/libraries/dagger_2_8.xml | 11 + .idea/libraries/espresso_core_2_2_2.xml | 14 ++ .../espresso_idling_resource_2_2_2.xml | 14 ++ ...xposed_instrumentation_api_publish_0_5.xml | 14 ++ .idea/libraries/glide_3_7_0.xml | 11 + .idea/libraries/gson_2_7.xml | 11 + .idea/libraries/hamcrest_core_1_3.xml | 11 + .idea/libraries/hamcrest_integration_1_3.xml | 9 + .idea/libraries/hamcrest_library_1_3.xml | 11 + .idea/libraries/javawriter_2_1_1.xml | 9 + .idea/libraries/javax_annotation_api_1_2.xml | 9 + .idea/libraries/javax_inject_1.xml | 11 + .idea/libraries/jsr305_1_3_9.xml | 9 + .idea/libraries/jsr305_3_0_1.xml | 11 + .idea/libraries/junit_4_12.xml | 11 + .idea/libraries/library_1_6_0.xml | 12 + .idea/libraries/logging_interceptor_3_5_0.xml | 11 + .idea/libraries/okhttp_3_5_0.xml | 11 + .idea/libraries/okio_1_11_0.xml | 11 + .idea/libraries/reactive_streams_1_0_0.xml | 11 + .idea/libraries/recyclerview_v7_25_0_1.xml | 12 + .../retrofit2_rxjava2_adapter_1_0_0.xml | 11 + .idea/libraries/retrofit_2_1_0.xml | 11 + .idea/libraries/rules_0_5.xml | 14 ++ .idea/libraries/runner_0_5.xml | 14 ++ .idea/libraries/rxandroid_2_0_1.xml | 12 + .idea/libraries/rxjava_2_0_1.xml | 11 + .idea/libraries/rxlifecycle_2_0_1.xml | 11 + .idea/libraries/rxlifecycle_android_2_0_1.xml | 12 + .../rxlifecycle_components_2_0_1.xml | 12 + .../libraries/support_annotations_25_0_1.xml | 11 + .idea/libraries/support_compat_25_0_1.xml | 15 ++ .idea/libraries/support_core_ui_25_0_1.xml | 15 ++ .idea/libraries/support_core_utils_25_0_1.xml | 15 ++ .idea/libraries/support_fragment_25_0_1.xml | 15 ++ .../libraries/support_media_compat_25_0_1.xml | 15 ++ .idea/libraries/support_v4_25_0_1.xml | 10 + .../support_vector_drawable_25_0_1.xml | 14 ++ .idea/misc.xml | 19 ++ .idea/modules.xml | 11 + .idea/runConfigurations.xml | 12 + .../android/goapp/dagger/ApiModule.java | 20 -- .../android/goapp/dagger/AppComponent.java | 1 - .../android/goapp/dagger/RetrofitService.java | 39 --- .../goapp/meizi/activity/MainActivity.java | 2 +- .../goapp/meizi/fragment/MainFragment.java | 1 - .../android/goapp/util/BaseInterceptor.java | 27 --- .../android/goapp/util/CallbackListener.java | 6 - .../android/goapp/util/RetrofitApi.java | 226 ------------------ .../android/goapp/util/TokenInterceptord.java | 80 ------- 58 files changed, 597 insertions(+), 401 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/libraries/animated_vector_drawable_25_0_1.xml create mode 100644 .idea/libraries/appcompat_v7_25_0_1.xml create mode 100644 .idea/libraries/cardview_v7_25_0_1.xml create mode 100644 .idea/libraries/converter_gson_2_1_0.xml create mode 100644 .idea/libraries/dagger_2_8.xml create mode 100644 .idea/libraries/espresso_core_2_2_2.xml create mode 100644 .idea/libraries/espresso_idling_resource_2_2_2.xml create mode 100644 .idea/libraries/exposed_instrumentation_api_publish_0_5.xml create mode 100644 .idea/libraries/glide_3_7_0.xml create mode 100644 .idea/libraries/gson_2_7.xml create mode 100644 .idea/libraries/hamcrest_core_1_3.xml create mode 100644 .idea/libraries/hamcrest_integration_1_3.xml create mode 100644 .idea/libraries/hamcrest_library_1_3.xml create mode 100644 .idea/libraries/javawriter_2_1_1.xml create mode 100644 .idea/libraries/javax_annotation_api_1_2.xml create mode 100644 .idea/libraries/javax_inject_1.xml create mode 100644 .idea/libraries/jsr305_1_3_9.xml create mode 100644 .idea/libraries/jsr305_3_0_1.xml create mode 100644 .idea/libraries/junit_4_12.xml create mode 100644 .idea/libraries/library_1_6_0.xml create mode 100644 .idea/libraries/logging_interceptor_3_5_0.xml create mode 100644 .idea/libraries/okhttp_3_5_0.xml create mode 100644 .idea/libraries/okio_1_11_0.xml create mode 100644 .idea/libraries/reactive_streams_1_0_0.xml create mode 100644 .idea/libraries/recyclerview_v7_25_0_1.xml create mode 100644 .idea/libraries/retrofit2_rxjava2_adapter_1_0_0.xml create mode 100644 .idea/libraries/retrofit_2_1_0.xml create mode 100644 .idea/libraries/rules_0_5.xml create mode 100644 .idea/libraries/runner_0_5.xml create mode 100644 .idea/libraries/rxandroid_2_0_1.xml create mode 100644 .idea/libraries/rxjava_2_0_1.xml create mode 100644 .idea/libraries/rxlifecycle_2_0_1.xml create mode 100644 .idea/libraries/rxlifecycle_android_2_0_1.xml create mode 100644 .idea/libraries/rxlifecycle_components_2_0_1.xml create mode 100644 .idea/libraries/support_annotations_25_0_1.xml create mode 100644 .idea/libraries/support_compat_25_0_1.xml create mode 100644 .idea/libraries/support_core_ui_25_0_1.xml create mode 100644 .idea/libraries/support_core_utils_25_0_1.xml create mode 100644 .idea/libraries/support_fragment_25_0_1.xml create mode 100644 .idea/libraries/support_media_compat_25_0_1.xml create mode 100644 .idea/libraries/support_v4_25_0_1.xml create mode 100644 .idea/libraries/support_vector_drawable_25_0_1.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml delete mode 100644 app/src/main/java/com/ways2u/android/goapp/dagger/RetrofitService.java delete mode 100644 app/src/main/java/com/ways2u/android/goapp/util/BaseInterceptor.java delete mode 100644 app/src/main/java/com/ways2u/android/goapp/util/CallbackListener.java delete mode 100644 app/src/main/java/com/ways2u/android/goapp/util/RetrofitApi.java delete mode 100644 app/src/main/java/com/ways2u/android/goapp/util/TokenInterceptord.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9680dd2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/animated_vector_drawable_25_0_1.xml b/.idea/libraries/animated_vector_drawable_25_0_1.xml new file mode 100644 index 0000000..a7be5d2 --- /dev/null +++ b/.idea/libraries/animated_vector_drawable_25_0_1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_25_0_1.xml b/.idea/libraries/appcompat_v7_25_0_1.xml new file mode 100644 index 0000000..c4d7dc6 --- /dev/null +++ b/.idea/libraries/appcompat_v7_25_0_1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/cardview_v7_25_0_1.xml b/.idea/libraries/cardview_v7_25_0_1.xml new file mode 100644 index 0000000..c71fd57 --- /dev/null +++ b/.idea/libraries/cardview_v7_25_0_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/converter_gson_2_1_0.xml b/.idea/libraries/converter_gson_2_1_0.xml new file mode 100644 index 0000000..fca41fd --- /dev/null +++ b/.idea/libraries/converter_gson_2_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/dagger_2_8.xml b/.idea/libraries/dagger_2_8.xml new file mode 100644 index 0000000..397ef71 --- /dev/null +++ b/.idea/libraries/dagger_2_8.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml new file mode 100644 index 0000000..9492756 --- /dev/null +++ b/.idea/libraries/espresso_core_2_2_2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml new file mode 100644 index 0000000..5586326 --- /dev/null +++ b/.idea/libraries/espresso_idling_resource_2_2_2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml new file mode 100644 index 0000000..f739fe0 --- /dev/null +++ b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/glide_3_7_0.xml b/.idea/libraries/glide_3_7_0.xml new file mode 100644 index 0000000..9b3a3ea --- /dev/null +++ b/.idea/libraries/glide_3_7_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/gson_2_7.xml b/.idea/libraries/gson_2_7.xml new file mode 100644 index 0000000..2260755 --- /dev/null +++ b/.idea/libraries/gson_2_7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml new file mode 100644 index 0000000..157e3f3 --- /dev/null +++ b/.idea/libraries/hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml new file mode 100644 index 0000000..58b2c4b --- /dev/null +++ b/.idea/libraries/hamcrest_integration_1_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml new file mode 100644 index 0000000..923d5fc --- /dev/null +++ b/.idea/libraries/hamcrest_library_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml new file mode 100644 index 0000000..a66fefb --- /dev/null +++ b/.idea/libraries/javawriter_2_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml new file mode 100644 index 0000000..811e73f --- /dev/null +++ b/.idea/libraries/javax_annotation_api_1_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/javax_inject_1.xml new file mode 100644 index 0000000..eebeedd --- /dev/null +++ b/.idea/libraries/javax_inject_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305_1_3_9.xml b/.idea/libraries/jsr305_1_3_9.xml new file mode 100644 index 0000000..52ccf61 --- /dev/null +++ b/.idea/libraries/jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305_3_0_1.xml b/.idea/libraries/jsr305_3_0_1.xml new file mode 100644 index 0000000..6d41b6e --- /dev/null +++ b/.idea/libraries/jsr305_3_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml new file mode 100644 index 0000000..305df30 --- /dev/null +++ b/.idea/libraries/junit_4_12.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/library_1_6_0.xml b/.idea/libraries/library_1_6_0.xml new file mode 100644 index 0000000..5859740 --- /dev/null +++ b/.idea/libraries/library_1_6_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/logging_interceptor_3_5_0.xml b/.idea/libraries/logging_interceptor_3_5_0.xml new file mode 100644 index 0000000..5ae83cc --- /dev/null +++ b/.idea/libraries/logging_interceptor_3_5_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/okhttp_3_5_0.xml b/.idea/libraries/okhttp_3_5_0.xml new file mode 100644 index 0000000..f04e037 --- /dev/null +++ b/.idea/libraries/okhttp_3_5_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/okio_1_11_0.xml b/.idea/libraries/okio_1_11_0.xml new file mode 100644 index 0000000..24d5dc9 --- /dev/null +++ b/.idea/libraries/okio_1_11_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/reactive_streams_1_0_0.xml b/.idea/libraries/reactive_streams_1_0_0.xml new file mode 100644 index 0000000..e0378bb --- /dev/null +++ b/.idea/libraries/reactive_streams_1_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_25_0_1.xml b/.idea/libraries/recyclerview_v7_25_0_1.xml new file mode 100644 index 0000000..c76af9e --- /dev/null +++ b/.idea/libraries/recyclerview_v7_25_0_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/retrofit2_rxjava2_adapter_1_0_0.xml b/.idea/libraries/retrofit2_rxjava2_adapter_1_0_0.xml new file mode 100644 index 0000000..e7292a3 --- /dev/null +++ b/.idea/libraries/retrofit2_rxjava2_adapter_1_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/retrofit_2_1_0.xml b/.idea/libraries/retrofit_2_1_0.xml new file mode 100644 index 0000000..cc9bd69 --- /dev/null +++ b/.idea/libraries/retrofit_2_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml new file mode 100644 index 0000000..ff0f82d --- /dev/null +++ b/.idea/libraries/rules_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml new file mode 100644 index 0000000..f1c0a5a --- /dev/null +++ b/.idea/libraries/runner_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rxandroid_2_0_1.xml b/.idea/libraries/rxandroid_2_0_1.xml new file mode 100644 index 0000000..226acd9 --- /dev/null +++ b/.idea/libraries/rxandroid_2_0_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rxjava_2_0_1.xml b/.idea/libraries/rxjava_2_0_1.xml new file mode 100644 index 0000000..73bb1b5 --- /dev/null +++ b/.idea/libraries/rxjava_2_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rxlifecycle_2_0_1.xml b/.idea/libraries/rxlifecycle_2_0_1.xml new file mode 100644 index 0000000..59327cf --- /dev/null +++ b/.idea/libraries/rxlifecycle_2_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rxlifecycle_android_2_0_1.xml b/.idea/libraries/rxlifecycle_android_2_0_1.xml new file mode 100644 index 0000000..233cc90 --- /dev/null +++ b/.idea/libraries/rxlifecycle_android_2_0_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rxlifecycle_components_2_0_1.xml b/.idea/libraries/rxlifecycle_components_2_0_1.xml new file mode 100644 index 0000000..23c75ac --- /dev/null +++ b/.idea/libraries/rxlifecycle_components_2_0_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_25_0_1.xml b/.idea/libraries/support_annotations_25_0_1.xml new file mode 100644 index 0000000..ab49259 --- /dev/null +++ b/.idea/libraries/support_annotations_25_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_compat_25_0_1.xml b/.idea/libraries/support_compat_25_0_1.xml new file mode 100644 index 0000000..8663d8a --- /dev/null +++ b/.idea/libraries/support_compat_25_0_1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_25_0_1.xml b/.idea/libraries/support_core_ui_25_0_1.xml new file mode 100644 index 0000000..e56b7b3 --- /dev/null +++ b/.idea/libraries/support_core_ui_25_0_1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_25_0_1.xml b/.idea/libraries/support_core_utils_25_0_1.xml new file mode 100644 index 0000000..bfd5501 --- /dev/null +++ b/.idea/libraries/support_core_utils_25_0_1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_fragment_25_0_1.xml b/.idea/libraries/support_fragment_25_0_1.xml new file mode 100644 index 0000000..02b1e2d --- /dev/null +++ b/.idea/libraries/support_fragment_25_0_1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_25_0_1.xml b/.idea/libraries/support_media_compat_25_0_1.xml new file mode 100644 index 0000000..6ffad9f --- /dev/null +++ b/.idea/libraries/support_media_compat_25_0_1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_25_0_1.xml b/.idea/libraries/support_v4_25_0_1.xml new file mode 100644 index 0000000..a1d930a --- /dev/null +++ b/.idea/libraries/support_v4_25_0_1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_25_0_1.xml b/.idea/libraries/support_vector_drawable_25_0_1.xml new file mode 100644 index 0000000..e7c7373 --- /dev/null +++ b/.idea/libraries/support_vector_drawable_25_0_1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..1d9d626 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..7aa9676 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/ways2u/android/goapp/dagger/ApiModule.java b/app/src/main/java/com/ways2u/android/goapp/dagger/ApiModule.java index 346d54e..b72f682 100644 --- a/app/src/main/java/com/ways2u/android/goapp/dagger/ApiModule.java +++ b/app/src/main/java/com/ways2u/android/goapp/dagger/ApiModule.java @@ -22,16 +22,8 @@ */ @Module public class ApiModule { - /* - @Inject - private String baseUrl; - @Inject - private boolean isDebug; -*/ public ApiModule() { - //this.baseUrl = baseUrl; - //this.isDebug = isDebug; } @Provides @@ -71,16 +63,4 @@ public GankApi provideApiService(Retrofit restAdapter) { return restAdapter.create(GankApi.class); } - @Provides - @ApplicationScope - public RetrofitService provideRetrofitService(Retrofit retrofit) { - return retrofit.create(RetrofitService.class); - } -/* - @Provides - @Singleton - public UserManager provideUserManager(GithubApiService githubApiService) { - return new UserManager(githubApiService); - } - */ } diff --git a/app/src/main/java/com/ways2u/android/goapp/dagger/AppComponent.java b/app/src/main/java/com/ways2u/android/goapp/dagger/AppComponent.java index a088d27..51c1326 100644 --- a/app/src/main/java/com/ways2u/android/goapp/dagger/AppComponent.java +++ b/app/src/main/java/com/ways2u/android/goapp/dagger/AppComponent.java @@ -36,5 +36,4 @@ public interface AppComponent { Validator getValidator(); GankApi getGankApi(); - RetrofitService getRetrofitService(); } diff --git a/app/src/main/java/com/ways2u/android/goapp/dagger/RetrofitService.java b/app/src/main/java/com/ways2u/android/goapp/dagger/RetrofitService.java deleted file mode 100644 index 8fa9ef9..0000000 --- a/app/src/main/java/com/ways2u/android/goapp/dagger/RetrofitService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ways2u.android.goapp.dagger; - -import com.google.gson.JsonObject; - -import java.util.Map; - -import okhttp3.RequestBody; -import retrofit2.Call; -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; -import retrofit2.http.Multipart; -import retrofit2.http.POST; -import retrofit2.http.PartMap; -import retrofit2.http.Path; -import retrofit2.http.QueryMap; - -public interface RetrofitService { - - @GET("{url}") - Call getData( - @Path("url") String url, - @QueryMap Map map - ); - - @FormUrlEncoded - @POST( "{url}") - Call postData( - @Path("url") String url, - @FieldMap Map map - ); - - @Multipart - @POST( "{url}") - Call uploadFile( - @Path("url") String url, - @PartMap Map map - ); - } \ No newline at end of file diff --git a/app/src/main/java/com/ways2u/android/goapp/meizi/activity/MainActivity.java b/app/src/main/java/com/ways2u/android/goapp/meizi/activity/MainActivity.java index f08aa01..0e3a54c 100644 --- a/app/src/main/java/com/ways2u/android/goapp/meizi/activity/MainActivity.java +++ b/app/src/main/java/com/ways2u/android/goapp/meizi/activity/MainActivity.java @@ -107,7 +107,7 @@ public void initView() { @Override public void setListener() { - + // } @Override diff --git a/app/src/main/java/com/ways2u/android/goapp/meizi/fragment/MainFragment.java b/app/src/main/java/com/ways2u/android/goapp/meizi/fragment/MainFragment.java index 98433e5..cbcbb78 100644 --- a/app/src/main/java/com/ways2u/android/goapp/meizi/fragment/MainFragment.java +++ b/app/src/main/java/com/ways2u/android/goapp/meizi/fragment/MainFragment.java @@ -115,7 +115,6 @@ public void handleMessage(Message msg) { LogUtil.e(this, msg.obj.toString()); } - @Override protected void setupFragmentComponent(ActivityComponent activityComponent) { diff --git a/app/src/main/java/com/ways2u/android/goapp/util/BaseInterceptor.java b/app/src/main/java/com/ways2u/android/goapp/util/BaseInterceptor.java deleted file mode 100644 index fc7bd16..0000000 --- a/app/src/main/java/com/ways2u/android/goapp/util/BaseInterceptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ways2u.android.goapp.util; - -import java.io.IOException; - -import okhttp3.HttpUrl; -import okhttp3.Interceptor; -import okhttp3.Request; -import okhttp3.Response; - -public class BaseInterceptor implements Interceptor { -@Override -public Response intercept(Chain chain) throws IOException { - Request original = chain.request(); -//添加请求参数，此处是以豆瓣api为例，下面会贴出Base_url - HttpUrl url=original.url().newBuilder() - .addQueryParameter("count", "5") - .addQueryParameter("start", "0") - .build(); -//添加请求头 - Request request = original.newBuilder() - .addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") - .addHeader("Connection", "keep-alive") - .method(original.method(), original.body()) - .url(url) - .build(); - return chain.proceed(request); - }} \ No newline at end of file diff --git a/app/src/main/java/com/ways2u/android/goapp/util/CallbackListener.java b/app/src/main/java/com/ways2u/android/goapp/util/CallbackListener.java deleted file mode 100644 index e0b0666..0000000 --- a/app/src/main/java/com/ways2u/android/goapp/util/CallbackListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.ways2u.android.goapp.util; - -public interface CallbackListener { - void onSuccess(Object data, String msg); - void onFail(String msg); - } \ No newline at end of file diff --git a/app/src/main/java/com/ways2u/android/goapp/util/RetrofitApi.java b/app/src/main/java/com/ways2u/android/goapp/util/RetrofitApi.java deleted file mode 100644 index 434511a..0000000 --- a/app/src/main/java/com/ways2u/android/goapp/util/RetrofitApi.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.ways2u.android.goapp.util; - - -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.socks.library.KLog; -import com.ways2u.android.goapp.dagger.RetrofitService; - -import java.io.File; -import java.util.Arrays; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.RequestBody; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; -import retrofit2.http.Multipart; -import retrofit2.http.POST; -import retrofit2.http.PartMap; -import retrofit2.http.Path; -import retrofit2.http.QueryMap; - - -public class RetrofitApi { - - public static int TYPE_NORMAL = 0; - public static int TYPE_LIST = 1; - public static int TYPE_MODEL = 2; - public static int TYPE_POST = 3; - - public static OkHttpClient okHttpClient; - - static { - OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder(); - //if (BuildConfig.DEBUG) - { - // okHttpBuilder.addNetworkInterceptor(new StethoInterceptor()); - okHttpBuilder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)); - /* - okHttpBuilder.addInterceptor( new HttpLoggingInterceptor( new HttpLoggingInterceptor.Logger() { - @Override - public void log(String message) { - KLog.i("OkHttp", message); - } - }).setLevel(HttpLoggingInterceptor.Level.BODY));//网络和日志拦截 - */ - } - //okHttpBuilder.addInterceptor(new BaseInterceptor()); - - okHttpBuilder.connectTimeout(30, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .writeTimeout(30, TimeUnit.SECONDS);//设置请求超时 - okHttpClient = okHttpBuilder.build(); - } - - private static final Retrofit retrofit = new Retrofit.Builder() - .baseUrl("http://com.base.url/") - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create()) - .build(); - - private static RetrofitApi retrofitApi; - - public static RetrofitApi getInstance() { - if (null == retrofitApi) return new RetrofitApi(); - return retrofitApi; - } - - public void getNormal(String url, Map map, final CallbackListener listener) { - callEnqueue(TYPE_NORMAL, null, url, map, listener); - } - - public void getList(final Class tClass, String url, Map map, final CallbackListener listener) { - callEnqueue(TYPE_LIST, tClass, url, map, listener); - } - - public void getModel(final Class tClass, String url, Map map, final CallbackListener listener) { - callEnqueue(TYPE_MODEL, tClass, url, map, listener); - } - - public void postData(String url, Map map, final CallbackListener listener) { - callEnqueue(TYPE_POST, null, url, map, listener); - } - - public void callEnqueue(final int type, final Class tClass, String url, Map map, final CallbackListener listener) { - Call call; - if (type == TYPE_POST) { - //POST - call = ((RetrofitService) retrofit.create(RetrofitService.class)).postData(url, map); - } else { - //GET - call = ((RetrofitService) retrofit.create(RetrofitService.class)).getData(url, map); - } - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.code() == 200) { - try { - JsonObject json = response.body(); - - if (json.get("status").getAsInt() >= 0) { - - if (type == TYPE_LIST) { - //列表 - JsonObject result = json.getAsJsonObject("result"); - JsonArray jsonArray = result.getAsJsonArray("list"); - - listener.onSuccess(Arrays.asList(new GsonBuilder().create().fromJson(jsonArray, (Class) tClass)), result.get("total").getAsString()); - - } else if (type == TYPE_MODEL) { - //单个对象 - JsonObject result = json.getAsJsonObject("result"); - listener.onSuccess(new GsonBuilder().create().fromJson(result, tClass), json.get("message").getAsString()); - - } else { - //普通JsonObject - if (json.has("result") && json.get("result").isJsonObject()) { - listener.onSuccess(json.getAsJsonObject("result"), json.get("message").getAsString()); - } else { - listener.onSuccess(null, json.get("message").getAsString()); - } - } - - } else { - listener.onFail(json.get("message").getAsString()); - } - } catch (Exception e) { - e.printStackTrace(); - if (e != null) { - listener.onFail(e.getMessage()); - } else { - listener.onFail(""); - } - } - } else { - listener.onFail(response.message()); - } - } - - @Override - public void onFailure(Call call, Throwable t) { - t.printStackTrace(); - if (t != null) { - listener.onFail(t.getMessage()); - } else { - listener.onFail(""); - } - } - }); - } - - public void uploadFile(String url, Map map, final CallbackListener listener) { - Call call = ((RetrofitService) retrofit.create(RetrofitService.class)).uploadFile(url, map); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.code() == 200) { - try { - JsonObject json = response.body(); - - if (json.get("status").getAsInt() >= 0) { - if (json.has("result") && json.get("result").isJsonObject()) {//单张图片 -返回图片路径 - - // listener.onSuccess(json.getAsJsonObject("result"), json.get("message").getAsString()); - - JsonObject result = json.getAsJsonObject("result"); - if (result.has("url")) { - listener.onSuccess(result.get("url").getAsString(), json.get("message").getAsString()); - - } else { - listener.onSuccess(null, json.get("message").getAsString()); - } - } else { - listener.onSuccess(null, json.get("message").getAsString()); - } - } else { - listener.onFail(json.get("message").getAsString()); - } - } catch (Exception e) { - e.printStackTrace(); - if (e != null) { - listener.onFail(e.getMessage()); - } else { - listener.onFail(""); - } - } - } else { - listener.onFail(response.message()); - } - } - - @Override - public void onFailure(Call call, Throwable t) { - t.printStackTrace(); - if (t != null) { - listener.onFail(t.getMessage()); - } else { - listener.onFail(""); - } - } - }); - } - - public RequestBody parseRequestBody(String value) { - return RequestBody.create(MediaType.parse("text/plain"), value); - } - - public RequestBody parseImageRequestBody(File file) { - return RequestBody.create(MediaType.parse("image/jpg"), file); - } - - public String parseImageMapKey(String key, String fileName) { - return key + "\"; filename=\"" + fileName; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/ways2u/android/goapp/util/TokenInterceptord.java b/app/src/main/java/com/ways2u/android/goapp/util/TokenInterceptord.java deleted file mode 100644 index 4377f45..0000000 --- a/app/src/main/java/com/ways2u/android/goapp/util/TokenInterceptord.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.ways2u.android.goapp.util; - -import android.util.Log; - -import org.json.JSONObject; - -import java.io.IOException; - -import okhttp3.HttpUrl; -import okhttp3.Interceptor; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.ResponseBody; - -public class TokenInterceptord implements Interceptor { - - private final String TAG = "respond"; - - @Override - public Response intercept(Chain chain) throws IOException { - Request oldRequest = chain.request(); - String url = oldRequest.url().toString(); - Response response = null; - - // 新的请求,添加参数 - Request newRequest = addParam(oldRequest); - response = chain.proceed(newRequest); - - ResponseBody value = response.body(); - byte[] resp = value.bytes(); - String json = new String(resp, "UTF-8"); - - // 判断stateCode值 - try { - JSONObject jsonObject = new JSONObject(json); - int stateCode = jsonObject.optInt("stateCode"); - if (stateCode == 3) { - String data = jsonObject.optString("data"); - Log.d(TAG, "token失效，新的token：" + data); - //DataStorageUtils.saveToken(data); - // token失效，重新执行请求 - Request newTokenRequest = addParam(oldRequest); - response = chain.proceed(newTokenRequest); - } else { - // 这里值得注意。由于前面value.bytes()把响应流读完并关闭了，所以这里需要重新生成一个response，否则数据就无法正常解析了 - response = response.newBuilder() - .body(ResponseBody.create(null, resp)) - .build(); - } - } catch (Exception e) { - - } - - return response; - } - - /** - * 添加公共参数 - * - * @param oldRequest - * @return - */ - private Request addParam(Request oldRequest) { - - HttpUrl.Builder builder = oldRequest.url() - .newBuilder() - //.setEncodedQueryParameter("lversion", PackagesUtils.getAppVersionName()) - //.setEncodedQueryParameter("token", DataStorageUtils.getToken()) - ; - - Request newRequest = oldRequest.newBuilder() - .method(oldRequest.method(), oldRequest.body()) - .url(builder.build()) - //.addHeader("Content-Encoding", "gzip") - .build(); - - - return newRequest; - } - } \ No newline at end of file