From 2da7d5db71a58d9118a5b578bbc3b1d1b2abaac2 Mon Sep 17 00:00:00 2001 From: wujifei Date: Thu, 21 Jan 2021 16:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/cloud/network/NetworkActivity.java | 6 ++---- foudations/mogo-commons/gradle.properties | 2 +- .../src/main/java/com/mogo/cloud/commons/Sample.kt | 5 ----- .../java/com/mogo/cloud/commons/network/NetConstants.kt | 7 ------- .../java/com/mogo/cloud/commons/network/OkHttpFactory.kt | 2 +- .../java/com/mogo/cloud/commons/network/RetrofitFactory.kt | 2 +- .../network/interceptor/HeaderNetworkInterceptor.kt | 2 +- .../main/java/com/mogo/cloud/commons/utils/NetworkUtils.kt | 6 +++++- 8 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/Sample.kt diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java index 91aed7e..78dd1bf 100644 --- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java +++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java @@ -27,8 +27,6 @@ import io.reactivex.schedulers.Schedulers; public class NetworkActivity extends AppCompatActivity { private Button btn; private TextView tvResult; - - private ApiService apiService; @@ -44,8 +42,8 @@ public class NetworkActivity extends AppCompatActivity { @Override public void onClick(View view) { tvResult.setText("结果显示"); - // queryRoadData("ZD802C1938L10797"); - queryHelpSignal("ZD802C1938L10797"); + queryRoadData("ZD802C1938L10797"); + // queryHelpSignal("ZD802C1938L10797"); } }); } diff --git a/foudations/mogo-commons/gradle.properties b/foudations/mogo-commons/gradle.properties index 97b0773..5ced2da 100644 --- a/foudations/mogo-commons/gradle.properties +++ b/foudations/mogo-commons/gradle.properties @@ -1,4 +1,4 @@ GROUP=com.mogo.cloud POM_ARTIFACT_ID=commons VERSION_CODE=1 -VERSION_NAME=1.0.0 \ No newline at end of file +VERSION_NAME=1.0.1-snapshots \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/Sample.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/Sample.kt deleted file mode 100644 index 994a511..0000000 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/Sample.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.mogo.cloud.commons - -class Sample { - -} \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/NetConstants.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/NetConstants.kt index 5275395..ad9c349 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/NetConstants.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/NetConstants.kt @@ -5,14 +5,7 @@ package com.mogo.cloud.commons.network * describe: */ class NetConstants { - companion object { - /** 无数据 */ - const val NO_DATA = -800 - - /** 数据返回正常 */ - const val OK = 0 - const val READ_TIMEOUT = 20000L const val WRITE_TIMEOUT = 20000L const val CONNECT_TIMEOUT = 15000L diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/OkHttpFactory.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/OkHttpFactory.kt index 0e177f9..d6fbe32 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/OkHttpFactory.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/OkHttpFactory.kt @@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit * * @Author: wujifei * @CreateDate: 1/20/21 12:16 AM - * @Description: 描述 + * @Description: 获取OkHttpClient */ class OkHttpFactory private constructor() { companion object { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/RetrofitFactory.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/RetrofitFactory.kt index 033c82e..64d8ebd 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/RetrofitFactory.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/RetrofitFactory.kt @@ -9,7 +9,7 @@ import retrofit2.converter.gson.GsonConverterFactory * * @Author: wujifei * @CreateDate: 1/19/21 11:21 PM - * @Description: 描述 + * @Description: 获取Retrofit实例 */ object RetrofitFactory { private val sRpcServiceMap: MutableMap = ArrayMap() diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/interceptor/HeaderNetworkInterceptor.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/interceptor/HeaderNetworkInterceptor.kt index cad397d..1c92313 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/interceptor/HeaderNetworkInterceptor.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/network/interceptor/HeaderNetworkInterceptor.kt @@ -6,7 +6,7 @@ import okhttp3.Response /** * created by wujifei on 2021/1/20 15:18 - * describe: + * describe:header携带信息 */ class HeaderNetworkInterceptor : Interceptor { override fun intercept(chain: Interceptor.Chain): Response { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/utils/NetworkUtils.kt b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/utils/NetworkUtils.kt index 722d991..feb1796 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/utils/NetworkUtils.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/cloud/commons/utils/NetworkUtils.kt @@ -9,7 +9,11 @@ import java.util.* /** * created by wujifei on 2021/1/20 12:51 - * describe: + * describe:网络工具 + */ + +/** + * 根据host获取InetAddress */ @Throws(UnknownHostException::class) fun lookup(hostname: String?): List? {