diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java index 69be074449..745865a533 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java @@ -67,6 +67,7 @@ import com.mogo.module.tanlu.model.NaviResult; import com.mogo.module.tanlu.model.PathLineResult; import com.mogo.module.tanlu.model.TanluModelData; import com.mogo.module.tanlu.model.VoiceCmdData; +import com.mogo.module.tanlu.model.event.CloseWindowInfo; import com.mogo.module.tanlu.model.event.ControlClickUpInfo; import com.mogo.module.tanlu.model.event.DataErrorInfo; import com.mogo.module.tanlu.model.event.GetInfoError; @@ -448,6 +449,16 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL } } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onCloseWindow(final CloseWindowInfo event) { + if (event == null) { + return; + } + + releaseTimer(); + TanluServiceManager.getIMogoTopViewManager().removeView(TanluListWindow.this); + } + /** * poi 搜索 * diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index 601a7707d3..f17ac07572 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -23,7 +23,9 @@ import com.mogo.module.tanlu.R; import com.mogo.module.tanlu.callback.IThumbsUpCallback; import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.module.tanlu.model.TanluModelData; +import com.mogo.module.tanlu.model.event.CloseWindowInfo; import com.mogo.module.tanlu.model.event.ControlClickUpInfo; +import com.mogo.module.tanlu.model.event.DataErrorInfo; import com.mogo.module.tanlu.model.event.StartPlayInfo; import com.mogo.module.tanlu.model.event.VoiceControlUpInfo; import com.mogo.module.tanlu.util.ChartUtil; @@ -71,6 +73,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 40236319c3..bab3d66b73 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -159,6 +159,15 @@ android:src="@drawable/icon_heart_like" /> + + 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 b103b2b1ac..ff75ac58ed 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 @@ -80,6 +80,7 @@ 350px 480px 320px + 45px 23px 15px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 20e89547a3..a39e44cd6d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -80,6 +80,7 @@ 194px 266px 194px + 45px 16px 8px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java index b380a66d2d..8e3189ad3d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java @@ -79,11 +79,14 @@ public class SurroundingEventAdapter extends RecyclerView.Adapter getPoiTypeMap(List list) { Map mPoiTypeMarkers = new HashMap<>(); - Log.d(TAG, "getPoiTypeMap list.size() = " + list.size()); for (int i = 0; i < list.size(); i++) { MarkerExploreWay exploreWay = list.get(i); if (!mPoiTypeMarkers.containsKey(exploreWay.getPoiType())) { @@ -187,10 +190,11 @@ public class SurroundingEventFragment extends MvpFragment valueList = new ArrayList<>(valueCollection); Log.d(TAG, "handleMapToList valueList.size() = " + valueList.size()); - return valueList; } + // TODO 排序 + /** * 处理marker的显示 @@ -208,7 +212,7 @@ public class SurroundingEventFragment extends MvpFragment exploreWayList = construction.getConstrutList(); Logger.d(TAG, "onItemClickListener exploreWayList.size() = " + exploreWayList.size()); if (exploreWayList != null && exploreWayList.size() > 0) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java index a5fd840a4d..8bc5a50beb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java @@ -78,7 +78,7 @@ public class SurroundingEventPresenter extends Presenter { @Override public void onSuccess(SurroundingResponse data) { super.onSuccess(data); - Log.e("SurroundingFragment", "onSuccess ------ "); + Logger.d("SurroundingFragment", "onSuccess ------> "); if (data != null && data.getResult() != null) { mView.showSurroudingData(data.getResult().getExploreWay()); } @@ -87,7 +87,7 @@ public class SurroundingEventPresenter extends Presenter { @Override public void onError(String message, int code) { super.onError(message, code); - Log.e("SurroundingFragment", "onError message = " + message + " >>> code = " + code); + Logger.e("SurroundingFragment", "onError message = " + message + " >>> code = " + code); } }); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java new file mode 100644 index 0000000000..38b67e6f3e --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java @@ -0,0 +1,33 @@ +package com.mogo.module.v2x.view; + +import android.graphics.Rect; +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + +/** + * @author lixiaopeng + * @description + * @since 2020/8/11 + */ +public class SurroundingMarginDecoration extends RecyclerView.ItemDecoration { + private int margin ; + + public SurroundingMarginDecoration(int space) { + margin = space; + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + outRect.bottom = margin; + //由于每行都只有2个,所以第一个都是2的倍数,把左边距设为0 + if (parent.getChildLayoutPosition(view) % 2 == 0) { + outRect.left = 0; + outRect.right = margin; + } else { + outRect.left = margin; + outRect.right = 0; + } + } + +} diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png new file mode 100644 index 0000000000..815dc5b40c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png new file mode 100644 index 0000000000..893d02518c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png new file mode 100644 index 0000000000..658a74c2e4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png new file mode 100644 index 0000000000..33e7d8873e Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png new file mode 100644 index 0000000000..d8c73a8404 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png new file mode 100644 index 0000000000..28f0db939b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png new file mode 100644 index 0000000000..7a1c124871 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png new file mode 100644 index 0000000000..0efac11676 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png new file mode 100644 index 0000000000..06163dda3f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png new file mode 100644 index 0000000000..dcef2a496c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png new file mode 100644 index 0000000000..37ed59c3b4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png new file mode 100644 index 0000000000..23aaf88e60 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png new file mode 100644 index 0000000000..c93bd218fb Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png new file mode 100644 index 0000000000..3901854251 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png new file mode 100644 index 0000000000..698b84ffbc Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png new file mode 100644 index 0000000000..f46fe492c4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png new file mode 100644 index 0000000000..a247ac6428 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png new file mode 100644 index 0000000000..632d1e5ad3 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png new file mode 100644 index 0000000000..0a255cbe93 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png new file mode 100644 index 0000000000..c25514506f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png new file mode 100644 index 0000000000..bdba45d7e0 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png new file mode 100644 index 0000000000..815dc5b40c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png new file mode 100644 index 0000000000..c77748e661 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png new file mode 100644 index 0000000000..658a74c2e4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png new file mode 100644 index 0000000000..33e7d8873e Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png new file mode 100644 index 0000000000..d8c73a8404 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png new file mode 100644 index 0000000000..28f0db939b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png new file mode 100644 index 0000000000..7a1c124871 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png new file mode 100644 index 0000000000..0efac11676 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png new file mode 100644 index 0000000000..06163dda3f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png new file mode 100644 index 0000000000..dcef2a496c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png new file mode 100644 index 0000000000..37ed59c3b4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png new file mode 100644 index 0000000000..23aaf88e60 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png new file mode 100644 index 0000000000..c93bd218fb Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png new file mode 100644 index 0000000000..3901854251 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png new file mode 100644 index 0000000000..698b84ffbc Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png new file mode 100644 index 0000000000..f46fe492c4 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png new file mode 100644 index 0000000000..a247ac6428 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png new file mode 100644 index 0000000000..632d1e5ad3 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png new file mode 100644 index 0000000000..0a255cbe93 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png new file mode 100644 index 0000000000..c25514506f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png new file mode 100644 index 0000000000..bdba45d7e0 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml new file mode 100644 index 0000000000..d7ea85c05e --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 359007e137..2c65afb955 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -20,7 +20,6 @@ android:layout_centerVertical="true" android:layout_marginLeft="20px" android:textSize="18px" - android:text="周边5公里,共有23条数据 " android:textColor="@color/white" /> + android:src="@drawable/mogo_image_blank_nor" /> + android:layout_height="173px"> + android:layout_width="280px" + android:layout_height="130px" /> 40px 80px + 6px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index d1601948ca..bd225eb0a4 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -24,6 +24,7 @@ 22px 40px - + 6px + 16px