解决编译错误

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);
                 }
             };
 

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);
     }

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))

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>

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);
                 }
             };
 

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);}}'
     }
 }