From ad81298273ebe62fe3f4e9907a055ec56e75ac0f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 18 May 2023 12:42:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[3.2.0]=20bus/B1=20UI=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-nodpi/bus_p_right_route_bg.png | Bin 11501 -> 10743 bytes .../src/jinlvvan/res/values/dimens.xml | 2 +- .../drawable-nodpi/bus_p_right_route_bg.png | Bin 11501 -> 10743 bytes .../src/jinlvvan/res/values/dimens.xml | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png index 1775865c656c06f21f35c8eaf1a549e8a79b2fe3..5d9bf564af4c988f6c51f6f5a1d230c5d0762ac2 100644 GIT binary patch literal 10743 zcmeHLdsLFk7AF)1Qv(!xswfa2_=bI9;8+fIn%&X#9UTs#n z_{j)0Nhx5%@^tr_tSZRfg4b(iKL1(jAJRDT;oXx5T^)6$$%)YsC-&2~yE)qtR+%kb z2nU@@)vaYUf--gzJLMUNj#czu)v)lxo@(`E96b zTPaO)`=?{9uxH@Vn1WqaZ3eFNF6-C$vlecwL4-uXz>TbX)4 z)jX>>wZcWRX6pL^NiQ&QHrJv-8yjrE#o1YbEYc>K7!`e^?$u#lh5F(sR|HS?5z5n< zxgH!ciwdz|$Lc$8K)T;to`(Li`dX3^)@m1=Q_lfg8plcJneV4~cp&rR(smKBpSJ+h z`Y_irFD=_`U>Jjrviiy%qWjjS=x3c>m{#Z;12IE;f?+@Q$#=Do-R~y+4nt5ONLKNt zyD>&^hX>oJN!4jyyZ4gg;`2EMw;jWX)$Z7@ zk2ek^>J&)c6%HjEAAWB)&+xC4y7N(pkRozQk(ObyE>VD6gt2ZzUy_yp`}YwvzcC5ypV-;x*>F?h0%_KB4<=`pxa@J5T2qix3Sy$zfb5VR&QE1z6n6f7Tr%L2nk_7_2n5RqkiM zkN1$d=?mS;1TMukAoN6z>-`3!rbI3!R5z%6iRDr8!BoXcVQXvc;a84>=`8W-3Py4+lk*T) z3m7QNNRAQakMT9>4>P#%+bE+hU3MDRetF0W_TJGCbx@xNp@)*E`}vTCUN=XnM{5j_ zIsUV4=J4h$cD%#e#gr$(3g!VWdTqfPBh0vYAqE|oSRSuVp zVE0lQB}Cu~{sbOIlN-41?q_GPXr4sz=5<7%9Pb}M6w?Ud0Ysn-zoH=MW&KzzUOb8w z^19!eVu>(X3$I&(BLdg({_4)MjkX1Gcp1P({_kWUP-3X9gd|Y()b6FSR+^kQh21Ki zBZM)B&o+nDq&^BK@+Y{;4ngv$BXJAnj0w&)HL2qRZ0sXRt*Z`2Ey8|I9&xUOz$xsX z^;+{(%0eriI!}zurSLxY3{L}Cv&Zi=fHiv(MGauhqPVXCtl9Gj(*V}20<1JuCb(!I z>_>kwQ4T~PFSg;oXvqKf3WDspv{$?d?0+H1@8M`w+722}^g+!}XIvb>PXZb;Bd-AY z;dzW&S80kvn23oPxkrrw{o8q}!*szaWs#<@r;NxnPBoL`%H2DrP_<)CHg9Z6)P%s9 z?8Mp{z?wDitO2Z96!$fNHIpIg?@74^ux2tu{oRf;LB;P5#FSaoGpHj^(Mce89<_a*fR3{0jn2q@w@; literal 11501 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 750dp - 886dp + 804dp 40dp 40dp 48dp diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png index 1775865c656c06f21f35c8eaf1a549e8a79b2fe3..5d9bf564af4c988f6c51f6f5a1d230c5d0762ac2 100644 GIT binary patch literal 10743 zcmeHLdsLFk7AF)1Qv(!xswfa2_=bI9;8+fIn%&X#9UTs#n z_{j)0Nhx5%@^tr_tSZRfg4b(iKL1(jAJRDT;oXx5T^)6$$%)YsC-&2~yE)qtR+%kb z2nU@@)vaYUf--gzJLMUNj#czu)v)lxo@(`E96b zTPaO)`=?{9uxH@Vn1WqaZ3eFNF6-C$vlecwL4-uXz>TbX)4 z)jX>>wZcWRX6pL^NiQ&QHrJv-8yjrE#o1YbEYc>K7!`e^?$u#lh5F(sR|HS?5z5n< zxgH!ciwdz|$Lc$8K)T;to`(Li`dX3^)@m1=Q_lfg8plcJneV4~cp&rR(smKBpSJ+h z`Y_irFD=_`U>Jjrviiy%qWjjS=x3c>m{#Z;12IE;f?+@Q$#=Do-R~y+4nt5ONLKNt zyD>&^hX>oJN!4jyyZ4gg;`2EMw;jWX)$Z7@ zk2ek^>J&)c6%HjEAAWB)&+xC4y7N(pkRozQk(ObyE>VD6gt2ZzUy_yp`}YwvzcC5ypV-;x*>F?h0%_KB4<=`pxa@J5T2qix3Sy$zfb5VR&QE1z6n6f7Tr%L2nk_7_2n5RqkiM zkN1$d=?mS;1TMukAoN6z>-`3!rbI3!R5z%6iRDr8!BoXcVQXvc;a84>=`8W-3Py4+lk*T) z3m7QNNRAQakMT9>4>P#%+bE+hU3MDRetF0W_TJGCbx@xNp@)*E`}vTCUN=XnM{5j_ zIsUV4=J4h$cD%#e#gr$(3g!VWdTqfPBh0vYAqE|oSRSuVp zVE0lQB}Cu~{sbOIlN-41?q_GPXr4sz=5<7%9Pb}M6w?Ud0Ysn-zoH=MW&KzzUOb8w z^19!eVu>(X3$I&(BLdg({_4)MjkX1Gcp1P({_kWUP-3X9gd|Y()b6FSR+^kQh21Ki zBZM)B&o+nDq&^BK@+Y{;4ngv$BXJAnj0w&)HL2qRZ0sXRt*Z`2Ey8|I9&xUOz$xsX z^;+{(%0eriI!}zurSLxY3{L}Cv&Zi=fHiv(MGauhqPVXCtl9Gj(*V}20<1JuCb(!I z>_>kwQ4T~PFSg;oXvqKf3WDspv{$?d?0+H1@8M`w+722}^g+!}XIvb>PXZb;Bd-AY z;dzW&S80kvn23oPxkrrw{o8q}!*szaWs#<@r;NxnPBoL`%H2DrP_<)CHg9Z6)P%s9 z?8Mp{z?wDitO2Z96!$fNHIpIg?@74^ux2tu{oRf;LB;P5#FSaoGpHj^(Mce89<_a*fR3{0jn2q@w@; literal 11501 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 750dp - 886dp + 804dp 40dp 40dp 48dp From bd48a830174c5469c8b35e52a8eba6353758cfa0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 18 May 2023 15:34:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[3.2.0]=20=E6=8E=A5=E9=A9=B3=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=8E=BB=E9=99=A4=E6=BC=AB=E6=B8=B8=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/jinlvvan/res/layout/bus_p_base_fragment.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index cb27c9f1b6..7db68697b0 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -41,6 +41,7 @@ android:background="@drawable/roma_bus_p_bg_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" + android:visibility="gone" app:roma_close="@drawable/roma_bus_p_bg_selector" app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" /> From 106d12b96a92b10a1fa4a5011ed7ce96840a9c24 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 18 May 2023 16:07:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[3.2.0][Fix]=E8=A7=A3=E5=86=B3=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E8=A2=AB=E5=85=B3=E9=97=AD=E5=90=8E=E4=BB=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 414b0806bf..eb690d7c56 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.27 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.2 +MOGO_NETWORK_VERSION=1.4.7.3 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.2 +MOGO_PASSPORT_VERSION=1.4.7.3 # 常链接 -MOGO_SOCKET_VERSION=1.4.7.2 +MOGO_SOCKET_VERSION=1.4.7.3 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.2 +MOGO_REALTIME_VERSION=1.4.7.3 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.4.7.2 +MOGO_TANLU_VERSION=1.4.7.3 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.2 +MOGO_LIVE_VERSION=1.4.7.3 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.2 +MOGO_TRAFFICLIVE_VERSION=1.4.7.3 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.2 +MOGO_LOCATION_VERSION=1.4.7.3 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.2 +MOGO_TELEMATIC_VERSION=1.4.7.3 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.12.1.1 @@ -146,7 +146,10 @@ ADAS_DATA_LIB_CHILD_VERSION=.4 # 是否支持patch升级 PATCH_UPGRADE_SUPPORT=true +MOGO_PLUGIN_VERSION=1.0.0.31 +# 线程优化版本 +THREAD_OPT_VERSION=4.0.1 # matrix版本 MATRIX_VERSION=2.0.8