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 11c5d86aa6..2fe9555b15 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 @@ -19,6 +19,8 @@ import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; import com.mogo.utils.logger.Logger; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.List; @@ -51,16 +53,87 @@ public class OchBusFragment extends BaseOchFragment{ // todo debug code + List stationList = new ArrayList<>(); + OchBusStation station; switch (stationSizeLevel) { case 2: - + stationSizeLevel++; + station = new OchBusStation(); + station.setSiteName("第一站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第二站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); break; case 3: + stationSizeLevel++; + station = new OchBusStation(); + station.setSiteName("第一站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第二站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第三站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + break; + case 4: + stationSizeLevel++; + station = new OchBusStation(); + station.setSiteName("第一站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第二站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第三站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第四站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); break; default: + stationSizeLevel = 2; + station = new OchBusStation(); + station.setSiteName("第一站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_STOPED); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第二站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第三站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第四站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第五站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第五站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); + station = new OchBusStation(); + station.setSiteName("第五站"); + station.setIsCurrentSite(OchBusConst.STATION_STATUS_IDLE); + stationList.add(station); break; } - + refreshBusStations(stationList); }); Logger.d(TAG, "initView: " + MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus()); @@ -121,21 +194,20 @@ public class OchBusFragment extends BaseOchFragment3 - View panelView = getPanelView(); - ViewGroup.LayoutParams params = panelView.getLayoutParams(); + // 根据车站数量,调整面板高度,分为2,3,>3 + ViewGroup.LayoutParams params = rvStationList.getLayoutParams(); switch (stationList.size()) { case 2: - params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_two_station_panel_height); + params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_two_station_list_height); break; case 3: - params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_three_station_panel_height); + params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_three_station_list_height); break; default: - params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_station_panel_height); + params.height = getResources().getDimensionPixelSize(R.dimen.module_mogo_och_bus_station_list_height); break; } - panelView.setLayoutParams(params); + rvStationList.setLayoutParams(params); // 渲染小巴路线数据 adapter.refreshStationList(stationList); int currPos = -1; diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml index afd0fcdab0..aa0e377783 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml @@ -2,8 +2,9 @@ diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml index ae91017c6c..2e0c11b709 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -3,8 +3,13 @@ 464px 348px - 148px - 248px + 211px + 276px + + + 220px + 98px + 159px 32px 20px