[Change]解除对core中utils的依赖,直接使用已有依赖库中的日志和json解析工具,防止出现插件检查时候出现的重复依赖问题

This commit is contained in:
donghongyu
2021-11-22 11:45:43 +08:00
parent db19f15ab6
commit ed49db4b32
46 changed files with 340 additions and 61 deletions

View File

@@ -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}"

View File

@@ -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云 实时上报数据频率处理类

View File

@@ -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;

View File

@@ -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}"

View File

@@ -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<String, Object> 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())

View File

@@ -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}"

View File

@@ -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;

View File

@@ -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;