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

Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
yangyakun
2023-05-10 19:22:43 +08:00
parent 1ba3a702e6 0edda6baa4
commit e7836b87cd
27 changed files with 434 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt
View File

@@ -35,7 +35,7 @@ class BusPStatusBarView @JvmOverloads constructor(
init {
LayoutInflater.from(context).inflate(R.layout.p_bus_view_status_bar, this, true)
setBackgroundColor(Color.parseColor("#80FFFFFF"))
setBackgroundResource(R.drawable.bg_status_bar)
isClickable = true
isFocusable = true
}

46
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
View File

@@ -2,14 +2,19 @@ package com.mogo.och.bus.passenger.ui;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import com.mogo.commons.mvp.IView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.data.multidisplay.TelematicConstant;
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
import com.mogo.eagle.core.function.view.MapBizView;
import com.mogo.och.bus.passenger.R;
@@ -40,9 +45,50 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
protected void initViews() {
mapBizView = findViewById(R.id.mapBizView);
videoSwitch = findViewById(R.id.video_switch_iv);
videoSwitch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
openOrCloseLiveVideo();
}
});
CallerTelematicListenerManager.INSTANCE.addListener(TAG, new IReceivedMsgListener() {
@Override
public void onReceivedServerSn(@Nullable String sn) {
}
@Override
public void onReceivedMsg(int type, @NonNull byte[] byteArray) {
if (type == TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR) {
switch (new String(byteArray)) {
// 乘客端开启漫游
case "0": {
// mLiveShadow.setVisibility(View.GONE);
goneLiveShadow();
break;
}
// 乘客端关闭漫游
case "1": {
// mLiveShadow.setVisibility(View.VISIBLE);
visibleLiveShadow();
break;
}
}
}
}
});
showRouteFragment();
}
protected abstract void openOrCloseLiveVideo();
protected abstract void goneLiveShadow();
protected abstract void visibleLiveShadow();
@Override
protected void initViews(Bundle savedInstanceState) {
super.initViews(savedInstanceState);

124
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -1,5 +1,6 @@
package com.mogo.och.bus.passenger.ui;
import android.annotation.SuppressLint;
import android.graphics.drawable.AnimationDrawable;
import android.os.Bundle;
import android.text.Html;
@@ -18,6 +19,7 @@ import com.elegant.utils.UiThreadHandler;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.och.bus.passenger.R;
import com.mogo.och.bus.passenger.adapter.BusPassengerLineStationsAdapter;
@@ -38,7 +40,7 @@ import java.util.List;
* @date: 2022/4/12
*/
public class BusPassengerRouteFragment extends
BusPassengerBaseFragment<BusPassengerRouteFragment, BaseBusPassengerPresenter> {
BusPassengerBaseFragment<BusPassengerRouteFragment, BaseBusPassengerPresenter> implements MapAndLiveVideoView.ChangeItemListener {
public static final String TAG = "BusPassengerRouteFragment";
@@ -50,9 +52,6 @@ public class BusPassengerRouteFragment extends
private Group mRouteInfoView;
private RecyclerView mStationsListRv;
private BusPassengerMapDirectionView mMapDirectionView;
// private ImageView mMapArrowIcon;
// private RotateAnimation rotateAnimation;
// private float lastBearing = 0;
private BusPassengerLineStationsAdapter mAdapter;
private TextView emptyTv;
private AppCompatImageView mAutopilotIv;
@@ -60,6 +59,13 @@ public class BusPassengerRouteFragment extends
private AppCompatTextView mCurrentArriveStationTitle;
private AppCompatTextView mCurrentArriveTip;
private AppCompatImageView mSpeakArrivedIv;
private DriverMonitorView driverMonitorView;
private ConstraintLayout indicatorView;
private View mapIndicator;
private View liveIndicator;
private MapAndLiveVideoView mapAndLiveVideoView;
List<View> views = new ArrayList<>();
/**
* 改变自动驾驶状态
@@ -91,7 +97,6 @@ public class BusPassengerRouteFragment extends
mNoLineInfoView =findViewById(R.id.bus_p_no_order_data_view);
emptyTv = findViewById(R.id.no_order_data_tv);
// mCarPlateNum = findViewById(R.id.bus_p_driver_num_plate_tv);
mLineName = findViewById(R.id.bus_p_line_name_tv);
mAutopilotIv = findViewById(R.id.auto_status_iv);
mCurrentArriveStation = findViewById(R.id.bus_p_cur_station_name);
@@ -99,8 +104,6 @@ public class BusPassengerRouteFragment extends
mCurrentArriveTip = findViewById(R.id.bus_p_cur_station_tip);
mSpeakArrivedIv = findViewById(R.id.speak_arrived_iv);
// mOperationTime = findViewById(R.id.line_operation_time_tv);
mRouteInfoView = findViewById(R.id.bus_p_line_cl);
mStationsListRv = findViewById(R.id.bus_p_line_stations_rl);
@@ -109,12 +112,24 @@ public class BusPassengerRouteFragment extends
mAdapter = new BusPassengerLineStationsAdapter(getContext(), mStationsList);
mStationsListRv.setAdapter(mAdapter);
// mMapArrowIcon = findViewById(R.id.bus_p_arrow_nor);
indicatorView = findViewById(R.id.busIndicatorView);
mapIndicator = findViewById(R.id.firstIndicator);
liveIndicator = findViewById(R.id.secondIndicator);
videoSwitch.setOnClickListener(new View.OnClickListener() {
driverMonitorView = new DriverMonitorView(getContext());
driverMonitorView.setLiveListener(new DriverMonitorView.LiveListener() {
@Override
public void onClick(View v) {
// TODO: 2023/5/4 漫游视频打开/关闭
public void onPlayError() {
goneLiveShadow();
}
@Override
public void showOrHideLiveBtn(boolean isShow) {
if (isShow){
visibleLiveShadow();
}else {
goneLiveShadow();
}
}
});
@@ -128,13 +143,69 @@ public class BusPassengerRouteFragment extends
}
});
}
mapAndLiveVideoView = findViewById(R.id.mapAndLiveVideoView);
initLiveView();
}
private void initLiveView() {
views.add(new View(getContext()));// 其实是空的，真正小地图还在fragment里
views.add(driverMonitorView);
mapAndLiveVideoView.setData(views);
mapAndLiveVideoView.setVisibility(View.GONE);
indicatorView.setVisibility(View.GONE);
}
@SuppressLint("UseCompatLoadingForDrawables")
@Override
public void changeToItem(int position) {
// (position == 0): 空view 地图占位 (position == 1) :live video
if (position == 0){
mapIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_selected_bg));
liveIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_unselected_bg));
}else {
mapIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_unselected_bg));
liveIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_selected_bg));
}
mMapDirectionView.setVisibility(position == 0? View.VISIBLE:View.GONE);
}
@Override
protected void openOrCloseLiveVideo() {
if (videoSwitch.isSelected()){
videoSwitch.setSelected(false);
}else {
videoSwitch.setSelected(true);
mapAndLiveVideoView.changeToSecondView();
}
mapAndLiveVideoView.setItemChangeListener(videoSwitch.isSelected()? this:null);
mapAndLiveVideoView.setVisibility(videoSwitch.isSelected()? View.VISIBLE : View.GONE);
indicatorView.setVisibility(videoSwitch.isSelected() ? View.VISIBLE : View.GONE);
mMapDirectionView.setVisibility(videoSwitch.isSelected() ? View.GONE : View.VISIBLE);
mapIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_unselected_bg));
liveIndicator.setBackground(getContext().getDrawable(R.drawable.indicator_selected_bg));
}
@Override
protected void goneLiveShadow() {
videoSwitch.setVisibility(View.GONE);
// driverMonitorView.setVisibility(View.GONE);
indicatorView.setVisibility(View.GONE);
}
@Override
protected void visibleLiveShadow() {
videoSwitch.setVisibility(View.VISIBLE);
}
@Override
protected void initViews(Bundle savedInstanceState) {
super.initViews(savedInstanceState);
mMapDirectionView = findViewById(R.id.bus_p_line_map_view);
mMapDirectionView = findViewById(R.id.busPLineMapView);
mMapDirectionView.onCreateView(savedInstanceState);
}
@Override
@@ -244,14 +315,6 @@ public class BusPassengerRouteFragment extends
}
}
// public void updatePlateNum(String plateNum){
// if ("".equals(plateNum) || null == plateNum) {
// mCarPlateNum.setText("-- --");
// }else {
// mCarPlateNum.setText((plateNum));
// }
// }
public void updateLineInfo(String lineName, String lineDurTime) {
mLineName.setText(lineName);
// mOperationTime.setText(lineDurTime);
@@ -301,27 +364,6 @@ public class BusPassengerRouteFragment extends
}
}
// @Override
// public void onCameraChange(float bearing) {
//// startIvCompass(bearing);
// }
// /**
// * 设置指南针旋转
// *
// * @param bearing
// */
// private void startIvCompass(float bearing) {
// bearing = 360 - bearing;
// CallerLogger.INSTANCE.d(M_BUS_P + TAG, "startIvCompass: " + bearing);
// rotateAnimation = new RotateAnimation(lastBearing, bearing, Animation.RELATIVE_TO_SELF
// , 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
// rotateAnimation.setFillAfter(true);
//
// mMapArrowIcon.startAnimation(rotateAnimation);
// lastBearing = bearing;
// }
public void onCarLocationChanged(MogoLocation location) {
updateSpeedView((float) location.getGnssSpeed());
}

139
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt Normal file
View File

@@ -0,0 +1,139 @@
package com.mogo.och.bus.passenger.ui
import android.app.Activity
import android.content.Context
import android.util.AttributeSet
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import androidx.viewpager.widget.PagerAdapter
import androidx.viewpager.widget.ViewPager
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.och.bus.passenger.R
import com.mogo.och.bus.passenger.ui.MapAndLiveVideoView.Companion.TAG
import java.lang.Exception
/**
* @author: wangmingjun
* @date: 2023/5/9
*/
class MapAndLiveVideoView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
) : RelativeLayout(context, attrs), ViewPager.OnPageChangeListener {
private var viewPager: ViewPager? = null
private var pagerAdapter: AdvancePagerAdapter? = null
private var changeItemListener: ChangeItemListener? = null
companion object {
const val TAG = "MapAndLiveVideoView"
}
init {
initView()
}
private fun initView() {
viewPager = ViewPager(context)
pagerAdapter = AdvancePagerAdapter()
viewPager?.adapter = pagerAdapter
addView(viewPager, LayoutParams(-1, -1))
viewPager?.addOnPageChangeListener(this)
}
fun setData(list: MutableList<View>){
pagerAdapter?.setData(list)
pagerAdapter?.notifyDataSetChanged()
}
fun setItemChangeListener(listener : ChangeItemListener?){
changeItemListener = listener
}
fun changeToSecondView(){
viewPager?.currentItem = 1
}
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
Logger.d(TAG, "onPageScrolled--position = $position")
}
override fun onPageSelected(position: Int) {
Logger.d(TAG, "onPageSelected--position = $position")
}
var startPosition = 1
override fun onPageScrollStateChanged(state: Int) {
Logger.d(TAG, "onPageScrollStateChanged--state = $state")
viewPager?.let {
val position = it.currentItem
if (state == 0) { //静止
if (startPosition == position){
if (position==0){
it.currentItem = 1
}else{
it.currentItem = 0
}
}else{
changeItemListener?.changeToItem(it.currentItem)
}
}else if (state == 1){ // 开始滑动
startPosition = it.currentItem
}else{
}
}
}
interface ChangeItemListener{
fun changeToItem(position: Int)
}
}
class AdvancePagerAdapter : PagerAdapter(),
ViewPager.OnPageChangeListener {
private var views: List<View>? = null
fun setData(views: List<View>?){
this.views = views
}
override fun instantiateItem(container: View, position: Int): Any {
Logger.d(TAG, "instantiateItem--position = $position")
return try {
val currentItem = position % views!!.size
(container as ViewPager).addView(views!![currentItem])
views!![currentItem]
}catch (e: Exception){
container
}
}
override fun getCount(): Int {
return if (views == null){
0
}else{
views!!.size
}
}
override fun isViewFromObject(arg0: View, arg1: Any): Boolean {
return arg0 === arg1
}
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
// Logger.d(TAG, "onPageScrolled--position = $position")
}
override fun onPageSelected(position: Int) {
// Logger.d(TAG, "onPageSelected--position = $position")
}
override fun onPageScrollStateChanged(state: Int) {
// Logger.d(TAG, "onPageScrollStateChanged--state = $state")
}
}

BIN
OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 287 KiB

5
OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:startColor="@android:color/white"
<gradient android:startColor="#FFFFFF"
android:centerColor="#00FFFFFF"
android:endColor="#00FFFFFF"
android:angle="315"
android:angle="0"
/>
</shape>

7
OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_select.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1466FB"/>
<corners android:radius="2dp"/>
</shape>

7
OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_unselect.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#A9B6CA"/>
<corners android:radius="2dp"/>
</shape>

9
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
View File

@@ -33,13 +33,12 @@
<com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
android:id="@+id/ivMoGoLogo"
android:layout_width="@dimen/dp_121"
android:layout_height="@dimen/dp_121"
android:layout_marginRight="@dimen/dp_751"
android:layout_marginBottom="@dimen/dp_59"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:background="@drawable/roma_bus_p_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintLeft_toRightOf="@+id/video_switch_iv"
app:roma_close="@drawable/roma_bus_p_bg_selector"
app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />

16
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="@dimen/bus_p_route_line_map_view_height"
android:background="@drawable/live_view_loading_bg">
<com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView
android:id="@+id/buDriverMonitorView"
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="@dimen/bus_p_route_line_map_view_height"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

64
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
View File

@@ -6,22 +6,6 @@
android:padding="@dimen/dp_40"
android:background="@android:color/transparent">
<!-- <com.mogo.och.common.module.wigets.OCHBorderShadowLayout-->
<!-- android:id="@+id/edge_view"-->
<!-- android:layout_width="725dp"-->
<!-- android:layout_height="match_parent"-->
<!-- app:shadowColor="@color/bus_p_route_view_left_edge_shadow"-->
<!-- app:xOffset="0dp"-->
<!-- app:yOffset="0dp"-->
<!-- app:bgColor="@android:color/transparent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="@dimen/bus_p_route_info_panel_width"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@android:color/transparent" />-->
<!-- </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="1120dp"
@@ -221,7 +205,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/bus_p_line_map_view"
app:layout_constraintBottom_toTopOf="@+id/busPLineMapView"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/split_line_iv" />
@@ -249,22 +233,52 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.mogo.och.bus.passenger.ui.BusPassengerMapDirectionView
android:id="@+id/bus_p_line_map_view"
android:id="@+id/busPLineMapView"
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="@dimen/bus_p_route_line_map_view_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<!-- <ImageView-->
<!-- android:id="@+id/bus_p_arrow_nor"-->
<!-- android:layout_width="@dimen/dp_108"-->
<!-- android:layout_height="@dimen/dp_107"-->
<!-- android:layout_marginRight="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_370"-->
<!-- android:src="@drawable/bus_p_arrow_nor"-->
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView-->
<!-- android:id="@+id/driverMonitorView"-->
<!-- android:layout_width="@dimen/bus_p_route_info_panel_width"-->
<!-- android:layout_height="@dimen/bus_p_route_line_map_view_height"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent" />-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/busIndicatorView"
android:layout_width="@dimen/dp_40"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent">
<View
android:id="@+id/firstIndicator"
android:layout_width="@dimen/dp_16"
android:layout_height="6dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:background="@drawable/indicator_select"/>
<View
android:id="@+id/secondIndicator"
android:layout_width="@dimen/dp_16"
android:layout_height="6dp"
app:layout_constraintTop_toTopOf="@+id/firstIndicator"
app:layout_constraintBottom_toBottomOf="@+id/firstIndicator"
app:layout_constraintRight_toRightOf="parent"
android:background="@drawable/indicator_unselect"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.mogo.och.bus.passenger.ui.MapAndLiveVideoView
android:id="@+id/mapAndLiveVideoView"
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="@dimen/bus_p_route_line_map_view_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
View File

@@ -305,22 +305,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"/>
<RelativeLayout
android:id="@+id/module_mogo_och_ai_collet_rl"
android:layout_width="@dimen/dp_172"
android:layout_height="@dimen/dp_172"
android:background="@drawable/bus_operation_status_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl">
<ImageView
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:src="@drawable/icon_ai_collect" />
</RelativeLayout>
<com.mogo.och.bus.view.SlidePanelView
android:id="@+id/module_mogo_och_slide_panel"
android:layout_width="wrap_content"

BIN
OCH/mogo-och-common-module/src/main/res/drawable-nodpi/count_down_rotate_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

8
OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
View File

@@ -10,8 +10,8 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/count_down_rotate_iv"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_55"
android:layout_width="@dimen/dp_65"
android:layout_height="@dimen/dp_65"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_10"
@@ -20,8 +20,8 @@
<TextView
android:id="@+id/sec_count_down"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_55"
android:layout_width="@dimen/dp_65"
android:layout_height="@dimen/dp_65"
android:background="@drawable/count_down_bg"
android:gravity="center"
app:layout_constraintLeft_toLeftOf="parent"

4
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
View File

@@ -372,6 +372,10 @@ public class BusPassengerModel {
}
private final IReceivedMsgListener mReceivedMsgListener = new IReceivedMsgListener() {
@Override
public void onReceivedServerSn(@Nullable String sn) {
}
@Override
public void onReceivedMsg(int type, @NonNull byte[] byteArray) {
if (OchCommonConst.BUSINESS_STRING == type) {

58
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
View File

@@ -39,22 +39,6 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
private MapBizView mapBizView;
private FrameLayout flContainer;
private ContentLoadingProgressBar mProgressBar;
private View mLiveBtn;
private View mLiveShadow;
private DriverMonitorView driverMonitorView;
// 记录司机端是否打开了显示开关,
// 开关开启时，有视频流的车辆持续常驻展示视频流，无视频流的车辆不展示（无占位）；
// 开关关闭时，无论是否有视频流，均不展示（无占位）；开关默认关闭
private boolean driverToggle = false;
/**
* 改变自动驾驶状态
*
* @param status 2 - running 1 - enable 2 - disable
*/
private int mPrevAPStatus = -1;
@Override
protected int getLayoutId() {
@@ -69,48 +53,6 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
@Override
protected void initViews() {
mapBizView = findViewById(R.id.mapBizView);
mProgressBar = findViewById(R.id.bus_progress_bar);
mLiveShadow = findViewById(R.id.liveShadow);
driverMonitorView = findViewById(R.id.driverMonitorView);
mLiveBtn = findViewById(R.id.liveBtn);
driverMonitorView.setLiveListener(
() -> {
mLiveShadow.setVisibility(View.GONE);
}
);
mLiveBtn.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
mLiveShadow.setVisibility(mLiveShadow.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
return true;
}
});
CallerTelematicListenerManager.INSTANCE.addListener(TAG, new IReceivedMsgListener() {
@Override
public void onReceivedServerSn(@Nullable String sn) {
}
@Override
public void onReceivedMsg(int type, @NonNull byte[] byteArray) {
if (type == TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR) {
switch (new String(byteArray)) {
// 乘客端开启漫游
case "0": {
mLiveShadow.setVisibility(View.GONE);
break;
}
// 乘客端关闭漫游
case "1": {
mLiveShadow.setVisibility(View.VISIBLE);
break;
}
}
}
}
});
showRouteFragment();

BIN
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 838 B

22
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
View File

@@ -54,17 +54,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
android:id="@+id/ivMoGoLogo"
android:layout_width="@dimen/dp_121"
android:layout_height="@dimen/dp_121"
android:layout_marginRight="@dimen/dp_751"
android:layout_marginBottom="@dimen/dp_59"
android:background="@drawable/roma_bus_p_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:roma_close="@drawable/roma_bus_p_bg_selector"
app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView-->
<!-- android:id="@+id/ivMoGoLogo"-->
<!-- android:layout_width="@dimen/dp_121"-->
<!-- android:layout_height="@dimen/dp_121"-->
<!-- android:layout_marginRight="@dimen/dp_751"-->
<!-- android:layout_marginBottom="@dimen/dp_59"-->
<!-- android:background="@drawable/roma_bus_p_bg_selector"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:roma_close="@drawable/roma_bus_p_bg_selector"-->
<!-- app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />-->
<com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView

2
app/config/urlConfig.json
View File

@@ -78,7 +78,7 @@
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&type=charter&sn=%1$s",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"chart_socket_url":""
},
"online": {

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

@@ -138,7 +138,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
clickListener?.showBadCaseManagerView()
}
//BadCase上报
CallerDevaToolsManager.initBadCase(badCaseLayout)
CallerDevaToolsManager.initAiCollect(badCaseLayout)
ivDebugPanel.setOnClickListener {
clickListener?.showDebugPanelView()
}

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

@@ -95,6 +95,12 @@ class DriverMonitorView :
sopShowDriverMap["20211112X2RI32A"] = "F803EB2046PZD00274"//京A40776D
sopShowDriverMap["202204085X310A1"] = "F803EB2046PZD00263"//湘D09005D
Logger.d(TAG, "getServerToken = ${CallerTelematicManager.getServerToken()}")
liveListener?.showOrHideLiveBtn(
sopShowDriverMap.containsKey(CallerTelematicManager.getServerToken())
)
// TODO SOP演示需求，只有乘客屏幕才会触发这个逻辑 END
// 点击重新连接直播
ivNormal.setOnClickListener {
@@ -207,6 +213,7 @@ class DriverMonitorView :
interface LiveListener {
fun onPlayError()
fun showOrHideLiveBtn(isShow: Boolean)
}
}

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

@@ -4,19 +4,16 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.data.multidisplay.TelematicConstant
import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
import com.mogo.eagle.core.function.hmi.R
class RomaPassengerView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), IReceivedMsgListener, IMoGoRomaListener {
) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoRomaListener {
companion object {
private const val TAG = "RomaPassengerView"
@@ -44,35 +41,15 @@ class RomaPassengerView @JvmOverloads constructor(
}
click = false
romaMode = !romaMode
romaTrigger(romaMode) { mode ->
click = true
romaMode = mode
}
romaTrigger(romaMode)
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerTelematicListenerManager.addListener(TAG, this)
CallerMapRomaListener.addListener(TAG, this)
}
override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
when (type) {
TelematicConstant.OPEN_ROMA_STATUS -> {
when (String(byteArray)) {
"0" -> {
romaStatus(true)
}
"1" -> {
romaStatus(false)
}
}
}
}
}
override fun romaStatus(status: Boolean) {
click = true
if (status) {
@@ -90,7 +67,6 @@ class RomaPassengerView @JvmOverloads constructor(
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerTelematicListenerManager.removeListener(TAG)
CallerMapRomaListener.removeListener(TAG)
}

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

@@ -4,10 +4,9 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.data.multidisplay.TelematicConstant
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
import com.mogo.eagle.core.function.hmi.R
import kotlinx.android.synthetic.main.view_roma_bg.view.*
@@ -15,7 +14,7 @@ class RomaView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr), IReceivedMsgListener {
) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoRomaListener {
companion object{
private const val TAG = "RomaView"
@@ -25,7 +24,7 @@ class RomaView @JvmOverloads constructor(
private var romaMode = false
@Volatile
private var click = false
private var click = true
init {
LayoutInflater.from(context).inflate(R.layout.view_roma_bg, this, true)
@@ -35,51 +34,33 @@ class RomaView @JvmOverloads constructor(
}
click = false
romaMode = !romaMode
// 司机屏发送事件给乘客屏
if (romaMode) {
CallerTelematicManager.sendMsgToAllClients(
TelematicConstant.OPEN_ROMA_STATUS,
"0".toByteArray()
)
} else {
CallerTelematicManager.sendMsgToAllClients(
TelematicConstant.OPEN_ROMA_STATUS,
"1".toByteArray()
)
}
//司机屏不控制乘客屏漫游，独自漫游
romaTrigger(romaMode)
}
}
override fun romaStatus(status: Boolean) {
click = true
if (status) {
romaMode = true
ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
} else {
romaMode = false
ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerTelematicListenerManager.addListener(TAG,this)
}
override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
click = true
when(type){
TelematicConstant.OPEN_ROMA_STATUS -> {
when (String(byteArray)) {
// 乘客端开启漫游
"3" -> {
romaMode = true
ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
}
// 乘客端关闭漫游
"4" -> {
romaMode = false
ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
}
}
}
}
CallerMapRomaListener.addListener(TAG, this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerTelematicListenerManager.removeListener(TAG)
CallerMapRomaListener.removeListener(TAG)
}
}

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt
View File

@@ -26,8 +26,8 @@ class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma {
aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp())
}
override fun trigger(romaStatus: Boolean,connectError:((Boolean) -> Unit)?) {
aiCloudIdentifyDataManager.trigger(romaStatus,connectError)
override fun trigger(romaStatus: Boolean,requestSuccess:((Boolean) -> Unit)?) {
aiCloudIdentifyDataManager.trigger(romaStatus,requestSuccess)
}
override fun onDestroy() {

96
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
View File

@@ -9,7 +9,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.data.multidisplay.TelematicConstant
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
import com.mogo.eagle.core.function.business.ai.net.AiCloudIdentifyNetWorkModel.Companion.aiCloudIdentifyNetWorkModel
import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
@@ -18,11 +17,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListener
import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.updateLongSightLevel
import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer
import com.mogo.eagle.core.function.utils.MapBizTrace
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.map.MogoMapUIController
import com.mogo.map.listener.IMogoMapListener
@@ -34,7 +31,7 @@ import mogo.telematics.pad.MessagePad
import mogo.yycp.api.proto.SocketDownData
import java.util.concurrent.atomic.AtomicBoolean
class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener,
class AiCloudIdentifyDataManager : IMogoMapListener,
IMoGoPlanningRottingListener, IMoGoAutopilotStatusListener {
companion object {
@@ -53,56 +50,45 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener,
private var serverSn = ""
fun initServer(mContext: Context) {
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
MogoMapListenerHandler.mogoMapListenerHandler.registerHostMapListener(TAG, this)
CallerTelematicListenerManager.addListener(TAG, this)
CallerAutoPilotStatusListenerManager.addListener(TAG, this)
CallerPlanningRottingListenerManager.addListener(TAG,this)
CallerAutoPilotControlManager.getGlobalPath()
MogoAiCloudSocketManager.getInstance(mContext)
.registerOnMessageListener(
0x040003, //低频数据
object : IMogoOnMessageListener<SocketDownData.SocketDownDataProto> {
override fun target(): Class<SocketDownData.SocketDownDataProto> {
return SocketDownData.SocketDownDataProto::class.java
}
MogoMapListenerHandler.mogoMapListenerHandler.registerHostMapListener(TAG, this)
CallerAutoPilotStatusListenerManager.addListener(TAG, this)
CallerPlanningRottingListenerManager.addListener(TAG,this)
CallerAutoPilotControlManager.getGlobalPath()
MogoAiCloudSocketManager.getInstance(mContext)
.registerOnMessageListener(
0x040003, //低频数据
object : IMogoOnMessageListener<SocketDownData.SocketDownDataProto> {
override fun target(): Class<SocketDownData.SocketDownDataProto> {
return SocketDownData.SocketDownDataProto::class.java
}
@ChainLog(
linkChainLog = ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED,
linkCode = ChainConstant.CHAIN_LINK_ADAS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
paramIndexes = [0],
clientPkFileName = "sn"
)
override fun onMsgReceived(obj: SocketDownData.SocketDownDataProto?) {
obj?.let {
obj.data?.let {
if (showAiCloud.get()) {
if (it.allListList == null || it.allListList.size == 0) {
MapIdentifySubscriber.instance.clearAiCloudRoma()
return
}
MapIdentifySubscriber.instance.renderAiCloudResult(it.allListList)
@ChainLog(
linkChainLog = ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED,
linkCode = ChainConstant.CHAIN_LINK_ADAS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
paramIndexes = [0],
clientPkFileName = "sn"
)
override fun onMsgReceived(obj: SocketDownData.SocketDownDataProto?) {
obj?.let {
obj.data?.let {
if (showAiCloud.get()) {
if (it.allListList == null || it.allListList.size == 0) {
MapIdentifySubscriber.instance.clearAiCloudRoma()
return
}
MapIdentifySubscriber.instance.renderAiCloudResult(it.allListList)
}
}
}
})
}
}
})
}
fun trigger(romaStatus: Boolean,connectError: ((Boolean) -> Unit)?) {
MapBizTrace.log(TAG, "trigger")
if (serverSn.isEmpty()) {
serverSn = CallerTelematicManager.getServerToken()
if (serverSn.isEmpty()) {
ToastUtils.showLong("未获取到司机屏设备信息")
connectError?.invoke(!romaStatus)
return
}
}
// 乘客屏单独控制漫游
// 乘客司机屏屏各自单独控制漫游
if (romaStatus) {
// 开启roma，当前非漫游，开启
openRoma()
@@ -111,23 +97,6 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener,
}
}
// 乘客屏接收开启/关闭 roma
override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
MapBizTrace.log(TAG, "onReceivedMsg type : $type")
when (type) {
TelematicConstant.OPEN_ROMA_STATUS -> {
when (String(byteArray)) {
"0" -> {
openRoma()
}
"1" -> {
closeRoma()
}
}
}
}
}
private fun openRoma() {
if (!MogoMapUIController.getInstance().currentMapVisualAngle.isRoma) {
updateLongSightLevel(true)
@@ -166,10 +135,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener,
// 请求地图开始漫游
MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle)
CallerMapRomaListener.invokeMapRoma(true)
sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "3".toByteArray())
} else {
CallerMapRomaListener.invokeMapRoma(false)
sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "4".toByteArray())
}
}, {
MapBizTrace.log(
@@ -178,7 +145,6 @@ class AiCloudIdentifyDataManager : IMogoMapListener, IReceivedMsgListener,
)
updateLongSightLevel(false)
CallerMapRomaListener.invokeMapRoma(false)
sendMsgToServer(TelematicConstant.OPEN_ROMA_STATUS, "4".toByteArray())
if(DebugConfig.isDebug()){
ToastUtils.showShort("漫游请求异常，msg:$it")
}

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/roma/IMogoRoma.kt
View File

@@ -8,6 +8,6 @@ interface IMogoRoma : IProvider {
* 触发开启/关闭漫游
* @param romaStatus 漫游状态
*/
fun trigger(romaStatus:Boolean,connectError:((Boolean) -> Unit)? = null)
fun trigger(romaStatus:Boolean,requestSuccess:((Boolean) -> Unit)? = null)
}

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

@@ -10,8 +10,8 @@ object CallerMapIdentifyManager {
get() = ARouter.getInstance().build( MogoServicePaths.PATH_MAP_BIZ)
.navigation() as IMogoRoma
fun romaTrigger(romaStatus:Boolean, connectError:((Boolean) -> Unit)? = null){
romaApi.trigger(romaStatus, connectError)
fun romaTrigger(romaStatus:Boolean, requestSuccess:((Boolean) -> Unit)? = null){
romaApi.trigger(romaStatus, requestSuccess)
}
}