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

Merge branch 'release_robotaxi-d-app-module_280_220608_2.8.0.1' into 'master'

Browse Source 
Release robotaxi d app module 280 220608 2.8.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!48
This commit is contained in:
pangfan
2022-07-07 06:12:01 +00:00
parent eb9dee094a dfbdcaa343
commit fb25be50c6
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
View File

@@ -71,27 +71,27 @@ public class BusTrajectoryManager {
if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
// 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载");
ToastUtils.showShort("轨迹开始下载");
// ToastUtils.showShort("轨迹开始下载");
stopTrajReqLoop();
} else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
// 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功");
ToastUtils.showShort("轨迹下载成功");
// ToastUtils.showShort("轨迹下载成功");
stopTrajReqLoop();
} else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
// 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
"轨迹下载失败，本地无对应轨迹");
ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
// ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
} else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
// 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
"轨迹下载失败，本地有对应轨迹，认为成功");
ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
// ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
} else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
// 5. 轨迹管理_轨迹下载超时
CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时");
ToastUtils.showShort("轨迹下载超时");
// ToastUtils.showShort("轨迹下载超时");
}
}

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
View File

@@ -241,7 +241,10 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
@Override
protected void onDetachedFromWindow() {
closeAllAnimsAndView();
isStarting = false;
clearStartingAnimFrame();
clearBgAnimDrawable();
mContext = null;
super.onDetachedFromWindow();
}
}

1
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
View File

@@ -211,6 +211,7 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){
TaxiModel.getInstance().startDynamicCalculateRouteInfo();
runOnUIThread(() -> mView.updateCtvAutopilotStatusTag(true));
}
if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus ||

8
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -91,7 +91,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
groupTestPanel = findViewById(R.id.groupTestPanel);
ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status);
ctvAutopilotStatus.setBackground(getResources().getDrawable(R.drawable.taxi_autopilot_bg_selector));
ctvAutopilotStatus.setTag(false);
updateCtvAutopilotStatusTag(false);
mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
mAutopilotTv = findViewById(R.id.module_och_autopilot_tv);
flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container);
@@ -296,8 +296,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
});
}
public void updateCtvAutopilotStatusTag(boolean tag){
ctvAutopilotStatus.setTag(tag);
}
public void onCheckPilotConditionSafe(boolean isSafe){
ctvAutopilotStatus.setTag(isSafe);
updateCtvAutopilotStatusTag(isSafe);
if (isSafe){
ToastUtils.showLong(getResources().getString(
R.string.module_och_taxi_order_choose_start_autopilot_tip));

10
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
View File

@@ -75,27 +75,27 @@ public class TaxiTrajectoryManager {
if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
// 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载");
ToastUtils.showShort("轨迹开始下载");
// ToastUtils.showShort("轨迹开始下载");
stopTrajReqLoop();
} else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
// 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功");
ToastUtils.showShort("轨迹下载成功");
// ToastUtils.showShort("轨迹下载成功");
stopTrajReqLoop();
} else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
// 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
"轨迹下载失败，本地无对应轨迹");
ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
// ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
} else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
// 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
"轨迹下载失败，本地有对应轨迹，认为成功");
ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
// ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
} else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
// 5. 轨迹管理_轨迹下载超时
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时");
ToastUtils.showShort("轨迹下载超时");
// ToastUtils.showShort("轨迹下载超时");
}
}

6
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -1045,14 +1045,16 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@drawable/debug_setting_edit_bg"
android:gravity="center_vertical">
<TextView
android:id="@+id/tvCurEnv"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:textColor="#1A1A1A"
android:textColor="#000"
android:gravity="start"
android:layout_marginStart="@dimen/dp_10"
android:textSize="@dimen/dp_24"
android:layout_weight="1"
tools:text="当前环境:"/>
@@ -1062,7 +1064,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_8"
android:layout_marginStart="20px"
android:layout_marginEnd="@dimen/dp_10"
android:text="切换环境"
android:textSize="@dimen/dp_24"
android:textColor="#1A1A1A"/>