();
if ( TextUtils.isEmpty(json)) {
return null;
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/SignUtil.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/SignUtil.java
similarity index 93%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/SignUtil.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/SignUtil.java
index 282bb3664e..3562caa6ac 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/SignUtil.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/SignUtil.java
@@ -1,8 +1,8 @@
-package com.mogo.utils.network.utils;
+package com.mogo.eagle.core.network.utils;
-import com.mogo.utils.digest.DigestUtils;
-import com.mogo.utils.network.HttpParams;
+import com.mogo.eagle.core.network.HttpParams;
+import com.mogo.eagle.core.network.utils.digest.DigestUtils;
import org.json.JSONObject;
@@ -14,7 +14,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-
public class SignUtil {
private static class StrSortTreeMap extends TreeMap< String, Object > {
@@ -30,7 +29,7 @@ public class SignUtil {
}
}
- public static String createSign( Map< String, Object > map, String key) {
+ public static String createSign(Map< String, Object > map, String key) {
if (map == null || map.isEmpty()) {
return "";
}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/Util.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
similarity index 87%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/Util.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
index 9caf3d16cb..397f5bc20d 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/Util.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
@@ -1,4 +1,5 @@
-package com.mogo.utils.network.utils;
+package com.mogo.eagle.core.network.utils;
+
import android.app.Activity;
import android.app.Dialog;
@@ -10,22 +11,22 @@ import android.os.Looper;
import android.view.View;
import android.widget.PopupWindow;
-import com.mogo.utils.network.CallerNotAliveException;
+import com.mogo.eagle.core.network.CallerNotAliveException;
public class Util {
public static boolean checkAlive( Object caller ) {
- if ( caller instanceof Activity ) {
+ if ( caller instanceof Activity) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ? !( ( Activity ) caller ).isDestroyed() : !( ( Activity ) caller ).isFinishing();
- } else if ( caller instanceof Fragment ) {
+ } else if ( caller instanceof Fragment) {
return ( ( Fragment ) caller ).isAdded();
} else if ( caller instanceof androidx.fragment.app.Fragment ) {
return ( ( androidx.fragment.app.Fragment ) caller ).isAdded();
- } else if ( caller instanceof View ) {
+ } else if ( caller instanceof View) {
return true;
- } else if ( caller instanceof Dialog ) {
+ } else if ( caller instanceof Dialog) {
return ( ( Dialog ) caller ).getWindow() != null;
- } else if ( caller instanceof PopupWindow ) {
+ } else if ( caller instanceof PopupWindow) {
return ( ( PopupWindow ) caller ).getContentView() != null;
}
return caller != null;
@@ -37,7 +38,7 @@ public class Util {
}
}
- public static Context getContext( Object object ) {
+ public static Context getContext(Object object ) {
if ( object instanceof Activity ) {
return ( Activity ) object;
} else if ( object instanceof Fragment ) {
@@ -52,7 +53,7 @@ public class Util {
if ( ( ( PopupWindow ) object ).getContentView() != null )
return ( ( PopupWindow ) object ).getContentView().getContext();
else return null;
- } else if ( object instanceof ContextWrapper ) {
+ } else if ( object instanceof ContextWrapper) {
return ( ( ContextWrapper ) object ).getBaseContext();
} else {
return null;
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryDecoder.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryDecoder.java
similarity index 96%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryDecoder.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryDecoder.java
index 9e4cf08970..66d0a3255c 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryDecoder.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryDecoder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Defines common decoding methods for byte array decoders.
diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryEncoder.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryEncoder.java
new file mode 100644
index 0000000000..8c5f5dbaff
--- /dev/null
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/BinaryEncoder.java
@@ -0,0 +1,15 @@
+package com.mogo.eagle.core.network.utils.digest;
+
+public interface BinaryEncoder extends Encoder {
+
+ /**
+ * Encodes a byte array and return the encoded data as a byte array.
+ *
+ * @param source
+ * Data to be encoded
+ * @return A byte array containing the encoded data
+ * @throws EncoderException
+ * thrown if the Encoder encounters a failure condition during the encoding process.
+ */
+ byte[] encode( byte[] source ) throws EncoderException;
+}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharEncoding.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharEncoding.java
similarity index 99%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharEncoding.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharEncoding.java
index 80a0081204..17c4d5c5ea 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharEncoding.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharEncoding.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Character encoding names required of every implementation of the Java platform.
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharSequenceUtils.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharSequenceUtils.java
similarity index 98%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharSequenceUtils.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharSequenceUtils.java
index bf5d9c3f3d..27b1bbc201 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/CharSequenceUtils.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/CharSequenceUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
*
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Decoder.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Decoder.java
similarity index 97%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Decoder.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Decoder.java
index fbb68cacfa..7cd68e02bc 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Decoder.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Decoder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Provides the highest level of abstraction for Decoders.
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DecoderException.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DecoderException.java
similarity index 96%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DecoderException.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DecoderException.java
index 4bbfb808ed..9955620838 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DecoderException.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DecoderException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Thrown when there is a failure condition during the decoding process. This exception is thrown when a {@link Decoder}
@@ -66,7 +66,7 @@ public class DecoderException extends Exception {
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
- public DecoderException( final String message, final Throwable cause) {
+ public DecoderException(final String message, final Throwable cause) {
super(message, cause);
}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DigestUtils.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DigestUtils.java
similarity index 99%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DigestUtils.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DigestUtils.java
index 5ee2a590f1..1368e2dadf 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/DigestUtils.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/DigestUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
import java.io.IOException;
@@ -44,7 +44,7 @@ public class DigestUtils {
* @throws IOException
* On error reading from the stream
*/
- private static byte[] digest( final MessageDigest digest, final InputStream data) throws IOException {
+ private static byte[] digest(final MessageDigest digest, final InputStream data) throws IOException {
return updateDigest(digest, data).digest();
}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Encoder.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Encoder.java
similarity index 97%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Encoder.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Encoder.java
index 115d49c620..dc8d58988b 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Encoder.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Encoder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Provides the highest level of abstraction for Encoders.
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/EncoderException.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/EncoderException.java
similarity index 96%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/EncoderException.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/EncoderException.java
index babc0bcc23..60f18151f7 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/EncoderException.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/EncoderException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
/**
* Thrown when there is a failure condition during the encoding process. This exception is thrown when an
@@ -69,7 +69,7 @@ public class EncoderException extends Exception {
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
- public EncoderException( final String message, final Throwable cause) {
+ public EncoderException(final String message, final Throwable cause) {
super(message, cause);
}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Hex.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Hex.java
similarity index 99%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Hex.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Hex.java
index 9879ed8f93..13d2d5f098 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Hex.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/Hex.java
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
import java.nio.charset.Charset;
+import kotlin.text.Charsets;
+
/**
* Converts hexadecimal Strings. The charset used for certain operation can be set, the default is set in
* {@link #DEFAULT_CHARSET_NAME}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/MessageDigestAlgorithms.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/MessageDigestAlgorithms.java
similarity index 97%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/MessageDigestAlgorithms.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/MessageDigestAlgorithms.java
index 9ecd4e4f9b..214300d5eb 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/MessageDigestAlgorithms.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/MessageDigestAlgorithms.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
+package com.mogo.eagle.core.network.utils.digest;
import java.security.MessageDigest;
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringUtils.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/StringUtils.java
similarity index 99%
rename from foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringUtils.java
rename to core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/StringUtils.java
index c847ec094c..ed8b542fda 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringUtils.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/digest/StringUtils.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package com.mogo.utils.digest;
-
+package com.mogo.eagle.core.network.utils.digest;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import kotlin.text.Charsets;
+
/**
* Converts String to and from bytes using the encodings required by the Java specification. These encodings are
* specified in
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 12dabb7c5f..4d22538719 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -52,6 +52,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogo_core_data
implementation rootProject.ext.dependencies.mogo_core_utils
+ api rootProject.ext.dependencies.mogo_core_network
} else {
implementation project(":foudations:mogo-utils")
api project(":foudations:mogo-aicloud-services-sdk")
@@ -59,6 +60,8 @@ dependencies {
implementation project(':core:mogo-core-utils')
implementation project(':core:mogo-core-data')
+ api project(':core:mogo-core-network')
+
}
api 'org.greenrobot:eventbus:3.1.1'
}
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index f335372b02..e02a49c25d 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -19,24 +19,12 @@ import com.mogo.commons.analytics.AnalyticsUtils;
import com.mogo.commons.crash.FinalizeCrashFixer;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.device.Devices;
-import com.mogo.commons.network.AllAllowedHostnameVerifier;
-import com.mogo.commons.network.Constants;
-import com.mogo.commons.network.ParamsUtil;
-import com.mogo.commons.network.X509TrustManagerImpl;
-import com.mogo.commons.storage.SpStorage;
+import com.mogo.commons.network.NetConfigUtils;
import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.utils.ThreadPoolService;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.NetConfig;
-
-import java.security.SecureRandom;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-import okhttp3.Request;
/**
* @author congtaowang
@@ -135,25 +123,14 @@ public abstract class AbsMogoApplication extends Application {
return contentView;
}
- /**
- * 忽略 https 验证
- *
- * @return {@link SSLContext}
- * @throws Exception
- */
- private static SSLContext getSslContext() throws Exception {
- SSLContext sc = null;
- sc = SSLContext.getInstance("SSL");
- sc.init(null, new TrustManager[]{new X509TrustManagerImpl()}, new SecureRandom());
- return sc;
- }
-
/**
* 异步初始化
*/
protected void asyncInit() {
ThreadPoolService.execute(() -> {
- initNetConfig();
+
+ //初始化网络配置
+ NetConfigUtils.init(sApis);
// 初始化埋点
AnalyticsUtils.init(sApp);
if (DebugConfig.getCarMachineType() == CAR_MACHINE_TYPE_SELF_INNOVATE) {
@@ -171,39 +148,7 @@ public abstract class AbsMogoApplication extends Application {
}
- /**
- * 初始化网络配置
- */
- private static void initNetConfig() {
- try {
- SSLContext sc = getSslContext();
- NetConfig.instance().setSslContext(sc);
- } catch (Exception e) {
- e.printStackTrace();
- }
- NetConfig.instance().setSignaturePrefix(Constants.SIGN_PREFIX)
- .setPublicParams(ParamsUtil.getStaticParams())
- .setHostnameVerifier(new AllAllowedHostnameVerifier())
- .addNetworkInterceptor(chain -> {
- Request original = chain.request();
- Request request = original.newBuilder()
- .header("token", SpStorage.getTicket())
- .method(original.method(), original.body())
- .build();
- return chain.proceed(request);
- })
- // 增加域名->域名的转换方式，暂时去掉httpdns方式
- .addInterceptor(chain -> {
- Request request = chain.request();
- String path = request.url().encodedPath();
- String host = "http://" + sApis.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
- String url = host + path;
- Logger.d("DomainExchange", "oriHost: " + request.url().host() + " newHost: " + host + " \r\n newUrl: " + url);
- return chain.proceed(request.newBuilder().url(url).build());
- })
- .setHttpDns(null)
- .setLoggable(DebugConfig.isDebug());
- }
+
// 缓存IP地址
private String cacheIp = null;
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
index b1f3cdafc5..f90e127892 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java
@@ -1,8 +1,7 @@
package com.mogo.commons.analytics;
-import android.content.Context;
-import androidx.annotation.Keep;
+import android.content.Context;
import com.elegant.analytics.Analytics;
import com.elegant.analytics.AnalyticsConfig;
@@ -14,6 +13,8 @@ import com.mogo.commons.network.ParamsUtil;
import java.util.Map;
+import androidx.annotation.Keep;
+
/**
* @author congtaowang
* @since 2019-12-23
@@ -29,7 +30,7 @@ public class AnalyticsUtils {
AnalyticsConfig.getInstance( context ).setAppKey( "6bbe7e0e1ecd8e2f8dc336e1678a2791" );
AnalyticsConfig.getInstance( context ).setUploadMode( DebugConfig.isDebug() ? UploadMode.instant : UploadMode.cache );
AnalyticsConfig.getInstance( context ).setShouldLog( DebugConfig.isDebug() );
- AnalyticsConfig.getInstance( AbsMogoApplication.getApp() ).setParamsProvider( new IAnalyticsParamsProvider() {
+ AnalyticsConfig.getInstance( AbsMogoApplication.getApp() ).setParamsProvider(new IAnalyticsParamsProvider() {
@Override
public Map< String, Object > staticParams() {
return ParamsUtil.getAnalyticsCustomParams();
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java
new file mode 100644
index 0000000000..a6f174a6cb
--- /dev/null
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/NetConfigUtils.java
@@ -0,0 +1,59 @@
+package com.mogo.commons.network;
+
+import com.mogo.aicloud.services.httpdns.IMogoHttpDns;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.storage.SpStorage;
+import com.mogo.eagle.core.network.AllAllowedHostnameVerifier;
+import com.mogo.eagle.core.network.Constants;
+import com.mogo.eagle.core.network.NetConfig;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+
+import javax.net.ssl.SSLContext;
+
+import okhttp3.Request;
+
+import static com.mogo.aicloud.services.httpdns.HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP;
+
+/**
+ * @author xuxinchao
+ * @description 网络配置工具
+ * @since: 2021/12/20
+ */
+public class NetConfigUtils {
+
+ /**
+ * 网络配置初始化
+ * @param iMogoHttpDns Http DNS转换实现
+ */
+ public static void init(IMogoHttpDns iMogoHttpDns){
+ try {
+ SSLContext sc = NetConfig.getSslContext();
+ NetConfig.instance().setSslContext(sc);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ NetConfig.instance().setSignaturePrefix(Constants.SIGN_PREFIX)
+ .setPublicParams(ParamsUtil.getStaticParams())
+ .setHostnameVerifier(new AllAllowedHostnameVerifier())
+ .addNetworkInterceptor(chain -> {
+ Request original = chain.request();
+ Request request = original.newBuilder()
+ .header("token", SpStorage.getTicket())
+ .method(original.method(), original.body())
+ .build();
+ return chain.proceed(request);
+ })
+ // 增加域名->域名的转换方式，暂时去掉httpdns方式
+ .addInterceptor(chain -> {
+ Request request = chain.request();
+ String path = request.url().encodedPath();
+ String host = "http://" + iMogoHttpDns.syncGetHttpDns(request.url().host().replace("http://", "").replace("https://", ""), HTTP_DNS_ADDRESS_TYPE_HTTP, true);
+ String url = host + path;
+ Logger.d("DomainExchange", "oriHost: " + request.url().host() + " newHost: " + host + " \r\n newUrl: " + url);
+ return chain.proceed(request.newBuilder().url(url).build());
+ })
+ .setHttpDns(null)
+ .setLoggable(DebugConfig.isDebug());
+ }
+
+}
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsProvider.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsProvider.java
index c09ad6d2f1..d84a48b69f 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsProvider.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsProvider.java
@@ -2,11 +2,13 @@ package com.mogo.commons.network;
import android.content.Context;
-import com.mogo.utils.CheckUtils;
-import com.mogo.utils.network.HttpParams;
-import com.mogo.utils.network.NetConfig;
-import com.mogo.utils.network.ServerParam;
-import com.mogo.utils.network.utils.SignUtil;
+import com.elegant.utils.CheckUtils;
+import com.mogo.eagle.core.network.Constants;
+import com.mogo.eagle.core.network.HttpParams;
+import com.mogo.eagle.core.network.HttpParamsEx;
+import com.mogo.eagle.core.network.NetConfig;
+import com.mogo.eagle.core.network.ServerParam;
+import com.mogo.eagle.core.network.utils.SignUtil;
import java.util.Map;
import java.util.Set;
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
index a4908cbdd1..275be58ca6 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
@@ -3,24 +3,26 @@ package com.mogo.commons.network;
import android.os.Build;
import android.text.TextUtils;
-import androidx.annotation.NonNull;
-import androidx.collection.ArrayMap;
-
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.storage.SpStorage;
+import com.mogo.eagle.core.network.Constants;
+import com.mogo.eagle.core.network.LocationHelper;
+import com.mogo.eagle.core.network.ServerParam;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.utils.CommonUtils;
import com.mogo.utils.DeviceIdUtils;
import com.mogo.utils.WindowUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Map;
import java.util.Set;
+import androidx.annotation.NonNull;
+import androidx.collection.ArrayMap;
import okhttp3.RequestBody;
public class ParamsUtil {
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
index 6b2ce7484b..2439eb14f2 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -1,5 +1,6 @@
package com.mogo.commons.network;
+
import android.Manifest;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryEncoder.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryEncoder.java
deleted file mode 100644
index 5d40f71c5e..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/BinaryEncoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mogo.utils.digest;
-
-/**
- * Defines common encoding methods for byte array encoders.
- *
- * @version $Id: BinaryEncoder.java 1379145 2012-08-30 21:02:52Z tn $
- */
-public interface BinaryEncoder extends Encoder {
-
- /**
- * Encodes a byte array and return the encoded data as a byte array.
- *
- * @param source
- * Data to be encoded
- * @return A byte array containing the encoded data
- * @throws EncoderException
- * thrown if the Encoder encounters a failure condition during the encoding process.
- */
- byte[] encode( byte[] source ) throws EncoderException;
-}
-
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Charsets.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Charsets.java
deleted file mode 100644
index 83104fb837..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/Charsets.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mogo.utils.digest;
-
-import java.nio.charset.Charset;
-
-/**
- * Charsets required of every implementation of the Java platform.
- *
- * From the Java documentation Standard
- * charsets:
- *
- * Every implementation of the Java platform is required to support the following character encodings. Consult the
- * release documentation for your implementation to see if any other encodings are supported. Consult the release
- * documentation for your implementation to see if any other encodings are supported.
- *
- *
- *
- * US-ASCII
- * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the Unicode character set.ISO-8859-1
- * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.UTF-8
- * Eight-bit Unicode Transformation Format.UTF-16BE
- * Sixteen-bit Unicode Transformation Format, big-endian byte order.UTF-16LE
- * Sixteen-bit Unicode Transformation Format, little-endian byte order.UTF-16
- * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either order
- * accepted on input, big-endian used on output.)
- *
- * This perhaps would best belong in the Commons Lang project. Even if a similar class is defined in Commons Lang, it is
- * not foreseen that Commons Codec would be made to depend on Commons Lang.
- *
- *
- * This class is immutable and thread-safe.
- *
- *
- * @see Standard charsets
- * @since 1.7
- * @version $Id: CharEncoding.java 1173287 2011-09-20 18:16:19Z ggregory $
- */
-public class Charsets {
-
- //
- // This class should only contain Charset instances for required encodings. This guarantees that it will load
- // correctly and without delay on all Java platforms.
- //
-
- /**
- * Returns the given Charset or the default Charset if the given Charset is null.
- *
- * @param charset
- * A charset or null.
- * @return the given Charset or the default Charset if the given Charset is null
- */
- public static Charset toCharset( final Charset charset) {
- return charset == null ? Charset.defaultCharset() : charset;
- }
-
- /**
- * Returns a Charset for the named charset. If the name is null, return the default Charset.
- *
- * @param charset
- * The name of the requested charset, may be null.
- * @return a Charset for the named charset
- * @throws java.nio.charset.UnsupportedCharsetException
- * If the named charset is unavailable
- */
- public static Charset toCharset( final String charset) {
- return charset == null ? Charset.defaultCharset() : Charset.forName(charset);
- }
-
- /**
- * CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset ISO_8859_1 = Charset.forName(CharEncoding.ISO_8859_1);
-
- /**
- * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set.
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset US_ASCII = Charset.forName(CharEncoding.US_ASCII);
-
- /**
- * Sixteen-bit Unicode Transformation Format, The byte order specified by a mandatory initial byte-order mark
- * (either order accepted on input, big-endian used on output)
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
-
- /**
- * Sixteen-bit Unicode Transformation Format, big-endian byte order.
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset UTF_16BE = Charset.forName(CharEncoding.UTF_16BE);
-
- /**
- * Sixteen-bit Unicode Transformation Format, little-endian byte order.
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset UTF_16LE = Charset.forName(CharEncoding.UTF_16LE);
-
- /**
- * Eight-bit Unicode Transformation Format.
- *
- * Every implementation of the Java platform is required to support this character encoding.
- *
- * @see Standard charsets
- * @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets}
- */
- @Deprecated
- public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringEncoder.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringEncoder.java
deleted file mode 100644
index 91dfa24b4f..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/digest/StringEncoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mogo.utils.digest;
-
-/**
- * Defines common encoding methods for String encoders.
- *
- * @version $Id: StringEncoder.java 1379145 2012-08-30 21:02:52Z tn $
- */
-public interface StringEncoder extends Encoder {
-
- /**
- * Encodes a String and returns a String.
- *
- * @param source
- * the String to encode
- * @return the encoded String
- * @throws EncoderException
- * thrown if there is an error condition during the encoding process.
- */
- String encode( String source ) throws EncoderException;
-}
-
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java
deleted file mode 100644
index f8589f8f18..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/httpdns/HttpSimpleLocation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mogo.utils.httpdns;
-
-public class HttpSimpleLocation {
- private String cityCode;
- private double lat;
- private double lon;
-
- public HttpSimpleLocation(String cityCode, double lat, double lon) {
- this.cityCode = cityCode;
- this.lat = lat;
- this.lon = lon;
- }
-
- public String getCityCode() {
- return cityCode;
- }
-
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode;
- }
-
- public double getLat() {
- return lat;
- }
-
- public void setLat(double lat) {
- this.lat = lat;
- }
-
- public double getLon() {
- return lon;
- }
-
- public void setLon(double lon) {
- this.lon = lon;
- }
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkMonitorInterceptor.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkMonitorInterceptor.java
deleted file mode 100644
index a014b352b4..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkMonitorInterceptor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.utils.network;
-
-import android.content.Context;
-
-import com.mogo.utils.CheckUtils;
-
-import java.io.IOException;
-
-import okhttp3.Interceptor;
-import okhttp3.Response;
-
-
-final class NetworkMonitorInterceptor implements Interceptor {
- private static final String TAG = "NetworkMonitorInterceptor";
-
- @Override
- public Response intercept(Chain chain) throws IOException {
- final Context appContext = NetConfig.instance().getAppContext();
- if(appContext != null && !CheckUtils.isNetworkConnected(appContext)){
- throw new NetworkUnavailableException("Network is unavailable");
- }
- return chain.proceed(chain.request());
- }
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkUnavailableException.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkUnavailableException.java
deleted file mode 100644
index 425d14c6e4..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/NetworkUnavailableException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mogo.utils.network;
-
-import java.io.IOException;
-
-import okhttp3.Interceptor;
-
-/**
- * An exception occurs whenever network is not reachable, it's threw by {@link NetworkMonitorInterceptor}
- * during {@link NetworkMonitorInterceptor#intercept(Interceptor.Chain)} method.
- *
- */
-
-public class NetworkUnavailableException extends IOException {
-
- public NetworkUnavailableException( String message) {
- super(message);
- }
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/OkHttpFactory.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/OkHttpFactory.java
deleted file mode 100644
index d7c18ac352..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/OkHttpFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.mogo.utils.network;
-
-import com.mogo.utils.logger.Logger;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.ConnectionPool;
-import okhttp3.Dns;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-
-/**
- *
- * Before getting an global instance of {@link OkHttpClient}, you can use {@link NetConfig} to set some
- * parameters of network. Note that network configuration must be first set before you get an instance of {@link OkHttpClient},
- * for the first time, otherwise configuration is invalid
- *
- */
-public final class OkHttpFactory {
-
- private static volatile OkHttpClient sInstance;
-
- private OkHttpFactory() {
- }
-
- public static OkHttpClient getInstance() {
- if (sInstance == null) {
- synchronized (OkHttpClient.class) {
- if (sInstance == null) {
- final OkHttpClient.Builder builder = new OkHttpClient.Builder();
- builder.addInterceptor(new NetworkMonitorInterceptor());
- builder.addInterceptor(new RequestLogInterceptor());
- builder.addInterceptor(new ResponseLogInterceptor());
- builder.hostnameVerifier(NetConfig.instance().getHostnameVerifier());
- if ( NetConfig.instance().getSslContext() != null ) {
- builder.sslSocketFactory( NetConfig.instance().getSslContext().getSocketFactory());
- }
- builder.connectTimeout(NetConfig.instance().getConnectTimeout(), TimeUnit.MILLISECONDS);
- builder.readTimeout(NetConfig.instance().getReadTimeout(), TimeUnit.MILLISECONDS);
- builder.writeTimeout(NetConfig.instance().getWriteTimeout(), TimeUnit.MILLISECONDS);
- final Set interceptors = NetConfig.instance().getInterceptors();
- for(Interceptor interceptor : interceptors){
- builder.addInterceptor(interceptor);
- }
-
- final Set networkInterceptors = NetConfig.instance().getNetworkInterceptors();
- for(Interceptor networkInterceptor : networkInterceptors){
- builder.addNetworkInterceptor(networkInterceptor);
- }
-
- HttpDns httpDns = NetConfig.instance().getHttpDns();
- if ( httpDns != null ) {
- builder.dns( hostname -> {
- List< InetAddress > addresses = httpDns.lookup( hostname );
- if ( addresses != null && !addresses.isEmpty() ) {
- Logger.d("OkHttpFactory","look up hostname: "+hostname+" address: "+addresses.get(0).getHostAddress());
- return addresses;
- }
- Logger.d("OkHttpFactory","hostname: "+hostname+" no address");
- return Dns.SYSTEM.lookup( hostname );
- } );
- }
-
- sInstance = builder.build();
- }
- }
- }
-
- return sInstance;
- }
-}
\ No newline at end of file
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/RequestLogInterceptor.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/RequestLogInterceptor.java
deleted file mode 100644
index 2bb8c921ae..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/RequestLogInterceptor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mogo.utils.network;
-
-import com.mogo.utils.logger.Logger;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okio.Buffer;
-
-
-final class RequestLogInterceptor implements Interceptor {
- private static final String TAG = "RequestLogInterceptor";
-
- @Override
- public Response intercept(Chain chain) throws IOException {
- Request request = chain.request();
- RequestBody requestBody = request.body();
- boolean hasRequestBody = requestBody != null;
-
- String protocol = Protocol.HTTP_1_1.toString();
- if(chain.connection() != null && chain.connection().protocol() != null){
- protocol = chain.connection().protocol().toString();
- }
-
- StringBuilder logMsg = new StringBuilder();
- logMsg.append("--> ");
- logMsg.append(protocol).append(", ");
- logMsg.append(request.method()).append(", ");
- logMsg.append("Request Headers: ").append(request.headers()).append("\r\n");
- logMsg.append(request.url()).append("\r\n");
- if(hasRequestBody){
- logMsg.append("Content-Type: ").append(requestBody.contentType()).append(", ");
- logMsg.append("\r\nContent-Length: ").append(requestBody.contentLength());
- try {
- String body = null;
- Charset UTF8 = Charset.forName("UTF-8");
- Buffer buffer = new Buffer();
- requestBody.writeTo(buffer);
- Charset charset = UTF8;
- MediaType contentType = requestBody.contentType();
- if (contentType != null) {
- charset = contentType.charset(UTF8);
- }
- if (charset != null) {
- body = buffer.readString(charset);
- }
- logMsg.append("\r\nContent-body: ").append(body);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- logMsg.append("\r\n<-- end http request");
-
- if(NetConfig.instance().isLoggable()){
- Logger.d(TAG, logMsg.toString());
- }
-
- return chain.proceed(request);
- }
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ResponseLogInterceptor.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ResponseLogInterceptor.java
deleted file mode 100644
index 0199ebc717..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ResponseLogInterceptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.mogo.utils.network;
-
-
-import com.mogo.utils.logger.Logger;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-
-final class ResponseLogInterceptor implements Interceptor {
- private static final String TAG = "ResponseLogInterceptor";
-
- @Override
- public Response intercept( Chain chain ) throws IOException {
- long startTime = System.nanoTime();
- Response response = chain.proceed( chain.request() );
- long endTime = TimeUnit.NANOSECONDS.toMillis( System.nanoTime() - startTime );
-
- ResponseBody responseBody = response.body();
- String responseContent = null;
- String bodySize = null;
- MediaType contentType = null;
- boolean consumedResponse = false;
-
- StringBuilder logMsg = new StringBuilder();
-
- if ( responseBody != null ) {
- long contentLength = responseBody.contentLength();
- bodySize = contentLength != -1L ? contentLength + "-byte" : "unknown-length";
- contentType = responseBody.contentType();
- responseContent = responseBody.string();
- consumedResponse = true;
- }
-
- logMsg.append( "--> " );
- logMsg.append( response.code() ).append( " " );
- logMsg.append( response.message() ).append( " " );
- logMsg.append( response.protocol() ).append( " " );
- logMsg.append( response.request().url() ).append( "\r\n" );
- logMsg.append( "Response Content: " ).append( responseContent ).append( "\r\n" );
- logMsg.append( "Content-Type: " ).append( contentType ).append( ", " );
- logMsg.append( "Content-Length: " ).append( bodySize ).append( ", " );
- logMsg.append( " (" ).append( endTime ).append( "ms)" );
- logMsg.append( " <-- end http response" );
-
- if ( NetConfig.instance().isLoggable() ) {
- Logger.d( TAG, logMsg.toString() );
- }
-
- return consumedResponse ?
- response.newBuilder().body( ResponseBody.create( contentType, responseContent ) ).build() :
- response;
- }
-}
\ No newline at end of file
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ServerParam.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ServerParam.java
deleted file mode 100644
index 87a7d768d1..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ServerParam.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mogo.utils.network;
-
-public class ServerParam {
- public static final String SIGNATURE = "sig";
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialog.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialog.java
deleted file mode 100644
index ee5b507132..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialog.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.mogo.utils.network.ui;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.mogo.utils.logger.Logger;
-
-
-public class ProgressDialog {
-
- private static final String TAG = "ProgressDialog";
-
- public static final String LOADING_DIALOG_TAG = "loading_dialog_tag";
-
- private ProgressDialogFragment mProgressDialogFragment;
- private FragmentManager mFragmentManager;
-
- public void showLoadingDialog( @NonNull Context context, CharSequence loadingMassage) {
- showLoadingDialog(context, loadingMassage, true);
- }
-
- public void showLoadingDialog( @NonNull Context context, CharSequence loadingMassage, boolean cancelable) {
- showLoadingDialog(context, loadingMassage, cancelable, false);
- }
-
- public void showLoadingDialog( Context context, CharSequence loadingMassage, boolean cancelable, boolean cancelableOnTouchOutSide) {
- if (context != null && context instanceof FragmentActivity )
- mFragmentManager = ((FragmentActivity) context).getSupportFragmentManager();
-
- if (mFragmentManager == null)
- return;
-
- mProgressDialogFragment = new ProgressDialogFragment();
- mProgressDialogFragment.setContent(loadingMassage, cancelable, cancelableOnTouchOutSide);
-
- try {
- FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction();
- fragmentTransaction.add( mProgressDialogFragment, LOADING_DIALOG_TAG );
- fragmentTransaction.add(mProgressDialogFragment, LOADING_DIALOG_TAG);
- fragmentTransaction.commitAllowingStateLoss();
- } catch ( IllegalStateException e) {
- Logger.e(TAG, e, e.getMessage());
- mFragmentManager = null;
- mProgressDialogFragment = null;
- }
- }
-
- public void removeLoadingDialog() {
- if (mProgressDialogFragment != null) {
- try {
- mProgressDialogFragment.dismissAllowingStateLoss();
- } catch ( Exception e) {
- Logger.e(TAG, "dialog 取消异常");
- } finally {
- mProgressDialogFragment = null;
- mFragmentManager = null;
- }
- }
- }
-
-}
-
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialogFragment.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialogFragment.java
deleted file mode 100644
index 527957bf17..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/ui/ProgressDialogFragment.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mogo.utils.network.ui;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-
-
-public class ProgressDialogFragment extends DialogFragment {
-
- /**
- * Progress显示的文字
- */
- private CharSequence mMessage;
-
- private boolean mCancelableOnTouchOutSide;
-
- /**
- * 设置dialog内容
- *
- * @param message 显示的文字
- * @param cancelable 是否可以被取消 例如back键取消
- */
- public void setContent( CharSequence message, boolean cancelable, boolean cancelableOnTouchOutSide) {
- mMessage = message;
- mCancelableOnTouchOutSide = cancelableOnTouchOutSide;
- setCancelable(cancelable);
- }
-
- @NonNull
- @Override
- public Dialog onCreateDialog( Bundle savedInstanceState) {
- ProgressDialog dialog = new ProgressDialog(getActivity());
- dialog.setMessage(mMessage);
- dialog.setCanceledOnTouchOutside(mCancelableOnTouchOutSide);
- return dialog;
- }
-}
diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java
deleted file mode 100644
index 051f1530c4..0000000000
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.mogo.utils.network.utils;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.telephony.PhoneStateListener;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import com.mogo.utils.CommonUtils;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * @author liujing
- * @description 网络状态监听
- * @since: 7/29/21
- */
-public class NetworkStatusUtil {
-
- private static PhoneStatListener phoneStatListener;
- private static int mSignalStrength;
- private static SignalStrength signal;
- private static NetWorkStatus netWorkStatus1 = new NetWorkStatus();
-
- /**
- * 监听网络强度
- */
- public static NetWorkStatus networkState(Context context) {
- ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo info = connectivityManager.getActiveNetworkInfo();
- String netWorkStatus = CommonUtils.getNetworkType(context);
- netWorkStatus1.status = netWorkStatus;
- if (info != null && info.isAvailable()) {
- netWorkStatus1.status = netWorkStatus;
- switch (info.getType()) {
- case ConnectivityManager.TYPE_WIFI:
- //wifi
- WifiManager manager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- WifiInfo connectionInfo = manager.getConnectionInfo();
- mSignalStrength = connectionInfo.getRssi();
- if (mSignalStrength > -90) {
- Log.e("CheckActivity", "getNetWorkInfo: 信号强度强");
- } else {
- Log.e("CheckActivity", "getNetWorkInfo: 信号强度弱");
- }
- netWorkStatus1.mSignalStrength = mSignalStrength;
- return netWorkStatus1;
- case ConnectivityManager.TYPE_MOBILE:
- TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- if (telephonyManager == null) {
- telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- }
- if (phoneStatListener == null) {
- phoneStatListener = new PhoneStatListener();
- }
- telephonyManager.listen(phoneStatListener, PhoneStatListener.LISTEN_SIGNAL_STRENGTHS);
- //移动网络,可以通过TelephonyManager来获取具体细化的网络类型
- if (netWorkStatus != "UNKNOWN") {
- try {
- if (signal == null) {
- Log.e("CheckActivity", "getNetWorkInfo: signal为空");
- break;
- }
- Method method = signal.getClass().getMethod("getDbm");
- mSignalStrength = (int) method.invoke(signal);
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
-
- } else {
- if (signal == null) {
- break;
- }
- mSignalStrength = signal.getGsmSignalStrength();
- }
- netWorkStatus1.mSignalStrength = mSignalStrength;
- return netWorkStatus1;
- }
- } else {
- return netWorkStatus1;
- }
- return netWorkStatus1;
- }
-
- /**
- * 监听非WiFi网络信号强度变化
- */
- static class PhoneStatListener extends PhoneStateListener {
- @Override
- public void onSignalStrengthsChanged(SignalStrength signalStrength) {
- //获取信号强度变化
- super.onSignalStrengthsChanged(signalStrength);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- mSignalStrength = signalStrength.getLevel();
- return;
- }
- mSignalStrength = signalStrength.getGsmSignalStrength();
- }
- }
-
- static public class NetWorkStatus implements Serializable {
- String status;
- int mSignalStrength;
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public int getSignalStrength() {
- return mSignalStrength;
- }
-
- public void setSignalStrength(int signalStrength) {
- mSignalStrength = signalStrength;
- }
- }
-}
-
-
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
index 0795d47e80..577f0595fb 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
@@ -86,7 +86,7 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder {
NavAutoApi.INSTANCE.init(context, mapParams, NavParams.Companion.init());
MapAutoView mapAutoView = new MapAutoView(context);
- mapAutoView.registerRenderListener(l -> Log.i(TAG, "renderTime: " + l));
+ //mapAutoView.registerRenderListener(l -> Log.i(TAG, "renderTime: " + l));
IMogoMapView mapView = new AMapViewWrapper(mapAutoView);
return mapView;
}
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
index e9dd2080b2..484c028908 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
@@ -16,6 +16,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.adas.entity.DispatchAdasAutoPilotLocReceiverBean;
import com.mogo.module.adas.entity.DispatchData;
@@ -29,7 +30,6 @@ import com.mogo.module.adas.view.DispatchRemindDialog;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import java.util.ArrayList;
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
index 58ce90ecf9..2886cb00f6 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
@@ -21,11 +21,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.module.adas.model.AdasServiceModel;
import com.mogo.module.common.drawer.IdentifyDataDrawer;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.support.adas.high.AdasManager;
import com.zhidao.support.adas.high.OnAdasMsgConnectStatusListener;
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
index a75937b6b2..3a0beb5fa1 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
@@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage
import com.mogo.eagle.core.data.enums.TrafficTypeEnum
import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.utils.network.utils.GsonUtil
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.zhidao.support.adas.high.bean.AutopilotRoute
import com.zhidao.support.adas.high.bean.CarStateInfo
import com.zhidao.support.adas.high.bean.RectInfo.RectBean
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
index 93fdaea4a3..1f85ac3abe 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
@@ -2,8 +2,10 @@ package com.mogo.module.adas.model;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.adas.entity.AutonomousDriveStatusBean;
import com.mogo.module.adas.entity.ReportDispatchResult;
import com.mogo.module.adas.entity.ReportSiteBean;
@@ -11,8 +13,6 @@ import com.mogo.module.adas.entity.ReportedRoute;
import com.mogo.module.adas.network.IAdasApiService;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java
index a6603115d9..9e06a612a7 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java
@@ -4,13 +4,13 @@ import android.content.Context;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.overlay.IMogoOverlayManager;
import com.mogo.map.overlay.IMogoPolyline;
import com.mogo.map.overlay.MogoPolylineOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.ColorUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
index 1c4dedd9de..c9a52a8571 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
@@ -3,10 +3,10 @@ package com.mogo.module.adas.receiver;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.adas.overlay.LineOverlayManager;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import org.json.JSONObject;
diff --git a/modules/mogo-module-chat/src/main/java/com/mogo/chat/base/BaseController.kt b/modules/mogo-module-chat/src/main/java/com/mogo/chat/base/BaseController.kt
index bdf676d454..57d1313363 100644
--- a/modules/mogo-module-chat/src/main/java/com/mogo/chat/base/BaseController.kt
+++ b/modules/mogo-module-chat/src/main/java/com/mogo/chat/base/BaseController.kt
@@ -8,7 +8,7 @@ import com.mogo.chat.model.bean.toSns
import com.mogo.chat.util.UserInfoHelper
import com.mogo.chat.util.log
import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.utils.network.request
+import com.mogo.eagle.core.network.request
open class BaseController {
diff --git a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/ChatController.kt b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/ChatController.kt
index 95d2f16490..f042d52245 100644
--- a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/ChatController.kt
+++ b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/ChatController.kt
@@ -22,7 +22,7 @@ import com.mogo.chat.util.sp.saveRoomId
import com.mogo.chat.util.trackCall
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.utils.network.request
+import com.mogo.eagle.core.network.request
object ChatController : BaseController(), IGMEEventCallBack {
diff --git a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/MatchController.kt b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/MatchController.kt
index 2a952bdb80..272f93a694 100644
--- a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/MatchController.kt
+++ b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/MatchController.kt
@@ -14,7 +14,7 @@ import com.mogo.chat.util.*
import com.mogo.chat.util.audio.AudioFocusUtil
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.utils.network.request
+import com.mogo.eagle.core.network.request
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.withContext
diff --git a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/VehicleTeamController.kt b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/VehicleTeamController.kt
index af7139271d..8ab605bd64 100644
--- a/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/VehicleTeamController.kt
+++ b/modules/mogo-module-chat/src/main/java/com/mogo/chat/model/control/VehicleTeamController.kt
@@ -13,7 +13,8 @@ import com.mogo.chat.util.log
import com.mogo.chat.util.sp.getRoomId
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.utils.network.request
+import com.mogo.eagle.core.network.request
+
object VehicleTeamController : BaseController(), IGMEEventCallBack {
diff --git a/modules/mogo-module-chat/src/main/java/com/mogo/chat/service/ChatServiceHandler.kt b/modules/mogo-module-chat/src/main/java/com/mogo/chat/service/ChatServiceHandler.kt
index 8732628ddf..a6170e308b 100644
--- a/modules/mogo-module-chat/src/main/java/com/mogo/chat/service/ChatServiceHandler.kt
+++ b/modules/mogo-module-chat/src/main/java/com/mogo/chat/service/ChatServiceHandler.kt
@@ -22,7 +22,8 @@ import com.mogo.chat.util.sp.setCarOnLineStatus
import com.mogo.chat.util.trackHangUp
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.eagle.core.data.BaseResponse
-import com.mogo.utils.network.request
+import com.mogo.eagle.core.network.request
+
object ChatServiceHandler : BaseController() {
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
index 8dd242489b..97172dc46e 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
@@ -1,13 +1,14 @@
package com.mogo.module.common.utils;
+
import android.content.Context;
import android.util.ArrayMap;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.R;
import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.marker.PoiWrapper;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import java.util.List;
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index 7062c39cb6..8e9005f11c 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -10,6 +10,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.network.utils.digest.DigestUtils;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.extensions.R;
@@ -27,7 +28,6 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoMsgCenter;
import com.mogo.service.statusmanager.IMogoMsgCenterListener;
-import com.mogo.utils.digest.DigestUtils;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.storage.SharedPrefsMgr;
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
index 25bc998797..4b3c24f0c4 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
@@ -7,13 +7,13 @@ import android.os.SystemClock;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
index a8c675d6e5..5b2f42734b 100644
--- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
+++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java
@@ -10,13 +10,13 @@ import android.widget.Toast;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.context.ContextHolderUtil;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.network.NetConfig;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.monitor.IMogoMonitorLog;
import com.mogo.utils.logger.LogLevel;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.NetConfig;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.mogo.module.monitor.MogoMonitorConst;
import com.zhidao.mogo.module.monitor.bean.RemoteLogPushContent;
import com.zhidao.mogo.module.monitor.dialog.ILogDialogListener;
diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/obu/NetCarObu.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/obu/NetCarObu.kt
index e7678145bf..f21102512d 100644
--- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/obu/NetCarObu.kt
+++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/obu/NetCarObu.kt
@@ -3,9 +3,8 @@ package com.zhidao.mogo.module.obu.obu
import android.content.Context
import android.os.Handler
import android.os.Message
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.utils.logger.Logger
-import com.mogo.utils.network.utils.GsonUtil
-import com.zhidao.mogo.module.obu.ObuConstant.TYPE_OPTIMAL_SPEED_ADVISORY
import com.zhidao.mogo.module.obu.ObuConstant.TYPE_ROAD_USER_COLLISION_WARNING
import com.zhidao.mogo.module.obu.obu.bean.MogoObuEventInfo
import com.zhidao.mogo.module.obu.obu.bean.MogoObuTrafficLightInfo
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
index 254ccfb2c9..51e828abde 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
@@ -1,12 +1,12 @@
package com.mogo.module.service.autopilot;
import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
public
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
index e00be820ac..a76f74bd62 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
@@ -1,19 +1,16 @@
package com.mogo.module.service.dispatch.model;
-import static com.mogo.commons.context.ContextHolderUtil.getContext;
-import static com.mogo.module.common.constants.HostConst.DATA_SERVICE_HOST;
-
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
-import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
+import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.service.dispatch.bean.ReportDispatchResult;
import com.mogo.module.service.dispatch.bean.ReportedRoute;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.HashMap;
import java.util.List;
@@ -22,6 +19,11 @@ import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
+import static com.mogo.commons.context.ContextHolderUtil.getContext;
+import static com.mogo.module.common.constants.HostConst.DATA_SERVICE_HOST;
+
+
+
public class DispatchServiceModel {
private static final String TAG = "DispatchServiceModel";
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/handler/MainLooperHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/handler/MainLooperHandler.java
index e8a126db0c..885d1737c1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/handler/MainLooperHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/handler/MainLooperHandler.java
@@ -7,8 +7,10 @@ import android.text.TextUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.storage.SpStorage;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.service.MogoServices;
@@ -18,8 +20,6 @@ import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse;
import com.mogo.module.service.onlinecar.panel.NavigationTargetInfo;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.Map;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java
index 55dae9dd4b..d11c075dc1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java
@@ -5,12 +5,12 @@ import android.content.Intent;
import android.text.TextUtils;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.datacenter.SnapshotLocationDataCenter;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import org.json.JSONObject;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index 98b7038a0b..0af0a5b7ed 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -23,6 +23,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.traffic.TrafficData;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
@@ -48,7 +49,6 @@ import com.mogo.service.entrance.ButtonIndex;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import org.json.JSONObject;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java
index 237c93580e..a0b497cf99 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java
@@ -3,9 +3,9 @@ package com.mogo.module.service.intent;
import android.content.Context;
import android.content.Intent;
+import com.mogo.eagle.core.network.NetConfig;
import com.mogo.utils.logger.LogLevel;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.NetConfig;
public
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java
index c61ff760eb..6d75b9d754 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java
@@ -5,9 +5,7 @@ import android.content.Intent;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.NetworkUtils;
-import com.mogo.utils.logger.LogLevel;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.NetConfig;
public
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index 6bfefc5b52..6e4a532f1c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -10,10 +10,12 @@ import android.text.TextUtils;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.R;
@@ -26,8 +28,6 @@ import com.mogo.service.cloud.passport.IMogoTicketCallback;
import com.mogo.utils.AppUtils;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import java.util.ArrayList;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
index 030a31b8b8..6ec3588aea 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
@@ -4,15 +4,15 @@ import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.service.ServiceConst;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.Map;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
index ea24f810f1..f737769347 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
@@ -7,6 +7,7 @@ import androidx.lifecycle.LifecycleOwner;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.storage.SpStorage;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.IDestroyable;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.navi.IMogoNaviListener2;
@@ -15,7 +16,6 @@ import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.service.network.RefreshCallback;
import com.mogo.module.service.network.RefreshModel;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
* @author congtaowang
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index a9afda506a..9882b64b7b 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -11,7 +11,9 @@ import androidx.annotation.RequiresApi;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.entity.SocketDownData;
import com.mogo.eagle.core.data.BaseData;
-import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.datacenter.SnapshotLocationDataCenter;
import com.mogo.module.service.MarkerServiceHandler;
@@ -24,8 +26,6 @@ import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
index ab5b54aaa0..fbb47f5f0a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
@@ -4,12 +4,12 @@ import android.text.TextUtils;
import android.util.Log;
import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.service.network.bean.TtsConfigEntity;
-import com.mogo.utils.network.RequestOptions;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java
index ce91b27108..f5c54842ce 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java
@@ -5,6 +5,7 @@ import android.util.Log;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.facade.template.IProvider;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.navi.IMogoAimlessModeListener;
import com.mogo.map.navi.MogoCongestionInfo;
import com.mogo.map.navi.MogoCongestionLink;
@@ -15,7 +16,6 @@ import com.mogo.module.common.entity.RoadTrafficStatus;
import com.mogo.module.common.entity.UploadTrafficEntity;
import com.mogo.module.share.net.TrafficModelData;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
index cd1ca6dba0..298fdf9712 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -39,9 +39,11 @@ import android.util.ArrayMap;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.common.dialog.BaseFloatDialog;
import com.mogo.module.common.utils.CloudPoiManager;
@@ -61,8 +63,6 @@ import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.utils.NetworkUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import org.json.JSONObject;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
index 101f1c675f..e624b17f29 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
@@ -13,8 +13,8 @@ import com.mogo.module.share.strategyreceiver.AccidentStrategyReceiver
import com.mogo.module.share.strategyreceiver.BlockStrategy
import com.mogo.service.IMogoServiceApis
import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.utils.logger.Logger
-import com.mogo.utils.network.utils.GsonUtil
import org.json.JSONObject
/**
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/SeekRequest.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/SeekRequest.kt
index cebea87220..3067a3a24c 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/SeekRequest.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/SeekRequest.kt
@@ -1,6 +1,6 @@
package com.mogo.module.share.bean
-import com.mogo.utils.network.utils.GsonUtil
+import com.mogo.eagle.core.network.utils.GsonUtil
/**
* 故障求助接口请求参数
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt
index 7eb289d236..8f4c5da0d2 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareConfigRequest.kt
@@ -1,6 +1,6 @@
package com.mogo.module.share.bean
-import com.mogo.utils.network.utils.GsonUtil
+import com.mogo.eagle.core.network.utils.GsonUtil
class ShareConfigRequest(val sn:String,val adCode:String) {
fun toJson():String{
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt
index d19e54e7df..5de72ec9b5 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt
@@ -7,13 +7,13 @@ import android.widget.GridLayout
import android.widget.ImageView
import android.widget.TextView
import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.module.share.R
import com.mogo.module.share.bean.FixableButton
import com.mogo.module.share.constant.ShareConstants
import com.mogo.service.share.IMogoTanluProvider
import com.mogo.utils.glide.GlideApp
import com.mogo.utils.logger.Logger
-import com.mogo.utils.network.utils.GsonUtil
import com.mogo.utils.storage.SharedPrefsMgr
/**
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
index 009f4f295f..06b0b88194 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
@@ -7,9 +7,10 @@ import android.util.ArrayMap
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.analytics.AnalyticsUtils
import com.mogo.eagle.core.data.BaseData
-import com.mogo.commons.network.SubscribeImpl
import com.mogo.commons.voice.AIAssist
import com.mogo.commons.voice.IMogoVoiceCmdCallBack
+import com.mogo.eagle.core.network.RequestOptions
+import com.mogo.eagle.core.network.SubscribeImpl
import com.mogo.module.common.constants.HostConst
import com.mogo.module.share.bean.SeekRecord
import com.mogo.module.share.bean.SeekRequest
@@ -17,7 +18,6 @@ import com.mogo.module.share.bean.getJson
import com.mogo.module.share.net.ShareRtlApiService
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
import com.mogo.utils.logger.Logger
-import com.mogo.utils.network.RequestOptions
import com.mogo.utils.storage.SharedPrefsMgr
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
@@ -164,7 +164,8 @@ object SeekHelpManager {
properties["from"] = from
AnalyticsUtils.track("v2x_share_type", properties)
- ServiceApisManager.serviceApis.networkApi.create(ShareRtlApiService::class.java, HostConst.REALTIME_LOCATION_HOST).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(RequestOptions.create(context)) {
+ ServiceApisManager.serviceApis.networkApi.create(ShareRtlApiService::class.java, HostConst.REALTIME_LOCATION_HOST).sendHelpSignal(param).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(object : SubscribeImpl(
+ RequestOptions.create(context)) {
override fun onSuccess(o: BaseData?) {
super.onSuccess(o)
// 接口请求成功，内部同步v2x状态，通知adas，改变自车图标
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
index f550ae76df..0e73a97ce2 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
@@ -2,16 +2,16 @@ package com.mogo.module.share.net;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.common.entity.UploadTrafficEntity;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.Map;
@@ -41,7 +41,7 @@ public class TrafficModelData {
final ParamsProvider.Builder builder = new ParamsProvider.Builder( getApp().getApplicationContext());
Map parameters = builder.build();
parameters.put("sn", MoGoAiCloudClientConfig.getInstance().getSn());
- parameters.put("data",GsonUtil.jsonFromObject(uploadTrafficEntity));
+ parameters.put("data", GsonUtil.jsonFromObject(uploadTrafficEntity));
mTrafficApiService.UploadCongestionInfo(parameters)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index 4fe45ef1d2..cefaf96493 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -16,8 +16,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.map.listener.IMogoMapListener;
@@ -52,12 +51,9 @@ import com.mogo.service.module.ModuleType;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import com.tencent.liteav.basic.log.TXCLog;
-import org.jetbrains.annotations.Nullable;
-
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
import static com.mogo.module.v2x.VideoInitKt.initVideo;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
index a56f476a98..42c6abab3f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XEventShowEntity;
@@ -24,7 +25,6 @@ import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.TanluUploadParams;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
index 918b3fb2a0..a94c71097b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
@@ -1,13 +1,11 @@
package com.mogo.module.v2x.adapter.holder;
-import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
import android.widget.TextView;
-import com.mogo.module.common.MogoApisHandler;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XEventShowEntity;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
@@ -24,10 +22,6 @@ import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
index 63b3f78363..119904a9b7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.animation.BezierAnimationView;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerUserInfo;
@@ -46,7 +47,6 @@ import com.mogo.utils.ArrayUtils;
import com.mogo.utils.DateTimeUtils;
import com.mogo.utils.glide.GlideRoundedCornersTransform;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.Calendar;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
index b53631a4bd..d838b397e5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
@@ -5,6 +5,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
import com.mogo.module.v2x.R;
@@ -14,7 +15,6 @@ import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.view.HeartLikeView;
import com.mogo.module.v2x.view.HeartUnLikeView;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
* 出行面板违章停车
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index 26726df4b3..616fb7c5b8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -8,6 +8,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.SpanUtils;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
@@ -21,7 +22,6 @@ import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.imageloader.MogoImageView;
-import com.mogo.utils.network.utils.GsonUtil;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index 9715e104e2..e736140d1a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
@@ -17,7 +18,6 @@ import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.view.HeartLikeView;
import com.mogo.module.v2x.view.HeartUnLikeView;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
* 出行面板道路事件面板
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index 1c7b07dd24..14d8e404f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -3,6 +3,7 @@ package com.mogo.module.v2x.alarm;
import android.text.TextUtils;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.constant.TimeConstants;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.data.map.MogoLocation;
@@ -28,7 +29,6 @@ import com.mogo.module.v2x.utils.FatigueDrivingUtils;
import com.mogo.module.v2x.utils.LocationUtils;
import com.mogo.utils.ArrayUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import java.util.ArrayList;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index fc35968bde..8deeef06b2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
@@ -25,7 +26,6 @@ import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.module.v2x.view.V2XListEmptyView;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
index 5ea07b595e..59a92845a6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -5,6 +5,7 @@ import android.location.Location;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -35,7 +36,6 @@ import com.mogo.module.v2x.utils.ObuConfig;
import com.mogo.module.v2x.utils.TrackUtils;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.HashMap;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index 0eea909036..7f56bee978 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -1,5 +1,6 @@
package com.mogo.module.v2x.listener;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -10,7 +11,6 @@ import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
index 5f3a1a6f9a..db4a302bd2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
@@ -1,5 +1,6 @@
package com.mogo.module.v2x.listener;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.enums.EventTypeEnum;
@@ -11,7 +12,6 @@ import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
index b99c6db976..0429e44b97 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -7,6 +7,7 @@ import android.content.Intent;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.constant.TimeConstants;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.data.map.MogoLocation;
@@ -22,7 +23,6 @@ import com.mogo.module.v2x.alarm.V2XAlarmServer;
import com.mogo.module.v2x.utils.TrackUtils;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
* author : donghongyu
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
index e062dda858..697f1ac656 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
@@ -4,13 +4,13 @@ import android.content.Intent;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
index d8ae58050c..2bd5b50b69 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
@@ -5,6 +5,7 @@ import com.mogo.eagle.core.data.traffic.TrafficData
import com.mogo.eagle.core.data.v2x.AdvanceWarningBean
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.module.common.drawer.TrafficMarkerDrawer
import com.mogo.module.common.enums.EventTypeEnum
@@ -29,7 +30,7 @@ class V2XMessageListener_404000 : IMogoOnMessageListener {
}
Logger.i(
V2XConst.MODULE_NAME,
- "V2XMessageListener_404000：" + com.mogo.utils.network.utils.GsonUtil.jsonFromObject(
+ "V2XMessageListener_404000：" + GsonUtil.jsonFromObject(
message
)
)
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
index ce07ef510a..57fa9fea71 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
@@ -8,11 +8,13 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.map.search.geo.IMogoGeoSearchListener;
@@ -37,8 +39,6 @@ import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
import com.mogo.module.v2x.utils.LocationUtils;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.Map;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index 072a01cbca..bcdb708835 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -3,11 +3,12 @@ package com.mogo.module.v2x.network;
import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
+import com.mogo.eagle.core.data.BaseData;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
index 50c7c648b2..9b87a3db3f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
@@ -9,8 +9,10 @@ import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.mvp.Presenter;
-import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.module.v2x.entity.panel.Center;
import com.mogo.module.v2x.entity.panel.SurroundingRequest;
import com.mogo.module.v2x.entity.panel.SurroundingResponse;
@@ -20,8 +22,6 @@ import com.mogo.service.IMogoServiceApis;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
index 856e95c8b4..1445b9422a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
import androidx.annotation.Nullable;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -14,7 +15,6 @@ import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
index d4bea10f77..558da1d757 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.road;
import android.view.View;
import android.view.ViewGroup;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -15,7 +16,6 @@ import com.mogo.module.v2x.scenario.view.IV2XWindow;
import com.mogo.module.v2x.utils.ADASUtils;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
index 0e7a62792d..e1472ea00b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
import androidx.annotation.Nullable;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.v2x.R;
@@ -14,7 +15,6 @@ import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
* author : donghongyu
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
index 8df65dfd1d..1eb178b68d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
@@ -2,13 +2,13 @@ package com.mogo.module.v2x.utils;
import android.text.TextUtils;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.constant.TimeConstants;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
/**
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
index c19b3f396f..87a6a855e4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
@@ -4,6 +4,7 @@ import android.location.Location;
import android.util.Log;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.map.search.geo.IMogoGeoSearchListener;
@@ -15,7 +16,6 @@ import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
/**
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 148b626d9a..4dda1fbfc6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -1,6 +1,7 @@
package com.mogo.module.v2x.utils;
import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerResponse;
@@ -11,7 +12,6 @@ import com.mogo.module.common.entity.V2XWarningEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
-import com.mogo.utils.network.utils.GsonUtil;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
index 2edd022996..dba8eed017 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
@@ -1,5 +1,6 @@
package com.mogo.module.v2x.utils;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.common.entity.V2XEventZanData;
@@ -7,7 +8,6 @@ import com.mogo.module.common.entity.V2XHistoryScenarioData;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.sqlite.SQLDaoFactory;
import com.mogo.utils.sqlite.SQLIDao;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
index 56ee97e025..8c33500576 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
@@ -16,6 +16,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.eagle.core.widget.RoundLayout;
import com.mogo.module.common.entity.MarkerCarInfo;
@@ -24,7 +25,6 @@ import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.tencent.rtmp.ITXLivePlayListener;
import com.tencent.rtmp.TXLiveConstants;
import com.tencent.rtmp.TXLivePlayConfig;
diff --git a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
index fb98c27ee9..814a7e21c4 100644
--- a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/net/HttpClient.kt
@@ -1,7 +1,7 @@
package com.zhidao.roadcondition.net
import com.mogo.commons.AbsMogoApplication
-import com.mogo.utils.network.NetConfig
+import com.mogo.eagle.core.network.NetConfig
import com.zhidao.roadcondition.constant.HttpConstants
import okhttp3.Cache
import okhttp3.Dns
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index 7eb434f01c..6893c9603c 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.adas.AdasProvider;
import com.mogo.module.adas.IAdasDataListener;
@@ -28,7 +29,6 @@ import com.mogo.service.impl.singleton.SingletonsHolder;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.adasconfig.api.AdasConfigApiController;
import com.zhidao.adasconfig.common.config.EnumCarHeading;
import com.zhidao.adasconfig.common.config.EnumSkinStyle;
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java
index f9d199d96c..0dab4f4707 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java
@@ -1,9 +1,10 @@
package com.mogo.service.impl.adas;
+import com.mogo.eagle.core.network.RequestOptions;
+import com.mogo.eagle.core.network.utils.Util;
import com.mogo.service.adas.entity.CarModelListResponse;
import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.Util;
+
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java
index 029fdb0189..5f4351d0f9 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java
@@ -1,11 +1,12 @@
package com.mogo.service.impl.network;
+
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.network.RetrofitFactory;
import com.mogo.service.network.IMogoNetwork;
-import com.mogo.utils.network.RetrofitFactory;
/**
* @author zyz