Merge branch 'dev' into demo/shunyi_v2v

This commit is contained in:
tongchenfei
2020-06-24 19:15:28 +08:00

View File

@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.analytics.AnalyticsUtils;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
@@ -30,7 +31,6 @@ import com.mogo.service.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.obu.IMogoObuDataChangedListener;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
@@ -40,10 +40,6 @@ import org.json.JSONObject;
import java.util.HashMap;
import java.util.Map;
import com.mogo.commons.analytics.AnalyticsUtils;
import com.zhidao.smartv2x.model.obu.CarEventInfo;
import com.zhidao.smartv2x.model.obu.CarLocationInfo;
import com.zhidao.smartv2x.model.obu.TrafficLightInfo;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG;
@@ -200,27 +196,27 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
UPLOAD_ROAD_CONSTRUCTION, this);
}
ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
@Override
public void showCarLocationInfo(CarLocationInfo info) {
Logger.d(TAG, "获取到car location info: " + info.carId);
}
@Override
public void showOtherInfo(String info) {
Logger.d(TAG, "获取到other info: " + info);
}
@Override
public void showTrafficLightInfo(TrafficLightInfo info) {
Logger.d(TAG, "获取到traffic light info: " + info.id);
}
@Override
public void showCarEventInfo(CarEventInfo info) {
Logger.d(TAG, "获取到car event info: " + info.describe);
}
});
// ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
// @Override
// public void showCarLocationInfo(CarLocationInfo info) {
// Logger.d(TAG, "获取到car location info: " + info.carId);
// }
//
// @Override
// public void showOtherInfo(String info) {
// Logger.d(TAG, "获取到other info: " + info);
// }
//
// @Override
// public void showTrafficLightInfo(TrafficLightInfo info) {
// Logger.d(TAG, "获取到traffic light info: " + info.id);
// }
//
// @Override
// public void showCarEventInfo(CarEventInfo info) {
// Logger.d(TAG, "获取到car event info: " + info.describe);
// }
// });
Logger.d(TAG,"init over====");
}