From aa466c325bf78ee81f44a9ecfe67dbdbdf641225 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 14 Oct 2024 10:37:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E6=9C=AA=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=95=85=E9=9A=9C=E5=8E=9F=E5=9B=A0=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=B1=BB=E5=9E=8B=E4=B9=9F=E8=83=BD=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt index 7c848cbc3c..300ef9914d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt @@ -361,6 +361,8 @@ class WorkOrderView @JvmOverloads constructor( ) ) setAudio(false) + //重置工单问题类型 + workOrderType = "" } } From 3ef4788292e15dda3bf5d4eac4881037d3f942e5 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Mon, 14 Oct 2024 10:55:16 +0800 Subject: [PATCH 2/6] [6.7.0] fix ui --- .../com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index d2c564aec8..af79a6ef72 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -220,7 +220,7 @@ class CarInfoTabView @JvmOverloads constructor( if(tvADMapVersion.text.contains(AppConfigInfo.adHdMapVersion)){ return@post } - tvADMapVersion.text = tvADMapVersion.text.toString() + AppConfigInfo.adHdMapVersion + tvADMapVersion.text = context.getString(R.string.tab_version_admap_info) + AppConfigInfo.adHdMapVersion } } } From 85adbfeeefcd1efb86c1f82062918fc6550e52bf Mon Sep 17 00:00:00 2001 From: EmArrow Date: Mon, 14 Oct 2024 10:55:59 +0800 Subject: [PATCH 3/6] [6.7.0] log --- .../com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt index af79a6ef72..870b9d249d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt @@ -215,8 +215,8 @@ class CarInfoTabView @JvmOverloads constructor( private fun updateAdHdMapVersion() { if (AppConfigInfo.adHdMapVersion.isNotEmpty()) { - CallerLogger.i(SceneConstant.M_HMI + TAG, "updateAdHdMapVersion, adHdMapVersion:${AppConfigInfo.adHdMapVersion} , text:${tvADMapVersion.text}") UiThreadHandler.post { + CallerLogger.i(SceneConstant.M_HMI + TAG, "updateAdHdMapVersion, adHdMapVersion:${AppConfigInfo.adHdMapVersion} , text:${tvADMapVersion.text}") if(tvADMapVersion.text.contains(AppConfigInfo.adHdMapVersion)){ return@post } From a616838566024ae6a51d9a0aaa0601977087609f Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 14 Oct 2024 15:44:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[6.7.0]BUS=E4=B9=98=E5=AE=A2=E7=AB=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=A2=E7=BB=BF=E7=81=AF=E5=92=8C=E7=BA=A2?= =?UTF-8?q?=E7=BB=BF=E7=81=AF=E6=8F=90=E9=86=92View?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 23 +++++++++++++++++++ .../main/res/m2/layout/bus_p_m2_fragment.xml | 23 +++++++++++++++++++ .../main/res/layout/shuttle_base_fragment.xml | 23 +++++++++++++++++++ .../res/m2/layout/shuttle_p_m2_fragment.xml | 2 ++ .../hmi_view_fusion_traffic_light_p_bus.xml | 8 +++---- 5 files changed, 75 insertions(+), 4 deletions(-) diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index bd33539f86..1f4ada6ab6 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -102,6 +102,29 @@ app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> + + + + + + + + + + + + + + + + + + @@ -176,6 +177,7 @@ app:layout_constraintTop_toBottomOf="@id/och_shadow_layout" android:layout_marginTop="@dimen/dp_30" app:fusionLightUser="passenger_bus" + android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml index c04846bd8e..2037dead22 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml @@ -10,12 +10,13 @@ \ No newline at end of file From e64e0254da7b00bded512182d7b0460e621db055 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 14 Oct 2024 15:52:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[6.7.0]=E5=8E=BB=E6=8E=89BUS=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E7=BA=A2=E7=BB=BF=E7=81=AF=EF=BC=88=E8=AF=AF?= =?UTF-8?q?=E5=8A=A0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 23 ------------------- .../main/res/layout/shuttle_base_fragment.xml | 22 ------------------ 2 files changed, 45 deletions(-) diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index 1f4ada6ab6..bd33539f86 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -102,29 +102,6 @@ app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> - - - - - - - - - - - Date: Mon, 14 Oct 2024 15:55:13 +0800 Subject: [PATCH 6/6] [6.7.0] replace 3d marker --- .../cloud/model/SweeperCloudTaskModel.java | 2 +- .../src/main/res/raw/cross_road_camera.nt3d | Bin 190296 -> 190296 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java index 3198e43a0a..35b1d25646 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java @@ -793,7 +793,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene } - @Override· + @Override public void onAutoPilotInfo(long token, long timestamp, @Nullable SsmInfo.AutoPilotInfo autoPilotInfo) { } diff --git a/core/function-impl/mogo-core-function-map/src/main/res/raw/cross_road_camera.nt3d b/core/function-impl/mogo-core-function-map/src/main/res/raw/cross_road_camera.nt3d index 06b080ed96bd412139a182c8f627383b8ece7626..f593c8fbd44fa063ed6b3931ce7299c6c8ccf29a 100644 GIT binary patch delta 6153 zcmbuDKZspL7{%u)`1a+cu*((!b+M7Sf{Kj@HgwrLND;I! zh#I%C2x^f=EwoV9fC1Ai!V(FJ7P6pKcAPW!p8I}x_TGn*?z}VS`!h4&d^7i5*_vP3 znxDEWetKXfY;R1$GxHEG{5B1rzcvZ~JQc$9`G$Y_a!S&W7e07f2-n|Q2^Z&+@Z2jQ z%umh={^NWIU%WUATc<*}_ooonE;PI~SlCY~xEQrP)ph+u!#!9Ys>8uG$-+>_FYC#PjAiEXQz z`1bF;^xfH8`kEYnF)%9XYi`}yOAmaU9c4Xn7l3}2Xo_uY9X&ix>GgLSr(=$8L}ObW zSFf~i^irz_c>gFOFYNth4`6SQ=FA5nJiF8M3>PMO;kI~VX+ExS4D_0bcx#lLkC3pB znKVvL*pp$R)HHl-x|n|Wcu2$^*eHKk@yBh}>K(qY6{lIm@!1O~tmMq#Nw7kxmMN}7Er$Lc2K+n&}1hn0GrDM4y zT#YJ525v<~L!JRtbY6BAEPYZ#{_1XA+*G^?>#FwNQ^Q~kAndDI*p*-VESi|_ehx5z zGIggDc9GI4HRPFuR?CkUVV?-uMmwd5!5Bb$+&!l<_VJ_Bo(93_Up3bz6w5==8OhjA zAu3m`c?Qr)@d^ohGP1Q#YREVKbN|;1RcF_GChR?h6{ewk22 zUNi9fjvDe>2|vqv8t_`t#!qa%cszr}z_i>8LkVfW&8sFnGujHfOG@uMg_^?0_L)ql zoPqFI|Mx7ZVPN_p&mKj zk!gRR&%3eI0i1+vhcx8rUt3U)Xso_`2Sr&^^XzU8%wP&Iq#-XH-6*v8ZY;!Ira6ga zyxVgfz)8q$Xv^|Z6A*T}68uARxo=-fc$$acC7#aAi*8!Zwn1*~E z*zH+9jTf5O{}*F1(C~csIXMQC(;*Fc2G&aZ?kG66|9XsxYTn;+bpR(Jr$ZX@Od_fp zeWempw2b!$XdS>w$aYB6^09mdGk}gFZ?+CIQEDpQUq1}o!`XJBiHqzMxEnwKbu_OK zF%we5-aBad}KT%BF_No^DZLdF-^^TYs5zf)(>MjrD%v}VBLy7TEt@-@Xh}} zu3iQvmeU~(c?RZtf_T3s@4x;Mtp|M8>i|xoevAz9+V8QaTgSifA4HsiF#l5XM+-Gd h+PtuzVyFK)^w8<+hYlWJUwwOhb@Ju<>P<&}{1-wg5@Y}X delta 6153 zcmbuDPly~v7{zN81hWxDXD15=)Z-#6Xz(CJyzA9J1l)t-B?yWqLC{hX@ZcpO1O!DR zIVg(<5j5y}5hN#B0};%@AcPHqh#(6Jf>YM3?$`6{+U`Ng?aizA{i&+2zN(%pJ1bXq zR!*(QPw!d{S2ri&*h&ar{XGqzzd8wjJsHAnuQdEiKcplLdEtY1hj8;dt6_U(5}tcG zggZW%75v-BA$L;epE`tbg0^){xIQhL7G2Azp6`h;4i+rF84H5O#m+Ysd?~ zz7@j5^I52|Z7;o;5`8xMm<>3Pv6B!_Y~$U%dGai&AusG1*Vwk-d^k^A@puSNO=p3k zGSKqE_dFQFClAd+jkj9OuP5ip+d&O^;S;~4bnMI3KpZKOvGE)6UkNeNB$P7#J1xHMd`zr=u6LqpTXl$$F z>XjCbUTXCK?;l0vg}vYG0qhOZoIMx9vwKa?aAA@cZi_dT=Hm*-K(CpIw?@hN2nqX` zN#o>%JsBoSO~c2gi|L1theVtKyP>-zHNxhV(Asw?J#l(kCT2h6)d7#ck<$8+tceK5 z0Tq|`jKRpO@;gWHLte*hC?WGvnd(e?1`I}C{eUasnUR;?eC@})0{{4P2p6B3X@z39 z)Ev+Z4j-6=Bj<~#(~#Fn?5$10@7t9IyjFC`&w|hWUwh+>gnc5oXPS*yh#K<3E;LJM0L@18Wbr5^!$uWK--;HI+jbq z)u>`*;8s*LU)HjmM6QXEL2~ z2Et?g-?OBKf$4`llZZ6F5zM95s<>{52Q;yK+0+9*e&YS;AePf14S5FE>iU!sU)_w0 zO#1_U-i@UW;3Q-_q#;lL+JbUK>o4CyQT{rvd3HAkW-tX9(vTO9ZWP*kHx}Y9)11UI z-tD;#;3Q-_po#l>dzS>d7&{k}SjGi|w-Ohdj7 z?Dj05#tTjC|BJC0Xn4N+oE(G6>5zsz18b#ycN84ke?7)THSce^I)Iaq(;*FcCJ|MQ zzEX)PTE_bWv<~1TWILp3`B*-K89+yoH(Q69C^Z%DuO9~P;cUCm#6@-r+zlXrI+|CA zn29dqJ^R{!i52sIJ~AE>k!Jw)c^47!n5O2vHR7WK>xZ$NQZ&Rfux>>kE#ff^_~!o~ zS1$t-%juAYJOlGRLA+m+_g{aB)&oB4bpR((KSqXl?f2Nzt>a(#4|{|oCVI#B=s