[charter]

[3.2.0]
[位置迁移]

OCH/mogo-och-charter-passenger/build.gradle

@@ -45,14 +45,6 @@ android {
         }
     }
 
-    flavorDimensions "vehicle"
-    productFlavors {
-        // 车型：金旅m1 包车业务
-        m1 {
-            dimension "vehicle"
-            buildConfigField 'int', 'NEW_TEST', '1'
-        }
-    }
 }
 
 dependencies {

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.model
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.ConnectivityManager
-import android.os.Build
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager

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

@@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.presenter
 import androidx.lifecycle.LifecycleOwner
 import com.amap.api.maps.model.LatLng
 import com.mogo.commons.voice.AIAssist
-import com.mogo.eagle.core.data.map.MogoLocation
 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.autopilot.CallerAutoPilotControlManager
@@ -14,7 +13,6 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
-import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback
 import com.mogo.och.bus.passenger.callback.IOrderChangeCallback
 import com.mogo.och.bus.passenger.callback.IDistanceTimeCallback
 import com.mogo.och.bus.passenger.model.CharterPassengerModel
@@ -34,7 +32,6 @@ import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
-import io.reactivex.disposables.Disposable
 import java.util.*
 
 class BusPassengerPresenter(view: MainFragment?) :

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt

@@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
-import kotlinx.android.synthetic.m1.m1_order_end.*
+import kotlinx.android.synthetic.main.m1_order_end.*
 
 /**
  * @author: yangyakun

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt

@@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter
-import kotlinx.android.synthetic.m1.m1_contain_fragment.*
+import kotlinx.android.synthetic.main.m1_contain_fragment.*
 
 /**
  * @author: yangyakun

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter
 import com.mogo.och.common.module.utils.SoundPoolHelper
-import kotlinx.android.synthetic.m1.m1_devices_fragment.*
+import kotlinx.android.synthetic.main.m1_devices_fragment.*
 
 /**
  * @author: yangyakun

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt

@@ -5,7 +5,7 @@ import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionEarlyEndOrderPresenter
-import kotlinx.android.synthetic.m1.m1_order_early_end.*
+import kotlinx.android.synthetic.main.m1_order_early_end.*
 
 /**
  * @author: yangyakun

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt

@@ -4,10 +4,9 @@ import android.os.Bundle
 import android.view.View
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay
 import com.mogo.och.bus.passenger.model.OrderStatusEnum
 import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter
-import kotlinx.android.synthetic.m1.m1_order_fragment.*
+import kotlinx.android.synthetic.main.m1_order_fragment.*
 
 /**
  * @author: yangyakun

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt

@@ -16,9 +16,6 @@ import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearSnapHelper
-import androidx.recyclerview.widget.SnapHelper
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -38,7 +35,7 @@ import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.m1.m1_soft_fragment.*
+import kotlinx.android.synthetic.main.m1_soft_fragment.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 import java.util.concurrent.TimeUnit
 
@@ -229,20 +226,34 @@ class M1SoftFragment :
             }
         }
         val pickerLayoutManager =
-            PickerLayoutManager(requireContext(), PickerLayoutManager.HORIZONTAL, false)
+            PickerLayoutManager(
+                requireContext(),
+                PickerLayoutManager.HORIZONTAL,
+                false
+            )
         pickerLayoutManager.isChangeAlpha = true
         pickerLayoutManager.scaleDownBy = 0.29f
         pickerLayoutManager.scaleDownDistance = 0.8f
 
         val data = getData()
-        val adapter = TemperatureAdapter(requireContext(), data, rv_aircondition_temperature)
+        val adapter = TemperatureAdapter(
+            requireContext(),
+            data,
+            rv_aircondition_temperature
+        )
         val snapHelper = PagerCenterSnapHelper()
         snapHelper.attachToRecyclerView(rv_aircondition_temperature)
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
-        HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0)
+        HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(
+            HorizontalDecoration.distancekey,0)
         val space = AutoSizeUtils.dp2px(context, 15f)
-        rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1))
+        rv_aircondition_temperature.addItemDecoration(
+            HorizontalDecoration(
+                space,
+                data.size - 1
+            )
+        )
 
         pickerLayoutManager.setOnScrollStopListener { view ->
             if (view is TextView) {
@@ -272,7 +283,7 @@ class M1SoftFragment :
         }
     }
 
-    private fun setCheckAir(adapter:TemperatureAdapter,tag:Temperature){
+    private fun setCheckAir(adapter: TemperatureAdapter, tag:Temperature){
         adapter.setCheckIndex(tag.index)
         currentTemperature = tag
         if (rv_aircondition_temperature.tag == touchTag) {

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt

@@ -13,7 +13,7 @@ import com.mogo.och.bus.passenger.ui.layoutmanage.CarouselZoomPostLayoutListener
 import com.mogo.och.bus.passenger.ui.layoutmanage.CenterScrollListener
 import com.mogo.och.bus.passenger.view.ConsultVideoPlayer
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
-import kotlinx.android.synthetic.m1.m1_video_fragment.*
+import kotlinx.android.synthetic.main.m1_video_fragment.*
 import kotlin.math.floor
 
 /**
@@ -35,7 +35,11 @@ class M1VideoFragment :
 
     override fun initViews() {
         initConsultData()
-        val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
+        val carouselLayoutManager =
+            CarouselLayoutManager(
+                CarouselLayoutManager.HORIZONTAL,
+                true
+            )
         carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener())
         carouselLayoutManager.maxVisibleItems = 1
         rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() {
@@ -81,7 +85,12 @@ class M1VideoFragment :
                 }
             }
         }
-        val recyclerVideoAdapter = RecyclerVideoAdapter(requireContext(), arrayListOf, rvVideoPlaylist)
+        val recyclerVideoAdapter =
+            RecyclerVideoAdapter(
+                requireContext(),
+                arrayListOf,
+                rvVideoPlaylist
+            )
         recyclerVideoAdapter.setOnThumbImageClilckListener {
             val (_: kotlin.Int, player) = getPlayer(carouselLayoutManager)
             if (player is ConsultVideoPlayer) {

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

@@ -27,7 +27,7 @@ import com.mogo.och.common.module.voice.VoiceManager
 import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.bus.passenger.utils.VoiceFocusManager
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
-import kotlinx.android.synthetic.m1.m1_main_fragment.*
+import kotlinx.android.synthetic.main.m1_main_fragment.*
 import java.lang.ref.WeakReference
 
 /**

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt

@@ -36,7 +36,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.m1.m1_order_lineside.view.*
+import kotlinx.android.synthetic.main.m1_order_lineside.view.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 
 class LineSiteView @JvmOverloads constructor(
@@ -99,12 +99,20 @@ class LineSiteView @JvmOverloads constructor(
         super.onAttachedToWindow()
         rlv_line_list.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-        rlv_line_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f)))
+        rlv_line_list.addItemDecoration(
+            BottomDecoration(
+                AutoSizeUtils.dp2px(context, 60f)
+            )
+        )
         rlv_line_list.adapter = lineAdapter
 
         rv_site_list.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-        rv_site_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f)))
+        rv_site_list.addItemDecoration(
+            BottomDecoration(
+                AutoSizeUtils.dp2px(context, 60f)
+            )
+        )
         rv_site_list.adapter = siteAdapter
 
         val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite()

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java

@@ -6,10 +6,6 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
-import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter;
-
 public class BottomDecoration extends RecyclerView.ItemDecoration {
     /**
      * 第一个视图和最后一个视图偏移的距离

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
 import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m1.m1_statusview_blue_tooth.view.*
+import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.*
 
 /**
  * 魔戒蓝牙控件

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt

@@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
-import kotlinx.android.synthetic.m1.m1_statusview_datetime.view.*
+import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 import kotlin.math.roundToInt