diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle index 4110051bd6..6bb1edb229 100644 --- a/modules/mogo-module-tanlu/build.gradle +++ b/modules/mogo-module-tanlu/build.gradle @@ -46,12 +46,14 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon + implementation rootProject.ext.dependencies.moduleservice } else { implementation project(":libraries:mogo-map") implementation project(":foudations:mogo-utils") api project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') + implementation project(':modules:mogo-module-service') } implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java index df85830cf9..3abfaf7578 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/tanlu/fragment/TanluCardViewFragment.java @@ -25,6 +25,7 @@ import com.mogo.map.search.geo.MogoPoiItem; import com.mogo.map.search.poisearch.IMogoPoiSearchListener; import com.mogo.map.search.poisearch.MogoPoiResult; import com.mogo.map.uicontroller.EnumMapUI; +import com.mogo.module.service.entity.MarkerExploreWay; import com.mogo.service.MogoServicePaths; import com.mogo.service.imageloader.IMogoImageLoaderListener; import com.mogo.service.imageloader.IMogoImageloader; @@ -60,13 +61,12 @@ public class TanluCardViewFragment extends MvpFragment> //map private IMogoMarker mPoiMarker; -// private int position = -1; + // private int position = -1; private IMogoMarkerManager mMarkerManager; private IMogoMapService mMogoMapService; //media private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder(); - // private String videoUrl = ""; private String videoUrl = "http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8"; private String imageUrl = "https://oimagec4.ydstatic.com/image?id=-5397300958976572132&product=adpublish&w=520&h=347"; SimpleCoverVideoPlayer simpleCoverVideoPlayer; @@ -75,6 +75,7 @@ public class TanluCardViewFragment extends MvpFragment> private TextView mPreviousTv; private TextView mNextTv; + private List markerExploreWayList; @Override protected int getLayoutId() { @@ -189,11 +190,26 @@ public class TanluCardViewFragment extends MvpFragment> */ @Override public boolean onMarkerClicked(IMogoMarker marker) { - marker.getObject(); + //点击marker以后,确认他的位置?然后点击下一个操作 + MarkerExploreWay exploreWay = (MarkerExploreWay) marker.getObject(); + return true; } + /** + * 刷新单个数据,更新位置positon TODO + */ +// private void refreshSingleData() { +// markerExploreWayList +// } + + /** + * + * @return + */ +// private void + @NonNull @Override diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml index 18f8f6ba5b..12b869a5ff 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml new file mode 100644 index 0000000000..793a82f62b --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_10px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml deleted file mode 100644 index 2835c0389f..0000000000 --- a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_6px_top.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml new file mode 100644 index 0000000000..3ac5215724 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_bg_222533_9px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml index aada8efa34..a90d871523 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml @@ -15,21 +15,20 @@ android:clickable="true" android:longClickable="true" /> - @@ -54,12 +53,12 @@ diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml index 49a58a51d0..a04b8566c3 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml @@ -1,46 +1,63 @@ + android:layout_width="330dp" + android:layout_height="330dp" + android:background="@drawable/shape_bg_222533_10px"> - + android:layout_height="wrap_content"> + android:textColor="@color/color_3" + android:textStyle="bold" + android:textSize="18dp" /> + android:layout_marginLeft="16dp" + android:layout_marginTop="2dp" + android:layout_marginBottom="5dp" + android:text="666KM" + android:textColor="@color/color_666666" + android:textStyle="bold" + android:textSize="13dp" /> + + - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="21dp" + android:layout_below="@+id/media_layout"> - + android:drawableLeft="@drawable/default_image" + android:text="@string/tanlu_previous" + android:textColor="@color/color_545362" + android:textSize="13dp" /> - + android:drawableRight="@drawable/default_image" + android:text="@string/tanlu_next" + android:paddingRight="10dp" + android:textColor="@color/color_545362" + android:textSize="13dp" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 0ed1b64aeb..6c0dd2590f 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -25,8 +25,16 @@ #213142 #33FFFFFF #B3000000 - #333333 #0091FF #d9000000 #FF1B1B + + #F8F8F8 + #333333 + #DADAE2 + #545362 + #99191C25 + #666666 + #999999 + diff --git a/modules/mogo-module-tanlu/src/main/res/values/strings.xml b/modules/mogo-module-tanlu/src/main/res/values/strings.xml index 624c47aa7f..b6fc8a1bd9 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/strings.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/strings.xml @@ -15,6 +15,9 @@ 为您找到%s条路况信息 开启小智车联 共享计划 + 上一条 + 下一条 + 正在为您搜索路况