From 52ea40970b3546b5e4e9e620a2ac30e74b007652 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 24 Oct 2024 15:40:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[6.7.0]=20[fix]=20[=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8E=AF=E5=A2=83=E8=BF=98=E5=8E=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/weaknet/model/OrderModel.kt | 1 + .../weaknet/repository/RepositoryManager.kt | 50 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index 429d4d6b2e..f83b7d01a5 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -445,6 +445,7 @@ object OrderModel { } MapMakerManager.removeAllMapMarkerByOwner(TAG) BusTrajectoryManager.getInstance().stopTrajReqLoop(); + RepositoryManager.release() LoginStatusManager.loginOut() } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt index 2a3bdbeae1..ab9f6ca1c4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt @@ -17,51 +17,57 @@ import io.reactivex.Observable object RepositoryManager { - private lateinit var repository: IRepository - - init { - if(ProjectUtils.isSaas()){ - if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { - repository = ShuttleSaasRepository() - }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - repository = BusSaasRepository() - } - }else { - if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { - repository = ShuttleRepository() - }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { - repository = BusRepository() + private var repository: IRepository?=null + get() { + if(field==null){ + if(ProjectUtils.isSaas()){ + if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { + repository = ShuttleSaasRepository() + }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + repository = BusSaasRepository() + } + }else { + if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) { + repository = ShuttleRepository() + }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + repository = BusRepository() + } + } } + return field } + + fun release(){ + repository = null } fun loadCurrentTaskInfo():Observable?{ - return repository.loadCurrentTaskInfo() + return repository?.loadCurrentTaskInfo() } fun queryCanUseLine() : Observable?>? { - return repository.queryCanUseLine() + return repository?.queryCanUseLine() } fun queryCanUserTask(lineId: Long): Observable?>? { - return repository.queryCanUserTask(lineId) + return repository?.queryCanUserTask(lineId) } fun startTask(taskId:Long,lineId:Long,taskTime:Long,lineName:String): Observable? { - return repository.startTask(taskId,lineId,taskTime,lineName) + return repository?.startTask(taskId,lineId,taskTime,lineName) } fun leaveStation(seq: Int, siteId: Long, taskId: Long, lineId: Long, taskStartTime:Long ): Observable?{ - return repository.leaveStation(seq,siteId,taskId,lineId,taskStartTime) + return repository?.leaveStation(seq,siteId,taskId,lineId,taskStartTime) } fun arriveStation(seq: Int, siteId: Long, taskId: Long): Observable?{ - return repository.arriveStation(seq,siteId,taskId) + return repository?.arriveStation(seq,siteId,taskId) } fun endTask(taskId: Long): Observable?{ - return repository.endTask(taskId) + return repository?.endTask(taskId) } @@ -85,7 +91,7 @@ object RepositoryManager { ochCommonServiceCallback: OchCommonServiceCallback ) { if (repository is ShuttleSaasRepository) { - repository.queryCarExecutableTaskList(ochCommonServiceCallback) + repository?.queryCarExecutableTaskList(ochCommonServiceCallback) } } From 07c17b693aa17dbef14237139ca0d1583c9fc11a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 24 Oct 2024 17:01:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[6.7.0]=E6=9B=B4=E6=94=B9SSM=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E4=B8=BA3?= =?UTF-8?q?=E5=88=86=E9=92=9F=EF=BC=8C=E5=86=B7=E5=90=AF=E5=8A=A8=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E4=B8=BA10=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index ab50574284..2cf4a7e7aa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -56,8 +56,8 @@ class ColdStartView @JvmOverloads constructor( companion object { const val TAG = "ColdStartView" - const val LOAD_SSM_WAITING_TIME = 60000L //SSM加载超时等待时间 - const val COLD_START_WAITING_TIME = 300000L //冷启动超时等待时间 + const val LOAD_SSM_WAITING_TIME = 180000L //SSM加载超时等待时间 + const val COLD_START_WAITING_TIME = 600000L //冷启动超时等待时间 } private var ipcConnectStatus = false //连接域控状态，默认是未连接 From be160ed6f667023dc8d2d7632f00f01d11c696dd Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 24 Oct 2024 17:19:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[6.7.0][=E8=A7=86=E8=A7=92=E5=88=87?= =?UTF-8?q?=E6=8D=A2]=20B2=E4=B9=98=E5=AE=A2=E5=B1=8F=E8=B7=AF=E5=8F=A3?= =?UTF-8?q?=E8=A7=86=E8=A7=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/angle/scenes/CrossRoad.kt | 2 +- gradle.properties | 2 +- .../java/com/mogo/map/uicontroller/VisualAngleMode.kt | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt index af3b7f4fd7..09758f2ec0 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt @@ -18,7 +18,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON override fun getVisualAngleMode(): VisualAngleMode { if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS + return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS_B2_PASSENGER } return MAP_STYLE_VR_ANGLE_CROSS_NEW } diff --git a/gradle.properties b/gradle.properties index 9b947b67b9..ad6f78576f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 MOGO_TELEMATIC_VERSION=1.4.7.42 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.4.1.16 +MAP_SDK_VERSION=3.4.1.17 MAP_SDK_DATA_VERSION=1.0.0.9 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt index 1917ad497b..cf98aa87de 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/VisualAngleMode.kt @@ -62,8 +62,14 @@ enum class VisualAngleMode(val code: Int) : IMogoMapVisualAngle { /** * 十字路口视角-新版 + * 适用于其它非B2乘客屏的车型 */ - MAP_STYLE_VR_ANGLE_CROSS_NEW(12); + MAP_STYLE_VR_ANGLE_CROSS_NEW(12), + + /** + * 十字路口视角-B2乘客 + */ + MAP_STYLE_VR_ANGLE_CROSS_B2_PASSENGER(13); override val isLongSight: Boolean get() = code == MODE_LONG_SIGHT.code From 6305a7f0bbf9e4d5f831dd0c4df034650ff2ae3b Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 24 Oct 2024 19:14:09 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[6.7.0][=E9=81=93=E8=B7=AF=E6=96=BD?= =?UTF-8?q?=E5=B7=A5]=20=E4=B8=89=E8=A7=92=E9=94=A5=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/functions/test/V2NTest.kt | 51 ++++++++++++++++--- .../scene/road/V2XAiRoadEventMarker.kt | 2 +- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt index 32f1ad3a4a..5f63bae62c 100644 --- a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt +++ b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt @@ -59,11 +59,15 @@ class V2NTest { delay(millis) } FunctionBuildConfig.v2nTotalSwitch = true - runCatching { - val map = HashMap().also { - it["f1"] = FunctionBuildConfig.v2nTotalSwitch + val isDriver = arguments.getString("isDriver", "1").toInt() == 1 + val times = arguments.getString("times", "100").toInt() + if (isDriver) { + runCatching { + val map = HashMap().also { + it["f1"] = FunctionBuildConfig.v2nTotalSwitch + } + CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } - CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } delay(2000) val targetX = arguments.getString("lon", "0").toDouble() @@ -83,10 +87,43 @@ class V2NTest { car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() val point = DrivingDirectionUtils.calculateNewPoint(car.longitude, car.latitude, car.heading , eventDistance) val polygon = generateTriangle(point.first, point.second, car.heading, r * 1e-5) - val data = TrackedObject.getDefaultInstance().toBuilder().setType(501).setLongitude(point.first).setLatitude(point.second).setAltitude(0.0).setSystemTime(System.currentTimeMillis() * 1.0 / 1000).setSatelliteTime(1.0).setUuid(10).setCarID("1").setColor("#ffffff").setHeading(car.heading).setSpeed(0.0).setDrawLevel(1).setDriverTime(1.0).setCameraIp("172.18.7.40").setVideoUrl("").addAllImageUrl(Collections.singletonList("http://www.baidu.com")).addAllPolygon(polygon.map { Location.getDefaultInstance().toBuilder().setLongitude(it.first).setLatitude(it.second).setAltitude(0.0).setHeading(0.0).setStation(false).build() }).setDetectStartTime(System.currentTimeMillis()).setV2XUuid("xxxxx1").setStrUuid("xxxxx2").build() + var data = TrackedObject.getDefaultInstance().toBuilder() + .setType(501) + .setLongitude(point.first) + .setLatitude(point.second) + .setAltitude(0.0) + .setSystemTime(System.currentTimeMillis() * 1.0 / 1000) + .setSatelliteTime(1.0) + .setUuid(10) + .setCarID("1") + .setColor("#ffffff") + .setHeading(car.heading) + .setSpeed(0.0) + .setDrawLevel(1) + .setDriverTime(1.0) + .setCameraIp("172.18.7.40") + .setVideoUrl("") + .addTrackedSource(MessagePad.TrackedSource.getDefaultInstance().toBuilder().setSource(2).addSubSource(MessagePad.SubSource.getDefaultInstance().toBuilder().setSource(1)).build()) + .addAllImageUrl(Collections.singletonList("http://www.baidu.com")) + .addAllPolygon(polygon.map { Location.getDefaultInstance().toBuilder().setLongitude(it.first).setLatitude(it.second).setAltitude(0.0).setHeading(0.0).setStation(false).build() }) + .setDetectStartTime(System.currentTimeMillis()) + .setV2XUuid("xxxxx1") + .setStrUuid("xxxxx2") + .build() val trafficData = Collections.singletonList(data) - CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_SHI_GONG, data.toByteArray()) - CallerAutopilotIdentifyListenerManager.invokeAutopilotIdentifyDataUpdate(trafficData) + if (isDriver) { + CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_AI_ROAD_SHI_GONG, data.toByteArray()) + } + var cur = 0 + while (cur < times) { + cur ++ + FunctionBuildConfig.v2nTotalSwitch = true + FunctionBuildConfig.v2nNewLinkedToPNC = true + FunctionBuildConfig.v2xTotalSwitch = true + CallerAutopilotIdentifyListenerManager.invokeAutopilotIdentifyDataUpdate(trafficData) + data = data.newBuilderForType().build() + delay(50) + } delay(TimeUnit.MINUTES.toMillis(10)) } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt index 5b7c1267b1..b852a692d3 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -55,7 +55,7 @@ class V2XAiRoadEventMarker { .set3DMode(true) .isUseGps(true) .icon3DRes(R.raw.taxi_sanjiaozui) - .scale(1.0f) + .scale(0.5f) .build().let { CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it) }?.also { From 52bfac25c2d9f0fd455d25671e247b5833d57d83 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 24 Oct 2024 19:23:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[6.7.0][=E8=BF=90=E8=90=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF]=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/operate/OperatePanelLayout.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index eccde5f3ba..fb71bff54c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -1263,9 +1263,9 @@ class OperatePanelLayout : LinearLayout { prevCheckedKeyForFusionMode?.takeIf { it != KEY_ALL_MERGE_MODE }?.let { preferenceScreen.findPreferenceReal(it) }?.also { - prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE changeValue(it, false) } + prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode) clickEventAnalytics("融合模式", true) CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) @@ -1283,9 +1283,9 @@ class OperatePanelLayout : LinearLayout { prevCheckedKeyForFusionMode?.takeIf { it != KEY_BLIND_AREA_MODE }?.let { preferenceScreen.findPreferenceReal(it) }?.also { - prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE changeValue(it, false) } + prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode) clickEventAnalytics("融合模式", true) CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) @@ -1303,9 +1303,9 @@ class OperatePanelLayout : LinearLayout { prevCheckedKeyForFusionMode?.takeIf { it != KEY_BEYOND_VISUAL_RANGE_MODE }?.let { preferenceScreen.findPreferenceReal(it) }?.also { - prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE changeValue(it, false) } + prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode) clickEventAnalytics("融合模式", true) CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) @@ -1323,9 +1323,9 @@ class OperatePanelLayout : LinearLayout { prevCheckedKeyForFusionMode?.takeIf { it != KEY_TRANSPARENT_TRANSFER_MODE }?.let { preferenceScreen.findPreferenceReal(it) }?.also { - prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE changeValue(it, false) } + prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode) clickEventAnalytics("融合模式", true) CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) @@ -1343,9 +1343,9 @@ class OperatePanelLayout : LinearLayout { prevCheckedKeyForFusionMode?.takeIf { it != KEY_PURE_OBU_MODE }?.let { preferenceScreen.findPreferenceReal(it) }?.also { - prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE changeValue(it, false) } + prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode) clickEventAnalytics("融合模式", true) CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) From 6286b1693b7f9f0b57fa53d390db83925ec4c2ad Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 24 Oct 2024 19:34:19 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[6.7.0][=E9=81=93=E8=B7=AF=E6=96=BD?= =?UTF-8?q?=E5=B7=A5]=20=E6=9B=BF=E6=8D=A2=E4=BA=8B=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/raw/taxi_sanjiaozui.nt3d | Bin 39974 -> 32682 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d b/core/mogo-core-res/src/main/res/raw/taxi_sanjiaozui.nt3d index 9db52cc348dec2430f5886d26c41cbdc375a6b5d..e09b556cade718ce891c8100a0d44608d954ae66 100644 GIT binary patch delta 21302 zcmb5WXHZjJ7dA{2M4G~lbP#DGNRDFO+INN>_> zP)Y#l9YTjd0x2)|GxL2v-hXdq_MCI}US~}vS^HYox>in#>#4qxDOs|qC@Cl?7#=5H zfVtyvI!W-_(EO^5yd)<>5Vc;PQ%+;wtUsL`_wv$>o94>xI@M3d9KS*5$=x zTa#yY`uY@iFVC-1P)0gX(EMj|Ik+ze1qF2hB?a~6k@CN}0;>OSm6Ec6`u{)wpW&k3 z?`sqk4=A2Je)!U#a<@f4UGmvT#6%siDa$MB97bPm+2cFKL_OK@l(U9Hls6N2wVAY4 zotP8!MQhUVj1~3J~4eh#1%*n08s~+4^?hg2LNW?(MFOem=IZQ&t-;~-j>0!6?7SBwEev{5ftOrqw^tk@IlYd zEHs^S!coD4G zzHW1~Wpj(LY@N%xnFewhEUtRkM&y1t@kJr6HC36Txp_b#A1~1g#BZIm!|I}5A@DyW zkcz(*d@X!Jf`}7IE#%0HZm+K=v)=gk`|G`wt_E(<@zD^~q<=l&Og*>xAdNrS3LhG- z{%X@hVej3q!+p(fA+?anVH@C3-cLN?H6!)vtCXYg@5B2CThbOdms`nJu5X#a?6^ zYC84Ir(Mj!I1gn~{xNyb|NQlhn~}|dlx#M0bX(Mv(^!CdGbU=Eq7MP-L)vQk5*d1m z%DsGBj1aqyyK{cRE;X&|2&KLZM`Rg>eH=ZDl~!r0xm=eCiGyfRh!&3-v>+QWZ0kd|M z!{j8_QRsThRoqQ=ujWj0s>RmnHtwcT_r7Rhq)p(sF7vj;bT8vq?Nb9+a zTxJHLKMNOZS*LBehN7d#OI%FioyLmw=KqV0T|I2g>kZ*nwoe^wQwvWd#wnJapJ{CJZG~vq$M|zfrmUm6}o273JJDLz0-kHH%D%v@Ni zL65Gbr=0OT)iQgp^Fh|$I{5jvM3nom<%Gr;E;l`c)&SX`YvB*QwnM)E!5B+*Al~53 zLI0Y|S8oRqy^EgixBP^Btrp2}_p7WpRk9{CMO)tO*E}H zyISJV_k#U0sA+b z2IMfKo*dvJS`W^uH&zqsmKuY@u1sB<#w=Wr*>cG%9O1|2=twH1m%diB{EBZIJCQCe zVVOLthr{V4cmE(|9+{6 z#bg~C%>Dfg$n6u`0Mu!iBmGrI=Q09ws~n7xfN|tzq*048|4DXV#-Wu&W54atUDNEJ z<5`cZf~S}%itpXRg5N9sy!P}Z{oDLN-GDp2W~p2Pi=WlH2aE1&i3$nCUrm?Z<&zZU z1E}VquVg;!WR}&w8fXdSd5Cm$OPwySdZlJBJ@@O?qp$aTL~lq6{G@*8z@SakA}Gtq zb5#L*+`f^mVy{TANvSuCpV?XG_e}-Mp=MukE@(ac-I|dNjJVO8PiAkZ?&E@-w_oj# zA&`_xxE9jCCe8!%WDj?e;0A#AcsGNI&{ObstEjFh0`JqysK(vPI$ejgg&6Lg=DkB6+1p-X6@%|ZpG_3XDcpr-n_*O!gCoA&< zWIUMcdy6Ho2|7PBjJzoMlH19rpxvk^h1WG|QeYa&()}SQplwZ& zt{0+LO+s`Sr-kjDS1sRRn#R)O^8Z|-eTk%o{ie#jX>-FBH{MHhhg)epLyIj2>A<|u z@b4$Ng&RNK`f0?qd7LQtg+yS5&EfC%#V_rEfj?dm`D4j**!!fO-Fx<8*FQ8yj7o{T#lFBwD+gX*HMoXcw z6%4cg1tp6*83xF1zE6zBCbHOA9DkqxAVKQlcs_69iC^PBW{3ZznH1UI9^EiEKj*++ z)2B`02o1T0z@xFkT0(k_nTDz-nb&)bwB%&$^+qDBkZs(WZooIc(-_597$X$ZkE|<= zGsv0f8*PhdCevfs;cyK{?6cl{meVn!=dyh9fjg1u0wA#$(xo?!r_H7N{QaFg=>6cn zoqKlAx{9ArX3=p{YvaEbB8fiU@J3c=G`!n)C@s`hR|@?T4NSya)o2ZkH_cv~ z#5pFHO8r*}kItEam%RAJ5%oiMST@DUzpsT<4GAI(*e@4^90!v$N66>}dS34KE*|Ym zq9G0Ni}FOmG*)@@2KT8G8Qo_dVcqYBc@tm4XLWF+5^dE3YyuIW)#uAie+JW=lbnu# zatP_m-XX#V33%s$rrFHqE>y3Nr5gv~^?pSn&w)XRO0h|R$G@1sX_DXt87mg{)xL(q z*pyOnswa31xW=M6lYj7gHFzc+(9g)pqp4XApvboURu{}>I*>gIeT5Py$B|c=HD~H& z(u3=;Qn>!40lep6T|@<;5_aY#=#%zisv6K ztRyI5E=I9%vUTFqX4UTwl=-qfcLf{&Ae||P^CM6pRCe&f?EPz4gDjSJqby)o8s|Ud zcT!d{gU~^A)yWRa8f>{zb6Ru4ur=l3TkYdJ9cG%P5qHnd&q!@c z1at!R@px?t=XPDMXQ_Ov$A+3c?>W>&8SQtZ0ACQk5KEK*?H<&^3u`N(8D37tRNLpa zqa07I|LW)U_0*wZK^7W->6zEAWRUnJiB4X+WSj!TJ|(8TkK2Z(@R(|rm6Qi+C6N@U zn%u=7lrPb3+>@Gyu`CoP0iCApQ8LdHV(ODk4Wai9ZMpdi|CI>oi6qh!Znhm&QU(!! zAOHJe;TVDHX`(EN;6HQg-XL{%AC&2J%7%VL;abQmYGL@daR}f<{}}B=8rU80x&jY% zKFybs*BQ__{-`_Bh5zR`FV9G2l)+i!z)^@44{ms`Il>0Q{pb*@!&k8Pzbjc8OK_>D zHqv=ktxdZg+iwazJ=fAaB?aAHH|?& zM|d`hnFst(=x7*fp^gX);|1U}>L(Rg9dvq3fw=G2?6K|+F$4OlOP)D>Z~&wkO1_Me z?&pQ`4ne>_^T`7V!-WVazT0OSlhZJhU2^Yz*WH@`l_x$0h>;xoE86)P$wLsrHr*J2 zg5fbS5A7J4%aa^Tq?QJ6Uz7e(Ty#}-l)W8ZwuDX}VhEcJDI}7zYG3_QYi`J2Ydb>m z4*sb`=MH5Yot+1~dtyA>R!(xPfgcZj?3m|fvD*iH9ii#eerV~Syzkj%_e#Ruf?1Wl z&quMZA0&PGD)T6fUPbRNX~4Gw-5>!R-C2F^8!sehe_tGJ>hH5kA(`y3A$9i8xsKG> z2Q0OE1I_#T%iSjLVB94RX{FVNEJEeIuq`CV)R32UV*`F7U1`u_u0xjD{|F1H`x3mO z9{E}Mk#1lKfgHdFFcQ4muPJ~C*wpL?o|G{zm@f!a?n{wIfR=%c$rciDI5c+wvtK5%?&sTGYN)(Pi3pTcxHg?quYld)+s(Woq+kY~Z^PkC%N)uwi z41TB~*H+viQF3D)XdGB@iSnBpp!p&u-Oo2u6FB_!|Mv5#ijQn?%kAhf`{R~xeanyP zv@sA?pRZ1DHeC&w+GuX|z-UW_qBqkoR(;n1Xg zA~1*-fH8izVpLR78Zg(jX*~Lj9049%dng0N;A7-vk*#;07vm!lWscSRqn!g(iaj50 zo7`wjT|}Np@JuNPD7)a=G%8-vcYL!??wKX5KOOmfQVT+V6<*hA`yOU~95xm~{@ZDm zcD*7{^pgL&?ZKUiz56uZ?JLD=!e*Q;cO4b)ooJ4k0sG_FJX|zt-1N;2z%fW9w6YNW z4Kc)<3=?G(x~%jYBpCaxbm!*Y?(aJl;@nk-ve1(;~(IG z^7v!3+!Ty5e;Q?MxdYfhN|{uf)04o#v-_UPrB9M%J_6jpk$D63!5e0N)}&~)WFu!@?yc}v#IXH}PaKDe3Pj5vYI5tbatX5~JH>R3G8Lr&J9 z$t|JNm=>}Uow3r!sC+eWHt1%+C5_p|(v0$Q@qir9$mKT#B2r7g?qkO?wf60RY!~3XZBrl<84+}R7Yw!j zEqzvwHpa=UnUD*|R=06~$V(UG{guLmuVWNE8Tv6%F}#%ykP!AnWtaAG*a`K89GPCm z^X>KOwS98OW7y*Ph^>_H%3}d$8(Qmzr|+D4ia-}weX?Q+<6*n8$PEC zZjjuY)|u(E1O(!^($}~joI%xv$yG!c$+><~+ly1`se`8TXQhQyuGGR6xhN@TzBl!{ z^*!xmGuR_RuJOWqOx9_fIeV(9F+q=*Zj{Vo1njN%f&8Dn(?{*Ie5E{X_Xj@IMcES# zLF6{|n=dfizlNU{^Is8fusK@4vlaJwM}7M|u}mqT5um2O1~9*E{v0cAoKPlb{t-@S zU(=?@;Othyz8uMDA^lEiAt!i|1^oZx3>UL*smCoc_h#K^U(WlNkNedh+MO8f1+Q!W z@JV}1EvF^YI^eemTh2Q7nrA1M9^fZt?h?ybAlM4$$n%>U;-O{0r8orSCxOoh3E-Op zC2s&;Z8mka(!nffyt`geeJob0zlnMIy)`<*ED$A@`f02X9g%Xw5@5Cq{1pk~3GK-s zaNuqzAbRdLNnfIHL&-D?_gcPx(TtkQ zVVm{|j&;>F=Y3^XCP!W0bq7e;f>L|00~_d|#TS!jRCtNDYn#008E$F+alw56%#fcF z8qr7^M@?7M5Lr~oD=F<0pI_%3OJTzDS^RfrJPkBuZt4Ems!Ed<0}g)Cp7@3Oyp8{w z?=a?)S1GF0c8gB1lGPsVHOIMn4=94Oys##3PF*tS{j3eivV~mo`EL8tDhP=Gya7?# zZ+r&b{}r_(#;pl2mk7V(_U*R%A)S=Va?<-nW{m}Wb+^&k*t^<>&1Ug-pH{|IR%(zJ zq*=m+vvfn0RY&ZK56!48*d){Q>iO+gyUoD>?0qc451 zhE$6c&WMT>AmqV3e*yzM7Sb}7N@(J)EtrS+9cq+8;VoqB^-TsR)#0HMr|EGP!x@uB z=kvyY7i#l^J?mH0@Zn-E-6iou^U_#m%u3_YF!ki5y3389=(e*3K)zG_1rRt-%DU8K zt}j}+^GRmQx*Zfd=}IbD+{P3;)c-9GI2K=WXbia2Vda{;n{Hw{7qCMjr7!Bl4_Zi* zhG!46TCTNebR**CcZtZL&)lg*`Z>~Y&3vG`%kEB8UELF<`7hk@`7uungP*N4+IT&h z7r?qPj&y}-CqF^}!a|}l{Ri!*UFYw<@Mky}ONaZ4u%8mr?5>5#FZdnSlzzTn?YZ<9 zBM_t|!1<#;f3=y>3w$j+A;~39cR=pnoKO$Wbdt@s%|77W$^V~cjt`MTxj!~U;77sq>p=q zLpcL`&vEfrT5{0zWU(R@vG$bAh_%lwT%9I(!{E!T;D=Kq3*TM)@LvTd5P31}7O8$V zFc#3=0R~h?`VyGR@}%cV5KtSsjg@ukjGv8Bubb6%s{6Wno{Tt*CPmak-3P_K4DK02 zd~*ZO$|O3x=gjPh|LL9?@_$eFU zmT!n)_EYlt+F!oYq}`W5 zMDLUH7Si?=jsA7@RV(B-s}NL^t7Zxn;_BXcXMxRJX|}zQRijk%-$n$G#>W+d**>ui1k0U6sgZkOH>4EuZ+Zrnc+}{6 zc18(KVXx_u>ThvjdYeun&4KqbPh8DohI6D|?tnc|43#&pci+B_LDLOz6i z@Z0|}ZIS~B&anV%^lkausIQSB zj^$}$m&#Oc%EJ0o%6#9S-J&BZPrUk$KkC$0^1)@|tieg)k5K-QA=s1wAxz^R2hBu? z%|FD_fbO>C$g|O}TAz(WI*_|z=frHNc#Ivg4eK=rpw@M;X~eW}3LoLl5Qs0&-Z{u= z&#=pZ`dlj#ngYHGwj?Jk(68P`a=%pk5JJ>o>YuvhVJMmvA<`kocW~2?dhH88_E{Yc zoy`XG7}I(Y8Tjmj?4wp8^ttG?Brel(xUOgavI@@)smGuiAyLTsEiaU8X$JJnrl+~I z0t!$ESHlhPzGT$LKpu|4A7^DU&Zr@1313N^Se})>%_qp;ITn z!0w?^JDECGJugGzfFgb`^`H22TOkH|Y)LWzIKz?A~ihI+5SBZY9EJM{nVmBFSFp5`-VRRO74NW9_Uc`Cz$8c&anlT{~L zj1lYTta00S^R>nwwTlDtq{8PNqFTP@MuJ#hV25zfg=d8&2AbBv<<6Zxt`{y!9hXbd+>U zMjLt|(Ag%nK0CAy9JeKc1^jmH$K}szPCEI24)qHhU)tQ;vR5Z#?K=${t-Vq!;hJ&v z&bSnu2VETkNpqd;4LyN;J(COzWI=y|9>`A;sIm1@I31hDA>u2d7$H31-~Vt?!zTBt z4@iS2aPhj+CEUTW`BM|;9(JDW zXmHY>|D_w47qpQavvNj@{bd6))AVT=Nsk272r!2z!=Ei&G=p0x%38PU(L&IUH|u+S%*>>FW# z=YZ3_>dVj4!TziM9}RbQ zSQM^rnry#0M%BJ1mcyh(ewf2n46%}!OF8PmFIbGMAL2x+B~9#`r3DeCcgfOt`=tB# zcsMvjbX?8)$2&yco%R@My_a~S&+=0jDC!$MFA^kG`~g?Kw7|==O!cHFP_%M-_5;x@ znm|v9(21ydo!k~1Z?HP!b{fX?qH8TMMhJpfs~LmO+J8I|wRHNR z6diUpD}g=^^qD8UKZd~=&EBfN`fj;8aTN;Ezn0)`-j0mU_w%RPj)0egSo?O_bPe9d zi!9N%joWvojwhE%khdVo|HY$<4H*5Oh_ijOiDSNb{xN%D)>iY9r{@*m&R+@AS~1)( zSMyg-T`5LWeCzg2d{ab#uGH9Yw&--J9R{4yRXO^fNz z5YT!AoF1N~B}i08Xm!+H#lW4Suk=03Jr@L~HsaRa>&`F93#gbqH{VEk?74%rkKE}l zB>$GV0H*iX-CX$Z4%-39Z(D;WC;f-X0@1b$y}b<=$I19p(qGbS%1rb)hJc1K7H|FD znLcTy{D{|qx_YjdoUtOxp)&@-VP_jSehH8Zl$U{0nI$_>)0y4hmW`YS{S&9jPkFS9 zP1u{JvpX%u%oq?EN9W0#T*J{;@Kgs~L-Tan_f5)V>^?mO5NcHc4!4)}sJ?Rt;q7ws zU9j!yGL;%fnX7u&ru@ULwYKuJzu1GQFz)RX&EmM2tP9R^rY3j7vT9s*_2giazX}C)3C7B|;X6*aPa%AjC;yqI5gX z&dWJ2ze@)NbzZ$o_2>0LIA{I&?t_3yKid4qGpyfp|D=!;mqKsX?K47xA(-E%Is~(i z)l(B`b-_WzA_wftrWs`I0&LjrV(#=R|JgIV4gttsm|EyQgEx?S7nrNcrgJC7UFJe< zd6E{I28wo6EUe7Hdq?RNyJB{@sCzwxhY>wdbK3sM=y-|NlxQVxO7`eX+ zxGpt@7k5FD1HqHKjhOv=p;sh%zU#S-RrVfAEp`de0Kfi=H8?i0B37zWeF*O%nXi6) zT@;7!4l)cdd&&974piFM`r@)9>pxUEO9xpR<2bJgv~$IC{JLzCZOxN`b3AgNW?SkY zB1`FtlD6J???ix&J1{w12;J+T2eACV08UTHuhrka6d=(&U32^crs0_o?G7YU*EvUc zDkUUM9{xQf#Ot}GM75mWoCek&n{>xUqA+kHye47fD`H34`+vHrCTy2Jy@h-~jJ!Z8 z4AzoK*NiF?=&OxV9M_~Jz3Ch)7p})F+~%n@ODSw2eQ_hS#_VDtb-*b}fPbLmnAN@n zE{z3ncrYoieM>Y!${jV%^GcB-JO;FcxlXhI__|Bps|IRpYxhhPn=p{v(7KGxG`-pg znLfNrYYr(^5_PHl^b+0OPDu&!$7-lc))IO_{`}Fm1`c+~Rd4ecr!_F&%3E#@Y25rl zH)mW~japg~&;*{!rScWU?}Rrf_%+q~{QZ_g*VMdjT5TN|%jwc}8o2sv0bMfZzZQ-0 zwdT~g{Plv%0DCV~Qgy`@WW?fn5S#C2!p}*x#v)&Uq45@|Z-1LwLCam@P5SdvYOZUn zVox37h5}?`pBx<#w(2aZLi)<|`Pa8~WOZ!PX41N3D}cgdMq+OQ`Lq{jU@2N-6rP$a zE|_kVW3na>Nb5-c^x<5PU8gD+;A8Z%xW5ok8fnFdIT5@<5hQR*nS)Q8>T<&1e^hdM z`Bl($tM_DUI`>BH5_+uO9H02G4qg}Pt;$D#oZ}ux&vQBPt5jzBW2l{615$hXOYTo9 z3rpkCK=bk^m{adlP~_}T+}Jwrv`>}ws+KQLBZdl9W#L_Yp!!3$mzh5&u(XERJCbvK z+x!~_Vl7Y<`egH;-cFSY%h^OS&C!Naewj%{r0aJqK@;%wd3GSekKs&N40vxk(cONoajzj@X ztw*72Z>s%{)ezW%xuyLhB73N#HNn*0uZoC8xBbijhZ6k2%ax;II&RF0DHy+o#S^DD zUzvJadsZ-{@`m8$#vRzl2q&ct2ArL#o=9L#;a&uHpl@s!mp@!9(V<$^5jl=zid8%T?d_bKhGRAl%{j_l z%waHjPU3Q{`82jtC0A%7C>Uv~rhFoy9)O6D^;DNRTzMxD74)6X@;);a+l-#D;)-wv z3v=+$As5GXto&=9V2Sx=YgMpfeYNaRxKxHhG+T^0BPaq?ZGGa?qzVEit39pkH#^-} z#t+Lo?ZH*p-)KpG0G;K>3vGF-G8~2yL~*Y`dB5BIu6z^JdrDZR?%nh`X*_IVvF;iS zYr}M%D4$qdY^Si$Cj_i^7%=b5j0WY&4j00seBQucgnkJ`#kfkUTb{)9N(rcT&dxwW zcd3be4|#3+&aI7X41ueCk46u(QX6EolT9g(*?Ee?nSwVw4WOu~kxk!~L}o8JNFAjo z2IDa)&Vp~Z@$1vfZOok%`>CrE*ouI4Z!0APTQ1dDxHlu5tqhu+Opi@6lmk+y(45;= z|I#_JyavfkK4Ua#=$5np#8=~S#U|fXi8d$nVmzSRfjS}H91u{9R1WdXrUpxIba90n zC|Nd6Ht>|L>OtsLr*g_zkVD7AU$EQcS~Es)?vYpHK3+FB7GqbznY zyt8S;IPl%J<(}TnLGm^5C=#}`yjI-Iiq|38bMC~pIckK5K;aXkvfHo;tT{jWR0rDY zJ=d83ta<=Y%O%C{pQj1D>Gd`z>?a+_?2KiG_z(|Q+BVd}d>-7IPIIf3J)^HXUtC^` zbAL4p+)sy(E3bl_@K#G&=-|jY~T;^pk{@; z-4%x;X!XT4W9t-_H+3r*YPiV`%<2&7bAn5=&jZ-@H(L=%d=^qg)uPot`S|KQrwH!V zegi}R2Wk`uLO$o0*@nD`-!qP6YvWu;#`$06q{;fA`1$XxlLt}8*8A#~O{fIXDG2mz z$=_xCJ!f(1Nu_5k<7x=5a5$z;(QX>fHd+7(I!}D%4hN< z0N%v&gEqNO=GA$q?4Z!I`d(88l_)F3aP5-UrdRx1aCJ_N*W$jDx0GSV_=F8wd3#F* zn!xKW4~0W@f)VsNji)|R39P)T$o#PYRFOV?U9C{ZX+ynC2@3&Iw6U%1 R#_*D9} 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 delta 28667 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 From a72a97ea8c4f9e116047edccca8612693d8048f8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 25 Oct 2024 09:52:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[6.7.0]=20[=E9=80=82=E9=85=8D]=20[1536x2560?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/shuttle_weak_switch_biz.xml | 32 +++++++++++++++---- .../res/layout/shuttle_weak_switch_line.xml | 3 +- .../res/layout/shuttle_weak_switch_task.xml | 3 +- .../res/layout/shuttle_weak_task_running.xml | 3 +- .../src/main/res/values/dimens.xml | 1 - .../routingrunning/RoutingRunningView.kt | 4 +-- .../res/layout/unmanned_routing_running.xml | 22 ++++--------- .../res/layout/unmanned_routing_select.xml | 3 +- .../res/layout/unmanned_routing_switch.xml | 3 +- .../main/res/layout/unmanned_switch_biz.xml | 25 ++++++++++++--- .../res/layout/unmanned_switch_itinerary.xml | 3 +- .../main/res/layout/view_bone_container.xml | 3 +- 12 files changed, 66 insertions(+), 39 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml index 5e1fca3986..f5b1760fd2 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml @@ -2,9 +2,20 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + + + android:layout_height="0dp"/> + android:layout_height="0dp"/> + android:layout_height="0dp"/> \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml index 2aa5f7ad18..1c0e065ac9 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml @@ -2,7 +2,8 @@ diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml index fd1ec0cd92..c45fa5d21e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml @@ -22,7 +22,6 @@ #323C6F 10dp 20dp - 200dp 52dp 65dp 20dp diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt index e22fefd1c3..f89b04ef30 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt @@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_distanc import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_end_routing import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_routing_name import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_submit_task -import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_end import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart @@ -196,8 +195,7 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal ) }" ) - actv_distance_end.text =TaskUtils.getCurrentTaskDistance(meters) - actv_time_end.text =TaskUtils.getCurrentTaskTime(timeInSecond) + actv_distance_end.text = "${TaskUtils.getCurrentTaskDistance(meters)} ${TaskUtils.getCurrentTaskTime(timeInSecond)}" } } diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml index c53c29dd26..865a2f1d6e 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" android:layout_width="@dimen/dp_880" - android:layout_height="@dimen/dp_966" + android:layout_height="match_parent" + tools:layout_height="@dimen/dp_966" tools:background="@drawable/shape_itinerary_bg_default" xmlns:tools="http://schemas.android.com/tools"> @@ -41,7 +42,7 @@ android:layout_marginEnd="@dimen/dp_52" android:layout_width="match_parent" android:background="@drawable/shape_itinerary_bg_default" - android:layout_height="@dimen/dp_351"/> + android:layout_height="@dimen/dp_272"/> + android:layout_height="@dimen/dp_92"/> + - - - diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml index 481fb6f4e7..b41c1767a4 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" android:layout_width="@dimen/dp_880" - android:layout_height="@dimen/dp_966" + android:layout_height="match_parent" + tools:layout_height="@dimen/dp_966" tools:background="@drawable/shape_itinerary_bg_default" xmlns:tools="http://schemas.android.com/tools"> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml index f123ba232c..7e1a136add 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml @@ -2,7 +2,8 @@ diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml index bdbf10549f..15b1f5a5ab 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml @@ -2,9 +2,20 @@ + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> + + + android:layout_height="0dp"/> + android:layout_height="0dp"/> \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml index d2790945a0..4dd327a9aa 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml @@ -2,7 +2,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml index 5e5fef813b..2f2f5e8065 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -19,10 +19,11 @@