Merge branch 'dev_obu' into dev

# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
This commit is contained in:
tongchenfei
2020-06-24 15:12:34 +08:00
32 changed files with 530 additions and 16 deletions

View File

@@ -16,14 +16,12 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkersHandler;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant;
import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener;
import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager;
import com.mogo.module.share.bean.StepAfterAuth;
import com.mogo.module.share.bean.StepAfterAuthKt;
import com.mogo.module.share.constant.ShareConstants;
import com.mogo.module.share.dialog.LaucherShareDialog;
import com.mogo.module.share.manager.ServiceApisManager;
@@ -32,6 +30,7 @@ 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;
@@ -42,6 +41,9 @@ 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;
@@ -198,6 +200,28 @@ 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);
}
});
Logger.d(TAG,"init over====");
}