From 1ea0f88c53de4cd78102e34b1e119efcd6e0a45e Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 27 Feb 2023 21:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java | 2 +-
 .../src/shuttle/java/com/mogo/och/bus/model/OrderModel.java  | 4 ++--
 .../com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt  | 5 ++++-
 OCH/mogo-och-charter/src/driverm1/res/values/strings.xml     | 2 +-
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java     | 2 +-
 app/productFlavors/fOchShuttle.gradle                        | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index c137eac508..4222bf781f 100644
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -227,7 +227,7 @@ public class OrderModel {
                     }
                     CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getMessage());
                     OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
-                            obj.getMessage());
+                            obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM);
                 }
             };
 
diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
index 6ce3f741b5..2483dd45a9 100644
--- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java
@@ -228,7 +228,7 @@ public class OrderModel {
                     }
                     CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getMessage());
                     OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
-                            obj.getMessage());
+                            obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM);
                 }
             };
 
@@ -931,7 +931,7 @@ public class OrderModel {
         //展示在运营消息
         OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(
                 DateTimeUtil.getCurrentTimeStamp(),
-                tips);
+                tips,OCHSocketMessageManager.OPERATION_SYSTEM);
         //语音提示
         VoiceNotice.showNotice(tips);
     }
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
index d5f34dbf4f..e7d5d9e53a 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -63,7 +63,10 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
             driverm1_line_name.text = orderStatus.lineName
             driverm1StationName1Tv.text = orderStatus.startSiteName
             driverm1StationName2Tv.text = orderStatus.siteName
-            passenger_phone.text = orderStatus.passengerPhone
+
+            passenger_phone.text = String.format(resources.getString(R.string.passenger_phone)
+                ,orderStatus.passengerPhone)
+
             during_time.text = String.format(resources.getString(R.string.during_time_tv),
                 DateTimeUtil.formatLongToString(orderStatus.startTime,DateTimeUtil.HH_mm)
                         +"—"+DateTimeUtil.formatLongToString(orderStatus.endTime,DateTimeUtil.HH_mm))
diff --git a/OCH/mogo-och-charter/src/driverm1/res/values/strings.xml b/OCH/mogo-och-charter/src/driverm1/res/values/strings.xml
index 173a67f36a..c1d15e20b4 100644
--- a/OCH/mogo-och-charter/src/driverm1/res/values/strings.xml
+++ b/OCH/mogo-och-charter/src/driverm1/res/values/strings.xml
@@ -2,6 +2,6 @@
     <string name="count_down_txt">剩余%1$s分钟</string>
     <string name="during_time_tv">包车时间：%1$s</string>
     <string name="passenger_phone">乘客信息：%1$s</string>
-
+    <string name="last_5_minutes">本次行程剩余5分钟，请知晓并通知乘客合理安排游玩时间</string>
 
 </resources>
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 8fd06b5aa6..4201b9d844 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -254,7 +254,7 @@ public class TaxiModel {
                     }
                     CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = "+obj.getMessage());
                     OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
-                            obj.getMessage());
+                            obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM);
                 }
             };
 
diff --git a/app/productFlavors/fOchShuttle.gradle b/app/productFlavors/fOchShuttle.gradle
index c359ba42a1..b3290c6685 100644
--- a/app/productFlavors/fOchShuttle.gradle
+++ b/app/productFlavors/fOchShuttle.gradle
@@ -48,6 +48,6 @@ project.android.productFlavors {
         buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
 
         //Bus不能启动自驾的档位
-        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR_BUS', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
+        buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}'
     }
 }
\ No newline at end of file