Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
This commit is contained in:
liujing
2021-09-15 18:09:27 +08:00
1270 changed files with 23741 additions and 379701 deletions

View File

@@ -7,9 +7,14 @@ import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
<<<<<<< HEAD
import com.mogo.service.check.ICheckProvider;
import com.mogo.service.connection.IMogoSocketManager;
import com.mogo.service.connection.IMogoWebSocketManager;
=======
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
>>>>>>> dev/dev_eagle_architecture_upgrade
import com.mogo.service.datamanager.IMogoDataManager;
import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.eventpanel.IEventPanelProvider;
@@ -17,9 +22,10 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.imageloader.IMogoImageloader;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.launcher.IMogoLauncher;
import com.mogo.service.locationinfo.IMogoLocationInfoService;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.map.IMogoMapFrameController;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.obu.IMoGoObuProvider;
import com.mogo.service.smp.IMogoSmallMapProvider;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoAddressManager;
@@ -30,7 +36,7 @@ import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoCrashWarnProvider;
import com.mogo.service.passport.IMogoPassportManager;
import com.mogo.service.cloud.passport.IMogoPassportManager;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.share.IMogoTrafficUploadProvider;
import com.mogo.service.statusmanager.IMogoMsgCenter;
@@ -41,6 +47,7 @@ import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.IMogoTanluUiProvider;
import com.mogo.service.v2x.DisplayEffectsInterface;
import com.mogo.service.v2x.IV2XProvider;
import com.mogo.service.warning.IMoGoWaringProvider;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.mogo.skin.support.IMogoSkinSupportInstaller;
@@ -184,14 +191,7 @@ public interface IMogoServiceApis extends IProvider {
*/
IMogoRefreshStrategyController getRefreshStrategyControllerApi();
/**
* 地址操作
* Deprecated, use {@link IMogoSearchManager} instead.
*
* @return
*/
@Deprecated
IMogoAddressManager getAddressManagerApi();
/**
* 桌面控制接口
@@ -328,6 +328,7 @@ public interface IMogoServiceApis extends IProvider {
IMogoSmallMapProvider getSmallMapProviderApi();
/**
<<<<<<< HEAD
* 检测接口
*/
ICheckProvider getCheckProvider();
@@ -335,5 +336,19 @@ public interface IMogoServiceApis extends IProvider {
/*
*V2X
* */
=======
* V2X
*/
>>>>>>> dev/dev_eagle_architecture_upgrade
IV2XProvider getV2XListenerManager();
/**
* warning 模块
*/
IMoGoWaringProvider getWaringProviderApi();
/**
* obu-mogo 模块
*/
IMoGoObuProvider getMoGoObuProviderApi();
}

View File

@@ -48,42 +48,49 @@ public class MogoServicePaths {
/**
* netty 长链
*/
@Keep
@Deprecated
public static final String PATH_SOCKET_MANAGER = "/socket/manager";
/**
* WebSocket 长链
*/
@Keep
@Deprecated
public static final String PATH_WEB_SOCKET_MANAGER = "/websocket/manager";
/**
* 状态管理接口
*/
@Keep
@Deprecated
public static final String PATH_STATUS_MANAGER = "/statusmanager/api";
/**
* 消息中心
*/
@Keep
@Deprecated
public static final String PATH_MSG_CENTER = "/msgcenter/api";
/**
* 消息中心
*/
@Keep
@Deprecated
public static final String PATH_WINDOW_MANAGER = "/windowmanger/api";
/**
* 卡片控制
*/
@Keep
@Deprecated
public static final String PATH_CARD_MANAGER = "/cardmanager/api";
/**
* 管理 fragment
*/
@Keep
@Deprecated
public static final String PATH_FRAGMENT_MANAGER = "/fragmentmanager/api";
@@ -92,36 +99,42 @@ public class MogoServicePaths {
*
* @deprecated use {@link #PATH_INTENT_MANAGER} instead.
*/
@Keep
@Deprecated
public static final String PATH_VOICE_MANAGER = "/voicemanager/api";
/**
* 意图控制接口
*/
@Keep
@Deprecated
public static final String PATH_INTENT_MANAGER = "/intentmanager/api";
/**
* 基础功能监听回调注册
*/
@Keep
@Deprecated
public static final String PATH_REGISTER_CENTER = "/registercenter/api";
/**
* 基础家和公司管理
*/
@Keep
@Deprecated
public static final String PATH_ADDRESS_MANAGER = "/addressmanager/api";
/**
* 导航搜索模块管理
*/
@Keep
@Deprecated
public static final String PATH_SEARCH_MANAGER = "/searchmanager/api";
/**
* 基础设置参数管理
*/
@Keep
@Deprecated
public static final String PATH_SETTING_MANAGER = "/settingmanager/api";
@@ -129,196 +142,238 @@ public class MogoServicePaths {
/**
* 搜索module管理中心
*/
@Keep
@Deprecated
public static final String PATH_SERACH_CENTER = "/searchcenter/api";
/**
* 大而全数据管理中心
*/
@Keep
@Deprecated
public static final String PATH_DATA_MANAGER = "/datamanager/api";
/**
* adas 控制
*/
@Keep
@Deprecated
public static final String PATH_ADAS_CONTROLLER = "/adascontroller/api";
/**
* 接口集合
*/
@Keep
@Deprecated
public static final String PATH_SERVICE_APIS = "/mogoservice/apis";
/**
* 动作指令
*/
@Keep
@Deprecated
public static final String PATH_ACTION_APIS = "/mogoaction/api";
/**
* 刷新策略控制
*/
@Keep
@Deprecated
public static final String PATH_REFRESH_STRATEGY_API = "/refreshstrategy/api";
/**
* 刷新策略控制
*/
@Keep
@Deprecated
public static final String PATH_LAUNCHER_API = "/launcher/api";
/**
* 入口按钮
*/
@Keep
@Deprecated
public static final String PATH_ENTRANCE_BUTTON_API = "/entrancebutton/api";
/**
* 顶部1/2屏管理
*/
@Keep
@Deprecated
public static final String PATH_EXTENSIONS_TOP_VIEW_MANAGER = "/topview/api";
/**
* 浓雾等极端事件特殊效果
*/
@Keep
@Deprecated
public static final String PATH_MAIN_DISPLAY_EFFECTS_MANAGER = "/displayeffects/api";
/**
* 其他模块调用公共的marker打点
*/
@Keep
@Deprecated
public static final String PATH_MARKER_SERVICE = "/mogomarker/api";
/**
* 其他模块调用分享框
*/
@Keep
@Deprecated
public static final String PATH_SHARE = "/extensions/share";
/**
* obu相关接口
*/
@Keep
@Deprecated
public static final String PATH_OBU = "/obu/api";
/**
* 事件面板
*/
@Keep
@Deprecated
public static final String PATH_EVENT_PANEL = "/event/panel";
/**
* 左侧面板
*/
@Keep
@Deprecated
public static final String PATH_LEFT_PANEL = "/left/panel";
/**
* 比亚迪模块
*/
@Keep
@Deprecated
public static final String PATH_SPLASH = "/splash/api";
/**
* 位置上报
*/
@Keep
@Deprecated
public static final String PATH_LOCATION_INFO = "/locationinfo/api";
/**
* passport
*/
@Keep
@Deprecated
public static final String PATH_PASSPORT = "/passport/api";
/**
* 授权服务
*/
@Keep
@Deprecated
public static final String PATH_AGREEMENT = "/agreement/showFragment";
/**
* 日志上传
*/
@Keep
@Deprecated
public static final String PATH_MOGO_MONITOR = "/monitor/api";
/**
* 探路api
*/
@Keep
@Deprecated
public static final String PATH_TANLU_API = "/tanlulib/api";
/**
* 策略上报
*/
@Keep
@Deprecated
public static final String PATH_STRATEGY_SHARE = "/share/strategy";
/**
* 分享模块中,交通状况服务上报
*/
@Keep
@Deprecated
public static final String PATH_TRAFFIC_UPLOAD = "/share/traffic";
/**
* 高德地图巡航上报
*/
@Keep
@Deprecated
public static final String PATH_GAODE_AIMLESS_SHARE = "/share/gaodeAimless";
/**
* 探路ui
*/
@Keep
@Deprecated
public static final String PATH_TANLU_UI_API = "/tanlu/ui";
/**
* 碰撞报警模块 已碰撞
*/
@Keep
@Deprecated
public static final String PATH_CRASH_WARNING = "/crash/warning";
/**
* 悬浮小控件
*/
@Keep
@Deprecated
public static final String PATH_WIDGETS = "/widgets/provider";
/**
* 在线好友面板
*/
@Keep
@Deprecated
public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel";
/**
* 全局免唤醒
*/
@Keep
@Deprecated
public static final String PATH_GLOBAL_UNWAKE = "/global/unwake";
/**
* 返回悬浮按钮
*/
@Keep
@Deprecated
public static final String PATH_BACK = "/back2launcher/ui";
/**
* 自研地图和高德地图切换
*/
@Keep
@Deprecated
public static final String PATH_MAP_FRAME_CONTROLLER = "/mapframe/controller";
/**
* 小地图控件
*/
@Keep
@Deprecated
public static final String PATH_SMALL_MAP = "/small_map/api";
/**
* ADAS 模块
*/
@Keep
@Deprecated
public static final String PATH_ADAS = "/adas/api";
/**
* 前方碰撞预警 未碰撞
*/
<<<<<<< HEAD
public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
/**
@@ -326,4 +381,23 @@ public class MogoServicePaths {
*/
public static final String PATH_CHECK = "/check/api";
=======
@Keep
@Deprecated
public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning";
/**
* warning 模块
*/
@Keep
@Deprecated
public static final String PATH_V2X_WARNING = "/warning/api";
/**
* obu-mogo 模块
*/
@Keep
@Deprecated
public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api";
>>>>>>> dev/dev_eagle_architecture_upgrade
}

View File

@@ -202,8 +202,6 @@ public interface IMogoADASController extends IProvider {
*/
void cancelAutopilot();
void mockAdasLoc(String json);
void mockAdasRecognized(List<ADASRecognizedResult> recognizedResults);
}

View File

@@ -32,6 +32,14 @@ class RemoteControlAutoPilotParameters {
this.lat = lat;
this.lon = lon;
}
@Override
public String toString() {
return "AutoPilotLonLat{" +
"lat=" + lat +
", lon=" + lon +
'}';
}
}
@Override

View File

@@ -1,13 +1,17 @@
package com.mogo.service.adas.entity;
import com.mogo.commons.data.BaseData;
import java.io.Serializable;
/**
* 请求根据热心指数获取自车图标列表的响应类
*
* @author tongchenfei
*/
public class CarModelListResponse extends BaseData {
public class CarModelListResponse implements Serializable, Cloneable {
public int code = -1;
public String msg;
private CarModelListInfo result;
public CarModelListInfo getResult() {

View File

@@ -1,4 +1,4 @@
package com.mogo.service.locationinfo;
package com.mogo.service.cloud.location;
import android.os.Build;
import android.os.Parcel;

View File

@@ -1,4 +1,4 @@
package com.mogo.service.locationinfo;
package com.mogo.service.cloud.location;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.map.location.MogoLocation;

View File

@@ -1,4 +1,4 @@
package com.mogo.service.passport;
package com.mogo.service.cloud.passport;
import com.alibaba.android.arouter.facade.template.IProvider;

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
/**
* @author congtaowang

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
public interface IMogoLifecycleListener {
void onConnectFailure();

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
/**
* @author congtaowang

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
/**
* @author congtaowang

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
import android.content.Context;
@@ -47,7 +47,9 @@ public interface IMogoSocketManager extends IProvider {
void registerLifecycleListener(int msgType,IMogoLifecycleListener listener);
void unregisterLifecycleListener(int msgType);
/**
* 发送消息
*
@@ -55,4 +57,9 @@ public interface IMogoSocketManager extends IProvider {
* @param listener 回执监听
*/
void sendMsg(MsgBody body, IMogoMsgAckListener listener );
/**
* 停止Socket服务
*/
void destroy();
}

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
import android.content.Context;

View File

@@ -1,4 +1,4 @@
package com.mogo.service.connection;
package com.mogo.service.cloud.socket;
public enum WebSocketMsgType {

View File

@@ -0,0 +1,6 @@
package com.mogo.service.entrance;
public interface IMogoEntranceAutopilotStatusClickListener {
void click();
}

View File

@@ -68,10 +68,11 @@ public interface IMogoEntranceButtonController extends IProvider {
* @param index
* @return
*/
TextView getButton( ButtonIndex index );
TextView getButton(ButtonIndex index);
/**
* 添加低层级view使用ViewGroup.addView(v,0)实现
*
* @param view 将要添加的view
*/
void addBottomLayerView(View view);
@@ -79,65 +80,89 @@ public interface IMogoEntranceButtonController extends IProvider {
/**
* 添加低层级view使用ViewGroup.addView(v,0)实现
* 可指定x,y位置
*
* @param view 将要添加的view
* @param x leftMargin
* @param y topMargin
* @param x leftMargin
* @param y topMargin
*/
void addBottomLayerView(View view, int x, int y);
/**
* 移除对应的底层view
*
* @param view 待移除view
*/
void removeBottomLayerView(View view);
/**
* 添加左下角功能View按顺序添加到最底端
*
* @param view 待添加view
*/
void addLeftFeatureView(View view);
/**
* 移除左下角功能按钮
*
* @param view 待移除view
*/
void removeLeftFeatureView(View view);
/**
* 设置vr模式下左下角提示view
*
* @param view 目前是adas提示和求助
*/
void showLeftNoticeView(View view);
/**
* 隐藏vr模式下左下角提示view需要与{@link #showLeftNoticeView(View)}成对使用
*
* @param view 待隐藏view
*/
void hideLeftNoticeView(View view);
/**
* 根据noticeType添加左侧提示
*
* @param noticeType {@link #NOTICE_TYPE_SUDDENLY_BREAK}...
* @param iconRes 本地 icon res
* @param content 提示内容
* @param iconRes 本地 icon res
* @param content 提示内容
*/
void showLeftNoticeByType(int noticeType, int iconRes, String content);
/**
* 移除noticeType需要与{@link #showLeftNoticeByType(int, int, String)}成对使用
*
* @param noticeType {@link #NOTICE_TYPE_SUDDENLY_BREAK}...
*/
void hideLeftNoticeByType(int noticeType);
/**
* 添加view状态回调监听
*
* @param listener 回调监听
*/
void addEntranceViewListener(IMogoEntranceViewListener listener);
/**
* 移除view状态回调监听
*
* @param listener 回调监听
*/
void removeEntranceViewListener(IMogoEntranceViewListener listener);
/**
* 添加entrance 自动驾驶状态监听
*
* @param listener {@link IMogoEntranceAutopilotStatusClickListener}
*/
void addEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener);
/**
* 移除entrance 自动驾驶状态监听
*
* @param listener {@link IMogoEntranceAutopilotStatusClickListener}
*/
void removeEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener);
}

View File

@@ -38,7 +38,9 @@ public interface IMogoModuleProvider extends IProvider {
* @param context
* @return
*/
View createView( Context context );
default View createView( Context context ){
return null;
}
/**
* 模块唯一标识

View File

@@ -0,0 +1,14 @@
package com.mogo.service.obu;
import com.alibaba.android.arouter.facade.template.IProvider;
/**
* @author xiaoyuzhou
* @date 2021/8/2 5:53 下午
* 蘑菇OBU 功能提接口
*/
public interface IMoGoObuProvider extends IProvider {
}

View File

@@ -0,0 +1,93 @@
package com.mogo.service.warning
import com.mogo.module.data.enums.WarningDirectionEnum
import com.mogo.service.module.IMogoModuleProvider
/**
* @author xiaoyuzhou
* @date 2021/8/2 7:36 下午
*/
interface IMoGoWaringProvider : IMogoModuleProvider {
/**
* 展示VR下V2X预警
*
* @param v2xType V2X类型
* @param alertContent 提醒文本
* @param ttsContent tts语音播报消息
* @param tag tag绑定弹窗的标志
*/
fun showWarningV2X(
v2xType: Int,
alertContent: String?,
ttsContent: String?,
tag: String?,
listener:WarningStatusListener?
)
/**
* 关闭指定floatTag 的 VR下V2X预警弹窗
* @param tag 弹窗标识
*/
fun disableWarningV2X(tag: String?)
/**
* 展示红绿灯预警
*
* @param checkLightId 0-都是默认1-红2-黄3-绿
*/
fun showWarningTrafficLight(checkLightId: Int)
/**
* 关闭红绿灯预警
*/
fun disableWarningTrafficLight()
/**
* 修改红灯倒计时
*/
fun changeCountdownRed(redNum: Int)
/**
* 修改黄灯倒计时
*/
fun changeCountdownYellow(yellowNum: Int)
/**
* 修改绿灯倒计时
*/
fun changeCountdownGreen(greenNum: Int)
/**
* @param readNum 红灯倒计时
* @param yellowNum 黄灯倒计时
* @param greenNum 绿灯倒计时
*/
fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int)
/**
* 展示限速预警
*
* @param limitingSpeed 限速速度
*/
fun showLimitingVelocity(limitingSpeed: Int)
/**
* 关闭限速预警
*/
fun disableLimitingVelocity()
/**
* 展示指定方位上的红框预警
* @param direction
* @see WarningDirectionEnum
*/
fun showWarning(direction: WarningDirectionEnum)
/**
* 展示指定方位上的红框预警
* @param direction
* @see WarningDirectionEnum
* @param closeTime 倒计时
*/
fun showWarning(direction: WarningDirectionEnum, closeTime: Long)
}

View File

@@ -0,0 +1,13 @@
package com.mogo.service.warning;
/**
* @author xiaoyuzhou
* @date 2021/9/13 4:41 下午
*/
public interface WarningStatusListener {
default void onShow() {
}
default void onDismiss() {
}
}