From a69cdaf0c6ad3337ef949c43a279b0b055f3b600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 29 Apr 2021 21:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=B7=B4=E8=BD=A6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B5=81=E8=BD=AC,=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=B0=8F=E5=B7=B4=E8=BD=A6UI=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/QueryLeaveAwayPassengersRequest.java | 13 +- .../mogo/och/bus/fragment/OchBusFragment.java | 2 + .../src/main/res/raw/bus_station_list1.json | 502 +----------------- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 1 + .../main/res/layout/module_och_taxi_panel.xml | 5 +- .../java/com/mogo/och/BaseOchFragment.java | 12 + ...g_module_mogo_och_operation_status_bg.png} | Bin ...ule_mogo_och_autopilot_status_bg_check.png | Bin 0 -> 20817 bytes ...odule_mogo_och_autopilot_status_bg_nor.png | Bin 0 -> 20635 bytes .../module_mogo_och_operation_status_bg.xml | 10 + .../res/drawable/module_och_panel_bkg.xml | 19 + .../layout/module_mogo_och_base_fragment.xml | 11 +- .../res/layout/module_ext_layout_entrance.xml | 2 +- .../com/mogo/module/v2x/V2XSocketManager.java | 2 +- .../v2x/overlay/V2XOptimalRouteOverlay.java | 2 +- .../v2x/scenario/impl/AbsV2XScenario.java | 2 +- .../route/V2XOptimalRouteVREventMarker.java | 2 +- .../module/v2x/utils/TestOnLineCarUtils.java | 2 +- .../res/raw/test_data_v2x_zuiyouluxian.json | 30 ++ 19 files changed, 112 insertions(+), 505 deletions(-) rename OCH/mogo-och/src/main/res/drawable-xhdpi/{module_mogo_och_operation_status_bg.png => img_module_mogo_och_operation_status_bg.png} (100%) create mode 100644 OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png create mode 100644 OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png create mode 100644 OCH/mogo-och/src/main/res/drawable/module_mogo_och_operation_status_bg.xml create mode 100644 OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml create mode 100644 modules/mogo-module-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java index 0ea411d4d7..acea5172a8 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java @@ -10,8 +10,9 @@ import com.mogo.commons.network.Utils; public class QueryLeaveAwayPassengersRequest { private String sn; private int endSiteId; + private int orderDispatchType = 4; - public QueryLeaveAwayPassengersRequest( int siteId ) { + public QueryLeaveAwayPassengersRequest(int siteId) { this.sn = Utils.getSn(); this.endSiteId = siteId; } @@ -20,7 +21,7 @@ public class QueryLeaveAwayPassengersRequest { return sn; } - public void setSn( String sn ) { + public void setSn(String sn) { this.sn = sn; } @@ -31,4 +32,12 @@ public class QueryLeaveAwayPassengersRequest { public void setEndSiteId(int endSiteId) { this.endSiteId = endSiteId; } + + public int getOrderDispatchType() { + return orderDispatchType; + } + + public void setOrderDispatchType(int orderDispatchType) { + this.orderDispatchType = orderDispatchType; + } } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java index c56a60c069..f3ceb8d44e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java @@ -221,9 +221,11 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese if ( launch ) { tvOperationStatus.setText( "收车" ); showSlidePanle("准备出发"); + showPanel(); } else { tvOperationStatus.setText( "出车" ); hideSlidePanel(); + hidPanel(); } } } diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json index f9ac00fca0..c74daa1174 100644 --- a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json +++ b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json @@ -26,27 +26,27 @@ }, { "lineId": 1.0, - "siteId": 1.0, - "siteName": "万集东门站", + "siteId": 2.0, + "siteName": "市政府前街18号", "cityCode": "010", "areaCode": "1001", "areaName": "顺义区", "currentLocation": [ - 116.7374429112, - 40.2023987087 + 116.729134342, + 40.1953113732 ], - "lon": 116.7374429112, - "lat": 40.2023987087, - "siteDesc": "万集东门站", + "lon": 116.729134342, + "lat": 40.1953113732, + "siteDesc": "市政府前街18号", "siteState": 1.0, - "isCurrentSite": 1.0, - "siteColor": 1.0, + "isCurrentSite": 3.0, + "siteColor": 2.0, "peoples": "0", - "ifStop": 1.0 + "ifStop": 0.0 }, { "lineId": 1.0, - "siteId": 2.0, + "siteId": 3.0, "siteName": "顺密路口站", "cityCode": "010", "areaCode": "1001", @@ -59,486 +59,6 @@ "lat": 40.1940181096, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 3.0, - "siteColor": 2.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 2.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.723146, - 40.179637 - ], - "lon": 116.723146, - "lat": 40.179637, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 3.0, - "siteColor": 2.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 2.0, - "siteId": 2.0, - "siteName": "顺密路口站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.738835502, - 40.2023958306 - ], - "lon": 116.738835502, - "lat": 40.2023958306, - "siteDesc": "顺密路口站", - "siteState": 1.0, - "isCurrentSite": 3.0, - "siteColor": 2.0, - "peoples": "0", - "ifStop": 1.0 - }, - { - "lineId": 1.0, - "siteId": 3.0, - "siteName": "第三站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.723232, - 40.180637 - ], - "lon": 116.723232, - "lat": 40.180637, - "siteDesc": "这里是第三站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 4.0, - "siteName": "第四站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.72343, - 40.182092 - ], - "lon": 116.72343, - "lat": 40.182092, - "siteDesc": "这里是第四站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 5.0, - "siteName": "第五站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7235, - 40.182699 - ], - "lon": 116.7235, - "lat": 40.182699, - "siteDesc": "这里是第五站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 6.0, - "siteName": "第六站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.723789, - 40.185416 - ], - "lon": 116.723789, - "lat": 40.185416, - "siteDesc": "这里是第六站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 7.0, - "siteName": "第七站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.723977, - 40.18701 - ], - "lon": 116.723977, - "lat": 40.18701, - "siteDesc": "这里是第七站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 8.0, - "siteName": "第八站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.72431, - 40.190182 - ], - "lon": 116.72431, - "lat": 40.190182, - "siteDesc": "这里是第八站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 9.0, - "siteName": "第九站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.72431, - 40.190182 - ], - "lon": 116.72431, - "lat": 40.190182, - "siteDesc": "这里是第九站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 10.0, - "siteName": "第十站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.724503, - 40.192026 - ], - "lon": 116.724503, - "lat": 40.192026, - "siteDesc": "这里是第十站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 11.0, - "siteName": "第十一站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.724873, - 40.19489 - ], - "lon": 116.724873, - "lat": 40.19489, - "siteDesc": "这里是第十一站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 14.0, - "siteName": "第十四站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.728258, - 40.195255 - ], - "lon": 116.728258, - "lat": 40.195255, - "siteDesc": "这里是第十四站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 15.0, - "siteName": "第十五站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.729288, - 40.195476 - ], - "lon": 116.729288, - "lat": 40.195476, - "siteDesc": "这里是第十五站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 16.0, - "siteName": "第十六站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.730554, - 40.195952 - ], - "lon": 116.730554, - "lat": 40.195952, - "siteDesc": "这里是第十六站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 17.0, - "siteName": "第十七站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.732227, - 40.196374 - ], - "lon": 116.732227, - "lat": 40.196374, - "siteDesc": "这里是第十七站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 18.0, - "siteName": "第十八站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.732978, - 40.196443 - ], - "lon": 116.732978, - "lat": 40.196443, - "siteDesc": "这里是第十八站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 19.0, - "siteName": "第十九站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.733671, - 40.196497 - ], - "lon": 116.733671, - "lat": 40.196497, - "siteDesc": "这里是第十九站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 20.0, - "siteName": "第二十站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.736852, - 40.196493 - ], - "lon": 116.736852, - "lat": 40.196493, - "siteDesc": "这里是第二十站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 21.0, - "siteName": "第二十一站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.737866, - 40.19646 - ], - "lon": 116.737866, - "lat": 40.19646, - "siteDesc": "这里是第二十一站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 22.0, - "siteName": "第二十二站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.745177, - 40.19646 - ], - "lon": 116.745177, - "lat": 40.19646, - "siteDesc": "这里是第二十二站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 1.0, - "siteId": 23.0, - "siteName": "第二十三站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.750644, - 40.196402 - ], - "lon": 116.750644, - "lat": 40.196402, - "siteDesc": "这里是第二十三站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 10000.0, - "siteId": 10000.0, - "siteName": "0409第一站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7389159039, - 40.1992312592 - ], - "lon": 116.7389159039, - "lat": 40.1992312592, - "siteDesc": "0409这里第一站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 10000.0, - "siteId": 10000.0, - "siteName": "0409第一站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7389159039, - 40.1992312592 - ], - "lon": 116.7389159039, - "lat": 40.1992312592, - "siteDesc": "0409这里第一站", - "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 0.0, - "peoples": "0", - "ifStop": 0.0 - }, - { - "lineId": 10001.0, - "siteId": 10002.0, - "siteName": "0409第二站", - "cityCode": "010", - "areaCode": "1001", - "areaName": "顺义区", - "currentLocation": [ - 116.7375553739, - 40.1992677344 - ], - "lon": 116.7375553739, - "lat": 40.1992677344, - "siteDesc": "这里是第二站", - "siteState": 1.0, "isCurrentSite": 0.0, "siteColor": 0.0, "peoples": "0", diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 775f882092..a8861ae85e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -74,6 +74,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i mEndStationName = findViewById( R.id.module_och_taxi_order_end_station ); mDistance = findViewById( R.id.module_och_taxi_order_distance ); + showPanel(); initListeners(); updateOrderStatus(); if ( MogoApisHandler.getInstance() diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 99ca32287c..0f357cd739 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -2,9 +2,8 @@ > e }); } + public void hidPanel(){ + getActivity().runOnUiThread(()->{ + flStationPanelContainer.setVisibility(View.GONE); + }); + } + + public void showPanel(){ + getActivity().runOnUiThread(()->{ + flStationPanelContainer.setVisibility(View.VISIBLE); + }); + } + public View getPanelView() { return panelView; } diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_operation_status_bg.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/img_module_mogo_och_operation_status_bg.png similarity index 100% rename from OCH/mogo-och/src/main/res/drawable-xhdpi/module_mogo_och_operation_status_bg.png rename to OCH/mogo-och/src/main/res/drawable-xhdpi/img_module_mogo_och_operation_status_bg.png diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_check.png new file mode 100644 index 0000000000000000000000000000000000000000..28857974b54c8284afcbae20bd663bab7e501be8 GIT binary patch literal 20817 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 literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png b/OCH/mogo-och/src/main/res/drawable/module_mogo_och_autopilot_status_bg_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..f7d4f92c4b872f6985030c27e0eddc93663605cf GIT binary patch literal 20635 zcmXtAbzGC*_aEILN+TsA-6dTDN=u9w4WmaW-65bLf=WntZHyQ&x<4R-bTd-AyXyz~ z`~LB4&$j1vU+12C?m6%CKIiU}mWDDBJ`Fwq03dqv`js{SfM$GuACHTD|2jYYRqp-` z?Y*|LJfO7y>BjwsS73uTHtOmCj{AFD09vFy0Q2FI`-|rO0st_w&;S_s?`RL-WugD? zS2W`+jQ`yO;vXK=mzh}x0AvAgUdictqwO?-%AOjgWKb4LZuj;5$?mrC@H0YiV~iK^ zC1T3ionyvgb@LInc_CR^DQ{V0ZUvk7^If<}j7|X}gfUVGJ@l>&`vEmSXlkeBS1#w> zCP6{sz&V#r%DQI)?-{%~5DtoZyB`hQxaTI=L*1{~(dSXP z%RX}fuSL(ABKkbcFQd(_|MXD#A9Pac?;bG)6m1x3V>a)Ro?jmglwocR1l=BSp83qn z-p&Ot3)Jq0ZAyQX_Bp(0^KSINSZRaIp9Rfq+-hS==i$yY-+XUk3^?D9PCpDVZzlY2 zkEWG@`xP;oC;kMxL7`TRoUhw~6DvJzY(vBFI<~Bo!K7YlPL#V4HxJiX23_yO8z(F9 z*wPJA38`xojqlXT2=&HaQ~(50?%x!dyU}%b1;;FIn#W|*bO>SFnzYb#<_Ea*8=a9z z_32=0W6lL(M*ZwXEAc&p)(e+NZQZu6;8`5~NGQe_+O!aD^cz&hXUh>}_Kb{c-&sN@YUEv% zY*cHiViubX^N&p@Qy^Jk2NIFyL2MK0MrbMb61$w!ylo<3?+UPo%i%(iA}VuPA2%j} zS9Qfm%W0rr#&3)@P6Z|I+qs^!98Mqgvl^+s>RoDZL9NVLEd>n!9sMP`q8mTJy^*E& zFlV}fTLxaA^Rg0x?nY=8c`r5byun2m^h|sqz@+-BE!YAdH7PP#Xfqp~@QvKMkOLT( z;Oo(hEp*j(}^GJgC)#a*Oqr>!Sk^X)GO zF#L~lga#c<%D-f9GkW5x68!{tp3rvaL(c>{C90`Saq8#AT+MK*bQ&0e2!87=-?y0E z^lSI?0m|vgdeq|Qq1#MUqak_$C@u*^5Ru8+){V@Uz?K7psgxZ^Ns_oe#1U7E>jDL!W)lc!;rBP=(lBD5-wHhw2s(SQ zaMK^WU!Ub6>}S%g(j;zq{#6zV{f(3 zlT-+YnKac%&K37Pg3Xf9)andwM$AaRw5IzHDMvWn0HX}QHkiWl2#81_QUS(6QlN36 zQVyIwA-k43ui^N4CLjt7UB5w^S0SsRTN{WhHH?o6BlA=U6aAfw9F^8F+vEbWkeVkU z?5LlEQkXc7ciu8k_8G>8E1+P zitbVDL!T6b3KyXwcCdICj1r1W)gh(_6HgEMk-Zar0b<)?Q z-s!m8`q6#Bm7I!0wN^-;dogiR3RbO}4|f8LwLT$cu=H&k@jT*piZP(szzYV2oQ8Ob zfU2DZYp0t$w)7<6T7Gov^qAdSm>Yxq{GUr<4ilNu!c-h6+3_}}!5)FQ6bNN7d94N$ zN@Qyopn4wWK;(+mTm)+ES$iDZgE)DLt()(QHDlTdq(&WYb-u`~M2w6W_^@FXODZxd zE*O#8b@>rB1suE4oJ=WYkr=HkgIKji3ys}0ZItLjoPp<- z8whEI742rI`a$9tyr5*?=fE505cY>iBy6-)LEql`(33&>dZv{pda+;NS9NG-wbe?#lhd!FUujUy!o)Mp!JBXWGY)e8<$KOf0tC+vYcT6wh;wQZSgVFw zMhV>xOHWR;ReyqqyriXekIClAWMb*ZYMm7A2Zzgs9%H_#Lt?^V!`7h@7sRI;0bp>_065E4w)Ss_bV;57DtzY;cHDoTai$ zeR?HpZ>A3HuOMu-`8pxCs|KA_Z*4Y6LpY ztl^wl6q25h3BY3G*C5cL`4*asTFUBo3}omQFS1=@Gc?4dK0@#fK4y?NLGEiqs~tp_gY67u zxE_^tkA4}D+d}8gOo#Ga2s62e#8YcsM1a;e(&fo{Omt%coRR| z%#O~E?#B#JYnpMwfLCdlk8xq=%P;$qk{86xj0{t1uF{qDnX8%G$~le~G(Wu(Dw_ z5}TmuyY?MWpW~|SpzAU|-Ns~}0!(?ENJN%n=Jy_oc#4L?GuMbh(}>kc&)1pD!#CSN zQ=v6D<+9Kv?-lJfxy6)e$orBHgxnFozah zMoZ=N=bWp55z9|V&BC%8%Kq%ZjqpW7;2>O(UMjhx{Ls_y-Tad{hK9W5#8F~najD zs#&h9|7lMd72zyEj}T9Ku5}{&nfl%9s5W`mQ&XIR=DoHc8+(PQRuV~csn2qboI$|v zZTfR?Ir2|%92Q3Rz6EDOYtWnKrHzrrl*6wfDqf$_S|S>U>bPtkFdW%CTF#9G#u-| z6@Rwo^w^9NS!Oyb-`U(V7HmO)Qmk0*kJsFSiXcf`!3T(9+yCspdOYGZ+Qt;(0Vu7! z3(^g$;6k+;qY;8Y6mg(utct4Ca%+NZ5XN%tW@JC@u}G-2Nnq>#FZ`^_XJfXb9qw!- z78Hd6?Ehez4JNu14oFTjpI$YvKc&9fBkwzaz`w1O-H86ZSUr~&^XnbY_F^NMY^RmQ zl%76OBA&AGw|25MGh}@cnO$rqe9t>!6S^DyYmlY7`iw%qwSG;IOU!EP$@L7o>wHvu z6S0$70r&VYStE2aWB3>L?{a?Q3lymk$+PgB;!k^i9=aJ*TriB^Wp6(p56sNBF<1YX#B}dDe&RQt%GyTqs#A?=H1HKyvQe$1wf7o>(lAo``neBTd2qN^Lo)Z$^2J{4V; zSq`vMgIqU6^dN-YzZsOls>m=TGO%o-mIV&o6=cod!DNf{l~@rXtHv z8=zyes-uVSyjS8`so&v*-n0w&=A=-;QK&y?7N?opybu3EI24u;^3&4CeQRh3Rdd&G z>2oalwk$Iu_WAX!ya&T;xYK;ZIhnoK!vZzEGQVOIH>h!mu0q_&<5jQ9h>J@PZOu2l zl(_0BG?Tfoh17^C?BwW6ynB6A9k_w`dWk=nbqai)%p4PSr6j!li3oFc^TRmEtu(CBH!mB)sXlUtd|vTw7qlDH@Ks(yl=u48++HL z8F)Dn=y|zwbay)?I)BX%;C7AFTPg5od5SF@ySgrZ$M+SR2nn_%-XT$_6{sP8@k!gzK$FmR5dL%*x)#eAuF9P8E$b#N1dMMxV9j_ zhL>k2;ThsuGsTgK(l#3DmgsU@6rWS1Y?vO{p+SCmcnKcv2RrgFo!YH2uCI*lr?gqAl=!wCc});9}2Bb z&Gg~*blz{8OCO`fS7+T)jFvm5R4gp|a4&Ri0?SXnUzCeJYvSlWWe0_E6H%`k;1Jy~ z6v=<){Tg)z<#EGw?1cwYB-)$(+r%7#|2q|3`YyjvEtFgiO<0|*YT_D~r;4I$l!3-}cY{dL$~%PkD}o;sCjkRTyTn#v*_ zEth>sEw?Uj%-gBf$N4M!%FszIj|J(fy~q$_3xJxe|@U!mSjx{RC@h3L7Id3QLs&71tD4BAqbx!h(5JRv_t z_t?(c(e}eOITwR_YFJD2Gr5l?15`)`^aGGWv@~y5tV@t5;g@DiPhxJ}?3!0OlD<$1 z+_We4kkd->>dWg5Hhs;11Os9Dq>hpGEM=*7yPJSvi-E!F&8G{~3TLP35_jvz zD9RwE2|TuYMK)sZf6JAg%rcy~1Wuq(q z6;iF|X)Q6zU{+(K#W^#;#5WgvWs2j3)0%m-(qIZ7dFb>;5*wMg8Xkq!3lUi>7;ATI z^NMCSy_7cyJl(Inv-WYnJ|i#5D5U>=E`13J$hzY0zb||5t2Cy9$d5#<<{4*g^G)a%NVX=Nc+`RgHZSHEwHuFYbPwa{xZ6gFKHZp!s zE?{+(CqZ_9IbB7By3S}l;#HILwVO~_IjH-`Gl4$0E@v-M*RZ2k5EQ*Wc{W|(AX;*! zqF?y3-s5nu-&FEyE%juT*5jbto{x}ExWZ-1M@geJp{~c|H%R+^af2CORg!p+WSbKB z!|7F(g&#G~=7O2-@d>MbP2dL*p6Q!ag+-@CbSJ$c$IfXQfe)i)Otc|9lQ>`kr#i2A zNX>t8h6^a3k3++&5abU!Zu)@J@0r)4ph+6LDXf>+lbc}+`PAUw$NJrL-{N4jr2#$e?4rDIHSpq^j0K_iGfQYwbjsSDb8CisEn7jBhq z{#SBaf>|uBTx^>X7sxbvkr)N{h`eY8jl|m@FoieF-t< z%AqZVQqb$S6)$`8*31x}L+SEqRj$$-oGM;k))b3gv0P_I27g-&VPc=f#7yYj7a;uE z(O+aL;DU;H3wHSCUW~Gp>?~*_-{BlMMyk+gAwvrS-BVqqO6FfL-tS?~wg$t-O6|2p zTal+<1Rj?#r>wFW;B9^=V6#0|u`kIhC} zCgAjOe!6gUd|8DbHLjnV7q?4yP<_p4Q??DDNt+o#v)@H;McZJpsw>eSG3M>wWCZ9q09he`&A5nvo(PC zl72At%?bxduD1vHh`IWyW)iv=)cK}002r#|pfzB22!RAEpF#Sxv#_YE{cV`dnTno$ z?ji`YZO}uu>X)0)-}T=_lH3x^x$uWVY5~seyH)@=mJaGP6e!^sB=I860#shv=JooB zEQBm1mIHmL(rMuGG-N(x*IGhy;mj>?YgvRNX}qM$HJqggB$sHmEuuVzbT7>RYR&i5 zpi3pIVdoRvHB*|P;O%#<69gwW);vG3hH3tk^a7~~H$%m_s3wto9yON=DwaX@bzysz zIAVWPjsv})O_aWm%!f`1mz{duoN`kf6C!M=7602@KN5x;D@%ZrpUQ6aqwSvxwO^&P z0^y6a8mSRi$LbPT&5OS8@01$n=IqNJWUiqOnd7Lvj`!`lVZHV={Os!2CbDIGnQ1%y z&i&10=0H#hkLe<|AdxKW*06-ZDRJx*)y@D_b?{vUIaN_~nU#PEG zICS3^zL8I_Tbopjs?Gc`sbZI!Ky+O68S|oAfrT1~P9AuCp1(^D*94K3+A=RpabT77 zu0}fqo-NwS+_DNecPYIDpo+u!Lg8p%8Dndq=jX=d>q&FyfvzRr;>t0 zDJpIn%xHe(X5YlZ|I~kGaC)4xU-IMQ3P18)z0GmXo_K7zEo0SaEqnt`PPy{2@|Qwk zxkLhCq7;I+gT89ic%S{qz|EWCC0O;PUpupYW0qh7 zlnN_uu3Fj7-11$QM8^?n!S+)L_-7m*juZ9^cz z(B=K!NcA3%oYO0}8f0g77rg6;p?RX!W?_i|WOZeML}BtAK`McRdS3S|$>*Znif7Mt zaTq8iRwL)m8Bi zYZ~xHmSlW~JBomrRXbI;HKI8!xi$>l`i&{KXJ|c;kwndE^SBqS-iDKp1HDeqlAvWE zq4<%0+K{;S)h<_OU9CiG%+3deO<*wzr?}|4hTZoHhaxsqJfw+DVIG+mWC%nDqUQ=v zmcMjpV`9=spf_V2-=friEwkBq-F7o@E9mV1%R@b$JHNu#Z?a5J_Dl`m|1ZI+jY<4U z_Cs*F8j1yktipQEy+bxCN);B^@eC%6QNPWZpc;X$X5?x|rrRXJd&@b@hnAiq+jnD|oL z@z^9e*3H!1m6R{zoujcFp>pDh%=}YR=}_3i33-dQf$+O!_uX~<$6^d_XC}) zrS)odEOoM+3B=d9MN;{Ccuoq0~@r9%ey-gEoJYg$x1MJ zfD^P>7OXEjZU_l(s4orOx4jkqn$v62+Gps0B8xafVDppRN`X;HMaE!uJKAdj{?|vi zJ>A;4+wz12^*y>&g%O=DFSTm}vpiiT+PpGsUKG7gDXu4?lb8&S)kYA4c{t^)zGl0+ zNi5I58#2JV*dDG;UF;Ni7VeR{bTb3b2 zs&Vos)nYtTfDcwVcB|zg_GCNzH!3ZpZoFbLJ~D%D2NQLv`y>8Ku*8(j=J*aKL}w13 zvTqd18}n3c_S+LK58B~Y0GAoovfjePp?2gSW2W>=bfb4}W5&ds7RWRiNpbPZhBN`< z4~aj^=|nZK=vRhyO#U};Q$*?c!CNV5_Mypx+f$#-d(>CoQOp{cAiwstN zL-mtJO{{qyG}ua5>yG0%!ko1c;rvr_54bsA&!V$qyf=&O!O1{b^ex|9tVTE9f+a5f zkuJ|XJ=?6O=h<9XCK0{}^07NeV;mE7S2Fw;hL|X}@=d;fZ%%rj38(a6HC}7i(4nU? z8hsj0=m8I>Sx{U(`4FwU6seHZfMI-5qhY0A^R4R{vJp?eW;2nnxBXI8OXjP?G9R$! zWzQtO+=eCZ;Il8_2quZ<24k*U3QDryYl}VY>QkEl5S*^j6RG%fGGs&ZLEZPo)K{{| z5b)^-Uqn^@S5)_@Ph}_}E>2Cq*2n z)Ul#N*laN{siBqa%b%1!i2V7R`d3I&N)>+>iNbXegg=LN-H3%+-0d@;d{)_36Ti0C$PuNqY&NVm*4wo3X1OjG*eRXLrm zN08N06k@TNc#go&nEvA;nLX1z6?RXCRX=+~)xqojBoeJT{>?A!vaiD*0c z_wLO79s!+NqAvZI)+3KBGr8o(XqsY*5mXGUd}OaRa=L zntt4(Cx>5j9r{>&F-;0xIzbR7Y@GS{vS_!AhCo>va;N+9I z+-NKWvYQ$Yr(itV>)F-tXn$iJI3F)$Z$#VMK z{Fo+On9a0Q(Dvc5glEP9@6P)n_DExQ~XK7CO8-V5~0jnZ-JkYrKYvDb?lBW>=g zh$l|2-3p%QkCS%YeZij?@sXWB3Cm6FW zCmt@_=2oW$F#HI+tjMP`7`j~KHY#}EBPAyBtXGV{$xadF{_p%t=-X;ZTlN`Ey~f}z zTkg9*)q6*L{|Wi?NeJD-WxmS|YEVrb-_9m0E$uO1E0VD*T1p~Sw9z7}% zFXP6Tw{&yA){)^ol0|*8c!VSg?~r#lHd4C}^Y?+ih?x()l;d}!SlMpRcdrCuo4)Z9 zPJv=n#L{R%?U0=#n_*pd3a3O{(u$N;M2BSNz-_f#{IgEq{PagV64Gz}-@Ts~J$oc7 zKUudwSpS*lKYNRDBrFafnahxFv|;Yk_DDSbSBu{K*UgRChk?M_oLW{`XW_y<} zR*g2j@>~-hi!@zihbLc>6n@9f52IGYa#$`A_I_mCH_*ADICpB2yfNcXvRrwaCb5>$ zJmDR1t;jc*_!qU_9HF8&4%h63A^Nl=DLWxlAt_v;}gs$}^`vX>SP^3BZIVW#NZnF5Mqk z>z+az;P|JeP`2;wM6R=^Y0T@;pYBt51zOZ`mRhyqw5Z_+KzQ%2N|_mzkJJlX{Zp~l zbDoOLpY$8@+3aR}&7qafm#Rd|Cgn1eHff_RhM1Z=}u1Su0B!_+rbBs7-s zOL=H&y0^MWQdyqn@dnkM(D4dV2rR0j(bbo0P2lhjrC`DON#BI9KI4o^+Itu}lw zB1DH4St#E!_-@E=e;4(hkhL;gVP&al*y!K(bW~o*QW@Jj0bb~*O`8@tU>GY8ex4T} zaAdJYTkP16Ib&$!o8vR3Ut55J4tfw|lhM61HsZ%B`j3;Q1-_A&q76B23pD?zdT_}1 zb3A1p^h^z7&2K>mcL+q43N4ueGFOuHe{9T1w4NxD+;;6QUe! zo{N^uCyAjT3<=(DEy8^d+v0C7UzHwApc|4XCp<~a)%z2I)qqv7wp&tn+sDe z@ua!^w?BxZ_|Mg^BX~V`4_IH)^b68)9Z=Xgsb#G)49JR(nf?a}3g;#bgK(^<#pG9nNV81zj_bac7SG{9#-H~-1 zhFwY&qr$#lRA&VBn!Z3@HIY1JC3vR(Z=df8q5HjoW&Sy67*FjZ(EFVHO_*1|x0O<# zsa5}$r#wdBu_Y&ybP_Kw1#9jZ6`JU-avRByep|QjDJ>?E*{vuKo{K1{;njaz;fyB4 zw=!_iJi&t?KbU)o9WbkuU{m0VHG5l)$Du#i$Lr0HunL5(HWe~=cZu?&J2x_w3PtyN zC9O7t;>vUs;+dD42!4&jHHLe$AnObwXb{g{xh^ zykG<6BQSN|UQDc9Bh(Lc#A(C{ff3XW2^E<{mTsKnS-X(^SM~k@#x+FCl1#+yRv(FM zoor$`VdWh{PKIxN@#>qBXvc{V=sQrEXoVWK{-S9b(VhFALV|wM0@aW$sql;bzlr$0 z{VpnJ;cT7oRyj_ejujZ1xqf6+RlxAUFR(+k0ppqgpJ$C2*UZ;b4zx5adRLmzko9Tz z15BV|>TQmP|N6jt-}RB%oQ+U&rewT@D63B%i+Te;FZgRMhYR5pNn;fq3)t>dX&@xkDCFdwnTzr?ou*&yfduY*-x=m%ial7W^Fk^6e; zbZRr92CHFk#%d6fNc-g^j>A5m^Kp4ug5fp2Q6SO6Zd&_rn|v|GId_`prHH-MKO{z{ zxUhYE+*_ij6w0W|k;pz1T9*iBDW56)u+j}`AcRTkgincCz7+C}YoDE1UtE*9t0TSR z{x)QRQpUWEwGy0?p8N6t-gHhLllY=0;G(FVE56#~KERxmeW1YTab;>+5Q8XKEh7+@t=jc@1SqMeL)@3FHTvwKdA1PyQ=G zm5-cw#0bn&wJgS~X(Y7)iEsjIpK!wP96KjNe0^$s-)MW4A7{B)5WLzb`M=3*^G{N$ z_eq&^xuGL2nRo0xNP7tY3eD(bJUmPS%4emHpF~#C+)lXf%#naL&6k+G{lQ*kQm6>8 zcI0E;$%7oRLg=D3Pejyj+&wCMBZ6Q<wvw`}u(unny z9mwd--}vcGNxEKF$ttmUeLa>rmb&^`%HiGP?R;>Gq>vFwV(7K8As$+NcALV!iyQqk zJcu^sScCJoyK=_kf|VM8vE%J{$5^%lK4?u-=U1 zWPA5*6r*^`oV_+ZOF$LpJwuJc3W5-Fq&`Kl@^lEc{lUY_bQFG#f{HsA-oi^?^lJ@X zIszvA`t7$>JiZD21D^igr0a5x%Cn{Y1GoN__23s?T{)CxZ=UX`wT>2#+_~ zex*zE#u&WVz#7W+;au;}8n#3T4_VcW#?A*sS`FCHiu3b5$8s;)qINilOrPYc;fe|7 zq4WcZU7cj?)%@hYE&3m)e>tYMSLTsVF#O~ha4~cAYd{npQ&X_YJHN^~$&Oq&d)Wq> zS|ImeHN#G;-iAdj?(YpJWS2l|2Ub1KHYS+0Hr-WkodjKEA zwlAb2;OxjZz*BgP;>V7MfBR8GOB9L zWC+r=iQKAu{7$FdhsjTFc3GgXUS%-6O#N+dFJzja0u~;g-yx?FuV_vOb?M~p^n39#!3wJ09tJVsqsf4JJzfpm^=#T#=XOncfA0+?yQhe zye2CXxFh}`Sd!t6qC)!uxjKt(vc*rAD!1wBe}r_r{QeJ?Oq14rX6N@>x_x}C(*Tn3 zxjYZTQgvW`L2L1(5#;pYsfS|}g<`Q!3n5T_cKqJt8pn^*853YV0@XZ6UBnaBPuzPk zTno=+PFxil7R^}=w(vcUvP3!qlpnp`+cDS`c@c;8Lc3|3zSHV5@P9t{5O+HqqDkI& zxzm*J2!^6G3%Y3;gN+f~s40_KQdZ>!ledZj3^plJu<}tNvJ;FTf~s+HW_t@oc1Nb= zxkSBL;21V2gxK*Cjkyf*#N7pZCVknM(7eU%dp{w@_Eu;~qT|+QeNi?r%%^4MEV-Wt z7%{Kq5<6S--@iibJ(DGbE~WPK>Ue*!WWE^#RpRI2d3o39eR9Za&CEzJ(LF2N=jl^j z1Zoq7MK=x#h@b_OTUT2+tQV4kn!MZJ{!+s3L<+=V_t4~s6i7F~A@j>c;*q!bB=cx&d>+)J&$%`w5a zAH}4+x(?QTvZuVSfKz|SM^jyzZ!do_wB-mJxe>Kv>egQjH_DEAP7OU{BhXV4@JE+vGm&%Lm z!yyfOmIsQ&k2)l5AZXxGUrvB;2Brt+B$CqX<`ia@PzOqdtf;1c83R##@7n zPkHVf7ZY6L=-`CetM)R>*|t(o0%TgHUE|DZyk<3tR%*xnWYUj^guYa}y*=)6isMJT z6aP{s*3qM|i&_NP=%4}mgm}m!?_wI`vdm-3$LQp@rfbu~(hnd}rWW@jE9vW+GZ#rb zn9=7`>b6966aAo@^P0OOhkye~YZkHsn+sA67}gX%h%>uetM;A+h=~&wP7g&hFilrcZMOZE?VkXC{Q@`KKNbp-kyVjY-K+#YYN(DuhShHvOzQNL&g9zs`VNz_p z6tviyt*@suyWO3}t)1TP^II|rgO_7Bf8MkTDG@#G?lc+OQOpP0 zhVF>$oyK|jC8uYR6isdknqz{tJ~d;|Zso}Z$lO!BeW>_+3SAy8J(?dJ{Qw?be`67R zUFa2M{Y#O_9A>x~7VX?)xp$2kWy>%&N2g>e0 zbmq)<*9;z~jH+^5=ZwdV3VKGBh7*Nryk@tmO-xTnmuuPbvJHZATfc-h&oXc4-u%&T zl=^$BsBs?mzkxr^E1YFYLi_qHm1sFZ{Z~1-NQ*t=7@FJdUf#QwJGV;H7WYX6EfiRe zRgWbi&oil{qHkJyp9%h?QpNGh#zw9vmBXQ3s|d0`Q35gR`<8CQ9NFgg4eJXHJLJFj z`o-!s|GSh<;QjCYSYvf%VPf$kj{fD@o&m+i(y*U+!L9)GIR~d)9<^-+knE{h=Op+`JNa)SN86{1^y=!G_y7wXZ z?h=f~&IkldwQo$UkE>A8@RJz|lheXfBtdu)E3z_Ch|i! z_O~*2v#~mh<8&J2=IA;_`>`3XpME6Z=~qtnTcs6PZoxUJpuszv{-$|i=OWs6;5O-Y z=0DDB7c^Z9GTrg^u5!U%RB&X@vFL--Wd0m1(<>e8ET`z(&wTLw#j)`t)~84n;hUYL zpc73^O|#pUr&dV0A8V7iMtceHHsrQN^l$<^uA)?$to+IJSwtK zr&(c#x1Pxfk65YJ+sksDtLMM8k9`8d%tnYydqQJjjDz!G;;5ztZMmBi-j9z3_0tc( zNwp>6*yDG*#XE(kl``?{eBXE;Dkf$X?+DUwIX^|or1!0!xunnBO8CAf;F&#*Tg=Lv z{WPq%KyGzQ@?TFEgPA*bK9_$k z%m9Qm+<=_VpD|X3zg>1td1t$W*|Xfk5DGktm6Zd(~&_DcN zjU?x^v*EHzY%A0Q6cSF6YS{4>pnF``N&^4^K!UWR?O}&s3LNrC*Gw)>Mp*CCQfq5| zFx;Hb7hxU=tZxb^FX)97I0hD3to>V}hA+V~2tP)cssz9&p+(&91ZJz5=|3dWM_m;c z{KR;XK&C-ZC`-v1fb5aXvYD4encp|Ez$k3;VjzPttw>DdY(a4_uY5(xLgH%W0!l1m;PEV|G;qLU$pY4f(7N1Mj>$#vW zP;$_3XkNXUz1b#%MLvG{!mri5z~WFYw%LU#l?|0C8mACvdl7k^in(~;8zlcaKGHCk zjPC+j8C{ypEf17WmSQyl8sbgy`G4Vg`@KV?#N@^cr*=ePd1-DOl79GyD4M(ux3a** z4Me_Cb0{MVRWm**#n6(NzOiK1s*b2`6@6q5-2D;PH}QEK?fvcfy%$<|C^yodwznwQ zT|CD%D{=Q=y0su&sBYgVoH9f7f4x5gMiz2LiH5UrOjqVjc2oC-c$Alhu%%>O{~7G^ff zY1(-1;pXP1?X=4qjj}aMa^$HqrC70 zV%4_?f-+mtoW%I%aR+n1Q7lLCWaZI_S!UqXj+ux74my10_#TFwtachNgwtgg^Tg$c z{;oF^>K+bNL&HXc=7nh*JhWK~t+l=k1qvlI8tL+XE@_}6ZV%^YQ5m{-Fixtj1YGBPvou!*lbeXB2lvMU?< z0|w^L^%-#7-2l2*q@Kk;3i+v;xi%^C%$Z*A;8%6h6#b~jsu!|bhhVQ}hpIjFW%(c* z%JoKO2W#ankhUd*B#`pH{B6H?u z`F4*dNx4NKW|7W0|IWN?e=M8?Fs>rm)Ft!beE(l-unp;cp{IKyeYx&&S{cu{Ss8Fm z(=c4qTr2x4+(dUexvia_{?fEP>bya4#jfLezbON& zO8<84lZrAyiZhRN0ntg7adN>A9L= zExqF3yfoa`K8VGy?R?&)v*iows-fQb*g(xz3MlrKDm!0&(yDsilcZlDmbxNRj+2Qi z!)vg%#4q;SOylt`+pXi(Ppp53EQWD|YZac5IJW#+^?g*W0j{H0|nyBu@FB zs16*w!bCKfKfpPKL&Jpq+-QaB>h&19xhGbYMY6Kg=hEIZ1u&BVGL%Np)h0jRlCH=F zljwVH1W|Q0W2F+&^3aHmcawcrniy_*v@6-rCFi$kJh#`}Z zqXt?;+0n}lV@W@J%uJKAm{|VhtCk>?5Atm+-C9-i(RrN%sl_wh0st(E3y~ytZe6;N zd~&xO7(Jv}8s^lFL`)>LN9( z_2jO=Td>)Oxw%_Q?Gnw z4WrlJ2%Qr?zK%h37qRkfr^tkiTL~KsNct`}1<-E;77qGrHF9mfA170&;l-yNo_`2d z6JKP@e8cra#$IHoWJuzBZ@e8B=(bAcJ{@K*i+S3fBk)SyWoRRz4Jfmy7xAtmV&THJ z2?t{47D1K!HNls*M77o7%H3VS3ecspuvR7Oc=PN7Hc>UWWLUJ_=7~{U@!K#bt#{B( zYG9Gk*SZ+K@SSuC8OW^Cf|TF^Uj)3z)QcvV(^7Cnyut}9UCRYpmvU*N$xw};khIE{ z>O0)5Euc0|9jNf+Rv;XbQP>cGO2CH~m@n{UliaZ)dG>}lL5=hQCvRpS-`B=C2ftO3 zhV~`twN+bamw)}g8qWQZ>HUA;Glu3K$}N{JVw1}fl}lJR5yFfy7A=gS+;a&P9VOk2 zkVEbp8*--^QkvUbW=1ZRN#>SY$50>D_xl&Te|Z1!d_5np$LoRbu9RJ41E&CN-LETa zkz?yC<=(-MDjUcqe=cwWp+IqD?|Zm<1M&E(Ka2%aeH=S*Tgy*cb)mKE&ZEPH7jeU7 zpq)(YxwO;WaiEqbk@e^B+NOBkih}gg_qHac(K2RI zwo!#qYQQU1yi>6O@M*V_#PWhr+NoT@kH z(9cg5!{bxO(gf@X325n{4jWo&?#2^mt8eu8Ocv2alz@AORq#J`0Z_gZl`&yi-J5mZ z&sT5vw2x7USAI3<>9POZmZd7^OuSPeUt>_bteyj;(_9O@n!mpSTwxZEPay9QLG@K~ zjxI+O%{jZCz=x9iLaMGzs8wF8JAih?i62cn_(8$1sH<`fJ>r;Ar&v{Dc1qUsno-#i z@ap-VP-cREmN#jLLj9ow>AZGGDFI&=Fey-*Jmx<24uUj_6wh3_>E)-^BFQ21L#IWcjro>lw=E0k;p~~7KSEpI1NnwdvliOmY z9$&z)8@A#98Kjl>7W)cWuiR)a+I7F*x>L7d?@^sdlEci=b6c|qC*8Cj7?B1odSbJ@ znAuoPc2Ud1D~Q6P%dVzZR{r>B0T*_mqirOasH?^QTx*9nV4rY`o9Q5Ub@NCb7OSpb z?JONsh(laSY{CSii!HHeiYdG)z_jxduibko{MpR!O^>pluQk}ng_llAq#qv>zw|<+ zvs*L0WFh?oM3hc|eMiP2!b}V2tXy$&&LmsB`@_sGgOH&1XVy5myNp>q(I`0hHb1Bg z3+4Y@Jv}p6l{R`@k)GWjx~11SlwO{w&(dg`xMeM-(0tPxFY{o5GYCA*?)1ZFpoQa z24uE0N!aZ;#A-;%wTJvdE82pDT+N1j>Zo>hpx1eVDHjYh-0gsUVfq=3gQ_d8XykE1~}1AmspBteX^b}F07W7 zabLHkEmrk@XgPVIL9oW^xsQBn#vILo?J1k=)KyuWljf{oox zy*db?7|5m~$qjv{p{cvJHoHixlheaJIsRXA>p$`!^+0k=TL+-#~~`O6f}zD z0JECV%j-;lt5U#_c5tSlNG;+6#zZQj(w7NK{TIBKOiR}>e7*O-gnV?Ry(}<qN8CB<+tp;Vg2#7fyOQjO=q7^35 zde`HN6Tf+CcMb#C{`|vNDo{o8G8-0S;Ogs&K9T|e*Rtz)f0YqoF;OhJKlF{KHS$fL zh23UePD}Lyn&$L%yi&%oK5!1o5XG$+8zZ_`gPBc_=0S)8=Kk$W)hNERFv;kN1I&zL zuY)r___Rc?tD$_G9)|Nr+~_dZt}U+()8A*lCs;q1dGw#X!&Pn{0UkXKf^4wDMT;Qp z8P0a*SZ?S~Z*Wk~wh=qrt5oYZDM}WOvs67j`XP>3EEWf2AM$hJPc52ji#!YR(7dVz zB)!Os6=6fMcVpsONjzBW)Cz#K|DAo$J7n? z*39zk?_Ks~BJ0>f4?A;BJ%&;jbPqqOk_^D8&ALy>`Y(Ls1^Z+Y-4?zMClHvd1W12D z2$zRYMiwyFfgodOqckde9hd%a+(H&--?+x_PYgHj14pM@+@N+&%txfj7Jlu;l+f)NUXHk{py$T?pil zzEUALnj7{F(z?NNvnj)nuz&|IAN+J&5;p#1UvHP2t$1y9!XQq-4lptBD?ahRr=e4_ zo@AeM59;l$SsXEW&n+`fC6UQ%A}S3w{J1QAa$)hN>~4aAl}CCMut;{7$x6vpj7FCM zS56CzA=I++TzfYU=1Z$gjn!y;bU}9?$Fb(U095^#gcYVN2(a2Abl0*+jD|2YEDEbh zl39#MrbIO#`J)|v)CZ=Mr~ninlehhOS`DjZMmUi(13hW4!z}Z-cC(EU{ZX}Q?3X5I_X3nnB zD?2fN%TMI}@wu4dtpP7OMz5p;Kcbvgs-xqVLV`J#>EwrT-ovW3$NP4J7_CYLo`tcT z9#8q{{X>O6a8CL6(t+BE`Ow|RCRO5OeiWL8B|44i{DSo>2L>vbg|aohrf@BCji?{V z`h9~b#{^5!jUC--6lfM-$qfBkP={3vHnzYzG0}X0FxQfhqZF^MEv|Zfd?rqoYc5&z z=I--=rAcsY6N7nT594aiUw=4KpjLN17;g^sSs&w!y>hOR_#znsgraW?8JY9Lgvc#ZPwmr`$g^2NqA=7y4F%4_#jXR6rOjBc1-^;;@F!+Pnt zteimZX9slo()Y$WW>{+- zKAnb8C44Sl^-3{k!$&sE_jt3P?7LErS}a!Xq$>1*<|FG&UJ4zJRYBGO ziR$Le87b%X(`Fs&_xb!dA?Xp)opTv6vYwFeb0m%gsJe0AWeO+{K9v$28oDwvW+E`L zwVq6`&b@VjN{$W{zpQt+{Z?EV#@}f9g53u8Uy%W7_W#d#&3^cWOL;s4bH^?qv1e-? z$WfqgEtt3=)Ma-adhN$LMu@6W9kTFXqoEsPW$3gWJ4q0QepbX198jB`E6|Goq0<_A zayc=}h=%3~IhxZjbgDv0OZb@WQS(UD4A;K<|GvdajcZ?FNL2wg@D8AKdLgPk+Mt`$ zLF|T71)N>~9RWccY~AgvP#f+dU#Jp}u`gaRHvk_7O#Sc< z61H!WSylYZ*X5bNP!9;xbD#}1d>DGLn|X9P;^`&j^n#k-3s{{zpXR`~%_6LxV-4jw zX~v-*^+J${y(vrL>{8Lq(4n%8t;eb)?)Puyv~Qs_lE~vZrrR>pjc(ZO!FChVtX_O} z$C)ecHCfa^Q=%0Av0uWa`GjWI=EWV;qCm*zR7g{`c75WeSC$H}Y=bT2l4gtNPm3wZ zW!CuKBE>a=n{Ty`1TY$lM#6-TG)X!&Jg*33MT4g!Tv0Z^=~s(XPzJB*v}297AFb;E z8I_6$PArfqTwAFk5M(b~zQ^B@wrs*w33$LIK+|TLcRKbj + + + + + \ No newline at end of file diff --git a/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml new file mode 100644 index 0000000000..204c5fc692 --- /dev/null +++ b/OCH/mogo-och/src/main/res/drawable/module_och_panel_bkg.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 509d3e5f16..4ae3c37821 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -4,16 +4,17 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingStart="@dimen/module_mogo_och_margin_left" android:paddingBottom="@dimen/module_mogo_och_margin_bottom"> + app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" + tools:visibility="visible" /> + app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" /> implements IV2XScenario { @Override public void speakTTSVoice(@Nullable String msg, IMogoVoiceCmdCallBack callBack) { if (!TextUtils.isEmpty(msg)) { - Logger.w(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg); + Logger.d(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg); AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java index f4a2898d3c..a5d78f20ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java @@ -21,7 +21,7 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker