yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix]修复日志输出

Browse Source
This commit is contained in:
donghongyu
2021-11-19 20:54:29 +08:00
parent 501dac9e55
commit 26fd50e726
53 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

@@ -18,7 +18,6 @@
<option value="$PROJECT_DIR$/foudations/mogo-network" />
<option value="$PROJECT_DIR$/foudations/mogo-passport" />
<option value="$PROJECT_DIR$/foudations/mogo-socket" />
<option value="$PROJECT_DIR$/foudations/mogo-utils" />
<option value="$PROJECT_DIR$/modules" />
<option value="$PROJECT_DIR$/modules/mogo-realtime" />
<option value="$PROJECT_DIR$/modules/mogo-tanlu" />

1
app/build.gradle
View File

@@ -55,6 +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}"

1
app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java
View File

@@ -7,6 +7,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.elegant.network.utils.GsonUtil;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
/**

2
app/src/main/java/com/mogo/cloud/LivePlayAndPushActivity.java
View File

@@ -10,8 +10,8 @@ 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.utils.logger.Logger;
import com.mogo.cloud.wifi.IWifiStateListener;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
/**

2
app/src/main/java/com/mogo/cloud/MainActivity.java
View File

@@ -15,7 +15,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
public class MainActivity extends AppCompatActivity {

2
app/src/main/java/com/mogo/cloud/RealTimeActivity.java
View File

@@ -6,11 +6,11 @@ import android.widget.Button;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.elegant.analytics.utils.Logger;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.entity.SocketDownData;
import com.mogo.realtime.api.MoGoAiCloudRealTime;
import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import com.mogo.cloud.utils.logger.Logger;
/**
* @author liujing

2
app/src/main/java/com/mogo/cloud/location/MogoLocationInfoServices.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import androidx.annotation.Keep;
import com.mogo.cloud.tanlu.bean.location.MogoLocation;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
@Keep
public class MogoLocationInfoServices {

3
app/src/main/java/com/mogo/cloud/wifi/WifiBroadCastReceiver.java
View File

@@ -6,7 +6,8 @@ import android.content.Intent;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import com.mogo.cloud.utils.logger.Logger;
import com.elegant.analytics.utils.Logger;
public class WifiBroadCastReceiver extends BroadcastReceiver {

1
foudations/mogo-live/build.gradle
View File

@@ -50,6 +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}"

8
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/CameraStatusManager.java
View File

@@ -1,17 +1,13 @@
package com.mogo.cloud.live.manager;
import com.google.gson.Gson;
import com.mogo.cloud.GsonUtil;
import com.elegant.network.utils.GsonUtil;
import com.mogo.cloud.live.model.BaseData;
import com.mogo.cloud.live.model.CameraStatusModel;
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.cloud.utils.logger.Logger;
import java.util.HashMap;
import java.util.Map;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;

2
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
View File

@@ -12,7 +12,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
/**

6
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
View File

@@ -1,5 +1,7 @@
package com.mogo.cloud.live.manager;
import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA;
import com.google.gson.Gson;
import com.mogo.cloud.live.constant.LiveConstant;
import com.mogo.cloud.live.listener.IRequestLiveListener;
@@ -12,7 +14,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import java.util.HashMap;
import java.util.Map;
@@ -23,8 +25,6 @@ import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import static com.mogo.cloud.live.constant.LiveConstant.FRONT_CAMERA;
/**
* 请求直播管理类

2
foudations/mogo-live/src/main/java/com/mogo/cloud/live/server/PushService.java
View File

@@ -11,7 +11,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
public class PushService extends Service

2
foudations/mogo-live/src/main/java/com/mogo/cloud/live/socket/SocketRequestUtils.java
View File

@@ -1,6 +1,6 @@
package com.mogo.cloud.live.socket;
import com.mogo.cloud.TelephoneUtil;
import com.mogo.eagle.core.utilcode.mogo.TelephoneUtil;
import com.zhidao.ptech.shadow.server.protocol.DeviceInfo;
public class SocketRequestUtils {

4
foudations/mogo-location/build.gradle
View File

@@ -28,13 +28,11 @@ 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:utils:${MOGO_UTILS_VERSION}"
implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}"
implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}"
} else {
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-passport")
implementation project(":foudations:mogo-socket")
}

2
foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/ThirdLocationManager.java
View File

@@ -6,7 +6,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
public class ThirdLocationManager {

2
foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/core/LocationDelegateManager.java
View File

@@ -2,7 +2,7 @@ package com.mogo.cloud.location.third.core;
import com.elegant.spi.AbstractDelegateManager;
import com.elegant.spi.core.visitor.ServiceClassValue;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
public class LocationDelegateManager extends AbstractDelegateManager<LocationServiceProvider>
implements AbstractDelegateManager.DelegateListener<Class<? extends LocationServiceProvider>> {

2
foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/SocketRequestUtil.java
View File

@@ -9,7 +9,7 @@ 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.cloud.utils.logger.Logger;
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;

2
foudations/mogo-location/src/main/java/com/mogo/cloud/location/third/service/UploadDataService.java
View File

@@ -17,7 +17,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload;
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;

1
foudations/mogo-network/build.gradle
View File

@@ -55,6 +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}"
if (Boolean.valueOf(RELEASE)) {
api "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}"

5
foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpDnsInterceptor.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.cloud.network.interceptor
import com.mogo.cloud.httpdns.MogoHttpDnsClient
import com.mogo.cloud.utils.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
@@ -22,7 +22,8 @@ class HttpDnsInterceptor : Interceptor {
Logger.d("DomainExchange", """oriHost: ${host} newHost: $it newUrl: $url""")
}
} catch (e: Exception) {
Logger.d("DomainExchange", e.toString())
e.printStackTrace()
Logger.e("DomainExchange", e.toString())
}
return chain.proceed(request.newBuilder().url(url).build())
}

2
foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpLoggingInterceptor.kt
View File

@@ -1,7 +1,7 @@
package com.mogo.cloud.network.interceptor
import com.mogo.cloud.network.NetConstants.Companion.TAG
import com.mogo.cloud.utils.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import okhttp3.*
import okio.Buffer
import java.io.IOException

20
foudations/mogo-network/src/main/java/com/mogo/cloud/network/interceptor/HttpPassportInterceptor.kt
View File

@@ -2,8 +2,8 @@ package com.mogo.cloud.network.interceptor
import com.mogo.cloud.network.BaseData
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.cloud.GsonUtil
import com.mogo.cloud.utils.logger.Logger
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,19 +29,21 @@ class HttpPassportInterceptor : Interceptor {
bodySize = if (contentLength != -1L) "$contentLength-byte" else "unknown-length"
contentType = responseBody.contentType()
responseContent = responseBody.string()
val response: BaseData<*>? = GsonUtil.objectFromJson(responseContent, BaseData::class.java)
val response: BaseData<*>? = GsonUtils.fromJson(responseContent, BaseData::class.java)
// 处理Token异常
if (response?.code == 100046 ||
response?.code == 100045 ||
response?.code == 100005 ||
response?.code == 100006 ||
response?.code == 520003) {
Logger.d("HttpPassportInterceptor", "Token 异常：$response")
response?.code == 100045 ||
response?.code == 100005 ||
response?.code == 100006 ||
response?.code == 520003
) {
Logger.e("HttpPassportInterceptor", "Token 异常：$response")
MoGoAiCloudClient.getInstance().refreshToken()
}
consumedResponse = true
}
return if (consumedResponse) response.newBuilder().body(ResponseBody.create(contentType, responseContent)).build() else response
return if (consumedResponse) response.newBuilder()
.body(ResponseBody.create(contentType, responseContent)).build() else response
}
}

3
foudations/mogo-passport/build.gradle
View File

@@ -31,13 +31,12 @@ 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}"
api "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
} else {
api project(':foudations:mogo-httpdns')
api project(':foudations:mogo-utils')
}
}

4
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
View File

@@ -8,8 +8,8 @@ import androidx.annotation.Keep;
import com.mogo.cloud.httpdns.MogoHttpDnsClient;
import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
import com.mogo.cloud.utils.logger.LogLevel;
import com.mogo.cloud.utils.logger.Logger;
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;

2
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
View File

@@ -4,7 +4,7 @@ import android.text.TextUtils;
import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
/**
* SDK 中的参数

3
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java
View File

@@ -1,6 +1,7 @@
package com.mogo.cloud.passport;
import com.mogo.cloud.storage.SharedPrefsMgr;
import com.elegant.utils.storage.SharedPrefsMgr;
/**
* @author donghongyu

4
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
View File

@@ -3,12 +3,12 @@ package com.mogo.cloud.passport.internal;
import android.content.Context;
import android.text.TextUtils;
import com.mogo.cloud.DevicesUtils;
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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.account.sdk.AccountClientManager;
import com.zhidao.account.sdk.BusinessType;
import com.zhidao.account.sdk.Environment;

3
foudations/mogo-socket/build.gradle
View File

@@ -38,13 +38,12 @@ 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}"
implementation "com.mogo.cloud:utils:${MOGO_UTILS_VERSION}"
} else {
implementation project(path: ':foudations:mogo-passport')
implementation project(path: ':foudations:mogo-utils')
}
}

4
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
View File

@@ -7,9 +7,9 @@ import android.content.Context;
import androidx.annotation.NonNull;
import com.elegant.network.utils.GsonUtil;
import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import com.mogo.cloud.GsonUtil;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.entity.MsgBody;
@@ -17,7 +17,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
import java.util.ArrayList;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java
View File

@@ -7,7 +7,7 @@ import android.text.TextUtils;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.SocketManager;
import com.mogo.cloud.utils.logger.Logger;
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;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
View File

@@ -17,7 +17,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.locupload.Platform;
import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;

3
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
View File

@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;
import androidx.annotation.NonNull;
import androidx.collection.ArraySet;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import java.util.Set;

3
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
View File

@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;
import androidx.collection.ArraySet;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import java.util.Set;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java
View File

@@ -11,7 +11,7 @@ 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.cloud.utils.logger.Logger;
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;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
View File

@@ -6,9 +6,9 @@ import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_PUB_
import android.content.Context;
import android.text.TextUtils;
import com.mogo.cloud.TelephoneUtil;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
import com.zhidao.utils.common.TelephoneUtil;
public class SocketConfig {
public static final String PROTO_VERSION = "1.0.1";

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
View File

@@ -11,7 +11,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
View File

@@ -4,7 +4,7 @@ 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.cloud.utils.logger.Logger;
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;

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
View File

@@ -3,7 +3,7 @@ package com.mogo.cloud.socket.third.core.client;
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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerContext;

4
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
View File

@@ -7,14 +7,14 @@ import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import com.mogo.cloud.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.cloud.utils.logger.Logger;
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

2
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
View File

@@ -1,6 +1,6 @@
package com.mogo.cloud.socket.third.core.network.model;
import com.mogo.cloud.GsonUtil;
import com.elegant.network.utils.GsonUtil;
import org.json.JSONObject;

6
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
View File

@@ -3,15 +3,15 @@ package com.mogo.cloud.socket.third.utils;
import android.os.Build;
import android.text.TextUtils;
import com.mogo.cloud.DevicesUtils;
import com.mogo.cloud.TelephoneUtil;
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.cloud.utils.logger.Logger;
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;
import com.zhidao.utils.common.TelephoneUtil;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;

3
gradle.properties
View File

@@ -33,7 +33,8 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
RELEASE=true
RELEASE=false
MOGO_CORE_UTILS_VERSION=0.0.25
# AI CLOUD 云平台
# 工具类
MOGO_UTILS_VERSION=1.3.4

1
modules.txt
View File

@@ -1,4 +1,3 @@
:foudations:mogo-utils
:foudations:mogo-httpdns
:foudations:mogo-passport
:foudations:mogo-network

1
modules/mogo-realtime/build.gradle
View File

@@ -29,6 +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}"

4
modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java
View File

@@ -4,12 +4,12 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
import com.mogo.cloud.utils.logger.Logger;
import static com.mogo.realtime.constant.RealTimeConstant.TAG;
import androidx.annotation.Keep;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
/**
* AI云 实时上报数据频率处理类
*/

2
modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
View File

@@ -11,7 +11,7 @@ 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.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.realtime.constant.RealTimeConstant;
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;

1
modules/mogo-tanlu/build.gradle
View File

@@ -36,6 +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}"
if (Boolean.valueOf(RELEASE)) {
api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"

4
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java
View File

@@ -11,7 +11,7 @@ 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.cloud.GsonUtil;
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", GsonUtil.jsonFromObject(roadInfoRequest));
map.put("data", GsonUtils.toJson(roadInfoRequest));
apiService.queryRoadInfos(map)
.subscribeOn(Schedulers.io())

1
modules/mogo-trafficlive/build.gradle
View File

@@ -29,6 +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}"
if (Boolean.valueOf(RELEASE)) {
implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}"

2
modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java
View File

@@ -3,7 +3,7 @@ package com.mogo.cloud.trafficlive.api;
import android.view.SurfaceView;
import com.mogo.cloud.trafficlive.core.TrafficLiveCurrentManager;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import static com.mogo.cloud.trafficlive.constant.TrafficLiveConstant.TAG;

2
modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
View File

@@ -13,7 +13,7 @@ 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.cloud.utils.logger.Logger;
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;

1
settings.gradle
View File

@@ -1,6 +1,5 @@
include ':foudations:mogo-location'
include ':modules:mogo-trafficlive'
include ':foudations:mogo-utils'
include ':foudations:mogo-live'
include ':foudations:mogo-socket'
include ':modules:mogo-realtime'