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

Merge branch 'dev_robotaxi-d-app-module_280_220608_2.8.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_280_220608_2.8.0

Browse Source
This commit is contained in:
xinfengkun
2022-06-14 14:38:13 +08:00
parent 29dea8e817 0b1632db80
commit 72ddbad949
25 changed files with 188 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
View File

@@ -15,6 +15,14 @@ public class BusRoutesResult {
private String description;
private int status;
//线路轨迹相关字段
public String csvFileUrl; //轨迹文件下载的cos url，默认“”
public String csvFileMd5; //轨迹文件md5，默认“”
public String txtFileUrl; //打点文件下载的cos url，默认“”
public String txtFileMd5; //轨迹文件md5，默认“”
public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String carModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
public int getLineId() {
return lineId;
}

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

@@ -52,12 +52,12 @@ public class OrderQueryRespBean extends BaseData {
//线路轨迹相关字段
public long lineId; //路线id，默认-1
public String trajUrl; //轨迹文件下载的cos url，默认“”
public String trajMd5; //轨迹文件md5，默认“”
public String stopUrl; //打点文件下载的cos url，默认“”
public String stopMd5; //轨迹文件md5，默认“”
public long timestamp; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String vehicleModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
public String csvFileUrl; //轨迹文件下载的cos url，默认“”
public String csvFileMd5; //轨迹文件md5，默认“”
public String txtFileUrl; //打点文件下载的cos url，默认“”
public String txtFileMd5; //轨迹文件md5，默认“”
public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
public String carModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
// !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
public double travelDistance;

66
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -92,6 +92,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
private TextView mGoAheadStationTitleTv31;
private TextView mCatchStationTitleTv31;
private ImageView mNaviIcon;
private TextView mPassengerNum;
private TextView mPassengerPhone;
private ConstraintLayout mPassengerInfoLayout;
private TextView mNoDatasTv;
@@ -125,6 +128,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mCatchStationTitleTv31 = view.findViewById(R.id.go_ahead_station_catch_31);
mGoAheadStationTitleTv31 = view.findViewById(R.id.go_ahead_station_31);
mArrivedStationTitleTv32 = view.findViewById(R.id.arrive_station_32);
mPassengerInfoLayout = view.findViewById(R.id.module_och_taxi_order_passenger_data);
mPassengerNum = view.findViewById(R.id.taxi_passenger_num);
mPassengerPhone = view.findViewById(R.id.taxi_passenger_phone);
mNoDatasTv = view.findViewById(R.id.no_order_data_tv);
mNoDataView = view.findViewById(R.id.being_no_data_view);
mOrderCancel.setOnClickListener(this);
@@ -173,15 +181,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
background.setColor(Color.parseColor("#FF1D5EF3"));
mOrderServerStatus.setClickable(true);
// String strHtml3 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "<big></font></b>";
mTitleTV2.setText("送乘客至");
mStationTv2.setText(order.endSiteAddr);
// String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 公里，</font>"
// + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
// mDistanceAndTime.setText(Html.fromHtml(strHtml2));
} else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点");
mContentModule3.setVisibility(View.GONE);
mContentModule2.setVisibility(View.VISIBLE);
mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station);
@@ -228,6 +232,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus){
CallerLogger.INSTANCE.d(M_TAXI + TAG, "车辆已经达到起点");
mPassengerInfoLayout.setVisibility(View.VISIBLE);
mPassengerNum.setText(order.passengerNum + "人");
mPassengerPhone.setText(order.passengerPhone);
mOrderStatus.setText(R.string.module_och_taxi_waiting);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start_wait_check);
mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -236,6 +243,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(false);
}else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus ){
CallerLogger.INSTANCE.d(M_TAXI + TAG, "乘客已上车验证成功");
mPassengerInfoLayout.setVisibility(View.GONE);
mOrderStatus.setText(R.string.module_och_taxi_user_check_success);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
@@ -244,44 +253,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(true);
}
}else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) {
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
mArrivedStartTimeTv32.setVisibility(View.VISIBLE);
mContentModule32.setVisibility(View.VISIBLE);
mContentModule31.setVisibility(View.GONE);
mOrderOtherContent3.setVisibility(View.GONE);
mOrderStatus.setText(R.string.module_och_taxi_waiting);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
background.setColor(Color.parseColor("#FF1D5EF3"));
mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF"));
mOrderServerStatus.setClickable(true);
Calendar currentCale = DateTimeUtils.getCurrentDateTime();
String currentHM = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm);
String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
String strHtml11 = "<font color=\"#CAD6FF\">已于</font><br>"
+ "<b><font color=\"#FFFFFF\"><big><big>" + currentHM + "</big></big></font></b>"
+ "<font color=\"#CAD6FF\">" + " " + "到达乘客上车地点</font>";
mArrivedStartTimeTv32.setLineHeight(60);
mArrivedStartTimeTv32.setText(Html.fromHtml(strHtml11));
// String strHtml12 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "</big</font></b>";
mArrivedStationTitleTv32.setText("送乘客至");
mStationTv32.setText(order.endSiteAddr);
currentCale.add(Calendar.MINUTE, 10);
String strHtml13 = "";
if (currentDay.equals(DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd))) {
strHtml13 = "<font color=\"#CAD6FF\">免费等待至 </font>"
+ "<b><font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm) + "</big></b></font>";
} else {
strHtml13 = "<font color=\"#CAD6FF\">免费等待至</font>"
+ "<font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_MM_dd_HH_mm) + "</big></font>";
}
mDistanceAndTime3.setText(Html.fromHtml(strHtml13));
} else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
}else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "前往乘客上车地点");
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
@@ -290,6 +262,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mContentModule32.setVisibility(View.GONE);
mOrderOtherContent3.setVisibility(View.VISIBLE);
mDistanceAndTime3.setVisibility(View.VISIBLE);
mPassengerInfoLayout.setVisibility(View.VISIBLE);
mPassengerNum.setText(order.passengerNum + "人");
mPassengerPhone.setText(order.passengerPhone);
mOrderStatus.setText(R.string.module_och_taxi_new_order);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -298,10 +273,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(false);
mGoAheadStationTitleTv31.setText("前往");
mCatchStationTitleTv31.setText("接乘客");
// String strHtml0 = "<font color=\"#CAD6FF\">前往</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.startSiteAddr + "</big></font></b><br>"
// + "<font color=\"#CAD6FF\">接乘客</font>";
mStationTv31.setText(order.startSiteAddr);
Calendar currentCale = DateTimeUtils.getCurrentDateTime();
Calendar startCale = DateTimeUtil.formatLongToCalendar(order.bookingTime);
String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
@@ -472,7 +445,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker);
break;
case ArriveAtEnd:
mCurrentOrder = null;
mTtsLessThan200Tip = 0;
mOrderCancel.setVisibility(View.GONE);
showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip));

70
OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
View File

@@ -101,18 +101,55 @@
android:paddingRight="40px"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/module_och_taxi_order_passenger_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="130px">
<TextView
android:id="@+id/taxi_passenger_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="--"
android:textColor="@android:color/white"
android:textSize="@dimen/taxi_passenger_txt_size"/>
<TextView
android:id="@+id/taxi_passenger_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toRightOf="@+id/taxi_passenger_num"
app:layout_constraintTop_toTopOf="@+id/taxi_passenger_num"
android:layout_marginLeft="@dimen/dp_30"
android:text="--"
android:textColor="@android:color/white"
android:textSize="@dimen/taxi_passenger_txt_size"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_2"
app:layout_constraintTop_toBottomOf="@+id/taxi_passenger_phone"
app:layout_constraintLeft_toLeftOf="@+id/taxi_passenger_num"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginTop="@dimen/dp_30"
android:background="@color/taxi_passenger_line_color"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/module_och_taxi_order_had_arrived_time_32"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="150px"
android:layout_marginTop="@dimen/dp_30"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginTop="50px"
app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data"
app:layout_goneMarginTop="@dimen/dp_150"
tools:text="已于 - - 到达乘客上车点" />
<LinearLayout
android:id="@+id/module_och_taxi_order_go_ahead_station_31"
@@ -120,15 +157,15 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="visible"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data">
<TextView
android:id="@+id/go_ahead_station_31"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#CAD6FF"
android:layout_marginTop="150px"
android:textSize="17sp"
android:textSize="30px"
android:text="前往"/>
<TextView
android:id="@+id/module_och_taxi_order_start_station_31"
@@ -141,21 +178,22 @@
android:ellipsize="end"
android:lineSpacingExtra="10px"
android:textColor="#FFFFFF"
android:textSize="23sp"
android:textSize="42px"
tools:text="- -" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8px"
android:layout_gravity="center_vertical">
<TextView
android:id="@+id/go_ahead_station_catch_31"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:gravity="center_horizontal"
android:text="接乘客"/>
android:text="接乘客"
android:textColor="#CAD6FF"
android:textSize="28px" />
<ImageView
android:id="@+id/module_och_taxi_navi_iv"
android:layout_width="wrap_content"
@@ -183,7 +221,7 @@
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
tools:text="送乘客至" />
<TextView
android:id="@+id/module_och_taxi_order_end_station_32"
@@ -195,7 +233,7 @@
android:ellipsize="end"
android:lineSpacingExtra="16px"
android:textColor="#FFFFFF"
android:textSize="23sp"
android:textSize="42px"
tools:text="- -" />
</LinearLayout>
@@ -207,7 +245,7 @@
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_arrive_station_32"
tools:text="乘客将于 - - 用车" />
@@ -219,9 +257,9 @@
android:layout_marginBottom="180px"
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:text="距离 - - 公里，用时 - - 分钟"
android:text="距离 -- 公里，用时 -- 分钟"
android:textColor="#CAD6FF"
android:textSize="16sp"
android:textSize="32px"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_go_ahead_station_31"/>

2
OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
View File

@@ -101,4 +101,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -101,4 +101,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values/colors.xml
View File

@@ -22,4 +22,6 @@
<color name="taxi_traffic_light_green_color_down">#FF006D43</color>
<color name="taxi_traffic_light_yellow_color_up">#FFFFE198</color>
<color name="taxi_traffic_light_yellow_color_down">#FFFF9B00</color>
<color name="taxi_passenger_line_color">#657EE2</color>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values/dimens.xml
View File

@@ -99,4 +99,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>

2
app/productFlavors/f8xx.gradle
View File

@@ -31,7 +31,7 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fPadLenovo.gradle
View File

@@ -31,6 +31,6 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fPadLenovoOchBus.gradle
View File

@@ -33,6 +33,6 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fPadLenovoOchBusPassenger.gradle
View File

@@ -31,6 +31,6 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fPadLenovoOchTaxi.gradle
View File

@@ -34,7 +34,7 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
View File

@@ -33,7 +33,7 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fochbus.gradle
View File

@@ -31,7 +31,7 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

2
app/productFlavors/fochtaxi.gradle
View File

@@ -31,7 +31,7 @@ project.android.productFlavors {
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
// 构建的是否是演示（美化）模式
buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
}
}

3
app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
View File

@@ -99,8 +99,5 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
FunctionBuildConfig.skinMode = 1
}
// 是否是演示（美化）模式，会存在SP中，方便做现场恢复
FunctionBuildConfig.isDemoMode =
SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
}
}

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

@@ -69,7 +69,6 @@ import mogo.telematics.pad.MessagePad
import mogo_msg.MogoReportMsg
import java.text.SimpleDateFormat
import java.util.*
import kotlin.collections.ArrayList
import kotlin.math.abs
/**
@@ -540,7 +539,6 @@ class DebugSettingView @JvmOverloads constructor(
if (!FunctionBuildConfig.isDemoMode) {
tbIsDrawAutopilotTrajectoryData.isChecked = false
}
SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)
}
@@ -612,7 +610,7 @@ class DebugSettingView @JvmOverloads constructor(
tbDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData
//是否渲染点云数据
tbDrawPointCloudData.setOnCheckedChangeListener { _, isChecked ->
FunctionBuildConfig.isDrawPointCloudData = isChecked
CallerHDMapManager.setIsDrawPointCloud(isChecked)
}
// 模拟自动驾驶中

18
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
View File

@@ -21,6 +21,7 @@ import com.mogo.map.IMogoMap;
import com.mogo.map.IMogoUiSettings;
import com.mogo.map.MogoMapView;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.zhidaoauto.map.sdk.open.business.PointCloudHelper;
/**
* @author donghongyu
@@ -275,4 +276,21 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
}
}
@Override
public void setPointCloudSize(float pointCloudSize) {
//设置点云大小
PointCloudHelper.INSTANCE.setPointCloudSize(pointCloudSize);
}
@Override
public void setPointCloudColor(@NonNull String color) {
// 设置点云颜色
PointCloudHelper.INSTANCE.setPointCloudColor(color);
}
@Override
public void setIsDrawPointCloud(boolean isDrawPointCloud) {
// 是否绘制点云
PointCloudHelper.INSTANCE.setIsDrawPointCloud(isDrawPointCloud);
}
}

1
core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
View File

@@ -102,6 +102,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb
V2XManager.init(V2XConfig.Builder().also {
it.aiCloudConfig(MoGoAiCloudClientConfig.getInstance())
it.context(context)
it.loggable(true)
it.distanceForTriggerRefresh(200f) //行驶超过200（包含）米，刷新道路周边信息（短链请求）
it.durationForTriggerRefresh(
60,

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
View File

@@ -8,7 +8,7 @@ package com.mogo.eagle.core.data.config
object FunctionBuildConfig {
/**
* 是否是演示（美化）模式，会存在SP中，方便做现场恢复
* 是否是演示（美化）模式
* 1.当点击【开始服务（taxi）/滑动出发（bus）】btn后，不管实际自动驾驶按钮「state值」如何变更，自动驾驶按钮都呈现2的状态。
* 只是自动驾驶按钮的样式为2-被选中的状态
* 若点击，则可继续向自动驾驶系统发送启动自动驾驶的命令。

3
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
View File

@@ -17,9 +17,6 @@ object MoGoConfig {
// CMD全量日志抓取当时时间
const val CATCH_LOG_TIME = "CATCH_LOG_TIME"
// 是否是演示（美化）模式，会存在SP中，方便做现场恢复
const val IS_DEMO_MODE = "IS_DEMO_MODE"
//根据加速度判断是否刹车阈值
const val BRAKE_ACCELERATION_THRESHOLD = "BRAKE_ACCELERATION_THRESHOLD"

24
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
View File

@@ -42,4 +42,28 @@ interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
* @param isDayMode true-白天模式，false-夜间模式
*/
fun stepInVrMode(isDayMode: Boolean)
/**
* 打开点云绘制
*
* @param isDrawPointCloud 是否绘制点云
*/
fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
/**
* 设制点云大小
*
* @param pointCloudSize 点云的点大小
*/
fun setPointCloudSize(pointCloudSize: Float)
/**
* 设置点云颜色
*
* @param color // color:"#RRGGBB*
*/
fun setPointCloudColor(color: String)
}

29
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.map
import androidx.annotation.RawRes
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
import com.mogo.eagle.core.data.map.CenterLine
import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider
@@ -58,4 +59,32 @@ object CallerHDMapManager : CallerBase() {
fun stepInVrMode(isDayMode: Boolean) {
return mapProviderApi.stepInVrMode(isDayMode)
}
/**
*
* 打开点云绘制
*
* @param isDrawPointCloud 是否绘制点云
*/
fun setIsDrawPointCloud(isDrawPointCloud: Boolean) {
FunctionBuildConfig.isDrawPointCloudData = isDrawPointCloud
return mapProviderApi.setIsDrawPointCloud(isDrawPointCloud)
}
/**
* 设制点云大小
* @param pointCloudSize 点云的点大小
*/
fun setPointCloudSize(pointCloudSize: Float) {
return mapProviderApi.setPointCloudSize(pointCloudSize)
}
/**
* 设置点云颜色
*
* @param color // color:"#RRGGBB*
*/
fun setPointCloudColor(color: String) {
return mapProviderApi.setPointCloudColor(color)
}
}

22
gradle.properties
View File

@@ -63,26 +63,26 @@ SERVICE_CHAIN_VERSION=1.1.0
LOGLIB_VERSION=1.3.0
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.1
MOGO_NETWORK_VERSION=1.4.2
# 鉴权
MOGO_PASSPORT_VERSION=1.4.1
MOGO_PASSPORT_VERSION=1.4.2
# 常链接
MOGO_SOCKET_VERSION=1.4.1
MOGO_SOCKET_VERSION=1.4.2
# 数据采集
MOGO_REALTIME_VERSION=1.4.1
MOGO_REALTIME_VERSION=1.4.2
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.4.1
MOGO_TANLU_VERSION=1.4.2
# 直播推流
MOGO_LIVE_VERSION=1.4.1
MOGO_LIVE_VERSION=1.4.2
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.1
MOGO_TRAFFICLIVE_VERSION=1.4.2
# 定位服务
MOGO_LOCATION_VERSION=1.4.1
MOGO_LOCATION_VERSION=1.4.2
# 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.1
MOGO_TELEMATIC_VERSION=1.4.2
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.2.0.7
MAP_SDK_VERSION=2.2.0.9
MAP_SDK_OPERATION_VERSION=1.0.13
# websocket
WEBSOCKET_VERSION=1.1.7
@@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
# v2x-sdk
MOGO_V2X_SDK_VERSION=1.4.1
MOGO_V2X_SDK_VERSION=1.4.2
################# 旧版本架构模块版本 #################