Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0

# Conflicts: # OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt # OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt # OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt # OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt # OCH/mogo-och-common-module/build.gradle # OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java # app/config/tempConfig.json # app/config/urlConfig.json # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt # gradle.properties
2023-04-14 10:40:00 +08:00
parent dbb5707239 81e778aa84
commit 67e5531d80
5 changed files with 55 additions and 21 deletions
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -1,10 +1,10 @@
 package com.mogo.och.bus.fragment;

 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
-
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

@@ -14,7 +14,9 @@ import androidx.constraintlayout.widget.Group;
 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -37,6 +39,8 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst;
 import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.utils.BlinkAnimationUtil;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
+import com.mogo.och.common.module.utils.QRUtilsKt;
+import com.mogo.och.common.module.wigets.BindQRCodeDialog;
 import com.mogo.och.common.module.wigets.MarqueeTextView;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;

@@ -46,6 +50,8 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.List;
 import java.util.Objects;

+import me.jessyan.autosize.utils.AutoSizeUtils;
+

 /**
 * 网约车小巴界面
@@ -125,6 +131,22 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
        if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
            CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
            mPresenter.logout();
+        }else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码
+            CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode");
+            String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(),
+                    MoGoAiCloudClientConfig.getInstance().getSn());
+            Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture(
+                    BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo)
+                    ,qrUrl, AutoSizeUtils.dp2px(getContext(),340f),
+                    AutoSizeUtils.dp2px(getContext(),340f),true);
+            if (bmQr != null){
+                BindQRCodeDialog.Builder builder = new BindQRCodeDialog.Builder();
+                builder.title(getString(R.string.bind_driver_qr_title))
+                        .cancelStr(getString(R.string.qr_cancel))
+                        .qrBm(bmQr).build(getContext()).show();
+            }else {
+                CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null ");
+            }
        }
    }

@@ -360,16 +382,16 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
        }else {
            firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
            thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
-             if (isArrived){ //到终点
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(0);
-                 thirdStationItem.setStationPointBg(1);
+            if (isArrived){ //到终点
+                firstStationItem.setStationPointBg(0);
+                firstStationItem.setStationArrowBg(0);
+                thirdStationItem.setStationPointBg(1);

-             }else { //到终点途中
-                 firstStationItem.setStationPointBg(0);
-                 firstStationItem.setStationArrowBg(1);
-                 thirdStationItem.setStationPointBg(1);
-             }
+            }else { //到终点途中
+                firstStationItem.setStationPointBg(0);
+                firstStationItem.setStationArrowBg(1);
+                thirdStationItem.setStationPointBg(1);
+            }
        }
    }

--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -852,18 +852,19 @@ object CharterPassengerModel {
    @Synchronized
    fun arriveDest() {
        orderInfo?.lineId?.let {
-            if(orderInfo!!.arriveStatus==OrderInfoResponse.ARRIVING) {
-                if (broadcastList.get("${it}$endKey")==null||broadcastList.get("${it}$endKey")==false) {
+            orderInfo?.siteId?.let { siteId ->
+                if (orderInfo!!.arriveStatus == OrderInfoResponse.ARRIVING) {
+                if (broadcastList.get("${siteId}$endKey") == null || broadcastList.get("${siteId}$endKey") == false) {
                    BusPassengerServiceManager.arriveDest(
                        mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
                            override fun onSuccess(data: BaseData?) {
                                if (null != data && 0 == data.code) {
                                    VoiceManager.arrivedStation(
                                        orderInfo!!.siteName!!,
-                                        orderInfo!!.siteNameKr!!,
+                                        orderInfo!!.siteNameKr ?: "",
                                        VoiceFocusManager.getVoiceCmdCallBack()
                                    )
-                                    broadcastList["${it}$endKey"] = true
+                                    broadcastList["${siteId}$endKey"] = true
                                    // 到站结束自驾
                                    CallerAutoPilotControlManager.cancelAutoPilot()
                                    // 结束路距计算
@@ -878,16 +879,18 @@ object CharterPassengerModel {
                            }
                        })
                }
+                }
            }
        }
    }

+    fun cleanbroadcastListInfo(){
+        broadcastList.clear()
+    }
+
    fun leaveStation() {
        orderInfo?.siteName?.let {cn->
-            orderInfo?.siteNameKr?.let {kr->
-                VoiceManager.leaveStation(cn,kr, VoiceFocusManager.getVoiceCmdCallBack())
-            }
-
+            VoiceManager.leaveStation(cn,orderInfo?.siteNameKr?:"", VoiceFocusManager.getVoiceCmdCallBack())
        }
    }

--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -441,6 +441,7 @@ class LineSiteView @JvmOverloads constructor(
                                }
                                go2StartCar()
                                CharterPassengerModel.queryOrder()
+                                CharterPassengerModel.cleanbroadcastListInfo()
                            } else {
                                tempCheckLineIsSubmit = true
                                ToastUtils.showShort("司机端拒绝请重新选择")
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
@@ -766,7 +766,8 @@ public class OrderModel {
 //                            queryBusRoutes();
 //                            isArrivedStation = true;
 //                            isGoingToNextStation = false;
-//                            arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation);
+//                            arriveStationSuccess(arrivedStationIndex, departureStopName,
+//                                    arriveStation,arriveStationKr);
 //                        }
                        //5s轮询核销乘客
 //                        startOrStopQueryPassengerWriteOff(true);
@@ -899,7 +900,8 @@ public class OrderModel {
 //                        //需要更改当前站和下一站的状态 然后渲染
 //                        //startOrStopQueryPassengerWriteOff(false);
 //                        queryBusRoutes();
-//                        leaveStationSuccess(backgroundCurrentStationIndex, currentStationName, finalNextStationName);
+//                        leaveStationSuccess(backgroundCurrentStationIndex, currentStationName,
+//                                finalNextStationName,finalNextStationNameKr);
                    }


--- a/app/config/tempConfig.json
+++ b/app/config/tempConfig.json
@@ -159,6 +159,12 @@
          "type": 1,
          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
          "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
+          "title": "2"
        }
      ]
    },