From 918352a0b46bb2ecad89025da08103070ba84d2a Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 7 Apr 2023 14:38:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8C=85=E8=BD=A6]=20=E5=8C=85=E8=BD=A6?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=B7=AF=E7=BA=BFdialog=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/magic/mogo/och/charter/model/DriverM1Model.kt      | 2 +-
 .../src/main/res/layout/dialog_bus_commit.xml                   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index a5b304a113..329eb1953f 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -258,7 +258,7 @@ class DriverM1Model {
                 val list = obj.screenList
                 d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + GsonUtils.toJson(list))
                 if (list != null && list.contains(1)){ // 司机端
-                    pushOperationalToMsgBox(obj.pushTimeStamp, obj.context)
+                    pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), obj.context)
                 }
                 if (list != null && list.contains(2)){ //发送乘客屏
                     sendMsgToClient(DPCommonOperationMsg(obj.context))
diff --git a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
index 03cf6737e0..6eb23e17ce 100644
--- a/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
+++ b/OCH/mogo-och-common-module/src/main/res/layout/dialog_bus_commit.xml
@@ -22,6 +22,8 @@
         android:id="@+id/common_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/dp_40"
+        android:paddingRight="@dimen/dp_40"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/common_title"