[6.2.4]

[bus_p_jl]
[mv file]

OCH/bus/passenger/build.gradle

@@ -44,6 +44,21 @@ android {
         }
     }
 
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res',
+                    'src/main/res/m2',
+                    'src/main/res/jinlv',
+            ]
+            java.srcDirs = [
+                    'src/main/java',
+                    'src/main/java/m2',
+                    'src/main/java/jinlv',
+            ]
+        }
+    }
+
     flavorDimensions "vehicle"
     productFlavors {
         // 车型：金旅星辰、开沃 小巴业务
@@ -51,6 +66,11 @@ android {
             dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '0'
         }
+        // 车型：金旅m1 小巴业务
+        m2 {
+            dimension "vehicle"
+            buildConfigField 'int', 'NEW_TEST', '1'
+        }
     }
 }
 

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java

@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -28,18 +29,13 @@ import org.jetbrains.annotations.Nullable;
  * Created on 2022/3/29
  */
 @Route(path = BusPassengerConst.PATH)
-public class MogoOCHBusPassenger implements IMogoOCH {
+public class MogoOCHBusPassenger implements IMoGoFunctionProvider {
     private static final String TAG = MogoOCHBusPassenger.class.getSimpleName();
 
     private FragmentActivity mActivity;
     private int mContainerId;
     private BusPassengerRouteFragment mPassengerFragment;
 
-    @Override
-    public void createCoverage(FragmentActivity activity, int containerId) {
-
-    }
-
     @Nullable
     @Override
     public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) {

OCH/bus/passenger/src/main/java/jinlv/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.main.p_bus_view_blue_tooth.view.blueView
 
 /**
  * 魔戒蓝牙控件

OCH/bus/passenger/src/main/java/jinlv/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.main.bus_p_traffic_light_view.view.bus_p_traffic_light_bg
+import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_iv
+import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_time_tv
 
 /**
  * bus乘客端：红绿灯view