diff --git a/app/build.gradle b/app/build.gradle index 3a9e785..3397f87 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid // 从车机获取视频流 implementation 'com.zhidao.carmanager:common:1.0.25@aar' - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}" diff --git a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java index ccdb9ab..0baec68 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java @@ -5,13 +5,13 @@ import android.os.Bundle; import android.util.Log; import android.view.View; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.live.listener.ILiveStatusListener; import com.mogo.cloud.live.manager.LiveStreamManagerImpl; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack; import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive; import com.mogo.cloud.wifi.IWifiStateListener; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 181d1e4..cdca13b 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -9,13 +9,13 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.network.NetworkActivity; import com.mogo.cloud.passport.IMoGoTokenCallback; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack; import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack; import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java b/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java index dd8e6af..fb27cb1 100644 --- a/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java +++ b/app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java @@ -4,8 +4,8 @@ import android.content.Context; import androidx.annotation.Keep; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.tanlu.bean.location.MogoLocation; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; @Keep public class MogoLocationInfoServices { diff --git a/foudations/mogo-live/build.gradle b/foudations/mogo-live/build.gradle index 3c66a0f..d657129 100644 --- a/foudations/mogo-live/build.gradle +++ b/foudations/mogo-live/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation 'com.google.protobuf:protobuf-java:3.12.4' implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java index 276c97c..c5b2112 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java @@ -1,5 +1,6 @@ package com.mogo.cloud.live.manager; +import com.elegant.log.simplelog.Logger; import com.elegant.network.utils.GsonUtil; import com.mogo.cloud.live.model.BaseData; import com.mogo.cloud.live.model.CameraStatusModel; @@ -7,7 +8,6 @@ import com.mogo.cloud.live.network.LiveApiServer; import com.mogo.cloud.network.NetConstants; import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClient; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 260084b..05304bd 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -5,6 +5,7 @@ import android.media.AudioFormat; import android.os.Handler; import android.os.SystemClock; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.live.listener.ILiveStatusListener; import com.mogo.cloud.live.model.CommandModel; import com.mogo.cloud.live.server.PushService; @@ -12,7 +13,6 @@ import com.mogo.cloud.live.socket.SocketMsgUtils; import com.mogo.cloud.live.socket.SocketRequestUtils; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.entity.MsgBody; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java index ddbe19c..1159d09 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java @@ -2,6 +2,7 @@ package com.mogo.cloud.live.manager; import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA; +import com.elegant.log.simplelog.Logger; import com.google.gson.Gson; import com.mogo.cloud.live.constant.LiveConstant; import com.mogo.cloud.live.listener.IRequestLiveListener; @@ -14,7 +15,6 @@ import com.mogo.cloud.live.network.LiveApiServer; import com.mogo.cloud.network.NetConstants; import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClient; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import java.util.HashMap; import java.util.Map; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java index 0793744..3f35eb4 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java @@ -6,12 +6,12 @@ import android.content.Intent; import android.os.IBinder; import android.os.SystemClock; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.live.listener.ILiveCurrentRoomStatusListener; import com.mogo.cloud.live.listener.IYUVDataListener; import com.mogo.cloud.live.manager.CameraFrameManager; import com.mogo.cloud.live.manager.MoGoLiveManager; import com.mogo.cloud.live.utils.ByteUtils; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; public class PushService extends Service diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java index 4d9e9ae..6103034 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java @@ -1,6 +1,6 @@ package com.mogo.cloud.live.socket; -import com.mogo.eagle.core.utilcode.mogo.TelephoneUtil; +import com.mogo.cloud.live.utils.TelephoneUtil; import com.zhidao.ptech.shadow.server.protocol.DeviceInfo; public class SocketRequestUtils { diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/TelephoneUtil.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/TelephoneUtil.java new file mode 100644 index 0000000..3c1c8a6 --- /dev/null +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/TelephoneUtil.java @@ -0,0 +1,172 @@ +package com.mogo.cloud.live.utils; + +import android.content.Context; +import android.net.ConnectivityManager; +import android.os.Build; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + + +import com.elegant.log.simplelog.Logger; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + + +/** + * @author wangzhiyuan + * @since 2018/2/7 + */ + +public class TelephoneUtil { + public static String sn = ""; + public static String fotaVersion = ""; + public static String fotaDevice = ""; + public static String imei = ""; + public static String iccid = ""; + public static String vin = ""; + + public static String getFotaDevice() { + if (TextUtils.isEmpty(fotaDevice)) { + String device = ""; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + device = (String) get.invoke(c, "ro.fota.device"); + if (!TextUtils.isEmpty(device)) { + device = device.trim(); + } + } catch (Exception e) { + e.printStackTrace(); + } + fotaDevice = device; + } + return fotaDevice; + } + + public static String getFotaVersion() { + if (TextUtils.isEmpty(fotaVersion)) { + String version = ""; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + version = (String) get.invoke(c, "ro.fota.version"); + if (!TextUtils.isEmpty(version)) { + version = version.trim(); + } + } catch (Exception e) { + e.printStackTrace(); + } + fotaVersion = version; + } + return fotaVersion; + } + + public static boolean getMobileDataState(Context context) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + // Android 5.0之前 + ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + Class conMgrClass = null; + Object iConMgr = null; + try { + conMgrClass = Class.forName(conMgr.getClass().getName());//ConnectivityManager + Field iConMgrField = conMgrClass.getDeclaredField("mService");//IConnectivityManager + iConMgrField.setAccessible(true); + iConMgr = iConMgrField.get(conMgr);//获得ConnectivityManager的IConnectivityManager实例 + + Class iConMgrClass = Class.forName(iConMgr.getClass().getName()); + Method getMobileDataEnabledMethod = iConMgrClass.getDeclaredMethod("getMobileDataEnabled"); + if (getMobileDataEnabledMethod != null) { + getMobileDataEnabledMethod.setAccessible(true); + boolean result = (Boolean) getMobileDataEnabledMethod.invoke(iConMgr); + Logger.d("TelephoneUtil", "getMobileDataEnabled = " + result); + return result; + } + } catch (Exception e) { + e.printStackTrace(); + } + } else { + // Android 5.0之后(包含) + TelephonyManager telephonyService = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + try { + Method getDataEnabled = telephonyService.getClass().getDeclaredMethod("getDataEnabled"); + if (null != getDataEnabled) { + boolean result = (Boolean) getDataEnabled.invoke(telephonyService); + Logger.d("TelephoneUtil", "getDataEnabled = " + result); + return result; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return false; + } + + public static void setMobileDataState(Context context, boolean enable) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + // Android 5.0之前 + ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + Class conMgrClass = null; + Object iConMgr = null; + try { + conMgrClass = Class.forName(conMgr.getClass().getName());//ConnectivityManager + Field iConMgrField = conMgrClass.getDeclaredField("mService");//IConnectivityManager + iConMgrField.setAccessible(true); + iConMgr = iConMgrField.get(conMgr);//获得ConnectivityManager的IConnectivityManager实例 + + Class iConMgrClass = Class.forName(iConMgr.getClass().getName()); + Method setMobileDataEnabledMethod = iConMgrClass.getDeclaredMethod("setMobileDataEnabled", boolean.class); + if (setMobileDataEnabledMethod != null) { + setMobileDataEnabledMethod.setAccessible(true); + setMobileDataEnabledMethod.invoke(iConMgr, enable); + Logger.d("TelephoneUtil", "setMobileDataEnabled = " + enable); + } + } catch (Exception e) { + e.printStackTrace(); + } + } else { + // Android 5.0之后(包含) + try { + TelephonyManager telephonyService = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); + Method setDataEnabledMethod = telephonyService.getClass().getDeclaredMethod("setDataEnabled", boolean.class); + if (null != setDataEnabledMethod) { + setDataEnabledMethod.invoke(telephonyService, enable); + Logger.d("TelephoneUtil", "setDataEnabled = " + enable); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + public static String getSerialNumber() { + if (TextUtils.isEmpty(sn)) { + String serial = ""; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + serial = (String) get.invoke(c, "zhidao.serial"); + if (TextUtils.isEmpty(serial)) { + serial = (String) get.invoke(c, "gsm.serial"); + } + if (TextUtils.isEmpty(serial)) { + serial = (String) get.invoke(c, "ro.serialno"); + } + } catch (Exception e) { + e.printStackTrace(); + } + + try { + if (serial.startsWith("ZD") || serial.startsWith("XT")) { + sn = serial; + } else { + return serial; + } + } catch (Exception e) { + e.printStackTrace(); + } + } + return sn; + } + +} diff --git a/foudations/mogo-location/build.gradle b/foudations/mogo-location/build.gradle index c37c7df..ddfb455 100644 --- a/foudations/mogo-location/build.gradle +++ b/foudations/mogo-location/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) api rootProject.ext.dependencies.spi - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}" diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java index a22c08f..95c03c6 100644 --- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java +++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java @@ -2,11 +2,11 @@ package com.mogo.cloud.location.third; import android.content.Context; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.location.third.core.LocUploadConfig; import com.mogo.cloud.location.third.core.LocUploadManager; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; public class ThirdLocationManager { diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java index f3570eb..b49e5ba 100644 --- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java +++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java @@ -1,8 +1,8 @@ package com.mogo.cloud.location.third.core; +import com.elegant.log.simplelog.Logger; import com.elegant.spi.AbstractDelegateManager; import com.elegant.spi.core.visitor.ServiceClassValue; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; public class LocationDelegateManager extends AbstractDelegateManager implements AbstractDelegateManager.DelegateListener> { diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java index cf5903a..4a078a9 100644 --- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java +++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java @@ -1,6 +1,7 @@ package com.mogo.cloud.location.third.service; +import com.elegant.log.simplelog.Logger; import com.elegant.utils.CheckUtils; import com.google.protobuf.ByteString; import com.mogo.cloud.location.third.core.LocUploadConfig; @@ -9,7 +10,6 @@ import com.mogo.cloud.location.third.core.LocationDelegateManager; import com.mogo.cloud.location.third.core.LocationServiceProvider; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.third.core.SocketClient; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; diff --git a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java index da22a76..294e20d 100644 --- a/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java +++ b/foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java @@ -7,6 +7,7 @@ import android.os.IBinder; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.elegant.log.simplelog.Logger; import com.elegant.utils.ThreadPoolService; import com.elegant.utils.UiThreadHandler; import com.google.protobuf.InvalidProtocolBufferException; @@ -17,7 +18,6 @@ import com.mogo.cloud.location.third.core.LocUploadConfig; import com.mogo.cloud.socket.third.core.Callback; import com.mogo.cloud.socket.third.core.CallbackManager; import com.mogo.cloud.socket.third.core.SocketClient; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; diff --git a/foudations/mogo-network/build.gradle b/foudations/mogo-network/build.gradle index d571657..eea7a1c 100644 --- a/foudations/mogo-network/build.gradle +++ b/foudations/mogo-network/build.gradle @@ -55,7 +55,7 @@ dependencies { api rootProject.ext.dependencies.retrofitadapter api rootProject.ext.dependencies.retrofitconvertergson api rootProject.ext.dependencies.retrofitconverterscalars - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + compileOnly 'com.elegant.network:network:1.1.28' if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt index f5cb4f3..15f7236 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt @@ -1,7 +1,7 @@ package com.mogo.cloud.network.interceptor +import com.elegant.log.simplelog.Logger import com.mogo.cloud.httpdns.MogoHttpDnsClient -import com.mogo.eagle.core.utilcode.mogo.logger.Logger import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt index 3365703..ca0f025 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt @@ -1,7 +1,7 @@ package com.mogo.cloud.network.interceptor +import com.elegant.log.simplelog.Logger import com.mogo.cloud.network.NetConstants.Companion.TAG -import com.mogo.eagle.core.utilcode.mogo.logger.Logger import okhttp3.* import okio.Buffer import java.io.IOException diff --git a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt index 9070665..3dc81eb 100644 --- a/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt +++ b/foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt @@ -1,9 +1,9 @@ package com.mogo.cloud.network.interceptor +import com.elegant.log.simplelog.Logger +import com.elegant.network.utils.GsonUtil import com.mogo.cloud.network.BaseData import com.mogo.cloud.passport.MoGoAiCloudClient -import com.mogo.eagle.core.utilcode.mogo.logger.Logger -import com.mogo.eagle.core.utilcode.util.GsonUtils import okhttp3.Interceptor import okhttp3.MediaType import okhttp3.Response @@ -29,7 +29,7 @@ class HttpPassportInterceptor : Interceptor { bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length" contentType = responseBody.contentType() responseContent = responseBody.string() - val response: BaseData<*>? = GsonUtils.fromJson(responseContent, BaseData::class.java) + val response: BaseData<*>? = GsonUtil.objectFromJson(responseContent, BaseData::class.java) // 处理Token异常 if (response?.code == 100046 || response?.code == 100045 || diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index 7dfec18..b257ca9 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation 'com.zhidao.thirdlogin:third-login:1.0.2' // passport-for-internal 内部SDK版本 implementation 'com.zhidao.accountservice:account-sdk:1.0.18' - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:httpdns:${MOGO_HTTPDNS_VERSION}" diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index 71b810b..ad0f41a 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -6,10 +6,10 @@ import android.widget.Toast; import androidx.annotation.Keep; +import com.elegant.log.simplelog.LogLevel; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import java.util.ArrayList; import java.util.List; diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java index 14dda9b..a0022fc 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java @@ -2,9 +2,9 @@ package com.mogo.cloud.passport; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** * SDK 中的参数 diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java index d0c316c..1e0663e 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java @@ -3,12 +3,12 @@ package com.mogo.cloud.passport.internal; import android.content.Context; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; import com.mogo.cloud.passport.IPassport; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.eagle.core.utilcode.mogo.DevicesUtils; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.cloud.passport.utils.DevicesUtils; import com.zhidao.account.sdk.AccountClientManager; import com.zhidao.account.sdk.BusinessType; import com.zhidao.account.sdk.Environment; diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/utils/DevicesUtils.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/utils/DevicesUtils.java new file mode 100644 index 0000000..dc6605c --- /dev/null +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/utils/DevicesUtils.java @@ -0,0 +1,107 @@ +package com.mogo.cloud.passport.utils; + +import android.content.Context; +import android.content.pm.PackageInfo; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.os.Build; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +/** + * 设备信息 + */ +public class DevicesUtils { + + private static final String PROPERTIES = "android.os.SystemProperties"; + private static final String GSM_SERIAL = "gsm.serial"; + private static final String GET = "get"; + + public static String getSn(){ + return getSystemProperties(GSM_SERIAL); + } + + public static String getSystemProperties(String name ) { + String value = ""; + try { + Class< ? > c = Class.forName( PROPERTIES ); + Method get = c.getMethod( GET, String.class ); + value = (String) get.invoke( c, name ); + } catch ( ClassNotFoundException var3 ) { + var3.printStackTrace(); + } catch ( NoSuchMethodException var4 ) { + var4.printStackTrace(); + } catch ( InvocationTargetException var5 ) { + var5.printStackTrace(); + } catch ( IllegalAccessException var6 ) { + var6.printStackTrace(); + } + return value; + } + + + public static String getNetworkTypeName(Context context) { + String typeName = "unknown"; + if (context != null) { + ConnectivityManager connectivityManager = (ConnectivityManager) context + .getSystemService(Context.CONNECTIVITY_SERVICE); + if (connectivityManager == null) { + return typeName; + } + NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo(); + if (networkInfo != null) { + typeName = networkInfo.getTypeName(); + } + } + return typeName; + } + + public static int getNetworkType(Context context) { + if (context != null) { + ConnectivityManager connectivityManager = (ConnectivityManager) context + .getSystemService(Context.CONNECTIVITY_SERVICE); + if (connectivityManager != null) { + NetworkInfo activeNetInfo = connectivityManager.getActiveNetworkInfo(); + if (activeNetInfo != null) { + return activeNetInfo.getType(); + } + } + } + return -1; + } + + public static boolean isSdkHigherThan18() { + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + } + + public static String getVersionName(Context context) { + String appVersion = ""; + + try { + if (context != null) { + String packageName = context.getApplicationInfo().packageName; + appVersion = context.getPackageManager().getPackageInfo(packageName, 0).versionName; + } + } catch (Exception e) { + e.printStackTrace(); + } + + return appVersion; + } + + public static int getVersionCode(Context context) { + String pkgName = context.getPackageName(); + + try { + PackageInfo e = context.getPackageManager().getPackageInfo(pkgName, 0); + if (e != null) { + return e.versionCode; + } + } catch (Exception var2) { + var2.printStackTrace(); + } + + return 1; + } +} diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle index 84631cc..2bd9ce5 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -38,7 +38,7 @@ dependencies { // 上报位置 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956200 implementation 'com.zhidao.locupload:loc-upload-sdk:1.2.0' - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index 354a934..77e22fd 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java @@ -7,6 +7,7 @@ import android.content.Context; import androidx.annotation.NonNull; +import com.elegant.log.simplelog.Logger; import com.elegant.network.utils.GsonUtil; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -17,7 +18,6 @@ import com.mogo.cloud.socket.entity.SocketDownData; import com.mogo.cloud.socket.internal.InternalSocketManager; import com.mogo.cloud.socket.third.ThirdSocketManager; import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; import java.util.ArrayList; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java index 4e818a0..bb59798 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java @@ -4,10 +4,10 @@ package com.mogo.cloud.socket.internal; import android.content.Context; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.SocketManager; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; import com.zhidao.socketsdk.manager.OnSocketAckCallback; import com.zhidao.socketsdk.manager.OnSocketReceiveCallback; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java index 76e82f7..a05d48d 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java @@ -8,6 +8,7 @@ import android.content.Context; import androidx.annotation.NonNull; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.SocketManager; @@ -17,7 +18,6 @@ import com.mogo.cloud.socket.third.core.CallbackManager; import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener; import com.mogo.cloud.socket.third.core.SocketClient; import com.mogo.cloud.socket.third.core.SocketConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.locupload.Platform; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java index b16847b..fab6770 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.collection.ArraySet; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.elegant.log.simplelog.Logger; import java.util.Set; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java index 04b9880..477b266 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java @@ -4,7 +4,7 @@ package com.mogo.cloud.socket.third.core; import androidx.collection.ArraySet; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.elegant.log.simplelog.Logger; import java.util.Set; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java index 7535d9f..dc46249 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java @@ -5,13 +5,13 @@ import static com.mogo.cloud.socket.SocketServicesConstants.getTag; import android.content.Context; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; import com.elegant.network.NetConfig; import com.elegant.utils.UiThreadHandler; import com.mogo.cloud.socket.third.core.client.ClientSocketManager; import com.mogo.cloud.socket.third.core.network.RequestManager; import com.mogo.cloud.socket.third.core.network.model.SocketAddressData; import com.mogo.cloud.socket.third.utils.RequestUtil; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java index 7959cfa..2206785 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java @@ -2,6 +2,7 @@ package com.mogo.cloud.socket.third.core.client; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.socket.third.analytics.EventRequest; import com.mogo.cloud.socket.third.analytics.SocketStatus; import com.mogo.cloud.socket.third.core.CallbackManager; @@ -11,7 +12,6 @@ import com.mogo.cloud.socket.third.core.SocketConstants; import com.mogo.cloud.socket.third.utils.LoginStatusUtil; import com.mogo.cloud.socket.third.utils.RSAUtils; import com.mogo.cloud.socket.third.utils.RequestUtil; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java index b444dfb..faaed52 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java @@ -1,10 +1,10 @@ package com.mogo.cloud.socket.third.core.client; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener; import com.mogo.cloud.socket.third.core.SocketConstants; import com.mogo.cloud.socket.third.utils.LoginStatusUtil; import com.mogo.cloud.socket.third.utils.RequestUtil; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketDecoder; import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameDecoder; import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameEncoder; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java index 8cd8653..306a1b1 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java @@ -1,9 +1,9 @@ package com.mogo.cloud.socket.third.core.client; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.socket.third.analytics.EventRequest; import com.mogo.cloud.socket.third.analytics.SocketStatus; import com.mogo.cloud.socket.third.core.SocketConstants; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java index c83df17..a1b8816 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java @@ -7,14 +7,14 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; +import com.elegant.log.simplelog.Logger; +import com.mogo.cloud.passport.utils.DevicesUtils; import com.mogo.cloud.socket.third.analytics.EventRequest; import com.mogo.cloud.socket.third.analytics.SocketStatus; import com.mogo.cloud.socket.third.core.SocketConfig; import com.mogo.cloud.socket.third.core.SocketConstants; import com.mogo.cloud.socket.third.utils.LoginStatusUtil; import com.mogo.cloud.socket.third.utils.RequestUtil; -import com.mogo.eagle.core.utilcode.mogo.DevicesUtils; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; /** * Send heartbeats according to network type to keep socket active as well as diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java index cedae10..8c1db33 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java @@ -3,11 +3,11 @@ package com.mogo.cloud.socket.third.utils; import android.os.Build; import android.text.TextUtils; +import com.elegant.log.simplelog.Logger; +import com.mogo.cloud.passport.utils.DevicesUtils; import com.mogo.cloud.socket.third.core.SocketConfig; import com.mogo.cloud.socket.third.core.SocketConstants; import com.mogo.cloud.socket.third.core.client.ClientSocketManager; -import com.mogo.eagle.core.utilcode.mogo.DevicesUtils; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket; diff --git a/gradle.properties b/gradle.properties index 80935a0..7d6fc5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,25 +34,24 @@ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本, true - 依赖 maven 版本 RELEASE=true -MOGO_CORE_UTILS_VERSION=0.0.26 # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.3.7 +MOGO_UTILS_VERSION=1.3.8 # 网络请求 -MOGO_NETWORK_VERSION=1.3.7 +MOGO_NETWORK_VERSION=1.3.8 # 网络DNS -MOGO_HTTPDNS_VERSION=1.3.7 +MOGO_HTTPDNS_VERSION=1.3.8 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.7 +MOGO_PASSPORT_VERSION=1.3.8 # 常链接 -MOGO_SOCKET_VERSION=1.3.7 +MOGO_SOCKET_VERSION=1.3.8 # 数据采集 -MOGO_REALTIME_VERSION=1.3.7 +MOGO_REALTIME_VERSION=1.3.8 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.3.7 +MOGO_TANLU_VERSION=1.3.8 # 直播推流 -MOGO_LIVE_VERSION=1.3.7 +MOGO_LIVE_VERSION=1.3.8 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.7 +MOGO_TRAFFICLIVE_VERSION=1.3.8 # 定位服务 -MOGO_LOCATION_VERSION=1.3.7 +MOGO_LOCATION_VERSION=1.3.8 diff --git a/modules/mogo-realtime/build.gradle b/modules/mogo-realtime/build.gradle index 8fac268..0649b20 100644 --- a/modules/mogo-realtime/build.gradle +++ b/modules/mogo-realtime/build.gradle @@ -29,7 +29,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) api rootProject.ext.dependencies.spi - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java index 519ca46..0a39f5b 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java @@ -8,7 +8,8 @@ import static com.mogo.realtime.constant.RealTimeConstant.TAG; import androidx.annotation.Keep; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.elegant.log.simplelog.Logger; + /** * AI云 实时上报数据频率处理类 diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java index 702bc24..f50bac6 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java @@ -6,12 +6,12 @@ import static com.mogo.realtime.constant.RealTimeConstant.TAG; import android.content.Context; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.SocketManager; import com.mogo.cloud.socket.entity.MsgBody; import com.mogo.cloud.socket.entity.SocketDownData; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.realtime.constant.RealTimeConstant; import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index 25fb1a2..318bbc9 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -36,7 +36,7 @@ dependencies { exclude group: 'com.zhidao.utils', module: 'utils' } implementation rootProject.ext.dependencies.videoprocessor - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + compileOnly 'com.elegant.network:network:1.1.28' if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java index 57998c2..13d0cf3 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java @@ -3,6 +3,7 @@ package com.mogo.cloud.tanlu.api; import android.content.Context; import android.util.Log; +import com.elegant.network.utils.GsonUtil; import com.mogo.cloud.network.BaseData; import com.mogo.cloud.network.NetConstants; import com.mogo.cloud.network.RetrofitFactory; @@ -11,7 +12,6 @@ import com.mogo.cloud.tanlu.bean.RoadInfoRequest; import com.mogo.cloud.tanlu.bean.RoadInfos; import com.mogo.cloud.tanlu.constant.HttpConstant; import com.mogo.cloud.tanlu.net.TanluApiService; -import com.mogo.eagle.core.utilcode.util.GsonUtils; import java.util.HashMap; import java.util.Map; @@ -65,7 +65,7 @@ public class MogoRoadSearchManager { public void queryRoadInfo(RoadInfoRequest roadInfoRequest, IRoadInfoSearchCallback callback) { Map map = new HashMap<>(); map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn()); - map.put("data", GsonUtils.toJson(roadInfoRequest)); + map.put("data", GsonUtil.jsonFromObject(roadInfoRequest)); apiService.queryRoadInfos(map) .subscribeOn(Schedulers.io()) diff --git a/modules/mogo-trafficlive/build.gradle b/modules/mogo-trafficlive/build.gradle index e901ffd..b1c609f 100644 --- a/modules/mogo-trafficlive/build.gradle +++ b/modules/mogo-trafficlive/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation "com.mogo.eagle.core:utils:${MOGO_CORE_UTILS_VERSION}" + compileOnly 'com.elegant.network:network:1.1.28' if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java index 7b6ece1..5bc72e1 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java @@ -2,8 +2,8 @@ package com.mogo.cloud.trafficlive.api; import android.view.SurfaceView; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.trafficlive.core.TrafficLiveCurrentManager; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import static com.mogo.cloud.trafficlive.constant.TrafficLiveConstant.TAG; diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java index f0086af..0cf92f7 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java @@ -3,6 +3,7 @@ package com.mogo.cloud.trafficlive.core; import android.text.TextUtils; import android.view.SurfaceView; +import com.elegant.log.simplelog.Logger; import com.mogo.cloud.live.listener.ILiveMultiRoomStatusListener; import com.mogo.cloud.live.listener.ILiveProgressListener; import com.mogo.cloud.live.listener.IMediaPlayerStateListener; @@ -13,7 +14,6 @@ import com.mogo.cloud.live.manager.RequestLiveManager; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack; import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_CLOSE; import static com.mogo.cloud.live.constant.LiveConstant.LIVE_TYPE_OPEN;