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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.eagle.core.utilcode.mogo.TelephoneUtil;
import com.mogo.cloud.live.utils.TelephoneUtil;
import com.zhidao.ptech.shadow.server.protocol.DeviceInfo;
public class SocketRequestUtils {

172
foudations/mogo-live/src/main/java/com/mogo/cloud/live/utils/TelephoneUtil.java Normal file
View File

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

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

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

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

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

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

@@ -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<LocationServiceProvider>
implements AbstractDelegateManager.DelegateListener<Class<? extends LocationServiceProvider>> {

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

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

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

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

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

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

2
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.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

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.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

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

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

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

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

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

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

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

@@ -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 中的参数

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

107
foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/utils/DevicesUtils.java Normal file
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.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

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

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

21
gradle.properties
View File

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

2
modules/mogo-realtime/build.gradle
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}"

3
modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java
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云 实时上报数据频率处理类

2
modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
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;

2
modules/mogo-tanlu/build.gradle
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}"

4
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/MogoRoadSearchManager.java
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())

2
modules/mogo-trafficlive/build.gradle
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}"

2
modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/api/MoGoAiCloudTrafficLive.java
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;

2
modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveCurrentManager.java
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;