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:
董宏宇
2020-01-19 17:05:30 +08:00
parent 24ed7886ef f78f899b75
commit da8e9d65ae
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -571,7 +571,6 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
//判断是图片还是视频，第一个时，上一个不可点击 //判断是图片还是视频，第一个时，上一个不可点击
Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); Log.e(TAG, " tv_previous_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size());
if (currentPosition < 0) { if (currentPosition < 0) {
// return;
currentPosition = markerExploreWayList.size(); currentPosition = markerExploreWayList.size();
} }
currentPosition--; currentPosition--;
@@ -583,7 +582,6 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
//判断是图片还是视频，最后一个时，下一个不可点击 //判断是图片还是视频，最后一个时，下一个不可点击
Log.e(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size()); Log.e(TAG, " tv_next_res --1-> currentPosition = " + currentPosition + " >> size= " + markerExploreWayList.size());
if (currentPosition >= markerExploreWayList.size()) { if (currentPosition >= markerExploreWayList.size()) {
// return;
currentPosition = 0; currentPosition = 0;
} }
currentPosition++; currentPosition++;

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_maginleft">109px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">28px</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_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> <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_video_marginbottom">20px</dimen>
<dimen name="tanlu_module_card_previous_width">300px</dimen> <dimen name="tanlu_module_card_previous_width">300px</dimen>
<dimen name="tanlu_module_card_previous_height">90px</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_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_previous_margin_left">90px</dimen>
<dimen name="tanlu_module_card_next_margin_left">80px</dimen> <dimen name="tanlu_module_card_next_margin_left">80px</dimen>