Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -163,7 +163,7 @@ object AutopilotManager : IMoGoAutopilotStatusListener {
                         TaxiPassengerModel.currentOCHOrder!!.endSiteAddr,
                         TaxiPassengerModel.currentOCHOrder!!.orderNo
                     )
-                    startServicePilotDone()
+                    //startServicePilotDone()
                 }
             }
             else -> {}

OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt

@@ -19,6 +19,7 @@ import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot
 import kotlinx.android.synthetic.main.taxi_p_statusview.view.iv_biz_icon
@@ -68,6 +69,9 @@ class DebugView @JvmOverloads constructor(
         tv_show_start_autopilot.onClick {
             fragment?.showOrHideStartAutopilotView(true)
         }
+        tv_show_order_info.onClick {
+            fragment?.showOrHideServingOrderFragment(true)
+        }
 
     }
     @Subscribe(threadMode = ThreadMode.MAIN)

OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_debug.xml

@@ -25,5 +25,10 @@
         android:text="启动自驾页面"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
+    <TextView
+        android:id="@+id/tv_show_order_info"
+        android:text="订单信息"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 </androidx.appcompat.widget.LinearLayoutCompat>

OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml

@@ -72,7 +72,7 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="@color/taxi_p_B35C71AB"
+        android:background="@color/taxi_p_B37E90BF"
         android:layout_marginTop="-15dp"
         app:layout_constraintEnd_toEndOf="@+id/actv_endstation"
         app:layout_constraintStart_toStartOf="@+id/actv_speed_value"

OCH/taxi/mogo-och-taxi-passenger/src/main/res/values/colors.xml

@@ -61,7 +61,6 @@
     <color name="taxi_p_004DC4">#004DC4</color>
     <color name="taxi_p_293449">#293449</color>
     <color name="taxi_p_203555">#203555</color>
-    <color name="taxi_p_B35C71AB">#B35C71AB</color>
     <color name="taxi_p_081831">#081831</color>
     <color name="taxi_p_112B57">#112B57</color>
     <color name="taxi_p_66476FBE">#66476FBE</color>
@@ -89,6 +88,7 @@
     <color name="taxi_p_005D6A8C">#005D6A8C</color>
     <color name="taxi_p_5D6A8C">#5D6A8C</color>
     <color name="taxi_p_995D6A8C">#995D6A8C</color>
+    <color name="taxi_p_B37E90BF">#B37E90BF</color>
 
 
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt

@@ -58,10 +58,8 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                 }
                 firstLoopCrossRoad = false
                 mLocation?.let { it ->
-                    val tileId = CallerMapUIServiceManager.getMapUIController()
-                        ?.getTileId(it.longitude, it.latitude) ?: 0
                     trafficLightNetWorkModel.requestRoadID(
-                        tileId, it.latitude, it.longitude, it.heading,
+                        it.latitude, it.longitude, it.heading,
                         {
                             mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD)
                             roadIDResult = it

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -4,6 +4,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.biz.trafficlight.*
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel
@@ -18,7 +19,6 @@ class TrafficLightNetWorkModel {
     }
 
     fun requestRoadID(
-        tileID: Long,
         lat: Double,
         lon: Double,
         bearing: Double,
@@ -28,8 +28,10 @@ class TrafficLightNetWorkModel {
         request<BaseResponse<RoadIDResult>>("requestRoadID") {
             loader {
                 apiCall {
+                    val tileId = CallerMapUIServiceManager.getMapUIController()
+                        ?.getTileId(lon, lat) ?: 0
                     val map = hashMapOf<String, String>()
-                    val roadIDRequestData = RoadIDRequestData(tileID, lat, lon, bearing)
+                    val roadIDRequestData = RoadIDRequestData(tileId, lat, lon, bearing)
                     map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
                     map["data"] = GsonUtils.toJson(roadIDRequestData)
                     getNetWorkApi().getFrontRoadID(map)

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt

@@ -128,13 +128,13 @@ internal class OverViewImpl(ctx: Context) : IFlow<OverViewStatus>(ctx),
                 override fun onGranted() {
                     Log.d(TAG,"权限: ${Manifest.permission.ACCESS_FINE_LOCATION} 被授予了....")
                     if (isLocationEnabled()) {
-                        isGpsException = true
-                        send(OverViewStatus(true))
-                        CallerDevaToolsListenerManager.invokeGpsStatus(false)
-                    } else {
                         isGpsException = false
                         checkIfNotException()
                         CallerDevaToolsListenerManager.invokeGpsStatus(true)
+                    } else {
+                        isGpsException = true
+                        send(OverViewStatus(true))
+                        CallerDevaToolsListenerManager.invokeGpsStatus(false)
                     }
                 }
 

core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt

@@ -52,7 +52,7 @@ class Request<T> {
 
     fun request(requestKey: String? = null) {
 
-        //todo list 缓存result ，在停止时关闭
+        //todo list 缓存result ， 在停止时关闭
         GlobalScope.launch(context = Dispatchers.Main) {
 
             start?.invoke()

libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt

@@ -26,7 +26,9 @@ class GDLocationClient private constructor(context: Context) : AMapLocationListe
     IMogoGDLocationClient {
     //声明LocationClient对象
     private lateinit var mLocationClient: AMapLocationClient
+    @Volatile
     private var mCityCode: String = ""
+    @Volatile
     private var mapLocation: AMapLocation? = null
 
     /**