Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java

@@ -152,9 +152,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
                                 ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green);
                                 break;
                             default:
-                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_green_info);
-                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_green);
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
                                 break;
                         }
                     }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java

@@ -104,7 +104,7 @@ public class MapMarkerView extends MapMarkerBaseView {
                                 break;
                             case MarkerPoiTypeEnum.ROAD_CLOSED:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_off);
-                                ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
                                 break;
                             case MarkerPoiTypeEnum.SHOP_DISCOUNT:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
@@ -116,23 +116,23 @@ public class MapMarkerView extends MapMarkerBaseView {
                                 break;
                             case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
-                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
                                 break;
                             case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
-                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue);
                                 break;
                             case MarkerPoiTypeEnum.FOURS_PONDING:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
-                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue);
                                 break;
                             case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
-                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_green_dark);
                                 break;
                             default:
-//                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-//                                ivBg.setImageResource(R.drawable.bg_map_marker_green);
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
                                 break;
                         }
                     }

modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@mipmap/main_video_pause_btn_press" android:state_pressed="true" />
-    <item android:drawable="@mipmap/main_video_pause_btn_normal" android:state_pressed="false" />
-    <item android:drawable="@mipmap/main_video_pause_btn_normal" />
+<!--    <item android:drawable="@mipmap/main_video_pause_btn_press" android:state_pressed="true" />-->
+    <item android:drawable="@drawable/main_video_pause_btn_normal" android:state_pressed="false" />
+    <item android:drawable="@drawable/main_video_pause_btn_normal" />
 </selector>

modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@mipmap/main_video_play_btn_press" android:state_pressed="true" />
-    <item android:drawable="@mipmap/main_video_play_btn_normal" android:state_pressed="false" />
-    <item android:drawable="@mipmap/main_video_play_btn_normal" />
+<!--    <item android:drawable="@mipmap/main_video_play_btn_press" android:state_pressed="true" />-->
+    <item android:drawable="@drawable/main_video_play_btn_normal" android:state_pressed="false" />
+    <item android:drawable="@drawable/main_video_play_btn_normal" />
 </selector>

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

@@ -139,12 +139,21 @@
         android:gravity="center_horizontal"
         android:visibility="gone">
 
+        <ImageView
+            android:id="@+id/iv_main_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/tanlu_module_logo_margin_left"
+            android:layout_marginTop="@dimen/tanlu_module_logo_margin_left"
+            android:src="@drawable/tanlu_logo" />
+
         <ImageView
             android:id="@+id/iv_main_empty"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/tanlu_module_card_empty_maginleft"
             android:layout_marginRight="@dimen/tanlu_module_card_empty_maginleft"
+            android:layout_below="@+id/iv_main_logo"
             android:layout_marginTop="@dimen/tanlu_module_card_empty_magintop"
             android:src="@drawable/main_view_empty_bg" />
 

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

@@ -34,11 +34,12 @@
     <dimen name="tanlu_module_card_video_marginbottom">10px</dimen>
     <dimen name="tanlu_module_card_previous_width">160px</dimen>
     <dimen name="tanlu_module_card_previous_height">48px</dimen>
-    <dimen name="tanlu_module_card_empty_magintop">65px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">22px</dimen>
     <dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
     <dimen name="tanlu_module_card_empty_tv_magintop">28px</dimen>
     <dimen name="tanlu_module_card_previous_margin_left">45px</dimen>
     <dimen name="tanlu_module_card_next_margin_left">42px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">16px</dimen>
 
     <!--播放器高度-->
     <dimen name="tanlu_module_small_player_height">6px</dimen>

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

@@ -35,11 +35,12 @@
     <dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
     <dimen name="tanlu_module_card_previous_width">300px</dimen>
     <dimen name="tanlu_module_card_previous_height">90px</dimen>
-    <dimen name="tanlu_module_card_empty_magintop">122px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">40px</dimen>
     <dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
     <dimen name="tanlu_module_card_empty_tv_magintop">50px</dimen>
     <dimen name="tanlu_module_card_previous_margin_left">90px</dimen>
     <dimen name="tanlu_module_card_next_margin_left">80px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">32px</dimen>
 
     <!--播放器高度-->
     <dimen name="tanlu_module_small_player_height">10px</dimen>

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

@@ -35,11 +35,12 @@
     <dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
     <dimen name="tanlu_module_card_previous_width">300px</dimen>
     <dimen name="tanlu_module_card_previous_height">90px</dimen>
-    <dimen name="tanlu_module_card_empty_magintop">75px</dimen>
+    <dimen name="tanlu_module_card_empty_magintop">40px</dimen>
     <dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
     <dimen name="tanlu_module_card_empty_tv_magintop">25px</dimen>
     <dimen name="tanlu_module_card_previous_margin_left">90px</dimen>
     <dimen name="tanlu_module_card_next_margin_left">80px</dimen>
+    <dimen name="tanlu_module_logo_margin_left">32px</dimen>
 
     <!--播放器高度-->
     <dimen name="tanlu_module_small_player_height">10px</dimen>