Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/mogo/cloud/MoGoApplication.java
This commit is contained in:
董宏宇
2021-01-28 16:26:44 +08:00
7 changed files with 19 additions and 27 deletions

View File

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

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() {