yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev2' into dev2

Browse Source
This commit is contained in:
wangcongtao
2021-02-03 10:53:50 +08:00
parent fdd25147c3 3670a224f1
commit b9d4b2786d
6 changed files with 115 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

@@ -89,6 +89,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

15
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
View File

@@ -13,6 +13,7 @@ import com.mogo.och.bus.fragment.OchBusFragment;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
import java.util.List;
@@ -33,6 +34,20 @@ public class OchBusProvider implements IMogoOCH {
public void init(FragmentActivity activity, int containerId) {
this.containerId = containerId;
this.activity = activity;
UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
}
/**
* 进入鹰眼模式，设置手势缩放地图失效
*/
private void stepIntoVrMode(){
Logger.d( TAG, "进入vr模式" );
MogoApisHandler.getInstance()
.getApis()
.getMapServiceApi()
.getMapUIController()
.openVrMode(false);
}
@Override

94
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
View File

@@ -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<OchBusFragment, OchBusPresen
tvStationNotice.setOnClickListener(view->{
// todo debug code
List<OchBusStation> 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 BaseOchFragment<OchBusFragment, OchBusPresen
// 获取小巴数据失败
return;
}
// todo 根据车站数量，调整面板高度，分为2，3，>3
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;
@@ -151,14 +223,14 @@ public class OchBusFragment extends BaseOchFragment<OchBusFragment, OchBusPresen
tvStationNotice.setText("当前车站");
tvStationName.setText(station.getSiteName());
if (i == stationList.size() - 1) {
showNotice("行程结束，请携带好随身物品\n注意侧后方来车\n感谢体验蘑菇智行自动驾驶车！");
showNotice("行程结束，请携带好随身物品，注意侧后方来车，感谢体验蘑菇智行自动驾驶车！");
tvStationNotice.setText("终点");
showSlidePanle("单程结束");
} else if (i == 0) {
hideNotice();
showSlidePanle("准备出发");
} else {
showNotice("行程结束，请携带好随身物品\n注意侧后方来车\n感谢体验蘑菇智行自动驾驶车！");
showNotice("行程结束，请携带好随身物品，注意侧后方来车，感谢体验蘑菇智行自动驾驶车！");
showSlidePanle("乘客已上车，准备出发");
}
break;

10
OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml
View File

@@ -3,7 +3,10 @@
<item>
<shape>
<corners android:radius="17px" />
<solid android:color="#AD3D4E81" />
<gradient
android:angle="270"
android:endColor="#152147"
android:startColor="#354E8A" />
</shape>
</item>
<item
@@ -14,8 +17,9 @@
<shape>
<corners android:radius="17px" />
<gradient
android:endColor="#202D4E"
android:startColor="#2C3862" />
android:angle="270"
android:endColor="#141C35"
android:startColor="#344687" />
</shape>
</item>
</layer-list>

3
OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml
View File

@@ -2,8 +2,9 @@
<com.mogo.och.bus.view.NoTouchConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/module_mogo_och_bus_station_panel_width"
android:layout_height="@dimen/module_mogo_och_bus_station_panel_height"
android:layout_height="wrap_content"
android:clickable="true"
android:maxHeight="@dimen/module_mogo_och_bus_station_panel_height"
android:background="@drawable/module_och_bus_panel_bkg">

9
OCH/mogo-och-bus/src/main/res/values/dimens.xml
View File

@@ -3,8 +3,13 @@
<!-- 本套资源适配分体机xhdpi -->
<dimen name="module_mogo_och_bus_station_panel_width">464px</dimen>
<dimen name="module_mogo_och_bus_station_panel_height">348px</dimen>
<dimen name="module_mogo_och_bus_two_station_panel_height">148px</dimen>
<dimen name="module_mogo_och_bus_three_station_panel_height">248px</dimen>
<dimen name="module_mogo_och_bus_two_station_panel_height">211px</dimen>
<dimen name="module_mogo_och_bus_three_station_panel_height">276px</dimen>
<dimen name="module_mogo_och_bus_station_list_height">220px</dimen>
<dimen name="module_mogo_och_bus_two_station_list_height">98px</dimen>
<dimen name="module_mogo_och_bus_three_station_list_height">159px</dimen>
<dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
<dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>