From 87aab03e36c620593b636c8905cb400fd48b3ac6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 26 Sep 2024 16:21:49 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=BB=91=E5=8A=A8=E5=87=BA?= =?UTF-8?q?=E5=8F=91=E5=8A=A8=E7=94=BB=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/facade/view/OchCustomViewProvider.kt | 5 ++++ OCH/shuttle/driver_weaknet/build.gradle | 1 + .../driver_weaknet/src/main/assets/data.json | 1 + .../src/main/assets/images/img_0.png | Bin 0 -> 3517 bytes .../src/main/assets/images/img_1.png | Bin 0 -> 3208 bytes .../src/main/assets/images/img_2.png | Bin 0 -> 1654 bytes .../driver_weaknet/src/main/assets/slide.json | 1 + .../ui/switchtask/SwitchLineTaskAdapter.kt | 3 +++ .../och/weaknet/view/BizLeaveStationView.kt | 14 +++++++++- .../drawable/bus_task_current_station_bg.xml | 2 +- .../shuttle_weak_task_leave_station_view.xml | 24 +++++++++++++----- .../src/main/res/values/colors.xml | 1 + config.gradle | 1 + 13 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 OCH/shuttle/driver_weaknet/src/main/assets/data.json create mode 100644 OCH/shuttle/driver_weaknet/src/main/assets/images/img_0.png create mode 100644 OCH/shuttle/driver_weaknet/src/main/assets/images/img_1.png create mode 100644 OCH/shuttle/driver_weaknet/src/main/assets/images/img_2.png create mode 100644 OCH/shuttle/driver_weaknet/src/main/assets/slide.json diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt index 8dbc57d0d5..1ebac9af0b 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt @@ -33,6 +33,11 @@ class OchCustomViewProvider : IOchCustomViewProvider { if(temp is FacadeProvider){ commonService = temp.commonService } + }else{ + val temp = ARouter.getInstance().build(FacadeConst.PASSENGER_PATH).navigation(context) + if(temp is FacadeProvider){ + commonService = temp.commonService + } } } diff --git a/OCH/shuttle/driver_weaknet/build.gradle b/OCH/shuttle/driver_weaknet/build.gradle index 3f2bd62161..a230b9a66d 100644 --- a/OCH/shuttle/driver_weaknet/build.gradle +++ b/OCH/shuttle/driver_weaknet/build.gradle @@ -61,6 +61,7 @@ dependencies { implementation rootProject.ext.dependencies.roomRxjava implementation rootProject.ext.dependencies.androidxrecyclerview kapt rootProject.ext.dependencies.recyclerviewadapterhelper + implementation rootProject.ext.dependencies.lottie implementation rootProject.ext.dependencies.androidxroomruntime kapt rootProject.ext.dependencies.androidxroomcompiler diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/data.json b/OCH/shuttle/driver_weaknet/src/main/assets/data.json new file mode 100644 index 0000000000..62cb3f9e9d --- /dev/null +++ b/OCH/shuttle/driver_weaknet/src/main/assets/data.json @@ -0,0 +1 @@ +{"v":"5.12.2","fr":25,"ip":0,"op":55,"w":774,"h":120,"nm":"滑动等待背景","ddd":0,"assets":[{"id":"image_0","w":774,"h":120,"u":"images/","p":"img_2.png","e":0},{"id":"comp_0","nm":"预合成 1","fr":25,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 7","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":42,"s":[99]},{"t":55,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[687,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":42,"s":[100,127,100]},{"t":55,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"形状图层 6","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":37,"s":[95]},{"t":50,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[587,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":25,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":37,"s":[100,127,100]},{"t":50,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"形状图层 5","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[31]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":32,"s":[100]},{"t":45,"s":[31]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[487,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":32,"s":[100,127,100]},{"t":45,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"形状图层 4","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[100]},{"t":40,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":27,"s":[100,127,100]},{"t":40,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"形状图层 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":22,"s":[99]},{"t":35,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[287,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":10,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":22,"s":[100,127,100]},{"t":35,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"形状图层 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17,"s":[99]},{"t":30,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[187,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":17,"s":[100,127,100]},{"t":30,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"形状图层 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":12,"s":[100]},{"t":25,"s":[30]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,59.438,0],"ix":2,"l":2},"a":{"a":0,"k":[-328.25,-4.062,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":12,"s":[100,127,100]},{"t":25,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[8,50],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-328.21,-4.084],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,60,0],"ix":2,"l":2},"a":{"a":0,"k":[387,60,0],"ix":1,"l":2},"s":{"a":0,"k":[107,52,100],"ix":6,"l":2}},"ao":0,"w":774,"h":120,"ip":0,"op":55,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":2,"nm":"滑动等待背景.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,60,0],"ix":2,"l":2},"a":{"a":0,"k":[387,60,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":55,"st":0,"bm":0}],"markers":[],"props":{}} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_0.png b/OCH/shuttle/driver_weaknet/src/main/assets/images/img_0.png new file mode 100644 index 0000000000000000000000000000000000000000..0aec427bb49c484430f7a50a72724f8b0b2eadd8 GIT binary patch literal 3517 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 YOy;MR?;ys0L1$kl13gm+5$yEx-}G_s2LJ#7 literal 0 HcmV?d00001 diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_1.png b/OCH/shuttle/driver_weaknet/src/main/assets/images/img_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef15cc4691efcdd7831da6ab324658ebcb1efb0 GIT binary patch literal 3208 zcmeHK`CAj$8cxC_28cjWFa@kZLA|IDMG!?G-~zaya+wg6Wn7?I+Ok9tBM?G*^{P`@C1Oj2Yug_Y40zr?WeNUiHefm(Iz0-aXx&Gc>1X+_+kM_sfaE@=p=FJ2< z?K_n~JhG1fO{r)f3+lu(h z?C%VT3Q(F+)O2PT(bh9P(~jtGaWvG{-(gI{XJsAlxOl?ER1{#HMXLgpE5yqR z8xB-XY)l~#Nf6b9!9v`iu9p=j8dkur-0LCAf0l?V#GwIhB|Q0|Dto_(ykDB$ULU)> zLh@}u5*&A>p25;ts`ru{`g*pAlS_EP!_wYIcVo!Hi2+T&cn2Ibn>pqCgQ`oAKstA| zn8(S256?@#KoLqQi96zo?2hPt{#Ocrt0it1SRES@^@hT1Gq#0Ky~i)9YV`C$%y$7Keyins&T#F{uEA1Gd%>N< zliRYQ%$MQwN+PudHjmyKy?Y_=a`kTtYU_>1XJ2dx*8r|HWxKJG{g+B3_?rS9ixqdTuXc3DV&nwWaZQwKl_ z+BU0h=Q_hJKJJyGTZ^40lCY#gT;VRcq_*1To0HRa&!okMdL|d4mBvYEcq;II)|~TG ziN~r_&!Zmp7CUyzjJM#N&lTiF4$6D)P3Vo3(1XRU15F-i+}}+3ORLq7F+S1uR%JOZ z^z?K7qIm8LH_QyT-c-#R8C8v+KR1e$1|8^H`DV#iz&k+@4wVfQ(3qBQFm-$*XUU^~ z#em9?M)Jo+RKNCzV;g~6H)v!TI+G@YRmwv{GTZ_bPd-UJNp{ao#Tq+ZgK;n`HX^6V zg-G;;zyZ1KM<#0N9;g*VdVFKRJf7hTEpcDB)pVK57w9wL4F|P zNK{OACJS5J!`|S7mLt(b$|p+pdur5)k)*~MAeCr$j1m4xNOc~fIPjzo#6xYEh7`+| zC1-$h>b04VqUqZj`epk7MlXEeQ)8t|Ob|gz z^(>z*3jtR1h!}El*Y}`eMA%!l#}v`o6h!g0F!GGf2=!qx=~uGn zf&JOUV(zWLuH#NJ8wNcs;QnViIQGtG(3iKXf5)e5LR)Y5CpZI^&oH6od=uSosxzYN zQz`SzxB#6Tt)S8Qr+Cm~X%Hklacm{1uu&_BunevOM(atb*#BYqpNGYVncynF1K3R@ zeFJrEU%I!v*lB}~tjN_AGhvPMOKZT*bx6go!NQG|V>UV&3t2cge-R}WQ{1%y#CImS z>QhSEuSvE6HbLu2n@{GS5!M%5!2(%WlyCI5(iF^M1t0wtm=qv{u)(+Cw-U4W(qWX}^x%5$8KYIGhwa z7~_-o2<1!X&?+MT#9me#0(Vd=SX>rUQZL5R?s|YWZe@SC?YiH}Zd9F|R()lRr>f2c z3RGzZdP|a}X{s#e*D&68mW**HJ!QBPxzw4|rfhcC9MWFLU9IzyrS+G)Xtnkk}O&EVgQZ zgw?16d`4o$zLxpxY*3?LKFerM{RT{Mj#0oni)7Y@ua?ytPG0)z!Y9+Y9xwVzM*JHZbe@x(})XI*V7`7q4;a zz}E&r@x4xb?VuO;TxGMviM}Z*SiDHZ?!01ZGT#h$dAaAaNSIK32zCfeYS+$|JxMG2 z>ZfKL!z;0b@yi3T!5A{h4VGAH2iq5|HKVQ};O1u`wt~Q6=>#># zE{rxbHQ4$>!uNCR!?-!{cM^Ei_F0D?r_OFouNQ2zW>w{mmM?ScBYy|EYqz}RmFDOB zmC1#%E(-0;*vz-HMkKxK9=;Jvjh>DiP1g_~`AbWCJm$}y`WN84&Tp;E3rYPCBjh4n literal 0 HcmV?d00001 diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/images/img_2.png b/OCH/shuttle/driver_weaknet/src/main/assets/images/img_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b68ce5eb1d77d1e49b8e32001863e57db92eec GIT binary patch literal 1654 zcmd5+`%{xg6kUm=AmF2jM1lkz6)EzP5&;dAf(nHILK4*BJz{KtBmz;45VcS!MF_3a zT8PG4M+kWldDx0PRYXOgj)q5-0A&ypk*J6SXrMRJKcYW;yLY}lyZ794&u(Ev*glID zHY*T97QsP*kqBY15NDYf#vtsN4klA}(7_Ctmwo)gx7_W8U^AC;ATuC6IWd!!j*v-N zM(Bg^uc+)$r(owuHaR4O?Ba+;{#E|BX6uWy=mye$f2-@K>8z&4` zO$lpz-=)#UB_2w3`;3F6xcz$b_%GCyq8XWf>^wrloxj(PzdG(Yl#%LOVy&Fg9GtG> zHtKj^|9tFSj=UincEFnuUu#`@cPts15 z)7JYwsLXGx((L6lsUz(XN~nLKe66895#PRIOEm8lvm^pjBZPFek0h5R@!TfV zthGcdF)PS&MMx3D7ZW6YzAwmx`Jn~8(oZnCeK|teJfh&kB6DXN#kVv!zwOX;Koste z;%%^?>J@jA`DQx3Jid@e{8(k3$|_R6WIL9^)Qzw*8`oBqUj2(NM(+} zmn=iWSp#Wjq7&J2AHO5(K+n=CvaYA=?wDlG-JB0?*}P^n9Ng{) zTMr}T#kAX5-^#>M1~+(s)!pthF%uTKyOi0}wXhlUXvt+a#Lt`vpFmSbjz?iAtbBi^ zOlkuM^)XeMlPxLw4X*uimuki)C~=G@p495wo;hKuEfhX&$4c-7gJ0e~JM>2G)?dYo z$p%X_+szAKwd6QHcIwFpUITYBjVE51k;hM1V?9YWvzeU4^_I|OCr;&@me-OUkE7`0 za-uGg9vW`PPYv<<@f=rO1pKANhS~y;3om)o+6tM`yiX7=HM)f+xG6P(ESuqZS)sxk za};h_W2(O~i!|8=rVEfXK3-0=(cY>YPAl+kYdMf}SqTo)*^(FyThs)?RK=Zz@zb)o z8w~>;G9Qqk)4iI<>M! literal 0 HcmV?d00001 diff --git a/OCH/shuttle/driver_weaknet/src/main/assets/slide.json b/OCH/shuttle/driver_weaknet/src/main/assets/slide.json new file mode 100644 index 0000000000..d17a977599 --- /dev/null +++ b/OCH/shuttle/driver_weaknet/src/main/assets/slide.json @@ -0,0 +1 @@ +{"v":"5.12.2","fr":25,"ip":0,"op":25,"w":774,"h":120,"nm":"矩形@2x","ddd":0,"assets":[{"id":"image_0","w":87,"h":100,"u":"images/","p":"img_0.png","e":0},{"id":"image_1","w":774,"h":120,"u":"images/","p":"img_1.png","e":0},{"id":"comp_0","nm":"预合成 1","fr":25,"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[100]},{"t":13,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[1371,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[1511,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[1231,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[1371,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[1091,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[1231,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[951,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[1091,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[811,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[951,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[671,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[811,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[531,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[671,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[391,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[531,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[251,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[391,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":2,"nm":"img_0.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":25,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[111,60,0],"to":[23.333,0,0],"ti":[-23.333,0,0]},{"t":25,"s":[251,60,0]}],"ix":2,"l":2},"a":{"a":0,"k":[43.5,50,0],"ix":1,"l":2},"s":{"a":0,"k":[173.563,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":8,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,60,0],"ix":2,"l":2},"a":{"a":0,"k":[770,60,0],"ix":1,"l":2},"s":{"a":0,"k":[50.649,90,100],"ix":6,"l":2}},"ao":0,"w":1540,"h":120,"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":2,"nm":"img_1.png","cl":"png","refId":"image_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,60,0],"ix":2,"l":2},"a":{"a":0,"k":[387,60,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":25,"st":0,"bm":0}],"markers":[],"props":{}} \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt index 38f210681c..55ff7d88dd 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt @@ -71,10 +71,12 @@ class SwitchLineTaskAdapter( if(checkTask!!.taskId==task.taskId){ checkTask = null mTaskItemClickListener?.onItemClick(currentPosition,false) + notifyItemChanged(currentPosition) }else { resetOther() checkTask = task mTaskItemClickListener?.onItemClick(currentPosition,true) + notifyItemChanged(currentPosition) } } @@ -88,6 +90,7 @@ class SwitchLineTaskAdapter( if(checkTask!=null && result.taskId==checkTask!!.taskId){ checkTask = null notifyItemChanged(index) + return } } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizLeaveStationView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizLeaveStationView.kt index 72aa680c1f..7504d76eb1 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizLeaveStationView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizLeaveStationView.kt @@ -9,8 +9,11 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.shuttle.weaknet.R import kotlinx.android.synthetic.main.shuttle_weak_task_leave_station_view.view.actv_draggable +import kotlinx.android.synthetic.main.shuttle_weak_task_leave_station_view.view.lottie_bg class BizLeaveStationView @JvmOverloads constructor( context: Context, @@ -38,6 +41,7 @@ class BizLeaveStationView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.shuttle_weak_task_leave_station_view, this, true) draggableButton = findViewById(R.id.actv_draggable) + lottie_bg.setImageAssetsFolder("images") } override fun onAttachedToWindow() { @@ -87,7 +91,12 @@ class BizLeaveStationView @JvmOverloads constructor( duration = 100 }.start() }else if (draggableButton.translationX>=(width-draggableButton.width)){ - slideListener?.slideEnd() + lottie_bg.setAnimation("data.json") + lottie_bg.playAnimation() + actv_draggable.setTextColor(ResourcesUtils.getColor(R.color.shuttle_driver_80FFFFFF)) + RxUtils.createSubscribe(1_000) { + slideListener?.slideEnd() + } }else{ ObjectAnimator.ofFloat( draggableButton, "translationX", draggableButton.translationX, @@ -106,6 +115,9 @@ class BizLeaveStationView @JvmOverloads constructor( override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) if(isVisible){ + lottie_bg.setAnimation("slide.json") + lottie_bg.playAnimation() + actv_draggable.setTextColor(ResourcesUtils.getColor(R.color.white)) ObjectAnimator.ofFloat( draggableButton, "translationX", draggableButton.translationX, 0f diff --git a/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_current_station_bg.xml b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_current_station_bg.xml index 5d58260925..9dc73b9a7c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_current_station_bg.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/drawable/bus_task_current_station_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml index ce187c43ba..ff7fa80565 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml @@ -7,14 +7,24 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" + app:lottie_fileName="slide.json" + app:lottie_loop="true" + app:lottie_autoPlay="true"/> #BF0E3DBC #BF1E2E89 #D4D4D4 + #80FFFFFF \ No newline at end of file diff --git a/config.gradle b/config.gradle index 1af3e24e20..5fe07c2dfa 100644 --- a/config.gradle +++ b/config.gradle @@ -20,6 +20,7 @@ ext { localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0", // flexbox flexbox : 'com.google.android.flexbox:flexbox:3.0.0', + lottie :'com.airbnb.android:lottie:5.2.0', guava :'com.google.guava:guava:29.0-android', // 测试 junit : "junit:junit:4.12",