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

Merge remote-tracking branch 'origin/qa_1.1.8' into dev

Browse Source
This commit is contained in:
wangcongtao
2020-12-07 15:50:43 +08:00
parent f38aec5077 0037a9300b
commit f873f338ec
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
View File

@@ -544,7 +544,11 @@ public class TanluManager implements IMogoMarkerClickListener,
markerShowEntity.setMarkerLocation(markerLocation);
IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity);
mogoMarker.setClickable(false);
if (mogoMarker != null) {
mogoMarker.setClickable(false);
} else {
Logger.e(TAG, "mogoMarker == null ");
}
//添加图片动画
Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tanlu_circle_image, null);

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
View File

@@ -166,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
private void initData() {
mTopLayout.setVisibility(View.GONE);
mRecyclerView.setVisibility(View.GONE);
mEmptyLayout.setVisibility(View.GONE);
mloadingImage.start();
surroundingEventPresenter.getSurroundingEventData();
}

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
View File

@@ -63,7 +63,7 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
}
Center center = new Center(location.getLatitude(), location.getLongitude());
String[] poiTypes = {"10002", "10003", "10006", "10007", "10008", "10010", "10011", "10013", "10015"};
SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 15);
SurroundingRequest request = new SurroundingRequest(center, poiTypes, 5, 300);
eventApiService.getSurroundingEventList(Utils.getSn(), convert(GsonUtil.jsonFromObject(request)))
.subscribeOn(Schedulers.io())