diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 08c4d3abe2..69dac71345 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -16,6 +16,7 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.listener.SurroundingDetailItemListener; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; @@ -39,10 +40,12 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter list) { + public V2XSurroundingDetailAdapter(Context context, List list, SurroundingDetailItemListener listener) { mContext = context; markerExploreWays = list; + mListener = listener; } @Override @@ -77,18 +80,19 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter() { +class V2XEventPanelFragment : MvpFragment() , SurroundingDetailItemListener { private val TAG = "EventPanelFragment" @@ -267,10 +268,14 @@ class V2XEventPanelFragment : MvpFragment - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index f656dd22e9..6098f58094 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -39,7 +39,7 @@ android:layout_alignTop="@+id/road_case_style" android:layout_toLeftOf="@id/road_case_useless" android:gravity="left" - android:paddingRight="@dimen/dp_28" + android:paddingRight="@dimen/dp_35" android:text="100" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/share_item_text_size" /> diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index a4979dd265..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png new file mode 100644 index 0000000000..b9dbf0d3b5 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png new file mode 100644 index 0000000000..6717a937ec Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000..866e774abe Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index f68dcac5f8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png new file mode 100644 index 0000000000..50ebd6ee07 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png new file mode 100644 index 0000000000..04dab00b7b Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000..9a95ce565f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml index c28d17cd1e..4a594f5e40 100644 --- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml @@ -1,8 +1,9 @@ + - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index 9947fa9c1a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml new file mode 100644 index 0000000000..045e0686d6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml new file mode 100644 index 0000000000..f3dad33abd --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml new file mode 100644 index 0000000000..24a1efd3b6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml new file mode 100644 index 0000000000..20b19e2b3a --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000..9a95ce565f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml new file mode 100644 index 0000000000..830309ff21 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 79c69fb8a2..c4deeb0b6a 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -1,7 +1,7 @@ - +