From baf83d24a6b90c3217bb47bd2cd0eadd34e10d66 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 4 Aug 2023 15:16:11 +0800 Subject: [PATCH 1/6] [3.4.0] gradle --- .../src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt index 1f1957cef1..05bcb850be 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt @@ -52,7 +52,7 @@ class Request { fun request(requestKey: String? = null) { - //todo list 缓存result ，在停止时关闭 + //todo list 缓存result ， 在停止时关闭 GlobalScope.launch(context = Dispatchers.Main) { start?.invoke() From 5fe87693371bfad85872d77ac537de181895c625 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 4 Aug 2023 16:59:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[3.4.0][Fix]=E8=A7=A3=E5=86=B3=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E5=AE=89=E8=A3=85GPS=E7=8A=B6=E6=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/flow/OverViewImpl.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt index e2ce2558bd..a9af35d89d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/OverViewImpl.kt +++ b/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(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) } } From be52387aa3f4d2872c6c43826a68a2330707ae2b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 4 Aug 2023 18:48:35 +0800 Subject: [PATCH 3/6] [3.4.0] change the crossid get before traffic light request cross road and adjust time to 1000 --- .../biz/v2x/trafficlight/core/MogoTrafficLightManager.kt | 4 +--- .../v2x/trafficlight/network/TrafficLightNetWorkModel.kt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt index 184b173cbb..1d519ae668 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/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 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index 1646e6a7d2..44bfad8607 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/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>("requestRoadID") { loader { apiCall { + val tileId = CallerMapUIServiceManager.getMapUIController() + ?.getTileId(lon, lat) ?: 0 val map = hashMapOf() - 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) From 8b1b323add867b17bf243eb89aae7e4d0df8f66e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 7 Aug 2023 13:03:13 +0800 Subject: [PATCH 4/6] [3.4.0] voltile gd loc --- .../src/main/java/com/mogo/map/location/GDLocationClient.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt index 534a351eac..100466e746 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt +++ b/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 /** From d6a8320920ec80ec840849cef956cc1da1071d62 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 7 Aug 2023 18:17:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[bugfix]=20[=E4=B9=98=E5=AE=A2=E7=AB=AF?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BEtts=20=E9=87=8D=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index 03c2e935df..6addccd258 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/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 -> {} From 62634d2677da7495b2ef52cf7991f8c5ca8f674e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 7 Aug 2023 18:31:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[3.4.0]=20[ui=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/passenger/ui/debug/DebugView.kt | 4 ++++ .../res/drawable-xhdpi/taxi_overmap_arrived.png | Bin 260 -> 842 bytes .../src/main/res/layout/taxi_p_debug.xml | 5 +++++ .../src/main/res/layout/taxi_p_itinerary.xml | 2 +- .../src/main/res/values/colors.xml | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index 125e245b99..4dbc72c503 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/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) diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png index 45614012e30c72f4c24ab4389658e1581e79af95..95f67cfb9690078f591fe7759ca7fe58e53419a2 100644 GIT binary patch delta 726 zcmZo+I>k1jp`K}rr;B4q1>@UU@4bTqWsc4Nd+F@V&A#DQb5kZST6Dr`%>k}6Z+i9D zPXAl4_GMk@i46->yc8G7Zwd7?Ke#a4?DETHbBmLOcBkKwKl1I_&wY~L@7(=t^V{Zr z@%dKk<0lT!bT-*I$M?#$C7BH@9#~L4y6By<_^6$+d_BDG4+MnI=%)ti$={fDYFeX1 zwf4K%ekG9)S&JSn;Qx3%^T~FvX}%Hf8YAi%E7@p&n^7&Fb?Sg&J-3?s;tBODdSBgH`S{lNN9!+X zi1aEO_9QG=&itJ<&iGMiaqJ@V6dz|Ly~V4%4=CQM{&L8ZXZ~BWS_jsbMBma@bjR6AIt46p+Oq&Ug}+Sy&(SW@j;h2`#Zv~ z?y{<#vCo)gXH%AUdO}u?z`pu0)fu<4b!E5jnA?;UQr>&6;mp2?ON|p;{{-9(4_nrd zd(C>O(LCKH4@C>_?z_d_dBg9f(S)ffR&_fjW_>_6dm@~y?kve51)*QRnjDO; + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml index a5666659f3..8d5f3e34e3 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml @@ -72,7 +72,7 @@ #004DC4 #293449 #203555 - #B35C71AB #081831 #112B57 #66476FBE @@ -89,6 +88,7 @@ #005D6A8C #5D6A8C #995D6A8C + #B37E90BF