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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java
This commit is contained in:
董宏宇
2021-01-28 16:26:44 +08:00
parent c0525f5433 c14f6dd701
commit c0e8f69280
7 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApiDoc/com/mogo/realtime/Interface/class-use/RealTimeProvider.html
View File

@@ -13,7 +13,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="\u63A5\u53E3 com.mogo.realtime.Interface.RealTimeProvider\u7684\u4F7F\u7528 (\u8611\u83C7AI\u4E91\u5E73\u53F0Doc)";
parent.document.title="\u63A5\u53E3 com.mogo.realtime.Interface.IRealTimeProvider\u7684\u4F7F\u7528 (\u8611\u83C7AI\u4E91\u5E73\u53F0Doc)";
}
}
catch(err) {
@@ -71,7 +71,7 @@
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
<div class="header">
<h2 title="接口的使用 com.mogo.realtime.Interface.RealTimeProvider" class="title">接口的使用<br>com.mogo.realtime.Interface.RealTimeProvider</h2>
<h2 title="接口的使用 com.mogo.realtime.Interface.IRealTimeProvider" class="title">接口的使用<br>com.mogo.realtime.Interface.IRealTimeProvider</h2>
</div>
<div class="classUseContainer">
<ul class="blockList">

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

@@ -1,7 +1,5 @@
package com.mogo.cloud;
import android.app.Application;
import androidx.multidex.MultiDexApplication;
import com.mogo.cloud.httpdns.MogoHttpDnsConfig;

10
app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java
View File

@@ -1,22 +1,22 @@
package com.mogo.cloud;
import com.elegant.spi.annotations.Service;
import com.mogo.realtime.Interface.RealTimeProvider;
import com.mogo.realtime.Interface.IRealTimeProvider;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.realtime.entity.CloudLocationInfo;
import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import com.zhidao.utils.common.SystemUtils;
import java.util.ArrayList;
import java.util.List;
/**
* @author liujing
* @description 描述
* @since: 2021/1/26
*/
@Service(value = RealTimeProvider.class)
class SPIRealTimeTestClass implements RealTimeProvider {
@Service(value = IRealTimeProvider.class)
class SPIRealTimeTestClass implements IRealTimeProvider {
@Override
public List<ADASRecognizedResult> getLastADASRecognizedResult() {

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

@@ -119,9 +119,9 @@ public class SocketManager implements IMogoCloudSocketManager, Callback {
@Override
public void sendMsg(MsgBody body, IMogoCloudSocketMsgAckListener listener) {
Logger.d(TAG, "sendMsg.");
Logger.d(TAG, "sendMsg msgId : " + body.getMsgId());
final byte[] pb = convertToPBBytes(body.getMsgType(), objectToBytes(body.getContent()));
SocketClient.getInstance().sendData(mAppId, MogoCommon.Product.mogoBussiness.getNumber(), pb, 1, true, System.currentTimeMillis());
SocketClient.getInstance().sendData(mAppId, MogoCommon.Product.mogoBussiness.getNumber(), pb, MogoConnsvr.MsgType.mogoMsgTypeCollectSvrNoRspReq.getNumber(), true, body.getMsgId());
}
@Override

4
modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/RealTimeProvider.java → modules/mogo-realtime/src/main/java/com/mogo/realtime/Interface/IRealTimeProvider.java
View File

@@ -2,15 +2,13 @@ package com.mogo.realtime.Interface;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.realtime.entity.CloudLocationInfo;
import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import com.mogo.realtime.util.MogoLatLng;
import java.util.List;
/**
* 蘑菇AI云平台实时定位点上报服务接口
*/
public interface RealTimeProvider {
public interface IRealTimeProvider {
/**
* 获取 adas 识别列表，由外部传入

16
modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
View File

@@ -3,14 +3,14 @@ package com.mogo.realtime.spi;
import com.elegant.spi.AbstractDelegateManager;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.realtime.Interface.RealTimeProvider;
import com.mogo.realtime.Interface.IRealTimeProvider;
/**
* 提供RealTime SPI接口实例对象管理类
*/
class RealTimeProviderDelegateManager extends AbstractDelegateManager<RealTimeProvider> {
class RealTimeProviderDelegateManager extends AbstractDelegateManager<IRealTimeProvider> {
private static RealTimeProviderDelegateManager sInstance = null;
private RealTimeProvider mRealTimeProvider = null;
private IRealTimeProvider mRealTimeProvider = null;
public static RealTimeProviderDelegateManager getInstance() {
if (sInstance == null) {
@@ -24,15 +24,11 @@ class RealTimeProviderDelegateManager extends AbstractDelegateManager<RealTimePr
}
public RealTimeProviderDelegateManager() {
loadDelegates(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener<RealTimeProvider>() {
@Override
public void onDelegate(String unit, RealTimeProvider p) {
mRealTimeProvider = p;
}
});
loadDelegates(MoGoAiCloudClient.getInstance().getContext(), IRealTimeProvider.class, (unit, p)
-> mRealTimeProvider = p);
}
public RealTimeProvider getRealTimeProvider(){
public IRealTimeProvider getRealTimeProvider(){
return mRealTimeProvider;
}
}

6
modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderImp.java
View File

@@ -1,6 +1,6 @@
package com.mogo.realtime.spi;
import com.mogo.realtime.Interface.RealTimeProvider;
import com.mogo.realtime.Interface.IRealTimeProvider;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.realtime.entity.CloudLocationInfo;
@@ -9,10 +9,10 @@ import java.util.List;
/**
* RealTime Provider SPI 单例对象
*/
public class RealTimeProviderImp implements RealTimeProvider {
public class RealTimeProviderImp implements IRealTimeProvider {
private static volatile RealTimeProviderImp sInstance = null;
private final RealTimeProvider mDelegate;
private final IRealTimeProvider mDelegate;
public static RealTimeProviderImp getInstance() {
if (sInstance == null) {