opt ui

modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml

@@ -121,7 +121,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/tanlu_module_margin_right"
                 android:layout_toRightOf="@+id/tv_information_media_distance"
-                android:textColor="@color/color_99FFFFFF"
+                android:textColor="@color/color_time_FFFFFF"
                 android:textSize="@dimen/tanlu_module_card_address_size" />
         </RelativeLayout>
 
@@ -161,7 +161,7 @@
                 android:layout_width="@dimen/tanlu_module_close_height"
                 android:layout_height="@dimen/tanlu_module_close_height"
                 android:layout_alignParentRight="true"
-                android:layout_centerInParent="true"
+                android:layout_marginTop="@dimen/tanlu_module_margin_right"
                 android:layout_marginRight="@dimen/tanlu_module_margin_right"
                 android:src="@drawable/selector_btn_close" />
 

modules/mogo-module-tanlu/src/main/res/values/colors.xml

@@ -38,6 +38,7 @@
     <color name="color_666666">#99666666</color>
     <color name="color_999999">#999999</color>
     <color name="color_99FFFFFF">#99FFFFFF</color>
+    <color name="color_time_FFFFFF">#99FFFFFF</color>
     <color name="color_59FFFFFF">#59FFFFFF</color>
     <color name="tanlu_white">#FFFFFF</color>
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java

@@ -87,16 +87,16 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
 //                .into(mBgImageView);
 
         mBgImageView.setBackgroundResource(getTypeRes(surroundingConstruction.getPoiType()));
-
-        RequestOptions requestOptions = new RequestOptions()
-                .placeholder(R.drawable.v2x_icon_live_logo)
-                .error(R.drawable.v2x_icon_live_logo)
-                .fallback(R.drawable.v2x_icon_live_logo);
-        Glide.with(mContext)
-                .asBitmap()
-                .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
-                .apply(requestOptions)
-                .into(new SkinAbleBitmapTarget(mTypeImageView, requestOptions));
+        mTypeImageView.setBackgroundResource(getTypeSmallRes(surroundingConstruction.getPoiType()));
+//        RequestOptions requestOptions = new RequestOptions()
+//                .placeholder(R.drawable.v2x_icon_live_logo)
+//                .error(R.drawable.v2x_icon_live_logo)
+//                .fallback(R.drawable.v2x_icon_live_logo);
+//        Glide.with(mContext)
+//                .asBitmap()
+//                .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
+//                .apply(requestOptions)
+//                .into(new SkinAbleBitmapTarget(mTypeImageView, requestOptions));
 
     }
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java

@@ -106,11 +106,11 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
         mShareTv.setOnClickListener(this);
         mFreshTv.setOnClickListener(this);
 
-        mRecyclerView.setHasFixedSize(true);
+//        mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setOverScrollMode(OVER_SCROLL_NEVER);
         GridLayoutManager layoutManage = new GridLayoutManager(getContext(), 2);
-        int spacingInPixels = getContext().getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_bottom_right_textsize);
-        mRecyclerView.addItemDecoration(new SurroundingMarginDecoration(spacingInPixels));
+//        int spacingInPixels = getContext().getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_bottom_right_textsize);
+//        mRecyclerView.addItemDecoration(new SurroundingMarginDecoration(spacingInPixels));
         mRecyclerView.setLayoutManager(layoutManage);
 
         mAdapter = new V2XSurroundingAdapter(getActivity(), poiInfosList, this);

modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml

@@ -46,14 +46,13 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@+id/layout_top"
-            android:layout_marginLeft="@dimen/module_v2x_surrounding_root_margin_left"
-            android:layout_marginRight="@dimen/module_v2x_surrounding_root_margin_left"
             android:layout_marginBottom="@dimen/module_v2x_panel_surrounding_marginbottom">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/surrounding_recycleview"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/module_v2x_surrounding_list_margin_left"
                 android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                 android:visibility="visible" />
 

modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml

@@ -2,53 +2,59 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_root"
     android:layout_width="wrap_content"
+    android:layout_marginBottom="@dimen/module_v2x_surrounding_item_margin_left"
+    android:layout_marginLeft="@dimen/module_v2x_surrounding_item_margin_left"
     android:layout_height="@dimen/module_v2x_surrounding_item_height">
 
-    <ImageView
-        android:id="@+id/iv_event_bg"
-        android:scaleType="fitXY"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-<!--    android:src="@drawable/mogo_image_nongwu_nor" bg_v2x_event_surrounding_item_bottom-->
-
     <RelativeLayout
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/v2x_surrounding_bottom_bg"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_surrounding_item_bottom">
+        android:layout_width="@dimen/module_v2x_surrounding_item_width"
+        android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/iv_event_type"
-            android:layout_width="@dimen/module_v2x_surrounding_item_bottom_image_height"
-            android:layout_height="@dimen/module_v2x_surrounding_item_bottom_image_height"
-            android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_left"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/v2x_icon_live_logo" />
-
-        <TextView
-            android:id="@+id/tv_poitype"
-            android:layout_width="wrap_content"
+            android:id="@+id/iv_event_bg"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:layout_toRightOf="@+id/iv_event_type"
-            android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left"
-            android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize"
-            android:textColor="@color/v2x_item_white"
-            android:text="求助" />
+            android:scaleType="centerCrop" />
+        <!--    android:src="@drawable/mogo_image_nongwu_nor" bg_v2x_event_surrounding_item_bottom-->
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/module_v2x_surrounding_item_bottom"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/v2x_surrounding_bottom_bg">
+
+            <ImageView
+                android:id="@+id/iv_event_type"
+                android:layout_width="@dimen/module_v2x_surrounding_item_bottom_image_height"
+                android:layout_height="@dimen/module_v2x_surrounding_item_bottom_image_height"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_left" />
+
+            <TextView
+                android:id="@+id/tv_poitype"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left"
+                android:layout_toRightOf="@+id/iv_event_type"
+                android:gravity="center_vertical"
+                android:text="求助"
+                android:textColor="@color/v2x_item_white"
+                android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize" />
+
+            <TextView
+                android:id="@+id/tv_info_total"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/module_v2x_surrounding_item_marigin_left"
+                android:text="23条"
+                android:textColor="@color/transparent_white_30"
+                android:textSize="@dimen/module_v2x_surrounding_item_bottom_right_textsize" />
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/tv_info_total"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/module_v2x_surrounding_item_marigin_left"
-            android:layout_centerVertical="true"
-            android:textSize="@dimen/module_v2x_surrounding_item_bottom_right_textsize"
-            android:textColor="@color/transparent_white_30"
-            android:text="23条" />
     </RelativeLayout>
-
 </RelativeLayout>
 
 

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -44,6 +44,7 @@
     <dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
+    <dimen name="module_v2x_surrounding_item_width">238px</dimen>
     <dimen name="module_v2x_surrounding_item_height">170px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
@@ -53,6 +54,9 @@
     <dimen name="module_v2x_panel_surrounding_stance">30px</dimen>
     <dimen name="module_v2x_surrounding_top">34px</dimen>
 
+    <dimen name="module_v2x_surrounding_list_margin_left">12px</dimen>
+    <dimen name="module_v2x_surrounding_item_margin_left">16px</dimen>
+
     <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>

modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -41,15 +41,19 @@
     <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
+    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_image_height">38px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
     <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
     <dimen name="module_v2x_surrounding_top">33px</dimen>
 
+    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
+    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
+
     <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>

modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml

@@ -39,18 +39,22 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
-    <dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
+    <dimen name="module_v2x_surrounding_root_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
+    <dimen name="module_v2x_surrounding_item_width">465px</dimen>
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_image_height">38px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
     <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
     <dimen name="module_v2x_surrounding_top">33px</dimen>
 
+    <dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
+    <dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
+
     <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>

skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml

@@ -2,6 +2,7 @@
 <resources>
     <color name="tanlu_white_light">#333333</color>
     <color name="color_99FFFFFF_light">#666666</color>
+    <color name="color_time_FFFFFF_light">#999999</color>
 
     <color name="tanlu_dialog_textcolor_light">#333333</color>
     <color name="tanlu_dialog_startcolor_light">#F5F5F5</color>