[6.2.6]

[shuttle-jl]
[资源整理]

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java

@@ -39,7 +39,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.bus_p_stations_common_item,parent,false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.shuttle_p_jl_stations_common_item,parent,false);
         StationViewHolder viewHolder = new StationViewHolder(view);
         return viewHolder;
     }
@@ -54,7 +54,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
             viewHolder.curArrowBg.setVisibility(View.GONE);
             viewHolder.curArrowBottomBg.setVisibility(View.VISIBLE);
             Log.d("onBindViewHolder" , "position0 = "+position);
-            viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
+            viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_bg_start_tag_bg);
             if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
                 BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
@@ -74,16 +74,16 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
+                viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_point_gray);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
                 Log.d("onBindViewHolder" , "position 1 = "+position);
             } else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
+                viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_arrive_line_green);
                 if (position == mStations.size() - 1){
-                    viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
+                    viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_bg_end_tag_bg);
                     viewHolder.curArrowBottomBg.setVisibility(View.GONE);
                 }
                 Log.d("onBindViewHolder" , "position2 = "+position);
@@ -93,7 +93,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
                 viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
+                viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_arrive_line_blue);
                 Log.d("onBindViewHolder" , "position3 = "+position);
 
                 if (position == mStations.size() - 1){
@@ -106,11 +106,11 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
                 viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
                 viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
-                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
+                viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_point_blue);
                 viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
 
                 if (position == mStations.size() - 1){
-                    viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
+                    viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_bg_end_tag_bg);
                     viewHolder.curArrowBottomBg.setVisibility(View.GONE);
                 }
                 Log.d("onBindViewHolder" , "position4 = "+position);

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.jinlvvan.p_bus_view_blue_tooth.view.*
+import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_view_blue_tooth.view.blueView
 
 /**
  * 魔戒蓝牙控件
@@ -20,15 +20,15 @@ class BusPBlueToothView @JvmOverloads constructor(
 ) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.p_bus_view_blue_tooth, this, true)
+        LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_view_blue_tooth, this, true)
     }
 
     override fun mofangStatus(status: Boolean) {
         ThreadUtils.runOnUiThread {
             if (status) {
-                blueView.setImageResource(R.drawable.bus_p_blue_tooth_close)
+                blueView.setImageResource(R.drawable.shuttle_p_jl_blue_tooth_close)
             } else {
-                blueView.setImageResource(R.drawable.bus_p_blue_tooth_open)
+                blueView.setImageResource(R.drawable.shuttle_p_jl_blue_tooth_open)
             }
         }
     }

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt

@@ -2,21 +2,16 @@ package com.mogo.och.bus.passenger.ui
 
 import android.annotation.*
 import android.content.Context
-import android.graphics.Color
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
-import chassis.ChassisStatesOuterClass
-import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
-import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystemListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.eagle.core.utilcode.kotlin.*
-import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.bus.passenger.R
 import kotlinx.coroutines.*
 import me.jessyan.autosize.utils.AutoSizeUtils
@@ -34,8 +29,8 @@ class BusPStatusBarView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.p_bus_view_status_bar, this, true)
-        setBackgroundResource(R.drawable.bg_status_bar)
+        LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_view_status_bar, this, true)
+        setBackgroundResource(R.drawable.shuttle_p_jl_bg_status_bar)
         isClickable = true
         isFocusable = true
     }

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java

@@ -1,35 +1,18 @@
 package com.mogo.och.bus.passenger.ui;
 
 import android.os.Bundle;
-import android.text.Html;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.widget.ContentLoadingProgressBar;
 
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 
 import com.mogo.commons.mvp.Presenter;
-import com.mogo.eagle.core.data.multidisplay.TelematicConstant;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
-import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView;
 import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView;
 import com.mogo.eagle.core.function.view.MapBizView;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.passenger.R;
-import com.mogo.och.bus.passenger.constant.BusPassengerConst;
-import com.mogo.och.common.module.utils.NumberFormatUtil;
-import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
-import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 
 /**
  * Created on 2022/3/31
@@ -45,7 +28,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
 
     @Override
     protected int getLayoutId() {
-        return R.layout.bus_p_base_fragment;
+        return R.layout.shuttle_p_jl_base_fragment;
     }
 
     @Override

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java

@@ -66,7 +66,7 @@ public class BusPassengerRouteFragment extends
 
     @Override
     public int getStationPanelViewId() {
-        return R.layout.bus_p_route_fragment;
+        return R.layout.shuttle_p_jl_route_fragment;
     }
 
     @NonNull
@@ -283,25 +283,25 @@ public class BusPassengerRouteFragment extends
             mCurrentArriveStation.setText("----");
             mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
             mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
-            mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
+            mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
             handleArrivingSpeakIconDrawable();
         }else {
             mCurrentArriveStation.setText(station);
             if (currentIndex == 0){
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
                 mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
-                mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
+                mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
                 handleArrivingSpeakIconDrawable();
                 return;
             }
             if (isArrived){
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
                 mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
-                mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
+                mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
                 handleArrivedSpeakIconDrawable();
             }else {
                 mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_next_station_title));
-                mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_un_arrived_bg);
+                mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_un_arrived_bg);
                 handleArrivingSpeakIconDrawable();
             }
         }
@@ -351,9 +351,9 @@ public class BusPassengerRouteFragment extends
 
     public void AutopilotStatusChanged(int status) {
         if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) {
-            mAutopilotIv.setImageResource(R.drawable.auto_open);
+            mAutopilotIv.setImageResource(R.drawable.shuttle_p_jl_auto_open);
         } else {
-            mAutopilotIv.setImageResource(R.drawable.auto_close);
+            mAutopilotIv.setImageResource(R.drawable.shuttle_p_jl_auto_close);
         }
     }
 }

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt

@@ -10,7 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.jinlvvan.bus_p_traffic_light_view.view.*
+import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg
+import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv
+import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv
 
 /**
  * bus乘客端：红绿灯view
@@ -34,7 +36,7 @@ class BusPassengerTrafficLightView @JvmOverloads constructor(
     }
 
     private fun init(context: Context?) {
-        LayoutInflater.from(context).inflate(R.layout.bus_p_traffic_light_view, this, true)
+        LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_traffic_light_view, this, true)
     }
 
     override fun onAttachedToWindow() {
@@ -134,15 +136,15 @@ class BusPassengerTrafficLightView @JvmOverloads constructor(
         UiThreadHandler.post {
             when (lightId) {
                 TrafficLightEnum.RED -> {
-                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_red_nor)
+                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_red_nor)
                     this@BusPassengerTrafficLightView.visibility = VISIBLE
                 }
                 TrafficLightEnum.YELLOW -> {
-                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_yellow_nor)
+                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_yellow_nor)
                     this@BusPassengerTrafficLightView.visibility = VISIBLE
                 }
                 TrafficLightEnum.GREEN -> {
-                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.bus_p_light_green_nor)
+                    bus_p_traffic_light_iv.setBackgroundResource(R.drawable.shuttle_p_jl_light_green_nor)
                     this@BusPassengerTrafficLightView.visibility = VISIBLE
                 }
                 else -> this@BusPassengerTrafficLightView.visibility = GONE

OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt

@@ -72,7 +72,7 @@ class BusPassengerMapDirectionView @JvmOverloads constructor(
 
     private fun initView(context: Context) {
         d(SceneConstant.M_BUS_P + TAG, "initView")
-        val smpView = LayoutInflater.from(context).inflate(R.layout.bus_p_map_view, this)
+        val smpView = LayoutInflater.from(context).inflate(R.layout.shuttle_p_jl_map_view, this)
         mAMapNaviView = smpView.findViewById<View>(R.id.bus_p_line_amap_view) as TextureMapView
         initAMapView()
 
@@ -96,11 +96,11 @@ class BusPassengerMapDirectionView @JvmOverloads constructor(
 
         // 设置 锚点 图标
         mCarMarker = mAMap.addMarker(
-            MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_car))
+            MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_car))
                 .anchor(0.5f, 0.5f)
         )
-        mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_arrived)
-        mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrow_un_arrive)
+        mArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrow_arrived)
+        mUnArrivedRes = BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrow_un_arrive)
 
         // 加载自定义样式
         val customMapStyleOptions = CustomMapStyleOptions()
@@ -312,11 +312,11 @@ class BusPassengerMapDirectionView @JvmOverloads constructor(
             val size = mLineStationsList.size
             val mStartMarker = mAMap.addMarker(
                 MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_start_point))
+                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_start_point))
             )
             val mEndMarker = mAMap.addMarker(
                 MarkerOptions()
-                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_end_point))
+                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_end_point))
             )
             mStartMarker.position = mLineStationsList[0]
             mLineMarkers.add(0, mStartMarker)
@@ -324,14 +324,14 @@ class BusPassengerMapDirectionView @JvmOverloads constructor(
                 if (currentIndex <= i && i < size - 1 && i > 0) { //未到达
                     val unArrivedMarker = mAMap.addMarker(
                         MarkerOptions()
-                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_unarrived_point))
+                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_unarrived_point))
                     )
                     unArrivedMarker.position = mLineStationsList[i]
                     mLineMarkers.add(i, unArrivedMarker)
                 } else if (i in 1 until currentIndex) {
                     val arrivedMarker = mAMap.addMarker(
                         MarkerOptions()
-                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrived_point))
+                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.shuttle_p_jl_map_arrived_point))
                     )
                     arrivedMarker.position = mLineStationsList[i]
                     mLineMarkers.add(i, arrivedMarker)

OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
-android:oneshot="false">
-    <item android:drawable="@drawable/speak_arrived_icon_0"  android:duration="300"/>
-    <item android:drawable="@drawable/speak_arrived_icon_1" android:duration="300"/>
-    <item android:drawable="@drawable/speak_arrived_icon_2" android:duration="300"/>
-</animation-list>

OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_progress_bar.xml

@@ -8,7 +8,7 @@
     </item>
     <item android:id="@android:id/progress">
         <scale
-            android:drawable="@drawable/progress_item_round"
+            android:drawable="@drawable/shuttle_p_jl_progress_item_round"
             android:scaleWidth="100%" />
     </item>
 </layer-list>

OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
+android:oneshot="false">
+    <item android:drawable="@drawable/shuttle_p_jl_speak_arrived_icon_0"  android:duration="300"/>
+    <item android:drawable="@drawable/shuttle_p_jl_speak_arrived_icon_1" android:duration="300"/>
+    <item android:drawable="@drawable/shuttle_p_jl_speak_arrived_icon_2" android:duration="300"/>
+</animation-list>

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_no_data_common_view.xml

@@ -16,7 +16,7 @@
         android:id="@+id/no_order_data_iv"
         android:layout_width="@dimen/dp_200"
         android:layout_height="@dimen/dp_210"
-        android:src="@drawable/bus_p_no_order_data"
+        android:src="@drawable/shuttle_p_jl_no_order_data"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_route_fragment.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/bus_p_route_bg_width"
     android:layout_height="match_parent"
-    android:background="@drawable/bus_p_right_route_bg">
+    android:background="@drawable/shuttle_p_jl_right_route_bg">
 
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:layout_width="800dp"
@@ -32,7 +32,7 @@
         <View
             android:layout_width="@dimen/bus_p_route_info_panel_width"
             android:layout_height="match_parent"
-            android:background="@drawable/bus_p_route_bg"
+            android:background="@drawable/shuttle_p_jl_route_bg"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -67,7 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/dp_20"
-                android:src="@drawable/bus_line_logo"
+                android:src="@drawable/shuttle_p_jl_bus_line_logo"
                 app:layout_constraintBottom_toBottomOf="@+id/bus_p_line_name_tv"
                 app:layout_constraintRight_toLeftOf="@+id/bus_p_line_name_tv"
                 app:layout_constraintTop_toTopOf="@+id/bus_p_line_name_tv" />
@@ -105,7 +105,7 @@
                 android:layout_width="@dimen/dp_100"
                 android:layout_height="@dimen/dp_58"
                 android:layout_marginTop="@dimen/dp_10"
-                android:src="@drawable/auto_close"
+                android:src="@drawable/shuttle_p_jl_auto_close"
                 app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv" />
 
@@ -180,7 +180,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_50"
-                android:src="@drawable/card_split_line_bg"
+                android:src="@drawable/shuttle_p_jl_split_line_bg"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/dividing_line_1" />
@@ -201,7 +201,7 @@
                 android:id="@+id/speak_arrived_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_40"
-                android:src="@drawable/bg_p_speak_icon_arrived"
+                android:src="@drawable/shuttle_p_jl_bg_speak_icon_arrived"
                 app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_title"
                 app:layout_constraintLeft_toRightOf="@+id/bus_p_cur_station_title"
                 app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_title" />
@@ -211,7 +211,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_57"
                 android:layout_marginRight="@dimen/dp_90"
-                android:background="@drawable/cur_station_arrived_bg"
+                android:background="@drawable/shuttle_p_jl_cur_station_arrived_bg"
                 android:gravity="center"
                 android:paddingLeft="@dimen/dp_30"
                 android:paddingRight="@dimen/dp_30"
@@ -236,7 +236,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />
 
             <include
-                layout="@layout/bus_p_no_data_common_view"
+                layout="@layout/shuttle_p_jl_no_data_common_view"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:visibility="gone"

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_stations_common_item.xml

@@ -51,7 +51,7 @@
         android:layout_width="@dimen/dp_60"
         android:layout_height="@dimen/dp_61"
         android:scaleType="centerInside"
-        android:src="@drawable/bus_p_point_blue"
+        android:src="@drawable/shuttle_p_jl_point_blue"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="@+id/bus_p_station"
         app:layout_constraintBottom_toBottomOf="@+id/bus_p_station"/>

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_traffic_light_view.xml

@@ -10,7 +10,7 @@
         android:id="@+id/bus_p_traffic_light_bg"
         android:layout_width="@dimen/bus_p_traffic_light_bg_width"
         android:layout_height="@dimen/bus_p_traffic_light_bg_height"
-        android:background="@drawable/bg_bus_p_traffic_light_background"
+        android:background="@drawable/shuttle_p_jl_bg_traffic_light_background"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_view_blue_tooth.xml

@@ -9,7 +9,7 @@
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_26"
         android:scaleType="fitXY"
-        android:src="@drawable/m2_blue_tooth_open"
+        android:src="@drawable/shuttle_p_jl_blue_tooth_open"
         tools:ignore="ContentDescription" />
 
 </RelativeLayout>

OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_view_status_bar.xml

@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
     tools:ignore="MissingDefaultResource"
-    android:background="@drawable/bg_status_bar">
+    android:background="@drawable/shuttle_p_jl_bg_status_bar">
 
     <!--Wifi状态-->
     <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toEndOf="@+id/wifiStateView"
         android:layout_width="@dimen/dp_15"
         android:layout_height="@dimen/dp_22"
-        android:src="@drawable/bus_p_blue_tooth_open"
+        android:src="@drawable/shuttle_p_jl_blue_tooth_open"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_40" />
 
@@ -38,7 +38,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_40"
-        android:src="@drawable/bus_p_status_bar_logo"
+        android:src="@drawable/shuttle_p_jl_status_bar_logo"
         android:scaleType="fitXY"
         android:layout_width="@dimen/dp_94"
         android:layout_height="@dimen/dp_25"/>

OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml

@@ -9,7 +9,7 @@
         android:id="@+id/turn_light_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/brakelight_background_daytime"
+        android:background="@drawable/shuttle_p_jl_brakelight_background_daytime"
         android:layout_gravity="top|center_horizontal"
         android:paddingLeft="@dimen/dp_10"
         android:paddingRight="@dimen/dp_10"
@@ -24,7 +24,7 @@
             android:layout_height="@dimen/dp_32"
             android:layout_gravity="left|center_vertical"
             android:layout_marginLeft="@dimen/dp_5"
-            android:src="@drawable/bus_p_zuozhuan_un_open" />
+            android:src="@drawable/shuttle_p_jl_zuozhuan_un_open" />
 
         <ImageView
             android:id="@+id/right_nor_image"
@@ -32,14 +32,14 @@
             android:layout_height="@dimen/dp_32"
             android:layout_gravity="right|center_vertical"
             android:layout_marginRight="@dimen/dp_5"
-            android:src="@drawable/bus_p_youzhuan_un_open" />
+            android:src="@drawable/shuttle_p_jl_youzhuan_un_open" />
 
         <ImageView
             android:id="@+id/left_select_image"
             android:layout_width="@dimen/dp_40"
             android:layout_height="@dimen/dp_40"
             android:layout_gravity="left|center_vertical"
-            android:src="@drawable/bus_p_zuozhuan_open"
+            android:src="@drawable/shuttle_p_jl_zuozhuan_open"
             android:visibility="gone"/>
 
         <ImageView
@@ -47,7 +47,7 @@
             android:layout_width="@dimen/dp_40"
             android:layout_height="@dimen/dp_40"
             android:layout_gravity="right|center_vertical"
-            android:src="@drawable/bus_p_youzhuan_open"
+            android:src="@drawable/shuttle_p_jl_youzhuan_open"
             android:visibility="gone"/>
     </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>