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 8baaea1315..f9f27f4699 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 @@ -184,7 +184,6 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL } public void initWindow() { - Logger.d("liyz", "initWindow --------->"); EventBus.getDefault().register(this); initInterface(); initModelData(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index 224fcfef4d..1b00b259ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -11,7 +11,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; import com.mogo.module.common.entity.MarkerPoiTypeEnum; +import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.v2x.R; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; @@ -84,22 +86,20 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter + + + + + + \ 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 e868cfe098..b4890addec 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 @@ -83,7 +83,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里,暂无交通事件" - android:textColor="@color/transparent_white_30" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> @@ -96,7 +96,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/transparent_white_30" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index 90a57dcea2..cdb15517bc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -20,7 +20,7 @@ android:paddingTop="10px" android:text="小窍门:分享路况,点赞其他车主,有助于提高热心指数" android:textColor="#FFFFFF" - android:textSize="16px"> + android:textSize="@dimen/share_top_text_size"> @@ -42,17 +42,17 @@ android:gravity="center_horizontal|center" android:text="0" android:textColor="#FFFFFF" - android:textSize="36px" /> + android:textSize="@dimen/share_des_num_size" /> + android:textSize="@dimen/share_index_des_size" /> @@ -76,17 +76,17 @@ android:gravity="center_horizontal|top" android:text="0" android:textColor="#FFFFFF" - android:textSize="36px" /> + android:textSize="@dimen/share_des_num_size" /> + android:textSize="@dimen/share_index_des_size" /> @@ -101,9 +101,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:gravity="center" android:orientation="vertical" - android:paddingTop="17px" - android:gravity="center"> + android:paddingTop="@dimen/v2x_index_rating_top"> + android:paddingTop="@dimen/share_index_bottom_padding" + android:text="热心指数" + android:textColor="#FFFFFF" + android:textSize="@dimen/share_index_des_size" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index bfe0b1657d..c66f16aa27 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/no_share_image" android:layout_centerHorizontal="true" - android:layout_marginTop="12.6px" + android:layout_marginTop="@dimen/share_empty_btn_padding" android:alpha="0.7" android:gravity="bottom" android:text="你还没有分享过道路事件,快去试试吧" @@ -28,7 +28,7 @@ + android:layout_marginTop="@dimen/share_empty_btn_padding">