diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index ec6271c154..8f297b2c43 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -82,6 +82,9 @@ public class MarkerUserInfo implements Serializable { } public String getGender() { + if (TextUtils.isEmpty(gender)) { + return "未知"; + } return gender; } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index b9fec430d4..1a3fa6b377 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -399,6 +399,7 @@ public class TanluCardViewFragment extends MvpFragment> private void handleMarkerExploreWay(MarkerExploreWay markerExploreWay) { if (markerExploreWay != null) { + Log.d(TAG, "markerExploreWay.getFileType() =" + markerExploreWay.getFileType()); if (markerExploreWay.getFileType() == 0) { //图片 refreshPhotoData(markerExploreWay); } else if (markerExploreWay.getFileType() == 1) { //视频 @@ -571,7 +572,6 @@ public class TanluCardViewFragment extends MvpFragment> //判断是图片还是视频，第一个时，上一个不可点击 Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); if (currentPosition < 0) { -// return; currentPosition = markerExploreWayList.size(); } currentPosition--; @@ -583,7 +583,6 @@ public class TanluCardViewFragment extends MvpFragment> //判断是图片还是视频，最后一个时，下一个不可点击 Log.e(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); if (currentPosition >= markerExploreWayList.size()) { -// return; currentPosition = 0; } currentPosition++; @@ -603,9 +602,10 @@ public class TanluCardViewFragment extends MvpFragment> autoZoomInImageView.post(new Runnable() { @Override public void run() { - //放大增量是0.3，放大时间是1000毫秒，放大开始时间是600毫秒以后 + Log.d(TAG, "handleImageAnimation run -------->"); + //放大增量是0.3，放大时间是1000毫秒，放大开始时间是500毫秒以后 autoZoomInImageView.init() - .startZoomInByScaleDeltaAndDuration(0.2f, 1000, 500); + .startZoomInByScaleDeltaAndDuration(0.2f, 1000, 300); } }); } @@ -685,16 +685,18 @@ public class TanluCardViewFragment extends MvpFragment> mDistanceTv.setText(handleDistance(markerExploreWay.getDistance())); mTimeTv.setText(formatDate(markerExploreWay.getGenerateTime())); String thumbnailUrl = markerExploreWay.getItems().get(0).getUrl(); - Logger.d(TAG, "refreshPhotoData thumbnailUrl ------>" + thumbnailUrl); + Logger.d(TAG, "refreshPhoto thumbnailUrl ------>" + thumbnailUrl); autoZoomInImageView.setVisibility(View.VISIBLE); simpleCoverVideoPlayer.setVisibility(View.GONE); mogoImageloader.downloadImage(getActivity(), thumbnailUrl, new IMogoImageLoaderListener() { @Override public void onStart() { + Log.d(TAG, "onStart ------>"); } @Override public void onCompleted(Bitmap bitmap) { + Log.d(TAG, "onCompleted ------>bitmap = " + bitmap); autoZoomInImageView.setImageBitmap(bitmap); //动画 handleImageAnimation(); @@ -702,7 +704,7 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onFailure(Exception e) { - Logger.e(TAG, "onFailure ------>" + e); + Log.e(TAG, "onFailure ------>" + e); } }); } @@ -1044,7 +1046,7 @@ public class TanluCardViewFragment extends MvpFragment> inputlon = lon; inputlat = lat; - Logger.d(TAG, "getVoiceControlRoadData lat =" + lat + ">>>lon =" + lon + ">>>cityCode= " + cityCode + " >>>adCode = " + adCode); + Log.d(TAG, "getVoiceControlRoadData lat =" + lat + ">>>lon =" + lon + ">>>cityCode= " + cityCode + " >>>adCode = " + adCode); mTanluModelData.getVoiceControlRoadData(keywords, cityCode, lon, lat, adCode, new VoiceSearchCallback() { @Override public void onSuccess(VoiceSearchResult o) { @@ -1093,7 +1095,7 @@ public class TanluCardViewFragment extends MvpFragment> .longitude(informationList.get(i).lon); optionList.add(options); - Log.e(TAG, "lat =" + informationList.get(i).lat + ">>>lon =" + informationList.get(i).lon); + Log.d(TAG, "lat =" + informationList.get(i).lat + ">>>lon =" + informationList.get(i).lon); } Logger.d(TAG, "getVoiceControlRoadData optionList.size() = " + optionList.size()); mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true); @@ -1131,7 +1133,7 @@ public class TanluCardViewFragment extends MvpFragment> markerExploreWayList.add(markerExploreWay); } - Log.e(TAG, "convertData markerExploreWayList.size() =" + markerExploreWayList.size()); + Log.d(TAG, "convertData markerExploreWayList.size() =" + markerExploreWayList.size()); } /** diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java index 0a9e1f27a9..1a34d8ad11 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java @@ -181,9 +181,6 @@ public class TanluModelData { Gson gson = new Gson(); NaviLatLng coordinates = new NaviLatLng(getNaviInfo(lon, lat).fromStart(), getNaviInfo(lon, lat).toEnd()); Logger.d(TAG, "getNavigationLineData -------> " + getSn()); - if (coordinates == null) { - return; - } List list = new ArrayList<>(); list.add(lon); diff --git a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml index 4e2517d37d..1369cbda37 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml @@ -38,7 +38,7 @@ 109px 28px 45px - 45px + 42px 20px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index c6f46c0772..ed17bded92 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -35,9 +35,9 @@ 20px 300px 90px - 75px + 122px 205px - 25px + 50px 90px 80px