Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt

@@ -216,6 +216,7 @@ class BusPassengerPresenter(view: MainFragment?) :
 
     override fun setEndStationCallBack(siteId: Long?, siteName: String?, gcj_lon: Double, gcj_lat: Double) {
         val latLng = LatLng(gcj_lat,gcj_lon)
+        mView?.cleanEndStation()
         mView?.drawEndStation(latLng)
     }
 

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt

@@ -48,7 +48,7 @@ class MainFragment :
     }
 
     override fun initViews() {
-        setCarModle(R.raw.aiqinghao)
+        setCarModle(R.raw.m1)
         cb_bp_video_player.onClick {
             openSettingPage(M1ContainFragment.VIDEOTAB)
         }

app/build.gradle

@@ -486,8 +486,12 @@ def variantName() {
 
             if (taskName.contains("Yantai")) {
                 project.dependencies.add('implementation', project.project(':tts:tts-iflytek'))
-            }else {
+            }else if (taskName.contains("Mogo")) {
                 project.dependencies.add('implementation', project.project(':tts:tts-pad'))
+            }else if (taskName.contains("Dali")) {
+                project.dependencies.add('implementation', project.project(':tts:tts-pad'))
+            }else {
+
             }
 
             taskName = taskName.replace("Debug", "")