From f5b4110904bf3cb2ef6fc1eb0bf9ca953974cef3 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 7 Mar 2023 10:51:04 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[1.1.2]=20[=E4=B8=8B=E8=BD=BD=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E6=9F=A5=E8=AF=A2=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E3=80=81=E8=A1=A5=E5=81=BF5=E5=88=86=E9=92=9F=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E6=92=AD=E6=8A=A5]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/util/BusTrajectoryManager.java     |  3 ++-
 .../passenger/model/CharterPassengerModel.kt   | 18 ++++++++++++------
 .../manager/CharterTrajectoryManager.kt        |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
index 6e9a4a0613..6cf6eb90c4 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.och.bus.bean.BusRoutesResult;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.model.OrderModel;
+import com.mogo.och.common.module.biz.constant.LoginStatusManager;
 import com.zhidao.socket.utils.LoginStatusUtil;
 
 import java.util.concurrent.TimeUnit;
@@ -50,7 +51,7 @@ public class BusTrajectoryManager {
      */
     public void syncTrajectoryInfo() {
         BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
-        if (LoginStatusUtil.isLogin() && routesResult != null
+        if (LoginStatusManager.isLogin() && routesResult != null
                 && OrderModel.getInstance().getCurrentStationIndex() == 0
                 && !OrderModel.getInstance().isGoingToNextStation()) {
             CallerLogger.INSTANCE.d(M_BUS + TAG, "syncTrajectoryInfo() start.");
diff --git 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
index 5bfaae7f5d..7aa686cb37 100644
--- 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
@@ -103,8 +103,9 @@ object CharterPassengerModel {
      *
      */
     private var broadcastList : MutableMap<String,Boolean> = HashMap()
-
+    // 到站仅一次
     private val endKey = "arrivedLine"
+    private val min5Speak = "min5Speak"
 
     private var countDownTimer:CountDownTimer?=null
 
@@ -508,11 +509,16 @@ object CharterPassengerModel {
                         }
                         countDownTimer = object :CountDownTimer(endlast,1000){
                             override fun onTick(millisUntilFinished: Long) {
-                                if(millisUntilFinished/1000==300L){
-                                    //发送 通知
-                                    OCHSocketMessageManager.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
-                                        AbsMogoApplication.getApp().getString(R.string.m1_end_order_5min),2)
-                                    VoiceManager.surplus5min()
+                                if(millisUntilFinished/1000<=300L){
+                                    orderInfo?.let {
+                                        if (broadcastList.get("${it}$min5Speak")==null||broadcastList.get("${it}$min5Speak")==false) {
+                                            //发送 通知
+                                            OCHSocketMessageManager.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(),
+                                                AbsMogoApplication.getApp().getString(R.string.m1_end_order_5min),2)
+                                            VoiceManager.surplus5min()
+                                            broadcastList["${it}$min5Speak"] = true
+                                        }
+                                    }
                                 }
                                 CallerLogger.d(M_BUS_P+TAG,"倒计时${millisUntilFinished/1000}")
                             }
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
index 241d2edda3..df96f0bc00 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
@@ -8,7 +8,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.GsonUtils
-import com.zhidao.socket.utils.LoginStatusUtil
+import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -34,7 +34,7 @@ object CharterTrajectoryManager {
     fun syncTrajectoryInfo(lineId: Int) {
         mLineId = lineId
         val routesResult = get().getBusRoutesResult()
-        if (LoginStatusUtil.isLogin() && routesResult != null) {
+        if (LoginStatusManager.isLogin()  && routesResult != null) {
             d(SceneConstant.M_CHARTER_D + TAG, "syncTrajectoryInfo() start.")
             startTrajReqLoop()
         } else {