From 363a7da7c609491d897aec35664e41a0290562cf Mon Sep 17 00:00:00 2001
From: bxb <baixiaobing@zhidaoauto.com>
Date: Thu, 19 Jan 2023 15:11:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E5=8F=B3=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92=E4=BA=BA=E5=B7=A5=E9=A9=BE=E9=A9=B6=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=B8=83=E5=B1=80=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/mogo-och-sweeper/build.gradle             |   2 +-
 .../fragment/BaseSweeperTabFragment.java      |  52 ++++-
 .../fragment/BaseSweeperUIFragment.java       |  50 ++++
 .../fragment/SweeperAmapNaviFragment.java     | 217 ++++++++++++++++++
 .../sweeper_close_navi_icon.png               | Bin 0 -> 2198 bytes
 .../drawable-xhdpi/sweeper_navi_refresh.png   | Bin 0 -> 3201 bytes
 .../res/layout/sweeper_amap_navi_view.xml     |  16 ++
 .../main/res/layout/sweeper_base_fragment.xml |  28 +++
 8 files changed, 360 insertions(+), 5 deletions(-)
 create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
 create mode 100644 OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png
 create mode 100644 OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml

diff --git a/OCH/mogo-och-sweeper/build.gradle b/OCH/mogo-och-sweeper/build.gradle
index faa8d4934e..7572168325 100644
--- a/OCH/mogo-och-sweeper/build.gradle
+++ b/OCH/mogo-och-sweeper/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
-
+    implementation rootProject.ext.dependencies.androidxcardview
     implementation project(":OCH:mogo-och-common-module")
 
     implementation rootProject.ext.dependencies.androidxrecyclerview
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
index d8663faa7a..d4aa341904 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
@@ -29,6 +30,8 @@ import com.mogo.och.sweeper.view.SweeperTrafficDataView;
 import com.mogo.och.sweeper.view.SweeperWorkModeView;
 
 import androidx.constraintlayout.widget.Group;
+import androidx.fragment.app.FragmentTransaction;
+
 /**
  * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况
  * <p>
@@ -52,7 +55,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     private FrameLayout flTaskListPanelContainer;
     private Group groupTestPanel;
     //清扫车车辆基本信息 速度 档位 转向灯 红绿灯等
-    private SweeperTrafficDataView  mTrafficDataView;
+    private SweeperTrafficDataView mTrafficDataView;
     //清扫车模式展示
     private SweeperWorkModeView mClWorkMode;
     //清扫车模式选择面板
@@ -61,6 +64,12 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     private SweeperTaskMenuView mTaskMenu;
     //当前任务面板
     private SweeperCurrentTaskInfoView mCurrentTaskView;
+    //人工驾驶地图Fragment
+    private SweeperAmapNaviFragment mOchAmapNaviFragment;
+    //关闭人工驾驶小地图
+    private ImageView mCloseNavIcon;
+    //人工驾驶地图View
+    private FrameLayout mFlNaviPanelContainer;
 
     public static final String TYPE_ENTRANCE = "entrance";
     public boolean isAnimateRunning = false;
@@ -87,7 +96,10 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         mSettingBtn = findViewById(R.id.module_mogo_och_setting_layout);
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl);
         mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl);
+        mCloseNavIcon = findViewById(R.id.sweeper_close_navi_icon);
+        mFlNaviPanelContainer = findViewById(R.id.module_mogo_och_navi_panel_container);
         initListener();
+        hideEagleConfig();
         //设置左下角四个按钮监听事件
         setBottomBtnListener();
         // 模拟 不可自动驾驶，目前场景是刚开机，adas还未和工控机连接
@@ -104,11 +116,12 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         findViewById(R.id.btnAutopilotRunning).setOnClickListener(view ->
                 debugAutoPilotStatus(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)
         );
+        showAmapNaviToStationFragment(true);
     }
 
     private void updateSwitchMapIcon() {
         IMogoMapUIController controller = CallerMapUIServiceManager.INSTANCE.getMapUIController();
-        if (controller!=null){
+        if (controller != null) {
             if (controller.getCurrentMapVisualAngle().isLongSight()) {
                 mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_long);
             } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
@@ -154,9 +167,9 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
      * @return
      */
     public void setTaskListPanelView(boolean isShow) {
-        if (isShow){
+        if (isShow) {
             panelView.setVisibility(View.VISIBLE);
-        }else{
+        } else {
             panelView.setVisibility(View.GONE);
         }
     }
@@ -178,6 +191,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     public SweeperCurrentTaskInfoView getCurrentTaskPanelView() {
         return mCurrentTaskView;
     }
+
     /**
      * 获取菜单view
      *
@@ -186,6 +200,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     public View getTaskMenuView() {
         return mTaskMenu;
     }
+
     /**
      * 清扫车任务列表面板view，在{@link #initViews()}时候添加到container中
      *
@@ -298,4 +313,33 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         }
     }
 
+    /**
+     * 隐藏鹰眼原有控件
+     */
+    private void hideEagleConfig() {
+        //隐藏小地图
+        CallerSmpManager.INSTANCE.hidePanel();
+    }
+
+    /**
+     * 人工驾驶地图导航
+     *
+     * @param isShow
+     */
+    protected void showAmapNaviToStationFragment(boolean isShow) {
+        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        if (isShow) {
+            mOchAmapNaviFragment = SweeperAmapNaviFragment.newInstance();
+            if (mOchAmapNaviFragment.isAdded()) {
+                return;
+            }
+            transaction.add(R.id.module_mogo_och_navi_panel_container, mOchAmapNaviFragment).show(mOchAmapNaviFragment);
+            transaction.commitAllowingStateLoss();
+            mCloseNavIcon.setVisibility(View.VISIBLE);
+            mFlNaviPanelContainer.setVisibility(View.VISIBLE);
+        } else {
+            mCloseNavIcon.setVisibility(View.GONE);
+            mFlNaviPanelContainer.setVisibility(View.GONE);
+        }
+    }
 }
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
new file mode 100644
index 0000000000..3ee40b9134
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperUIFragment.java
@@ -0,0 +1,50 @@
+package com.mogo.och.sweeper.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+/**
+ * @author: wangmingjun
+ * @date: 2021/9/9
+ */
+public abstract class BaseSweeperUIFragment extends Fragment {
+    private View mRootView;
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (mRootView == null) {
+            mRootView = inflater.inflate(getLayoutId(), container, false);
+        } else {
+            ViewGroup viewGroup = (ViewGroup) mRootView.getParent();
+            if (viewGroup != null) {
+                viewGroup.removeView(mRootView);
+            }
+        }
+        initViews(mRootView);
+        initViews(savedInstanceState);
+        return mRootView;
+    }
+    /**
+     * 布局资源
+     *
+     * @return
+     */
+    protected abstract int getLayoutId();
+
+    protected abstract void initViews(View view);
+
+    protected void initViews(Bundle savedInstanceState) {
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mRootView = null;
+    }
+}
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
new file mode 100644
index 0000000000..00b26c29b9
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperAmapNaviFragment.java
@@ -0,0 +1,217 @@
+package com.mogo.och.sweeper.fragment;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.amap.api.navi.AMapNaviViewListener;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.och.common.module.map.AmapNaviToDestinationModel;
+import com.mogo.och.common.module.map.CommonAmapNaviVIew;
+import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
+import com.mogo.och.sweeper.R;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
+
+/**
+ * @author: wangmingjun
+ * @date: 2021/11/30
+ */
+public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AMapNaviViewListener {
+
+    private CommonAmapNaviVIew mAMapNaviView;
+    private ICommonNaviChangedCallback mNaviToStartInfoCallback;
+    public static SweeperAmapNaviFragment newInstance() {
+        
+        Bundle args = new Bundle();
+
+        SweeperAmapNaviFragment fragment = new SweeperAmapNaviFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+    
+    @Override
+    protected int getLayoutId() {
+        return R.layout.sweeper_amap_navi_view;
+    }
+
+    @Override
+    protected void initViews(View view) {
+        mAMapNaviView = view.findViewById(R.id.navi_view);
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        if (mAMapNaviView != null)
+        mAMapNaviView.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mAMapNaviView != null)
+        mAMapNaviView.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mAMapNaviView != null)
+        mAMapNaviView.onPause();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        AmapNaviToDestinationModel.getInstance(getContext()).setVoiceIsMute(false);
+        if (mAMapNaviView != null){
+            mAMapNaviView.onDestroy();
+        }
+
+        if (mNaviToStartInfoCallback != null){
+            mNaviToStartInfoCallback = null;
+        }
+    }
+
+    @Override
+    public void onNaviSetting() {
+        //底部导航设置点击回调
+    }
+
+    @Override
+    public void onNaviCancel() {
+    }
+
+    @Override
+    public void onNaviMapMode(int naviMode) {
+        //导航态车头模式，0:车头朝上状态；1:正北朝上模式。
+    }
+
+    @Override
+    public void onNaviTurnClick() {
+        //转弯view的点击回调
+    }
+
+    @Override
+    public void onNextRoadClick() {
+        //下一个道路View点击回调
+    }
+
+
+    @Override
+    public void onScanViewButtonClick() {
+        //全览按钮点击回调
+    }
+
+
+    @Override
+    public void onLockMap(boolean isLock) {
+        //锁地图状态发生变化时回调
+    }
+
+    @Override
+    public void onNaviViewLoaded() {
+        CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功");
+        CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑");
+    }
+
+    @Override
+    public void onMapTypeChanged(int i) {
+
+    }
+
+    @Override
+    public void onNaviViewShowMode(int i) {
+
+    }
+
+    @Override
+    public boolean onNaviBackClick() {
+        return false;
+    }
+
+    /**
+     * 车道信息说明：
+     * <p>
+     * 0xFF, 无对应车道
+     * 0,    直行
+     * 1,    左转
+     * 2,    直行+左转
+     * 3,    右转
+     * 4,    直行+右转
+     * 5,    左掉头
+     * 6,    左转+右转
+     * 7,    直行+左转+右转
+     * 8,    右掉头
+     * 9,    直行+左掉头
+     * 10,   直行+右掉头
+     * 11,   左转+左掉头
+     * 12,   右转+右掉头
+     * 13,   直行+扩展
+     * 14,   左转+左掉头+扩展
+     * 15,   保留
+     * 16,   直行+左转+左掉头
+     * 17,   右转+左掉头
+     * 18,   左转+右转+左掉头
+     * 19,   直行+右转+左掉头
+     * 20,   左转+右掉头
+     * 21,   公交车道
+     * 22,   空车道
+     * 23    可变车道
+     */
+
+    String[] array = {
+            "直行车道"
+            , "左转车道"
+            , "左转或直行车道"
+            , "右转车道"
+            , "右转或直行车道"
+            , "左掉头车道"
+            , "左转或者右转车道"
+            , " 左转或右转或直行车道"
+            , "右转掉头车道"
+            , "直行或左转掉头车道"
+            , "直行或右转掉头车道"
+            , "左转或左掉头车道"
+            , "右转或右掉头车道"
+            , "直行并且车道扩展"
+            , "左转+左掉头+扩展"
+            , "不可以选择该车道"
+            , "直行+左转+左掉头车道"
+            , "右转+左掉头"
+            , "左转+右转+左掉头"
+            , "直行+右转+左掉头"
+            , "左转+右掉头"
+            , "公交车道"
+            , "空车道"
+            , "可变车道"
+    };
+
+    String[] actions = {
+            "直行"
+            , "左转"
+            , "左转或直行"
+            , "右转"
+            , "右转或这行"
+            , "左掉头"
+            , "左转或者右转"
+            , " 左转或右转或直行"
+            , "右转掉头"
+            , "直行或左转掉头"
+            , "直行或右转掉头"
+            , "左转或左掉头"
+            , "右转或右掉头"
+            , "直行并且车道扩展"
+            , "左转+左掉头+扩展"
+            , "不可以选择"
+            , "直行+左转+左掉头"
+            , "右转+左掉头"
+            , "左转+右转+左掉头"
+            , "直行+右转+左掉头"
+            , "左转+右掉头"
+            , "公交车道"
+            , "空车道"
+            , "可变车道"
+    };
+}
diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_close_navi_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..56525e7ed20f87c91a54a9bd690010fc84d290fb
GIT binary patch
literal 2198
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
Y2hbv7*HV9A!~g&Q07*qoM6N<$f}7X-+W-In

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png b/OCH/mogo-och-sweeper/src/main/res/drawable-xhdpi/sweeper_navi_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3c3c32558c55d8c7ecbb9ef0f6fdd8f21669293
GIT binary patch
literal 3201
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml
new file mode 100644
index 0000000000..10174a8e2a
--- /dev/null
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_amap_navi_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardCornerRadius="30dp"
+    app:cardElevation="8dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
+
+    <com.mogo.och.common.module.map.CommonAmapNaviVIew
+        android:id="@+id/navi_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</androidx.cardview.widget.CardView>
diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
index bd02cb7c77..9bc969996f 100644
--- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
@@ -141,6 +141,34 @@
             android:layout_gravity="center"
             android:src="@drawable/ai_collect_selector" />
     </FrameLayout>
+    <!--清扫手动驾驶路线导航-->
+    <FrameLayout
+        android:id="@+id/module_mogo_och_navi_panel_container"
+        android:layout_width="@dimen/dp_600"
+        android:layout_height="@dimen/dp_600"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+    <ImageView
+        android:id="@+id/sweeper_close_navi_icon"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:visibility="gone"
+        android:src="@drawable/sweeper_close_navi_icon"
+        app:layout_constraintTop_toTopOf="@+id/module_mogo_och_navi_panel_container"
+        app:layout_constraintStart_toStartOf="@+id/module_mogo_och_navi_panel_container"
+        android:layout_marginTop="@dimen/dp_26"
+        android:layout_marginStart="@dimen/dp_24"
+        />
+    <ImageView
+        android:id="@+id/sweeper_refresh_navi"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_26"
+        android:layout_marginEnd="@dimen/dp_24"
+        app:layout_constraintTop_toTopOf="@+id/module_mogo_och_navi_panel_container"
+        app:layout_constraintEnd_toEndOf="@+id/module_mogo_och_navi_panel_container"
+        android:src="@drawable/sweeper_navi_refresh"
+        />
     <Button
         android:id="@+id/btnAutopilotDisable"
         android:layout_width="wrap_content"