[3.2.0] bus/shuttle乘客屏状态栏，包车司机端二维码-a环境修改

2023-05-08 17:51:48 +08:00
parent c5e6dae9e8
commit 9bee56d0f4
7 changed files with 75 additions and 13 deletions
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
@@ -76,7 +76,7 @@ public class MogoOCHBusPassenger implements IMogoOCH {
    private void showFragment() {
        FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
        if(mPassengerFragment == null){
-            CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
+            CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备add fragment======");
            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG);
            if (fragmentByTag instanceof BusPassengerRouteFragment){
                mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag;
@@ -89,7 +89,7 @@ public class MogoOCHBusPassenger implements IMogoOCH {
            return;
        }

-        CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
+        CallerLogger.INSTANCE.d(M_BUS_P + TAG, "准备show fragment");
        supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
    }

--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -375,6 +375,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){
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java
@@ -0,0 +1,33 @@
+package com.mogo.och.bus.passenger.provider;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
+import com.mogo.och.bus.passenger.ui.BusPStatusBarView;
+
+/**
+ * @author congtaowang
+ * @since 2020-01-06
+ * <p>
+ * 根据优先级控制显示 window view.
+ */
+@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
+public class BusPStatusViewManager implements IStatusViewLayout {
+
+
+    @NonNull
+    @Override
+    public View getStatusView(Context context) {
+        return new BusPStatusBarView(context);
+    }
+
+    @Override
+    public void init(Context context) {
+
+    }
+}
--- a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -15,7 +15,6 @@ import com.magic.mogo.och.charter.view.SlidePanelView
 import com.mogo.commons.mvp.IView
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.mvp.Presenter
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
@@ -24,7 +23,6 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.initAi
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.initBadCase
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showToolsView
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
-import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.updateLongSightLevel
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView.ClickListener
@@ -111,20 +109,14 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
                if (controller != null) {
                    //切换地图的远近视图
                    if (controller.currentMapVisualAngle.isLongSight) {
-                        updateLongSightLevel(false)
                        Objects.requireNonNull(getMapUIController())
                            ?.setLockMode(true)
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
                        mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
                    } else if (controller.currentMapVisualAngle.isMediumSight) {
-                        updateLongSightLevel(true)
-                        if (FunctionBuildConfig.isRomaMode) {
-                            controller.setRomaMode(1)
-                        } else {
-                            Objects.requireNonNull(getMapUIController())
+                        Objects.requireNonNull(getMapUIController())
                                ?.setLockMode(false)
                            controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
-                        }
                        mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long)
                    } else {
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java
@@ -0,0 +1,33 @@
+package com.mogo.och.bus.passenger.provider;
+
+import android.content.Context;
+import android.view.View;
+
+import com.mogo.och.bus.passenger.ui.BusPStatusBarView;
+import androidx.annotation.NonNull;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
+
+/**
+ * @author congtaowang
+ * @since 2020-01-06
+ * <p>
+ * 根据优先级控制显示 window view.
+ */
+@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
+public class B1StatusViewManager implements IStatusViewLayout {
+
+
+    @NonNull
+    @Override
+    public View getStatusView(Context context) {
+        return new BusPStatusBarView(context);
+    }
+
+    @Override
+    public void init(Context context) {
+
+    }
+}
--- a/app/config/urlConfig.json
+++ b/app/config/urlConfig.json
@@ -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&sn=%1$s",
+      "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&type=charter&sn=%1$s",
      "chart_socket_url":""
    },
    "online": {
--- a/app/script/productFlavors/bus.gradle
+++ b/app/script/productFlavors/bus.gradle
@@ -20,7 +20,7 @@ project.android.productFlavors {
        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""

        // ③是否需要重写状态栏
-        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'

        // ④构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'