diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
index 3a99d5d57e..b2b722d02a 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
@@ -15,6 +15,14 @@ public class BusRoutesResult {
     private String description;
     private int status;
 
+    //线路轨迹相关字段
+    public String csvFileUrl; //轨迹文件下载的cos url，默认“”
+    public String csvFileMd5; //轨迹文件md5，默认“”
+    public String txtFileUrl; //打点文件下载的cos url，默认“”
+    public String txtFileMd5; //轨迹文件md5，默认“”
+    public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+    public String carModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
+
     public int getLineId() {
         return lineId;
     }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java
index 8a46cd8116..22c969090e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java
@@ -52,12 +52,12 @@ public class OrderQueryRespBean extends BaseData {
 
         //线路轨迹相关字段
         public long lineId; //路线id，默认-1
-        public String trajUrl; //轨迹文件下载的cos url，默认“”
-        public String trajMd5; //轨迹文件md5，默认“”
-        public String stopUrl; //打点文件下载的cos url，默认“”
-        public String stopMd5; //轨迹文件md5，默认“”
-        public long timestamp; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
-        public String vehicleModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
+        public String csvFileUrl; //轨迹文件下载的cos url，默认“”
+        public String csvFileMd5; //轨迹文件md5，默认“”
+        public String txtFileUrl; //打点文件下载的cos url，默认“”
+        public String txtFileMd5; //轨迹文件md5，默认“”
+        public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+        public String carModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
 
         // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
         public double travelDistance;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index b79d0f57f6..e55240a1f5 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -92,6 +92,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
     private TextView mGoAheadStationTitleTv31;
     private TextView mCatchStationTitleTv31;
     private ImageView mNaviIcon;
+    private TextView mPassengerNum;
+    private TextView mPassengerPhone;
+    private ConstraintLayout mPassengerInfoLayout;
 
     private TextView mNoDatasTv;
 
@@ -125,6 +128,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
         mCatchStationTitleTv31 = view.findViewById(R.id.go_ahead_station_catch_31);
         mGoAheadStationTitleTv31 = view.findViewById(R.id.go_ahead_station_31);
         mArrivedStationTitleTv32 = view.findViewById(R.id.arrive_station_32);
+
+        mPassengerInfoLayout = view.findViewById(R.id.module_och_taxi_order_passenger_data);
+        mPassengerNum = view.findViewById(R.id.taxi_passenger_num);
+        mPassengerPhone = view.findViewById(R.id.taxi_passenger_phone);
+
         mNoDatasTv = view.findViewById(R.id.no_order_data_tv);
         mNoDataView = view.findViewById(R.id.being_no_data_view);
         mOrderCancel.setOnClickListener(this);
@@ -173,15 +181,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
             GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
             background.setColor(Color.parseColor("#FF1D5EF3"));
             mOrderServerStatus.setClickable(true);
-//            String strHtml3 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
-//                    + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "<big></font></b>";
             mTitleTV2.setText("送乘客至");
             mStationTv2.setText(order.endSiteAddr);
-//            String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 公里，</font>"
-//                    + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
-//            mDistanceAndTime.setText(Html.fromHtml(strHtml2));
         } else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) {
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点");
+
             mContentModule3.setVisibility(View.GONE);
             mContentModule2.setVisibility(View.VISIBLE);
             mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station);
@@ -228,6 +232,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
 
             if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus){
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "车辆已经达到起点");
+                mPassengerInfoLayout.setVisibility(View.VISIBLE);
+                mPassengerNum.setText(order.passengerNum  + "人");
+                mPassengerPhone.setText(order.passengerPhone);
                 mOrderStatus.setText(R.string.module_och_taxi_waiting);
                 mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start_wait_check);
                 mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -236,6 +243,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
                 mOrderServerStatus.setClickable(false);
             }else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus ){
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "乘客已上车验证成功");
+
+                mPassengerInfoLayout.setVisibility(View.GONE);
                 mOrderStatus.setText(R.string.module_och_taxi_user_check_success);
                 mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
                 GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
@@ -244,44 +253,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
                 mOrderServerStatus.setClickable(true);
             }
 
-        }else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) {
-
-            mContentModule2.setVisibility(View.GONE);
-            mContentModule3.setVisibility(View.VISIBLE);
-            mArrivedStartTimeTv32.setVisibility(View.VISIBLE);
-            mContentModule32.setVisibility(View.VISIBLE);
-            mContentModule31.setVisibility(View.GONE);
-            mOrderOtherContent3.setVisibility(View.GONE);
-            mOrderStatus.setText(R.string.module_och_taxi_waiting);
-            mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
-            GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
-            background.setColor(Color.parseColor("#FF1D5EF3"));
-            mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF"));
-            mOrderServerStatus.setClickable(true);
-            Calendar currentCale = DateTimeUtils.getCurrentDateTime();
-            String currentHM = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm);
-            String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
-            String strHtml11 = "<font color=\"#CAD6FF\">已于</font><br>"
-                    + "<b><font color=\"#FFFFFF\"><big><big>" + currentHM + "</big></big></font></b>"
-                    + "<font color=\"#CAD6FF\">" + " " + "到达乘客上车地点</font>";
-            mArrivedStartTimeTv32.setLineHeight(60);
-            mArrivedStartTimeTv32.setText(Html.fromHtml(strHtml11));
-//            String strHtml12 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
-//                    + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "</big</font></b>";
-            mArrivedStationTitleTv32.setText("送乘客至");
-            mStationTv32.setText(order.endSiteAddr);
-            currentCale.add(Calendar.MINUTE, 10);
-            String strHtml13 = "";
-            if (currentDay.equals(DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd))) {
-                strHtml13 = "<font color=\"#CAD6FF\">免费等待至 </font>"
-                        + "<b><font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm) + "</big></b></font>";
-
-            } else {
-                strHtml13 = "<font color=\"#CAD6FF\">免费等待至</font>"
-                        + "<font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_MM_dd_HH_mm) + "</big></font>";
-            }
-            mDistanceAndTime3.setText(Html.fromHtml(strHtml13));
-        } else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
+        }else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "前往乘客上车地点");
             mContentModule2.setVisibility(View.GONE);
             mContentModule3.setVisibility(View.VISIBLE);
@@ -290,6 +262,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
             mContentModule32.setVisibility(View.GONE);
             mOrderOtherContent3.setVisibility(View.VISIBLE);
             mDistanceAndTime3.setVisibility(View.VISIBLE);
+            mPassengerInfoLayout.setVisibility(View.VISIBLE);
+            mPassengerNum.setText(order.passengerNum  + "人");
+            mPassengerPhone.setText(order.passengerPhone);
             mOrderStatus.setText(R.string.module_och_taxi_new_order);
             mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
             mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -298,10 +273,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
             mOrderServerStatus.setClickable(false);
             mGoAheadStationTitleTv31.setText("前往");
             mCatchStationTitleTv31.setText("接乘客");
-//            String strHtml0 = "<font color=\"#CAD6FF\">前往</font><br>"
-//                    + "<b><font color=\"#FFFFFF\"><big>" + order.startSiteAddr + "</big></font></b><br>"
-//                    + "<font color=\"#CAD6FF\">接乘客</font>";
             mStationTv31.setText(order.startSiteAddr);
+
             Calendar currentCale = DateTimeUtils.getCurrentDateTime();
             Calendar startCale = DateTimeUtil.formatLongToCalendar(order.bookingTime);
             String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
@@ -472,7 +445,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
                         setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker);
                         break;
                     case ArriveAtEnd:
-                        mCurrentOrder = null;
                         mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.GONE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip));
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
index da7aa36c9d..cb652413ae 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
@@ -101,18 +101,55 @@
             android:paddingRight="40px"
             android:visibility="visible"
             app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/module_och_taxi_order_passenger_data"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginTop="130px">
+                <TextView
+                    android:id="@+id/taxi_passenger_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:text="--"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/taxi_passenger_txt_size"/>
+                <TextView
+                    android:id="@+id/taxi_passenger_phone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toRightOf="@+id/taxi_passenger_num"
+                    app:layout_constraintTop_toTopOf="@+id/taxi_passenger_num"
+                    android:layout_marginLeft="@dimen/dp_30"
+                    android:text="--"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/taxi_passenger_txt_size"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_2"
+                    app:layout_constraintTop_toBottomOf="@+id/taxi_passenger_phone"
+                    app:layout_constraintLeft_toLeftOf="@+id/taxi_passenger_num"
+                    app:layout_constraintRight_toRightOf="parent"
+                    android:layout_marginTop="@dimen/dp_30"
+                    android:background="@color/taxi_passenger_line_color"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
             <TextView
                 android:id="@+id/module_och_taxi_order_had_arrived_time_32"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="150px"
+                android:layout_marginTop="@dimen/dp_30"
                 android:lineSpacingExtra="16px"
                 android:textColor="#CAD6FF"
-                android:textSize="17sp"
+                android:textSize="30px"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_goneMarginTop="50px"
+                app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data"
+                app:layout_goneMarginTop="@dimen/dp_150"
                 tools:text="已于 - - 到达乘客上车点" />
             <LinearLayout
                 android:id="@+id/module_och_taxi_order_go_ahead_station_31"
@@ -120,15 +157,15 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="visible"
+                android:layout_marginTop="@dimen/dp_30"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data">
                 <TextView
                     android:id="@+id/go_ahead_station_31"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="#CAD6FF"
-                    android:layout_marginTop="150px"
-                    android:textSize="17sp"
+                    android:textSize="30px"
                     android:text="前往"/>
                 <TextView
                     android:id="@+id/module_och_taxi_order_start_station_31"
@@ -141,21 +178,22 @@
                     android:ellipsize="end"
                     android:lineSpacingExtra="10px"
                     android:textColor="#FFFFFF"
-                    android:textSize="23sp"
+                    android:textSize="42px"
                     tools:text="- -" />
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8px"
                     android:layout_gravity="center_vertical">
+
                     <TextView
                         android:id="@+id/go_ahead_station_catch_31"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#CAD6FF"
-                        android:textSize="17sp"
                         android:gravity="center_horizontal"
-                        android:text="接乘客"/>
+                        android:text="接乘客"
+                        android:textColor="#CAD6FF"
+                        android:textSize="28px" />
                     <ImageView
                         android:id="@+id/module_och_taxi_navi_iv"
                         android:layout_width="wrap_content"
@@ -183,7 +221,7 @@
                     android:inputType="textMultiLine"
                     android:lineSpacingExtra="16px"
                     android:textColor="#CAD6FF"
-                    android:textSize="17sp"
+                    android:textSize="30px"
                     tools:text="送乘客至" />
                 <TextView
                     android:id="@+id/module_och_taxi_order_end_station_32"
@@ -195,7 +233,7 @@
                     android:ellipsize="end"
                     android:lineSpacingExtra="16px"
                     android:textColor="#FFFFFF"
-                    android:textSize="23sp"
+                    android:textSize="42px"
                     tools:text="- -" />
             </LinearLayout>
 
@@ -207,7 +245,7 @@
                 android:inputType="textMultiLine"
                 android:lineSpacingExtra="16px"
                 android:textColor="#CAD6FF"
-                android:textSize="17sp"
+                android:textSize="30px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_arrive_station_32"
                 tools:text="乘客将于 - - 用车" />
@@ -219,9 +257,9 @@
                 android:layout_marginBottom="180px"
                 android:inputType="textMultiLine"
                 android:lineSpacingExtra="16px"
-                android:text="距离 - - 公里，用时 - - 分钟"
+                android:text="距离 -- 公里，用时 -- 分钟"
                 android:textColor="#CAD6FF"
-                android:textSize="16sp"
+                android:textSize="32px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_go_ahead_station_31"/>
 
diff --git a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
index c58602dcd2..c51eac02c2 100644
--- a/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
@@ -101,4 +101,6 @@
     <dimen name="taxi_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_traffic_light_time_view_width">130px</dimen>
     <dimen name="taxi_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_passenger_txt_size">34px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 7dd0bd4e6b..eb9e459063 100644
--- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -101,4 +101,6 @@
     <dimen name="taxi_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_traffic_light_time_view_width">130px</dimen>
     <dimen name="taxi_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_passenger_txt_size">34px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values/colors.xml b/OCH/mogo-och-taxi/src/main/res/values/colors.xml
index 6cec08f793..116d9ab70f 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/colors.xml
@@ -22,4 +22,6 @@
     <color name="taxi_traffic_light_green_color_down">#FF006D43</color>
     <color name="taxi_traffic_light_yellow_color_up">#FFFFE198</color>
     <color name="taxi_traffic_light_yellow_color_down">#FFFF9B00</color>
+
+    <color name="taxi_passenger_line_color">#657EE2</color>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
index ae72969ee1..c3e4e839f4 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
@@ -99,4 +99,6 @@
     <dimen name="taxi_traffic_light_icon_size">154px</dimen>
     <dimen name="taxi_traffic_light_time_view_width">130px</dimen>
     <dimen name="taxi_traffic_light_time_size">60px</dimen>
+
+    <dimen name="taxi_passenger_txt_size">34px</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle
index 9504d6c0c6..bb0a3be919 100644
--- a/app/productFlavors/f8xx.gradle
+++ b/app/productFlavors/f8xx.gradle
@@ -31,7 +31,7 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 
 }
\ No newline at end of file
diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle
index 830d322313..d24cd0e616 100644
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -31,6 +31,6 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 }
\ No newline at end of file
diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle
index 481187896d..fee00431e4 100644
--- a/app/productFlavors/fPadLenovoOchBus.gradle
+++ b/app/productFlavors/fPadLenovoOchBus.gradle
@@ -33,6 +33,6 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 }
\ No newline at end of file
diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle
index 74487113d3..241ba1770b 100644
--- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle
+++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle
@@ -31,6 +31,6 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 }
\ No newline at end of file
diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle
index 7a583209e6..5111983e45 100644
--- a/app/productFlavors/fPadLenovoOchTaxi.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxi.gradle
@@ -34,7 +34,7 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 
 }
\ No newline at end of file
diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
index 2c4ad036b9..4a4e2ac167 100644
--- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
@@ -33,7 +33,7 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 
 }
\ No newline at end of file
diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle
index 16feafdae4..e86161847a 100644
--- a/app/productFlavors/fochbus.gradle
+++ b/app/productFlavors/fochbus.gradle
@@ -31,7 +31,7 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 
 }
\ No newline at end of file
diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle
index fa21f03205..47bcbd5ede 100644
--- a/app/productFlavors/fochtaxi.gradle
+++ b/app/productFlavors/fochtaxi.gradle
@@ -31,7 +31,7 @@ project.android.productFlavors {
         // 连接的工控机IP地址
         buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""
         // 构建的是否是演示（美化）模式
-        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
+        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
index 442700a153..1647869ae4 100644
--- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
@@ -99,8 +99,5 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
             FunctionBuildConfig.skinMode = 1
         }
 
-        // 是否是演示（美化）模式，会存在SP中，方便做现场恢复
-        FunctionBuildConfig.isDemoMode =
-            SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
     }
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index a9a44777d0..6807ab3408 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -69,7 +69,6 @@ import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import java.text.SimpleDateFormat
 import java.util.*
-import kotlin.collections.ArrayList
 import kotlin.math.abs
 
 /**
@@ -540,7 +539,6 @@ class DebugSettingView @JvmOverloads constructor(
             if (!FunctionBuildConfig.isDemoMode) {
                 tbIsDrawAutopilotTrajectoryData.isChecked = false
             }
-            SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)
         }
 
 
@@ -612,7 +610,7 @@ class DebugSettingView @JvmOverloads constructor(
         tbDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData
         //是否渲染点云数据
         tbDrawPointCloudData.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isDrawPointCloudData = isChecked
+            CallerHDMapManager.setIsDrawPointCloud(isChecked)
         }
 
         // 模拟自动驾驶中
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
index a4dce21da3..b93cf3e793 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
@@ -21,6 +21,7 @@ import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoUiSettings;
 import com.mogo.map.MogoMapView;
 import com.mogo.map.uicontroller.IMogoMapUIController;
+import com.zhidaoauto.map.sdk.open.business.PointCloudHelper;
 
 /**
  * @author donghongyu
@@ -275,4 +276,21 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
         }
     }
 
+    @Override
+    public void setPointCloudSize(float pointCloudSize) {
+        //设置点云大小
+        PointCloudHelper.INSTANCE.setPointCloudSize(pointCloudSize);
+    }
+
+    @Override
+    public void setPointCloudColor(@NonNull String color) {
+        // 设置点云颜色
+        PointCloudHelper.INSTANCE.setPointCloudColor(color);
+    }
+
+    @Override
+    public void setIsDrawPointCloud(boolean isDrawPointCloud) {
+        // 是否绘制点云
+        PointCloudHelper.INSTANCE.setIsDrawPointCloud(isDrawPointCloud);
+    }
 }
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
index 2b13a45f9e..4298b23cd2 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt
@@ -102,6 +102,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb
                 V2XManager.init(V2XConfig.Builder().also {
                     it.aiCloudConfig(MoGoAiCloudClientConfig.getInstance())
                     it.context(context)
+                    it.loggable(true)
                     it.distanceForTriggerRefresh(200f) //行驶超过200（包含）米，刷新道路周边信息（短链请求）
                     it.durationForTriggerRefresh(
                         60,
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 3c7cd675c6..d295029d62 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -8,7 +8,7 @@ package com.mogo.eagle.core.data.config
 object FunctionBuildConfig {
 
     /**
-     * 是否是演示（美化）模式，会存在SP中，方便做现场恢复
+     * 是否是演示（美化）模式
      * 1.当点击【开始服务（taxi）/滑动出发（bus）】btn后，不管实际自动驾驶按钮「state值」如何变更，自动驾驶按钮都呈现2的状态。
      *    只是自动驾驶按钮的样式为2-被选中的状态
      *    若点击，则可继续向自动驾驶系统发送启动自动驾驶的命令。
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
index 815eb08e8e..9ab0e0bd07 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt
@@ -17,9 +17,6 @@ object MoGoConfig {
     // CMD全量日志抓取当时时间
     const val CATCH_LOG_TIME = "CATCH_LOG_TIME"
 
-    // 是否是演示（美化）模式，会存在SP中，方便做现场恢复
-    const val IS_DEMO_MODE = "IS_DEMO_MODE"
-
     //根据加速度判断是否刹车阈值
     const val BRAKE_ACCELERATION_THRESHOLD = "BRAKE_ACCELERATION_THRESHOLD"
 
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
index 02290028c1..a3292d1393 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
@@ -42,4 +42,28 @@ interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
      * @param isDayMode true-白天模式，false-夜间模式
      */
     fun stepInVrMode(isDayMode: Boolean)
+
+    /**
+     * 打开点云绘制
+     *
+     * @param isDrawPointCloud 是否绘制点云
+     */
+    fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
+
+    /**
+     * 设制点云大小
+     *
+     * @param pointCloudSize 点云的点大小
+     */
+    fun setPointCloudSize(pointCloudSize: Float)
+
+
+    /**
+     * 设置点云颜色
+     *
+     * @param color // color:"#RRGGBB*
+     */
+    fun setPointCloudColor(color: String)
+
+
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
index f407c14c38..6627707e3c 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerHDMapManager.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.map
 
 import androidx.annotation.RawRes
 import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
 import com.mogo.eagle.core.data.map.CenterLine
 import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider
@@ -58,4 +59,32 @@ object CallerHDMapManager : CallerBase() {
     fun stepInVrMode(isDayMode: Boolean) {
         return mapProviderApi.stepInVrMode(isDayMode)
     }
+
+    /**
+     *
+     * 打开点云绘制
+     *
+     * @param isDrawPointCloud 是否绘制点云
+     */
+    fun setIsDrawPointCloud(isDrawPointCloud: Boolean) {
+        FunctionBuildConfig.isDrawPointCloudData = isDrawPointCloud
+        return mapProviderApi.setIsDrawPointCloud(isDrawPointCloud)
+    }
+
+    /**
+     * 设制点云大小
+     * @param pointCloudSize 点云的点大小
+     */
+    fun setPointCloudSize(pointCloudSize: Float) {
+        return mapProviderApi.setPointCloudSize(pointCloudSize)
+    }
+
+    /**
+     * 设置点云颜色
+     *
+     * @param color // color:"#RRGGBB*
+     */
+    fun setPointCloudColor(color: String) {
+        return mapProviderApi.setPointCloudColor(color)
+    }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 023b0f0e9f..2162b4fea3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,26 +63,26 @@ SERVICE_CHAIN_VERSION=1.1.0
 LOGLIB_VERSION=1.3.0
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.1
+MOGO_NETWORK_VERSION=1.4.2
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.1
+MOGO_PASSPORT_VERSION=1.4.2
 # 常链接
-MOGO_SOCKET_VERSION=1.4.1
+MOGO_SOCKET_VERSION=1.4.2
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.1
+MOGO_REALTIME_VERSION=1.4.2
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.1
+MOGO_TANLU_VERSION=1.4.2
 # 直播推流
-MOGO_LIVE_VERSION=1.4.1
+MOGO_LIVE_VERSION=1.4.2
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.1
+MOGO_TRAFFICLIVE_VERSION=1.4.2
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.1
+MOGO_LOCATION_VERSION=1.4.2
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.1
+MOGO_TELEMATIC_VERSION=1.4.2
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.2.0.7
+MAP_SDK_VERSION=2.2.0.9
 MAP_SDK_OPERATION_VERSION=1.0.13
 # websocket
 WEBSOCKET_VERSION=1.1.7
@@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66
 # mogoAiCloud sdk services
 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
 # v2x-sdk
-MOGO_V2X_SDK_VERSION=1.4.1
+MOGO_V2X_SDK_VERSION=1.4.2
 ################# 旧版本架构模块版本 #################