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

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source
This commit is contained in:
tongchenfei
2020-01-19 18:08:08 +08:00
parent dce5dfc683 f7770f03e9
commit f63d0101ea
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
View File

@@ -82,6 +82,9 @@ public class MarkerUserInfo implements Serializable {
}
public String getGender() {
if (TextUtils.isEmpty(gender)) {
return "未知";
}
return gender;
}

20
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -399,6 +399,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
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<IView, Presenter<IView>>
//判断是图片还是视频，第一个时，上一个不可点击
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<IView, Presenter<IView>>
//判断是图片还是视频，最后一个时，下一个不可点击
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<IView, Presenter<IView>>
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<IView, Presenter<IView>>
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<IView, Presenter<IView>>
@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<IView, Presenter<IView>>
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<IView, Presenter<IView>>
.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<IView, Presenter<IView>>
markerExploreWayList.add(markerExploreWay);
}
Log.e(TAG, "convertData markerExploreWayList.size() =" + markerExploreWayList.size());
Log.d(TAG, "convertData markerExploreWayList.size() =" + markerExploreWayList.size());
}
/**

3
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
View File

@@ -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<Double> list = new ArrayList<>();
list.add(lon);

2
modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
View File

@@ -38,7 +38,7 @@
<dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">28px</dimen>
<dimen name="tanlu_module_card_previous_margin_left">45px</dimen>
<dimen name="tanlu_module_card_next_margin_left">45px</dimen>
<dimen name="tanlu_module_card_next_margin_left">42px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">20px</dimen>

4
modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
View File

@@ -35,9 +35,9 @@
<dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
<dimen name="tanlu_module_card_previous_width">300px</dimen>
<dimen name="tanlu_module_card_previous_height">90px</dimen>
<dimen name="tanlu_module_card_empty_magintop">75px</dimen>
<dimen name="tanlu_module_card_empty_magintop">122px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">25px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">50px</dimen>
<dimen name="tanlu_module_card_previous_margin_left">90px</dimen>
<dimen name="tanlu_module_card_next_margin_left">80px</dimen>