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

Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9

Browse Source
This commit is contained in:
wangcongtao
2021-01-08 11:28:53 +08:00
parent dd6d7c6746 14688750a6
commit 953ee21b8c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
libraries/map-custom/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 25 KiB

15
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -346,7 +346,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
initDebugPanel();
// 根据本地配置设置自车图标
MyLocationUtil.setMyLocationIconUrl( getContext() );
MyLocationUtil.setMyLocationIconUrl(getContext());
}
private int debugPanelClickCount = 0;
@@ -356,14 +356,14 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
private Group groupFix;
private void enterVrMode() {
if(!localIsVrMode) {
if (!localIsVrMode) {
// tvEnterVrMode.setVisibility(View.GONE);
mMove2CurrentLocation.setVisibility(View.GONE);
mUploadRoadCondition.setVisibility(View.GONE);
mWeatherContainer.setVisibility(View.GONE);
mMsgContainer.setVisibility(View.GONE);
groupUserHead.setVisibility(View.GONE);
seekHelpGroup.setVisibility(View.GONE);
// tvExitVrMode.setVisibility(View.VISIBLE);
TopViewAnimHelper.getInstance().enterVrMode();
TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
@@ -378,12 +378,13 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
private void exitVrMode() {
if(localIsVrMode) {
if (localIsVrMode) {
EntranceViewHolder.getInstance().forceHideNoticeView();
// tvEnterVrMode.setVisibility(View.VISIBLE);
mMove2CurrentLocation.setVisibility(View.VISIBLE);
mUploadRoadCondition.setVisibility(View.VISIBLE);
groupUserHead.setVisibility(View.VISIBLE);
seekHelpGroup.setVisibility(View.VISIBLE);
// mWeatherContainer.setVisibility(View.VISIBLE);
// mMsgContainer.setVisibility(View.VISIBLE);
@@ -845,7 +846,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
} else {
exitVrMode();
}
} catch( Exception e ){
} catch (Exception e) {
e.printStackTrace();
}
@@ -1039,7 +1040,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
private static final int SEEK_HELP_NOTICE_NUM_MSG_TYPE = 401015;
//求助已通知周围XX位车主
private final IMogoOnMessageListener<String> seekHelpNoticeListener =
new IMogoOnMessageListener<String>() {
@Override
@@ -1054,7 +1055,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
final int finalSeekNum = seekNum++;
SharedPrefsMgr.getInstance(getContext()).putInt("seek_help_num", seekNum);
handler.post(() -> {
seekHelpGroup.setVisibility(View.VISIBLE);
seekHelpGroup.setVisibility(localIsVrMode ? View.INVISIBLE : View.VISIBLE);
seekHelpNum.setText("" + finalSeekNum);
});
}