From 754d77560c1a36dae93682a2d23fd5f7235ad6b0 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 11:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88=E5=8F=8A?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/fragment/OchBusFragment.java | 2 +- .../src/main/res/raw/bus_station_list1.json | 50 +- .../src/main/res/raw/bus_station_list2.json | 456 +----------------- 3 files changed, 34 insertions(+), 474 deletions(-) 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 1c62094d45..c56a60c069 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 @@ -220,7 +220,7 @@ public class OchBusFragment extends BaseOchFragment< OchBusFragment, OchBusPrese isOperationStatus = launch; if ( launch ) { tvOperationStatus.setText( "收车" ); - showSlidePanle("准备发车"); + showSlidePanle("准备出发"); } else { tvOperationStatus.setText( "出车" ); hideSlidePanel(); 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 cf271b2883..f9ac00fca0 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 @@ -19,7 +19,7 @@ "lat": 40.1974932972, "siteDesc": "万集东门站", "siteState": 1.0, - "isCurrentSite": 0.0, + "isCurrentSite": 1.0, "siteColor": 1.0, "peoples": "0", "ifStop": 1.0 @@ -39,10 +39,10 @@ "lat": 40.2023987087, "siteDesc": "万集东门站", "siteState": 1.0, - "isCurrentSite": 0.0, + "isCurrentSite": 1.0, "siteColor": 1.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 1.0, @@ -59,10 +59,10 @@ "lat": 40.1940181096, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 1.0, + "isCurrentSite": 3.0, + "siteColor": 2.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 1.0, @@ -79,10 +79,10 @@ "lat": 40.179637, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 1.0, + "isCurrentSite": 3.0, + "siteColor": 2.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 2.0, @@ -99,10 +99,10 @@ "lat": 40.2023958306, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, - "siteColor": 1.0, + "isCurrentSite": 3.0, + "siteColor": 2.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 1.0, @@ -120,7 +120,7 @@ "siteDesc": "这里是第三站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -140,7 +140,7 @@ "siteDesc": "这里是第四站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -160,7 +160,7 @@ "siteDesc": "这里是第五站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -180,7 +180,7 @@ "siteDesc": "这里是第六站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -200,7 +200,7 @@ "siteDesc": "这里是第七站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -220,7 +220,7 @@ "siteDesc": "这里是第八站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -240,7 +240,7 @@ "siteDesc": "这里是第九站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -260,7 +260,7 @@ "siteDesc": "这里是第十站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -280,7 +280,7 @@ "siteDesc": "这里是第十一站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -299,8 +299,8 @@ "lat": 40.195255, "siteDesc": "这里是第十四站", "siteState": 1.0, - "isCurrentSite": 2.0, - "siteColor": 1.0, + "isCurrentSite": 0.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, @@ -319,8 +319,8 @@ "lat": 40.195476, "siteDesc": "这里是第十五站", "siteState": 1.0, - "isCurrentSite": 3.0, - "siteColor": 2.0, + "isCurrentSite": 0.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 0.0 }, diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json index 4dd9fa4f06..48d6782cc3 100644 --- a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json +++ b/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json @@ -20,7 +20,7 @@ "siteDesc": "万集东门站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", "ifStop": 1.0 }, @@ -40,9 +40,9 @@ "siteDesc": "万集东门站", "siteState": 1.0, "isCurrentSite": 0.0, - "siteColor": 1.0, + "siteColor": 0.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 1.0, @@ -59,10 +59,10 @@ "lat": 40.1940181096, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, + "isCurrentSite": 1.0, "siteColor": 1.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 1.0, @@ -79,10 +79,10 @@ "lat": 40.179637, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, + "isCurrentSite": 1.0, "siteColor": 1.0, "peoples": "0", - "ifStop": 0.0 + "ifStop": 1.0 }, { "lineId": 2.0, @@ -99,449 +99,9 @@ "lat": 40.2023958306, "siteDesc": "顺密路口站", "siteState": 1.0, - "isCurrentSite": 0.0, + "isCurrentSite": 1.0, "siteColor": 1.0, "peoples": "0", - "ifStop": 0.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": 1.0, - "peoples": "0", - "ifStop": 1.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": 1.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": 1.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": 1.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": 1.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": 1.0, - "peoples": "0", - "ifStop": 1.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": 1.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": 1.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": 1.0, - "peoples": "0", - "ifStop": 1.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": 2.0, - "siteColor": 1.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": 3.0, - "siteColor": 2.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": 1.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": 1.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": 1.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": 1.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", "ifStop": 1.0 } ]