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

Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
This commit is contained in:
董宏宇
2021-10-13 17:48:07 +08:00
parent 488aba52b8 10214aa805
commit 92097cc007
130 changed files with 406 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml generated
View File

@@ -20,7 +20,8 @@
<entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.0" />
<entry key="modules/mogo-module-adas/src/main/res/drawable/module_adas_left_corner_bg.xml" value="0.22125" />
<entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.22658490296325878" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="1.0" />
<entry key="modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml" value="0.27395833333333336" />
<entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="0.375" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/module_hmi_warning_v2x.xml" value="0.246875" />
<entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />

12
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
View File

@@ -30,8 +30,8 @@ import com.mogo.och.bus.bean.UpdateSiteStatusRequest;
import com.mogo.och.bus.fragment.OchBusFragment;
import com.mogo.och.bus.net.IOchBusApiService;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
@@ -307,10 +307,10 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
currentStation.setIsCurrentSite( STATION_STATUS_LEAVING );
nextStation.setIsCurrentSite( STATION_STATUS_ARRIVING );
RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
AutoPilotControlParameters currentAutopilot = new AutoPilotControlParameters();
currentAutopilot.isSpeakVoice = !isRestart;
currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() );
currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() );
currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() );
currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() );
currentAutopilot.vehicleType = VEHICLE_TYPE;
Logger.d( TAG, "开启自动驾驶====" + currentAutopilot );
MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( currentAutopilot );
@@ -354,7 +354,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog
}
@Override
public void onArriveAt( AdasOCHData data ) {
public void onArriveAt( AutoPilotStationInfo data ) {
if ( currentStationIndex >= stationList.size() - 1 ) {
Logger.e( TAG, "到站异常，取消后续操作" );
return;

12
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
View File

@@ -15,8 +15,8 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.och.taxi.ui.OCHTaxiUiController;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.service.cloud.socket.IMogoLifecycleListener;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.intent.IMogoIntentListener;
@@ -714,7 +714,7 @@ class MogoOCHTaxiModel {
*/
private class OCHArriveNotifyCallback implements IMogoAdasOCHCallback {
@Override
public void onArriveAt( AdasOCHData data ) {
public void onArriveAt( AutoPilotStationInfo data ) {
if ( data == null ) {
return;
}
@@ -853,10 +853,10 @@ class MogoOCHTaxiModel {
return;
}
RemoteControlAutoPilotParameters parameters = new RemoteControlAutoPilotParameters();
AutoPilotControlParameters parameters = new AutoPilotControlParameters();
parameters.vehicleType = mCurrentOCHOrder.orderType;
parameters.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon );
parameters.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon );
parameters.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 0 ).wgsLon );
parameters.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat( mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLat, mCurrentOCHOrder.drivingRoutes.get( 1 ).wgsLon );
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()

4
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
View File

@@ -26,7 +26,7 @@ import com.mogo.och.taxi.R;
import com.mogo.och.view.SlidePanelView;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.service.adas.IMogoAdasRouteCallBack;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.utils.logger.Logger;
@@ -524,7 +524,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
}
@Override
public void onArriveAt(AdasOCHData data) {
public void onArriveAt(AutoPilotStationInfo data) {
Logger.d( TAG, "行程结束");
MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot();
}

8
OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
View File

@@ -17,7 +17,7 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.view.OnPreventFastClickListener;
import com.mogo.och.view.SlidePanelView;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.utils.logger.Logger;
/**
@@ -135,12 +135,12 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
findViewById(R.id.btnAutopilotControl).setOnClickListener(view ->
{
// Logger.d("lianglihui","模拟 站点下发工控");
RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
AutoPilotControlParameters currentAutopilot = new AutoPilotControlParameters();
currentAutopilot.isSpeakVoice = true;
// 万集东门站
currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409);
// 市政府前街18号
currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.1939540844,116.720067);
currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.1939540844,116.720067);
// 订单运营类型 （9出租车，10小巴）
currentAutopilot.vehicleType = 10;
Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot);

2
app/build.gradle
View File

@@ -198,6 +198,8 @@ dependencies {
implementation project(':test:crashreport-upgrade')
implementation project(':test:crashreport-bugly')
implementation project(':core:mogo-core-data')
implementation project(':core:function-impl:mogo-core-function-obu-mogo')
implementation project(':core:function-impl:mogo-core-function-smp')
implementation project(':core:function-impl:mogo-core-function-hmi')

4
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -18,6 +18,7 @@ import com.mogo.commons.FunctionBuildConfig;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.Utils;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.carchatting.card.CallChatConstant;
@@ -32,7 +33,6 @@ import com.mogo.module.share.constant.ShareConstants;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.utils.ObuConfig;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.test.crashreport.ITestCrashReportProvider;
import com.mogo.test.crashreport.upgrade.UpgradeReportProvider;
import com.mogo.utils.ProcessUtils;
@@ -44,8 +44,6 @@ import com.mogo.utils.storage.SharedPrefsMgr;
import com.zhidao.boot.persistent.lib.PersistentManager;
import com.zhidao.mogo.module.left.panel.LeftPanelConst;
import leakcanary.LeakCanary;
/**
* @author congtaowang
* @since 2019-12-18

55
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.java
View File

@@ -1,55 +0,0 @@
package com.mogo.eagle.core.function.autopilot;
import android.content.Context;
import com.mogo.eagle.core.data.autopilot.AdasControlCommandParameter;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotProvider;
import com.mogo.eagle.core.utilcode.util.GsonUtils;
import com.mogo.eagle.core.utilcode.util.LogUtils;
import com.zhidao.support.adas.high.AdasManager;
/**
* @author xiaoyuzhou
* @date 2021/9/22 8:43 下午
*/
public class MoGoAutoPilotProvider implements IMoGoAutoPilotProvider {
private static final String TAG = "MogoAutoPilotProvider";
@Override
public void init(Context context) {
}
@Override
public void startAutoPilot(RemoteControlAutoPilotParameters result) {
if (AdasManager.getInstance().isSocketConnect()) {
AdasControlCommandParameter parameter = new AdasControlCommandParameter(TAG, result);
AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter));
} else {
LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶");
}
}
@Override
public void cancelAutoPilot() {
if (AdasManager.getInstance().isSocketConnect()) {
AdasManager.getInstance().controlAutopilotCarHead();
} else {
LogUtils.eTag(TAG, "车机与工控机链接失败，无法断开自动驾驶");
}
}
@Override
public int getAutopilotStatus() {
// int status = IMoGoAutoPilotStatusListener.STATUS_AUTOPILOT_DISABLE;
// try {
// status = adasProvider.autopilotStateCall().getState();
// } catch (Exception e) {
// e.printStackTrace();
// }
return 0;
}
}

55
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutoPilotProvider.kt Normal file
View File

@@ -0,0 +1,55 @@
package com.mogo.eagle.core.function.autopilot
import android.content.Context
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.data.autopilot.AutoPilotControlCmdParameter
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotProvider
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.LogUtils
import com.zhidao.support.adas.high.AdasManager
/**
* @author xiaoyuzhou
* @date 2021/9/22 8:43 下午
*/
@Route(path = MogoServicePaths.PATH_AUTO_PILOT)
class MoGoAutoPilotProvider : IMoGoAutoPilotProvider {
override fun init(context: Context) {}
override fun connectAutoPilot() {}
override fun startAutoPilot(result: AutoPilotControlParameters) {
if (AdasManager.getInstance().isSocketConnect) {
val parameter =
AutoPilotControlCmdParameter(
TAG,
result
)
AdasManager.getInstance().aiCloudToAdasData(GsonUtils.toJson(parameter))
} else {
LogUtils.eTag(TAG, "车机与工控机链接失败，无法开启自动驾驶")
}
}
override fun cancelAutoPilot() {
if (AdasManager.getInstance().isSocketConnect) {
AdasManager.getInstance().controlAutopilotCarHead()
} else {
LogUtils.eTag(TAG, "车机与工控机链接失败，无法断开自动驾驶")
}
}
override fun getAutopilotStatus(): Int {
// int status = IMoGoAutoPilotStatusListener.STATUS_AUTOPILOT_DISABLE;
// try {
// status = adasProvider.autopilotStateCall().getState();
// } catch (Exception e) {
// e.printStackTrace();
// }
return 0
}
companion object {
private const val TAG = "MogoAutoPilotProvider"
}
}

1
core/function-impl/mogo-core-function-check/build.gradle
View File

@@ -64,6 +64,7 @@ dependencies {
implementation project(':modules:mogo-module-service')
implementation project(':core:mogo-core-utils')
implementation project(':core:mogo-core-data')
implementation project(':core:mogo-core-function-call')
}

2
core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt
View File

@@ -14,7 +14,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.LogUtils
import com.mogo.module.common.MogoApisHandler
import com.mogo.module.service.receiver.MogoReceiver
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.statusmanager.IMogoStatusChangedListener
import com.mogo.service.statusmanager.StatusDescriptor
import com.mogo.utils.ActivityLifecycleManager

2
core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java
View File

@@ -2,8 +2,8 @@ package com.mogo.eagle.core.function.check.net;
import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.module.common.constants.HostConst;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
/**

2
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_dialog_back.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#1E3282"/>
<solid android:color="@color/check_list_item_back"/>
<corners android:radius="30px"/>
</shape>

2
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_left_shape.xml
View File

@@ -7,7 +7,7 @@
</item>
<item
android:left="@dimen/dp_3"
android:right="0px"
android:right="@dimen/dp_1"
android:top="@dimen/dp_3"
android:bottom="@dimen/dp_1">
<shape>

8
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_item_right_shape.xml → core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_left_shape.xml
View File

@@ -6,10 +6,10 @@
</shape>
</item>
<item
android:left="@dimen/dp_3"
android:right="@dimen/dp_3"
android:top="@dimen/dp_3"
android:bottom="@dimen/dp_1">
android:left="@dimen/dp_2"
android:right="0px"
android:top="0px"
android:bottom="0px">
<shape>
<solid android:color="@color/check_info_title_back" />
</shape>

13
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_no_line_shape.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="0px"
android:left="0px"
android:right="0px"
android:top="0px">
<shape>
<solid android:color="@color/check_info_title_back" />
</shape>
</item>
</layer-list>

11
core/function-impl/mogo-core-function-check/src/main/res/drawable/check_top_item_shape.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="3px"
android:color="@color/check_info_shape_color" />
<padding
android:bottom="0px"
android:left="2px"
android:right="2px"
android:top="2px" />
</shape>

4
core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_adapter.xml
View File

@@ -8,7 +8,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_46"
android:paddingLeft="@dimen/dp_38"
android:layout_marginRight="@dimen/dp_10"
android:gravity="left"
android:paddingRight="@dimen/dp_25"
@@ -20,6 +20,7 @@
android:id="@+id/info_check_icon"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginRight="@dimen/dp_24"
android:layout_gravity="center"
android:src="@drawable/check_right" />
@@ -27,7 +28,6 @@
android:id="@+id/info_result_tx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_27"
android:ellipsize="end"
android:gravity="left"
android:maxLines="2"

22
core/function-impl/mogo-core-function-check/src/main/res/layout/check_info_title_item.xml
View File

@@ -3,14 +3,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/check_width"
android:layout_height="@dimen/dp_127"
android:background="@drawable/check_top_item_shape"
android:orientation="horizontal">
<TextView
android:id="@+id/title_one"
android:layout_width="0px"
android:layout_height="match_parent"
android:background="@drawable/check_item_left_shape"
android:gravity="center"
android:background="@drawable/check_top_item_no_line_shape"
android:gravity="left"
android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32"
android:text="模块名称"
android:textSize="@dimen/dp_38"
app:layout_constraintHorizontal_chainStyle="spread"
@@ -23,8 +26,9 @@
android:id="@+id/title_two"
android:layout_width="0px"
android:layout_height="match_parent"
android:background="@drawable/check_item_left_shape"
android:gravity="center"
android:background="@drawable/check_top_item_left_shape"
android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32"
android:text="运行状态"
android:textSize="@dimen/dp_38"
app:layout_constraintHorizontal_chainStyle="spread"
@@ -37,8 +41,9 @@
android:id="@+id/title_thr"
android:layout_width="0px"
android:layout_height="match_parent"
android:background="@drawable/check_item_left_shape"
android:gravity="center"
android:background="@drawable/check_top_item_left_shape"
android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32"
android:text="模块名称"
android:textSize="@dimen/dp_38"
app:layout_constraintHorizontal_chainStyle="spread"
@@ -51,8 +56,9 @@
android:id="@+id/title_for"
android:layout_width="0px"
android:layout_height="match_parent"
android:background="@drawable/check_item_right_shape"
android:gravity="center"
android:background="@drawable/check_top_item_left_shape"
android:paddingLeft="@dimen/dp_40"
android:paddingTop="@dimen/dp_32"
android:text="运行状态"
android:textSize="@dimen/dp_38"
app:layout_constraintHorizontal_chainStyle="spread"

3
core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml
View File

@@ -5,9 +5,8 @@
android:layout_width="2360px"
android:layout_height="@dimen/dp_525"
android:layout_marginStart="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_100"
android:layout_marginBottom="@dimen/dp_35"
android:background="@drawable/check_list_item_back">
<TextView

4
core/function-impl/mogo-core-function-check/src/main/res/layout/check_titel.xml
View File

@@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_500"
android:layout_height="@dimen/dp_450"
android:layout_marginStart="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_100"
@@ -13,7 +13,7 @@
android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_140"
android:layout_marginStart="@dimen/dp_856"
android:layout_marginTop="@dimen/dp_200"
android:layout_marginTop="@dimen/dp_144"
android:src="@drawable/check_wrong"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt
View File

@@ -6,7 +6,7 @@ import android.content.Intent
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.function.hmi.WaringConst
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
import com.mogo.utils.logger.Logger

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt
View File

@@ -6,7 +6,7 @@ import android.content.Intent
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.function.hmi.WaringConst
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
import com.mogo.utils.logger.Logger

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt
View File

@@ -7,7 +7,7 @@ import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.module.common.enums.EventTypeEnum
import com.mogo.eagle.core.function.hmi.WaringConst
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
import com.mogo.utils.logger.Logger

15
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -5,9 +5,10 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.autopilot.AdasOCHData
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo
import com.mogo.eagle.core.data.constants.MoGoConfig
import com.mogo.eagle.core.data.obu.ObuStatusInfo
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener
@@ -17,10 +18,10 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager
import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.AppUtils
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.map.MogoMap
import com.mogo.utils.DeviceIdUtils
import com.mogo.utils.network.utils.GsonUtil
import com.mogo.utils.storage.SharedPrefsMgr
import kotlinx.android.synthetic.main.view_debug_setting.view.*
@@ -68,7 +69,7 @@ class DebugSettingView @JvmOverloads constructor(
appConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
appConfigInfo.appVersionName = AppUtils.getAppVersionName()
appConfigInfo.appPackageName = AppUtils.getAppPackageName()
appConfigInfo.uniqueDeviceId = DeviceUtils.getUniqueDeviceId()
appConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
appConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
appConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion
@@ -103,7 +104,7 @@ class DebugSettingView @JvmOverloads constructor(
/**
* 自动驾驶相关回调
*/
override fun onAutoPilotArriveAtStation(data: AdasOCHData?) {
override fun onAutoPilotArriveAtStation(data: AutoPilotStationInfo?) {
}
@@ -111,8 +112,8 @@ class DebugSettingView @JvmOverloads constructor(
}
override fun onAutoPilotStatusResponse(autopilotStatusInfo: AutopilotStatusInfo?) {
tvAutopilotInfo.text = GsonUtils.toJson(autopilotStatusInfo)
override fun onAutoPilotStatusResponse(autoPilotStatusInfo: AutoPilotStatusInfo?) {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
}
}

16
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
View File

@@ -5,17 +5,14 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.data.autopilot.AdasOCHData
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters
import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.LogUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.module.common.MogoApisHandler
import com.mogo.service.adas.IMogoAdasOCHCallback
import com.mogo.utils.logger.Logger
import kotlinx.android.synthetic.main.view_autopilot_status.view.*
import java.util.*
/**
* @author xiaoyuzhou
@@ -70,10 +67,11 @@ class AutoPilotStatusView @JvmOverloads constructor(
// startAutoPilot();
}
private fun startAutoPilot() {
val currentAutopilot = RemoteControlAutoPilotParameters()
val currentAutopilot =
AutoPilotControlParameters()
currentAutopilot.isSpeakVoice = false
currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687);
currentAutopilot.startLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.194795425,116.724476409);
currentAutopilot.endLatLon = AutoPilotControlParameters.AutoPilotLonLat(40.199730,116.735687);
currentAutopilot.vehicleType = 10
MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
}
@@ -105,7 +103,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
}
}
override fun onArriveAt(data: AdasOCHData?) {
override fun onArriveAt(data: AutoPilotStationInfo?) {
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
View File

@@ -16,7 +16,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng
import com.mogo.map.navi.IMogoCarLocationChangedListener2
import com.mogo.module.common.MogoApisHandler
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.statusmanager.IMogoStatusChangedListener
import com.mogo.service.statusmanager.StatusDescriptor

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt
View File

@@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.function.hmi.WaringConst
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.utils.logger.Logger
/**

7
core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
View File

@@ -64,10 +64,9 @@
<com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="40px"
android:layout_marginBottom="@dimen/dp_490"
android:layout_marginLeft="@dimen/dp_380"
android:layout_marginBottom="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
View File

@@ -5,7 +5,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.data.constants.MoGoConfig
import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
import com.mogo.eagle.core.utilcode.util.LogUtils
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.utils.storage.SharedPrefsMgr
/**

2
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -12,7 +12,7 @@ import com.mogo.module.common.datacenter.SnapshotLocationDataCenter
import com.mogo.module.common.drawer.TrafficMarkerDrawer
import com.mogo.module.common.enums.EventTypeEnum
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.map.IMogoMapService
import com.mogo.utils.storage.SharedPrefsMgr
import com.zhidao.support.obu.MogoObuManager

23
core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
View File

@@ -98,18 +98,17 @@ public class SmallMapDirectionView
SmpServiceManager.getMogoRegisterCenter()
.registerCarLocationChangedListener(MODULE_NAME, this);
setOnClickListener(view -> {
if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
MogoApisHandler.getInstance().getApis()
.getMapServiceApi()
.getMapUIController()
.changeMapMode(
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()
.getCurrentSkinMode()
);
}
setOnLongClickListener(view -> {
MogoApisHandler.getInstance().getApis()
.getMapServiceApi()
.getMapUIController()
.changeMapMode(
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()
.getCurrentSkinMode()
);
return false;
});
}

2
core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapProvider.java
View File

@@ -13,7 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.adas.IMogoAdasRouteCallBack;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;

2
core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmpServiceManager.java
View File

@@ -4,7 +4,7 @@ import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoRegisterCenter;
/**

6
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasControlCommandParameter.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlCmdParameter.java
View File

@@ -5,14 +5,14 @@ public
* @author congtaowang
* @since 2020/10/22
*
* 描述
* 域控制器 控制指令发送
*/
class AdasControlCommandParameter {
class AutoPilotControlCmdParameter {
public String action;
public Object result;
public AdasControlCommandParameter( String action, Object result ) {
public AutoPilotControlCmdParameter(String action, Object result ) {
this.action = action;
this.result = result;
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/RemoteControlAutoPilotParameters.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotControlParameters.java
View File

@@ -8,7 +8,7 @@ import java.util.List;
* <p>
* 启动自动驾驶参数
*/
public class RemoteControlAutoPilotParameters {
public class AutoPilotControlParameters {
public AutoPilotLonLat startLatLon;
public List<AutoPilotLonLat> wayLatLons;

4
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AdasOCHData.java → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStationInfo.java
View File

@@ -7,13 +7,13 @@ public
*
* 自动驾驶网约车回调数据
*/
class AdasOCHData {
class AutoPilotStationInfo {
public int type;
public double lon;
public double lat;
public AdasOCHData( int type, double lon, double lat ) {
public AutoPilotStationInfo(int type, double lon, double lat ) {
this.type = type;
this.lon = lon;
this.lat = lat;

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt → core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotStatusInfo.kt
View File

@@ -6,7 +6,7 @@ package com.mogo.eagle.core.data.autopilot
* 域控制器状态信息
* 不建议自己初始化此对象，建议使用 CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
*/
class AutopilotStatusInfo {
class AutoPilotStatusInfo {
/**
* 当前链接的IP地址, 默认地址 192.168.1.102
*/

7
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
View File

@@ -397,4 +397,11 @@ public class MogoServicePaths {
@Keep
@Deprecated
public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api";
/**
* AutoPilot 模块
*/
@Keep
@Deprecated
public static final String PATH_AUTO_PILOT = "/auto_pilot/api";
}

9
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotProvider.java
View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.autopilot;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider;
/**
@@ -10,12 +10,17 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider;
*/
public interface IMoGoAutoPilotProvider extends IMoGoFunctionServerProvider {
/**
* 连接自动驾驶域控制器
*/
void connectAutoPilot();
/**
* 开启自动驾驶
*
* @param result
*/
void startAutoPilot(RemoteControlAutoPilotParameters result);
void startAutoPilot(AutoPilotControlParameters result);
/**
* 结束自动驾驶

10
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutoPilotStatusListener.java
View File

@@ -1,7 +1,7 @@
package com.mogo.eagle.core.function.api.autopilot;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo;
/**
* @author xiaoyuzhou
@@ -29,7 +29,7 @@ public interface IMoGoAutoPilotStatusListener {
*
* @param data 所到车站的简单信息
*/
void onAutoPilotArriveAtStation(AdasOCHData data);
void onAutoPilotArriveAtStation(AutoPilotStationInfo data);
/**
* 自动驾驶状态发生改变
@@ -42,7 +42,7 @@ public interface IMoGoAutoPilotStatusListener {
/**
* 自动驾驶状态信息
*
* @param autopilotStatusInfo 状态信息
* @param autoPilotStatusInfo 状态信息
*/
void onAutoPilotStatusResponse(AutopilotStatusInfo autopilotStatusInfo);
void onAutoPilotStatusResponse(AutoPilotStatusInfo autoPilotStatusInfo);
}

36
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
View File

@@ -1,8 +1,8 @@
package com.mogo.eagle.core.function.call.autopilot
import androidx.annotation.Nullable
import com.mogo.eagle.core.data.autopilot.AdasOCHData
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutoPilotStatusListener
import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
import com.mogo.eagle.core.function.call.base.CallerBase
@@ -18,7 +18,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
private val TAG = "CallerAutopilotListenerManager"
// 存储最后一次回调的数据，当有新当位置注册了监听将此数据回调过去，防止有些模块注册顺序问题导致无法获取最新状态
private var mAutopilotStatusInfo: AutopilotStatusInfo = AutopilotStatusInfo()
private var mAutoPilotStatusInfo: AutoPilotStatusInfo = AutoPilotStatusInfo()
// 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步
private val mAutoPilotStatusListeners: HashMap<String, IMoGoAutoPilotStatusListener> = HashMap()
@@ -26,15 +26,15 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
/**
* 查询AutoPilot状态
*/
fun getAutoPilotStatusInfo(): AutopilotStatusInfo {
return mAutopilotStatusInfo
fun getAutoPilotStatusInfo(): AutoPilotStatusInfo {
return mAutoPilotStatusInfo
}
/**
* 查询AutoPilot状态
*/
fun getAutoPilotStatusInfoJsonString(): String {
return GsonUtils.toJson(mAutopilotStatusInfo)
return GsonUtils.toJson(mAutoPilotStatusInfo)
}
/**
@@ -47,7 +47,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
@Nullable listener: IMoGoAutoPilotStatusListener
) {
mAutoPilotStatusListeners[tag] = listener
listener.onAutoPilotStatusResponse(mAutopilotStatusInfo)
listener.onAutoPilotStatusResponse(mAutoPilotStatusInfo)
}
/**
@@ -75,37 +75,37 @@ object CallerAutoPilotStatusListenerManager : CallerBase() {
*/
@Synchronized
fun invokeAutoPilotStatusListener() {
LogUtils.dTag(TAG, "$mAutopilotStatusInfo")
invokeAutoPilotStatusListener(mAutopilotStatusInfo)
LogUtils.dTag(TAG, "$mAutoPilotStatusInfo")
invokeAutoPilotStatusListener(mAutoPilotStatusInfo)
}
/**
* 自动驾驶状态信息回调
* @param autopilotStatusInfo 自动驾驶状态信息
* @param autoPilotStatusInfo 自动驾驶状态信息
*/
@Synchronized
fun invokeAutoPilotStatusListener(autopilotStatusInfo: AutopilotStatusInfo) {
LogUtils.dTag(TAG, "$autopilotStatusInfo")
mAutopilotStatusInfo = autopilotStatusInfo
fun invokeAutoPilotStatusListener(autoPilotStatusInfo: AutoPilotStatusInfo) {
LogUtils.dTag(TAG, "$autoPilotStatusInfo")
mAutoPilotStatusInfo = autoPilotStatusInfo
mAutoPilotStatusListeners.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
listener.onAutoPilotStatusResponse(mAutopilotStatusInfo)
listener.onAutoPilotStatusResponse(mAutoPilotStatusInfo)
}
}
/**
* 自动驾驶网约车回调数据 回调
* @param adasOCHData 自动驾驶网约车回调数据
* @param autoPilotStationInfo 自动驾驶网约车回调数据
*/
fun invokeArriveAtStationListener(adasOCHData: AdasOCHData) {
LogUtils.dTag(TAG, "$adasOCHData")
fun invokeArriveAtStationListener(autoPilotStationInfo: AutoPilotStationInfo) {
LogUtils.dTag(TAG, "$autoPilotStationInfo")
mAutoPilotStatusListeners.forEach {
val tag = it.key
val listener = it.value
LogUtils.dTag(TAG, "tag:$tag listener:$listener")
listener.onAutoPilotArriveAtStation(adasOCHData)
listener.onAutoPilotArriveAtStation(autoPilotStationInfo)
}
}

17
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
View File

@@ -1,5 +1,10 @@
package com.mogo.eagle.core.utilcode.util;
import static android.Manifest.permission.ACCESS_WIFI_STATE;
import static android.Manifest.permission.CHANGE_WIFI_STATE;
import static android.Manifest.permission.INTERNET;
import static android.content.Context.WIFI_SERVICE;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@@ -23,11 +28,6 @@ import java.net.SocketException;
import java.util.Enumeration;
import java.util.UUID;
import static android.Manifest.permission.ACCESS_WIFI_STATE;
import static android.Manifest.permission.CHANGE_WIFI_STATE;
import static android.Manifest.permission.INTERNET;
import static android.content.Context.WIFI_SERVICE;
/**
* <pre>
* author: Blankj
@@ -403,7 +403,7 @@ public final class DeviceUtils {
}
private static final String KEY_UDID = "KEY_UDID";
private static final String KEY_UDID = "KEY_UDID";
private volatile static String udid;
/**
@@ -479,8 +479,9 @@ public final class DeviceUtils {
if (!TextUtils.isEmpty(androidId)) {
return saveUdid(prefix + 2, androidId);
}
} catch (Exception ignore) {/**/}
} catch (Exception ignore) {
ignore.printStackTrace();
}
return saveUdid(prefix + 9, "");
}

58
foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
View File

@@ -8,10 +8,8 @@ import android.telephony.TelephonyManager;
import android.telephony.cdma.CdmaCellLocation;
import android.telephony.gsm.GsmCellLocation;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.utilcode.util.DeviceUtils;
import com.mogo.utils.DeviceIdUtils;
import java.lang.reflect.InvocationTargetException;
@@ -23,36 +21,36 @@ import java.lang.reflect.Method;
public class Utils {
public static String getCellId( Context context ) {
TelephonyManager tm = ( TelephonyManager ) context.getSystemService( Context.TELEPHONY_SERVICE );
if ( tm == null ) {
public static String getCellId(Context context) {
TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
if (tm == null) {
return "";
}
PackageManager pm = context.getPackageManager();
boolean accessCoarseLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
pm.checkPermission( Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName() ) );
boolean accessFineLocationPermission = ( PackageManager.PERMISSION_GRANTED ==
pm.checkPermission( Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName() ) );
if ( !accessCoarseLocationPermission || !accessFineLocationPermission )
boolean accessCoarseLocationPermission = (PackageManager.PERMISSION_GRANTED ==
pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, context.getPackageName()));
boolean accessFineLocationPermission = (PackageManager.PERMISSION_GRANTED ==
pm.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, context.getPackageName()));
if (!accessCoarseLocationPermission || !accessFineLocationPermission)
return "noPermission";
CellLocation location = null;
try {
location = tm.getCellLocation();
} catch ( Exception e ) {
} catch (Exception e) {
e.printStackTrace();
}
if ( location != null ) {
if (location != null) {
// Gsm网络 , 联通移动的网络属于这一套
if ( location instanceof GsmCellLocation ) {
GsmCellLocation gsmLoc = ( GsmCellLocation ) location;
if (location instanceof GsmCellLocation) {
GsmCellLocation gsmLoc = (GsmCellLocation) location;
int cellid = gsmLoc.getCid();
return String.valueOf( cellid );
return String.valueOf(cellid);
// Cdma网络 , 电信网络属于这一种
} else if ( location instanceof CdmaCellLocation ) {
CdmaCellLocation cdmaLoc = ( CdmaCellLocation ) location;
return String.valueOf( cdmaLoc.getBaseStationId() );
} else if (location instanceof CdmaCellLocation) {
CdmaCellLocation cdmaLoc = (CdmaCellLocation) location;
return String.valueOf(cdmaLoc.getBaseStationId());
}
}
return "";
@@ -66,31 +64,25 @@ public class Utils {
public static final String PROPERTIES = "android.os.SystemProperties";
public static String getDevicesId() {
if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
return DeviceUtils.getUniqueDeviceId();
if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp());
}
return getSystemProperties( GSM_SERIAL );
return getSystemProperties(GSM_SERIAL);
}
public static String getFotaVersion() {
return getSystemProperties( FOTA_VERSION );
return getSystemProperties(FOTA_VERSION);
}
public static String getSystemProperties( String name ) {
public static String getSystemProperties(String name) {
String value = "";
try {
Class< ? > c = Class.forName( PROPERTIES );
Method get = c.getMethod( GET, String.class );
value = ( String ) get.invoke( c, name );
} catch ( ClassNotFoundException var3 ) {
Class<?> c = Class.forName(PROPERTIES);
Method get = c.getMethod(GET, String.class);
value = (String) get.invoke(c, name);
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException var3) {
var3.printStackTrace();
} catch ( NoSuchMethodException var4 ) {
var4.printStackTrace();
} catch ( InvocationTargetException var5 ) {
var5.printStackTrace();
} catch ( IllegalAccessException var6 ) {
var6.printStackTrace();
}
return value;
}

30
foudations/mogo-utils/src/main/java/com/mogo/utils/DeviceIdUtils.java
View File

@@ -36,33 +36,25 @@ public final class DeviceIdUtils {
if ( TextUtils.isEmpty( deviceId )) {
deviceId = getDeviceIdInternal(appContext);
if (!TextUtils.isEmpty(deviceId)) {
saveDeviceId(appContext,deviceId);
} else {
if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
if ( ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE ) == PackageManager.PERMISSION_GRANTED ) {
deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
if (TextUtils.isEmpty(deviceId)) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
}
}else{
deviceId = (( TelephonyManager ) appContext.getSystemService( Context.TELEPHONY_SERVICE)).getSimSerialNumber();
}
if (!TextUtils.isEmpty(deviceId)) {
saveDeviceId(appContext,deviceId);
} else {
deviceId = ((TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE)).getSimSerialNumber();
}
if (TextUtils.isEmpty(deviceId)) {
deviceId = getDeviceSerial();
if (!TextUtils.isEmpty(deviceId) && !deviceId.equalsIgnoreCase("unknown")) {
saveDeviceId(appContext,deviceId);
} else {
if (TextUtils.isEmpty(deviceId) || deviceId.equalsIgnoreCase("unknown")) {
deviceId = getAndroidId(appContext);
if (!TextUtils.isEmpty(deviceId)) {
saveDeviceId(appContext,deviceId);
} else {
deviceId = String.valueOf( System.currentTimeMillis());
saveDeviceId(appContext,deviceId);
if (TextUtils.isEmpty(deviceId)) {
deviceId = String.valueOf(System.currentTimeMillis());
}
}
}
}
saveDeviceId(appContext,deviceId);
}
return deviceId;

2
gradle.properties
View File

@@ -166,7 +166,7 @@ MOGO_TRAFFICLIVE_VERSION=1.1.46
# 定位服务
MOGO_LOCATION_VERSION=1.1.46
# 自研地图
MAP_SDK_VERSION=1.0.1-vr-1.1.2
MAP_SDK_VERSION=1.0.1-vr-1.1.3
#################架构升级新的版本号
MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级

38
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -23,9 +23,9 @@ import android.widget.TextView;
import com.mogo.commons.FunctionBuildConfig;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoMapView;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.impl.custom.location.GpsTester;
import com.mogo.map.impl.custom.navi.NaviClient;
import com.mogo.map.impl.custom.utils.MogoMapUtils;
@@ -351,28 +351,28 @@ public class AMapViewWrapper implements IMogoMapView,
Logger.d(TAG, "设置的样式 = %s", ui);
if (checkAMapView()) {
switch (ui) {
// case CarUp_2D:
// case CarUp_3D:
// case NorthUP_2D:
// setUIMode(ui);
// break;
case CarUp_2D:
case CarUp_3D:
case NorthUP_2D:
setUIMode(ui);
break;
case Type_VR:
mMapView.getMapAutoViewHelper().setScaleVRMode(true);
mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
return;
// case Type_Light:
// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
// mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
// mIsLightStyle = true;
// break;
// case Type_Night:
// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
// mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
// mIsLightStyle = false;
// break;
// case Type_AUTO_LIGHT_Night:
// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
// break;
case Type_Light:
mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY);
mIsLightStyle = true;
break;
case Type_Night:
mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false);
mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT);
mIsLightStyle = false;
break;
case Type_AUTO_LIGHT_Night:
mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true);
break;
}
}

4
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
View File

@@ -1,7 +1,7 @@
package com.mogo.module.adas;
import com.google.gson.Gson;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.module.adas.model.AdasServiceModel;
import com.mogo.utils.logger.Logger;
@@ -184,7 +184,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
AutopilotStatus.ValuesBean autopilotStatusValues = autopilotStatus.getValues();
if (autopilotStatusValues != null) {
// 初始化自动驾驶状态信息
AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
AutoPilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
autopilotStatusInfo.setAutopilotStatus(autopilotStatusValues.getState());
autopilotStatusInfo.setAutoDriveStatus(autopilotStatusValues.getPilotmode());
autopilotStatusInfo.setErrorReason(autopilotStatusValues.getReason());

2
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.utils.logger.Logger;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.support.adas.high.AdasManager;

3
modules/mogo-module-apps/build.gradle
View File

@@ -61,6 +61,9 @@ dependencies {
api project(":foudations:mogo-commons")
api project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
implementation project(':core:mogo-core-data')
}
}

2
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
View File

@@ -6,11 +6,9 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.utils.logger.Logger;

17
modules/mogo-module-authorize/build.gradle
View File

@@ -1,8 +1,10 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.alibaba.arouter'
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-android-extensions'
id 'kotlin-kapt'
id 'com.alibaba.arouter'
}
android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -20,7 +22,7 @@ android {
kapt {
useBuildCache = false
arguments {
arg("AROUTER_MODULE_NAME",project.getName() )
arg("AROUTER_MODULE_NAME", project.getName())
}
}
@@ -49,6 +51,7 @@ dependencies {
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout
implementation rootProject.ext.dependencies.arouter
kapt rootProject.ext.dependencies.aroutercompiler
if (Boolean.valueOf(RELEASE)) {
@@ -61,6 +64,8 @@ dependencies {
implementation project(":foudations:mogo-commons")
implementation project(':services:mogo-service-api')
implementation project(":modules:mogo-module-common")
implementation project(':core:mogo-core-data')
}
}

2
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt
View File

@@ -15,7 +15,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant.Companion
import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant.Companion.AUTHORIZE_TYPE_LAUNCHER_MAIN
import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow
import com.mogo.module.authorize.util.SharedPreferenceUtil.hasGuide
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.auth.IMogoAuthManager
import com.mogo.service.module.IMogoModuleLifecycle
import com.mogo.utils.logger.Logger

5
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/model/BaseRepository.kt
View File

@@ -1,11 +1,10 @@
package com.mogo.module.authorize.model
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.module.authorize.constant.HttpConstant
import com.mogo.module.authorize.net.AuthorizeApi
import com.mogo.module.common.constants.HostConst
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
open class BaseRepository {
@@ -15,7 +14,7 @@ open class BaseRepository {
fun getNetWorkApi(): AuthorizeApi {
var serviceApi: IMogoServiceApis? = null
val mogoService = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation()
val mogoService = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation()
if (mogoService is IMogoServiceApis) {
serviceApi = mogoService
}

4
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/AnalyticsUtil.kt
View File

@@ -2,7 +2,7 @@ package com.mogo.module.authorize.util
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.analytics.IMogoAnalytics
object AnalyticsUtil {
@@ -14,7 +14,7 @@ object AnalyticsUtil {
fun track(eventType: String, data: MutableMap<String, Any>? = hashMapOf()) {
if (trackRouter == null) {
val arouter = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation()
val arouter = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation()
if (arouter is IMogoServiceApis) {
trackRouter = arouter.analyticsApi
}

4
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/voice/VoiceUtil.kt
View File

@@ -5,7 +5,7 @@ import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.voice.AIAssist
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.intent.IMogoIntentManager
import com.mogo.utils.logger.Logger
@@ -17,7 +17,7 @@ object VoiceUtil {
init {
Logger.i(TAG, "init")
val register =
ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation()
ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation()
if (register is IMogoServiceApis) {
intentRegister = register.intentManagerApi
}

2
modules/mogo-module-back/build.gradle
View File

@@ -56,6 +56,8 @@ dependencies {
implementation project(":foudations:mogo-commons")
implementation project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
implementation project(':core:mogo-core-data')
}
}

3
modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java
View File

@@ -9,9 +9,8 @@ import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.module.ModuleType;

2
modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.back;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.launcher.IMogoLauncher;
/**

4
modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
View File

@@ -2,7 +2,7 @@ package com.mogo.module.common.datacenter;
import com.mogo.commons.FunctionBuildConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutoPilotStatusInfo;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.cloud.location.CloudLocationInfo;
@@ -94,7 +94,7 @@ public class SnapshotLocationDataCenter {
// 使用与渠道配置一样的gps提供者提供的数据
if (gpsProvider == FunctionBuildConfig.gpsProvider) {
//测试面板状态同步
AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
AutoPilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo();
autopilotStatusInfo.setLocationLat(lat);
autopilotStatusInfo.setLocationLon(lon);
CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatusListener();

13
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -126,7 +126,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
IMogoAimlessModeListener,
IMogoStatusChangedListener,
IMogoIntentListener,
// IMogoLocationListener,
IMogoCarLocationChangedListener2 {
private static final String TAG = "EntranceFragment";
@@ -210,8 +209,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private TextView tvRed;
private TextView tvGreen;
// private CheckedTextView ctvAutopilotStatus;
/**
* 内部变量标识是否在vrMode，用于方法执行过滤，避免重复或异常调用
*/
@@ -277,7 +274,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location);
mUserHeadImg = findViewById(R.id.ivUserHeadImg);
groupFix = findViewById(R.id.groupFix);
// ctvAutopilotStatus = findViewById(R.id.module_mogo_autopilot_status);
ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout);
if (rootView != null) {
@@ -348,15 +344,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
});
}
// ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() {
// @Override
// public void onClickImpl(View v) {
// // 如果能自动驾驶，就自动驾驶，不能就提示
// autopilotStatusClick();
// }
// });
dealWeatherContainer();
listenSeekNumber();

3
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
View File

@@ -10,7 +10,6 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.network.Utils;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.extensions.R;
@@ -24,7 +23,7 @@ import com.mogo.module.extensions.weather.Phenomena;
import com.mogo.module.extensions.weather.WeatherCallback;
import com.mogo.module.extensions.weather.WeatherInfo;
import com.mogo.module.extensions.weather.WeatherModel;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoMsgCenter;
import com.mogo.service.statusmanager.IMogoMsgCenterListener;

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java
View File

@@ -6,7 +6,7 @@ import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.entrance.ButtonIndex;
import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.windowview.IMogoEntranceViewListener;

2
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
View File

@@ -7,7 +7,7 @@ import android.view.ViewGroup.LayoutParams;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.module.extensions.R;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoTopViewStatusListener;

21
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -24,27 +24,6 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:id="@+id/fl_speed"
android:layout_width="@dimen/module_ext_speed_width"
android:layout_height="@dimen/module_ext_speed_height"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/yi_biao_pan_bg_nor"
android:elevation="@dimen/dp_10"
android:padding="@dimen/dp_20"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.mogo.eagle.core.function.hmi.ui.widget.SpeedChartView
android:id="@+id/moudule_arc"
android:layout_width="@dimen/module_ext_arcView_width"
android:layout_height="@dimen/module_ext_arcView_height"
android:layout_gravity="center" />
</FrameLayout>
<!--切换地图远近事件 @dimen/module_switch_map -->
<FrameLayout
android:id="@+id/module_switch_model_layout"

3
modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt
View File

@@ -1,12 +1,9 @@
package com.zhidao.mogo.module.left.panel.presenter
import android.os.Handler
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.commons.mvp.Presenter
import com.mogo.map.IDestroyable
import com.mogo.module.common.MogoApisHandler
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.utils.logger.Logger
import com.zhidao.mogo.module.left.panel.LeftPanelConst.MODULE_NAME
import com.zhidao.mogo.module.left.panel.fragment.SimpleSpeedFragment

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.main;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.cardmanager.IMogoCardChangedListener;
import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.utils.logger.Logger;

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -11,7 +11,7 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.main.MainActivity;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.utils.ResourcesHelper;
import com.mogo.utils.logger.Logger;

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
View File

@@ -9,7 +9,7 @@ import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.navi.IMogoAimlessModeListener;
import com.mogo.map.navi.IMogoCarLocationChangedListener;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoRegisterCenter;

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/utils/DisplayEffectsManager.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.main.utils;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.v2x.DisplayEffectsInterface;
/**

2
modules/mogo-module-main/src/main/java/com/mogo/module/main/windowview/MogoWindowManager.java
View File

@@ -5,7 +5,7 @@ import android.view.View;
import android.widget.FrameLayout;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.windowview.IMogoWindowManager;
/**

3
modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java
View File

@@ -3,8 +3,7 @@ package com.mogo.module.map;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.google.gson.internal.$Gson$Preconditions;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.map.IMogoMapFrameController;
public

19
modules/mogo-module-obu/build.gradle
View File

@@ -1,8 +1,10 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.alibaba.arouter'
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-android-extensions'
id 'kotlin-kapt'
id 'com.alibaba.arouter'
}
android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -16,9 +18,9 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
javaCompileOptions {
annotationProcessorOptions {
arguments = [AROUTER_MODULE_NAME: project.getName()]
kapt {
arguments {
arg("AROUTER_MODULE_NAME", project.getName())
}
}
}
@@ -46,6 +48,7 @@ dependencies {
implementation rootProject.ext.dependencies.modulecommon
} else {
implementation project(':modules:mogo-module-common')
implementation project(':core:mogo-core-data')
}
}

4
modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt
View File

@@ -9,7 +9,7 @@ import android.view.View
import android.widget.Button
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.utils.logger.Logger
import com.zhidao.mogo.module.obu.obu.BaseObu
import com.zhidao.mogo.module.obu.obu.IObuCallback
@@ -44,7 +44,7 @@ class MockUtil:Handler.Callback {
override fun handleMessage(msg: Message): Boolean {
if (msg.what == 1001) {
Logger.d(TAG,"准备添加调试view")
val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis
val api = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis
api.windowManagerApi.addView(view, 800, 300, false)
}
return false

3
modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
View File

@@ -3,10 +3,9 @@ package com.zhidao.mogo.module.obu.crashwarn
import android.content.Context
import android.content.Intent
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.obu.IMogoCrashWarnProvider
import com.mogo.utils.logger.Logger
import com.zhidao.manager.constent.Common
import com.zhidao.manager.power.ZDPowerManager
import com.zhidao.manager.ts.TsSensorChannel
import com.zhidao.manager.ts.TsThreshold

2
modules/mogo-module-push/build.gradle
View File

@@ -68,6 +68,8 @@ dependencies {
implementation project(':foudations:mogo-commons')
implementation project(':modules:mogo-module-common')
implementation project(':services:mogo-service-api')
implementation project(':core:mogo-core-data')
}
}

2
modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt
View File

@@ -5,7 +5,7 @@ package com.mogo.module.push.utils
import android.util.ArrayMap
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.module.push.repository.PushRepository
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.analytics.IMogoAnalytics
object AnalyticsUtils {

4
modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt
View File

@@ -4,7 +4,7 @@ import android.content.Context
import android.view.View
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
/**
* @author congtaowang
@@ -16,7 +16,7 @@ private var apis: IMogoServiceApis? = null
fun getApis(context: Context): IMogoServiceApis {
if (apis == null) {
apis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis;
apis = ARouter.getInstance().build(com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis;
}
return apis!!
}

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java
View File

@@ -4,7 +4,7 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoAddressManager;
import com.mogo.service.module.IMogoSearchManager;
import com.mogo.utils.logger.Logger;

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.module.navi.constants.SearchApisHolder;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoSearchManager;
/**

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSettingManager.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.navi.manager;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoSettingManager;
/**

16
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/BaseSearchFragment.java
View File

@@ -7,25 +7,11 @@ import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.map.search.inputtips.MogoTip;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.navi.R;
import com.mogo.module.navi.bean.EntityConvertUtils;
import com.mogo.module.navi.bean.SearchPoi;
import com.mogo.module.navi.ui.adapter.HistoryPoiAdapter;
import com.mogo.module.navi.ui.adapter.SearchPoiAdapter;
import com.mogo.module.navi.ui.base.BaseFragment;
import com.mogo.module.navi.ui.base.UiController;
import com.mogo.module.navi.ui.setting.NaviSettingFragment;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.fragmentmanager.FragmentDescriptor;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import java.util.ArrayList;
import java.util.List;
/**
* 搜索页面

2
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchPresenter.java
View File

@@ -21,7 +21,7 @@ import com.mogo.module.navi.bean.SearchPoi;
import com.mogo.module.navi.constants.DataConstants;
import com.mogo.module.navi.constants.SearchApisHolder;
import com.mogo.module.navi.database.AppDataBase;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.map.IMogoMapService;
import java.util.List;

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/actionmanager/MogoActionManager.java
View File

@@ -3,8 +3,7 @@ package com.mogo.module.service.actionmanager;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.map.MogoOverlayManager;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoBizActionDoneListener;
import com.mogo.service.module.MogoAction;
import com.mogo.service.module.IMogoActionListener;

10
modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
View File

@@ -2,7 +2,7 @@ package com.mogo.module.service.autopilot;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.utils.logger.Logger;
@@ -23,14 +23,14 @@ class AutoPilotRemoteController {
private IMogoSocketManager mMogoSocketManager;
private IMogoOnMessageListener< RemoteControlAutoPilotParameters > mParametersListener = new IMogoOnMessageListener< RemoteControlAutoPilotParameters >() {
private IMogoOnMessageListener<AutoPilotControlParameters> mParametersListener = new IMogoOnMessageListener<AutoPilotControlParameters>() {
@Override
public Class< RemoteControlAutoPilotParameters > target() {
return RemoteControlAutoPilotParameters.class;
public Class<AutoPilotControlParameters> target() {
return AutoPilotControlParameters.class;
}
@Override
public void onMsgReceived( RemoteControlAutoPilotParameters obj ) {
public void onMsgReceived( AutoPilotControlParameters obj ) {
if ( obj == null ) {
Logger.e( TAG, "远端控制参数为null", new NullPointerException() );
return;

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/datamanager/MogoDataManager.java
View File

@@ -3,7 +3,7 @@ package com.mogo.module.service.datamanager;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.datamanager.IMogoDataChangedListener;
import com.mogo.service.datamanager.IMogoDataManager;

16
modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
View File

@@ -10,8 +10,8 @@ import android.os.Handler;
import android.os.Message;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.eagle.core.data.autopilot.AdasOCHData;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener;
import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager;
@@ -137,17 +137,17 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
}
private void startAutoPilot() {
RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
AutoPilotControlParameters currentAutopilot = new AutoPilotControlParameters();
currentAutopilot.isSpeakVoice = false;
List<RemoteControlAutoPilotParameters.AutoPilotLonLat> wayLatLon = new ArrayList<>();
List<AutoPilotControlParameters.AutoPilotLonLat> wayLatLon = new ArrayList<>();
if (receiverBean!=null && receiverBean.getStopsList()!= null){
for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) {
wayLatLon.add(new RemoteControlAutoPilotParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
wayLatLon.add(new AutoPilotControlParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
}
}
currentAutopilot.wayLatLons = wayLatLon;
currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon());
currentAutopilot.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
currentAutopilot.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon());
currentAutopilot.vehicleType = 10;
Logger.d(TAG, "开启自动驾驶====" + currentAutopilot);
mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot);
@@ -191,7 +191,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
}
@Override
public void onArriveAt(AdasOCHData data) {
public void onArriveAt(AutoPilotStationInfo data) {
Logger.d(TAG, "onArriveAt data : " + data.toString());
double endLat = data.lat;
double endLon = data.lon;

8
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -38,7 +38,7 @@ import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.R;
import com.mogo.module.service.status.EnvStatusManager;
import com.mogo.module.service.timedelay.TimeDelayUploadManager;
import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters;
import com.mogo.eagle.core.data.autopilot.AutoPilotControlParameters;
import com.mogo.service.adas.entity.ADASCarStateInfo;
import com.mogo.service.adas.entity.ADASRecognizedResult;
import com.mogo.service.entrance.ButtonIndex;
@@ -526,10 +526,10 @@ public class MockIntentHandler implements IntentHandler {
.onAutopilotArriveLike(intent.getIntExtra("type", 8));
break;
case 44:// 控制自动驾驶
RemoteControlAutoPilotParameters parameters = new RemoteControlAutoPilotParameters();
AutoPilotControlParameters parameters = new AutoPilotControlParameters();
parameters.vehicleType = 9;
parameters.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.1690522746, 116.567374558);
parameters.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.1651999405, 116.567217441);
parameters.startLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.1690522746, 116.567374558);
parameters.endLatLon = new AutoPilotControlParameters.AutoPilotLonLat(40.1651999405, 116.567217441);
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MogoMarkerServiceImpl.java
View File

@@ -9,8 +9,7 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.module.common.drawer.MarkerDrawer;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.ServiceConst;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.module.IMogoMarkerService;
import com.mogo.utils.logger.Logger;

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java
View File

@@ -3,9 +3,8 @@ package com.mogo.module.service.network;
import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.module.common.constants.HostConst;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java
View File

@@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
import com.mogo.utils.logger.Logger;

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
View File

@@ -5,12 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.voice.VoiceIntentTrack;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.utils.logger.Logger;
/**
* @author congtaowang

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java
View File

@@ -4,8 +4,7 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.module.service.MogoServices;
import com.mogo.module.service.location.MogoRTKLocation;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.strategy.IMogoRefreshStrategyController;
import com.mogo.utils.logger.Logger;

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java
View File

@@ -3,16 +3,12 @@ package com.mogo.module.service.ttsConfig;
import android.text.TextUtils;
import android.util.Log;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.constants.HostConst;
import com.mogo.module.service.network.RefreshModel;
import com.mogo.module.service.network.bean.TtsConfigEntity;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.utils.network.RequestOptions;
import io.reactivex.android.schedulers.AndroidSchedulers;

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java
View File

@@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.utils.logger.Logger;

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/GaoDeAimlessProvider.java
View File

@@ -14,7 +14,7 @@ import com.mogo.module.common.entity.RoadTrafficSegment;
import com.mogo.module.common.entity.RoadTrafficStatus;
import com.mogo.module.common.entity.UploadTrafficEntity;
import com.mogo.module.share.net.TrafficModelData;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.utils.network.utils.GsonUtil;
import java.util.ArrayList;

5
modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
View File

@@ -11,27 +11,24 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.network.Utils;
import com.mogo.map.location.MogoLocation;
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.common.constants.HostConst;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.dialog.BaseFloatDialog;
import com.mogo.module.common.utils.CloudPoiManager;
import com.mogo.module.share.bean.FixableButton;
import com.mogo.module.share.bean.ShareButtonConfigResponse;
import com.mogo.module.share.bean.ShareConfigRequest;
import com.mogo.module.share.bean.StepAfterAuth;
import com.mogo.module.share.constant.HttpConstant;
import com.mogo.module.share.constant.ShareConstants;
import com.mogo.module.share.dialog.GridFixableShareDialog;
import com.mogo.module.share.manager.ServiceApisManager;
import com.mogo.module.share.manager.UploadHelper;
import com.mogo.module.share.net.ShareDevaApiService;
import com.mogo.service.MogoServicePaths;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.share.TanluUploadParams;

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
View File

@@ -12,7 +12,7 @@ import com.mogo.module.share.constant.S_TAG
import com.mogo.module.share.strategyreceiver.AccidentStrategyReceiver
import com.mogo.module.share.strategyreceiver.BlockStrategy
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.utils.logger.Logger
import com.mogo.utils.network.utils.GsonUtil
import org.json.JSONObject

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java
View File

@@ -2,14 +2,12 @@ package com.mogo.module.share;
import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.navi.IMogoAimless;
import com.mogo.map.search.poisearch.IMogoPoiSearch;
import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.map.IMogoMapService;

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/TrafficUploadProvider.kt
View File

@@ -6,7 +6,7 @@ import android.content.Context
import com.alibaba.android.arouter.facade.annotation.Route
import com.alibaba.android.arouter.facade.template.IProvider
import com.mogo.module.share.manager.TrafficUploadManager.Companion.trafficUpload
import com.mogo.service.MogoServicePaths
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.service.share.IMogoTrafficUploadProvider
@Route( path = MogoServicePaths.PATH_TRAFFIC_UPLOAD )

Some files were not shown because too many files have changed in this diff Show More