添加EntranceFragment，分享，音乐，TipToast的黑夜白天模式，部分细节需再调整

foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml

@@ -20,7 +20,7 @@
         android:maxWidth="@dimen/module_commons_toast_maxWidth"
         android:maxLength="20"
         android:maxLines="1"
-        android:textColor="#FFFF"
+        android:textColor="@color/modules_commons_toast_text_color"
         android:textSize="@dimen/module_commons_toast_textSize"
         tools:text="测试测试测试" />
 

foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml

@@ -31,7 +31,7 @@
         android:maxWidth="@dimen/module_commons_toast_maxWidth"
         android:maxLength="20"
         android:maxLines="1"
-        android:textColor="#FFFF"
+        android:textColor="@color/modules_commons_toast_text_color"
         android:textSize="@dimen/module_commons_toast_textSize"
         tools:text="测试测试测试" />
 

foudations/mogo-commons/src/main/res/values/colors.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <color name="modules_commons_toast_text_color">#fff</color>
+</resources>

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -618,16 +618,16 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         findViewById(R.id.btnShowDrawableTip).setOnClickListener(v->{
             mMsgContainer.setVisibility(View.VISIBLE);
-//            TipDrawable drawable =
-//                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150);
-//            TipToast.tip("分享成功",drawable);
+            TipDrawable drawable =
+                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150);
+            TipToast.tip("分享成功",drawable);
         });
 
         findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v->{
             mMsgContainer.setVisibility(View.GONE);
-//            TipDrawable drawable =
-//                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
-//            TipToast.tip("分享成功",drawable);
+            TipDrawable drawable =
+                    new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head));
+            TipToast.tip("分享成功",drawable);
         });
     }
 

modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_msg_container_bkg.xml

@@ -2,7 +2,7 @@
     <item>
         <shape>
             <corners android:radius="@dimen/module_ext_common_corner" />
-            <gradient android:angle="135" android:endColor="#3F435F" android:startColor="#2E3141" />
+            <gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
         </shape>
     </item>
 </selector>

modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <corners android:radius="@dimen/module_ext_common_corner" />
-            <solid android:color="@color/module_ext_weather_bkg_color"/>
+            <gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
         </shape>
     </item>
 </selector>

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -77,22 +77,15 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <LinearLayout
+    <ImageButton
         android:id="@+id/module_entrance_id_move2_current_location"
         android:layout_width="@dimen/module_ext_operation_panel_width"
         android:layout_height="@dimen/module_ext_operation_panel_move2_height"
         android:background="@drawable/module_ext_dw_common_corner_bkg"
-        android:gravity="center"
-        android:orientation="vertical"
+        android:scaleType="centerInside"
+        android:src="@drawable/module_map_ic_move2_current_location"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/module_map_ic_move2_current_location" />
-    </LinearLayout>
-
+        app:layout_constraintRight_toRightOf="parent" />
 
     <FrameLayout
         android:id="@+id/module_entrance_id_upload_road_condition"

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml

@@ -28,7 +28,7 @@
             android:id="@+id/module_ext_id_weather_temp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FFFFFF"
+            android:textColor="@color/module_ext_weather_text_color"
             android:textSize="@dimen/module_ext_weather_temp_textSize"
             tools:text="28°" />
     </LinearLayout>

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

@@ -54,7 +54,7 @@
     <dimen name="module_entrance_id_button_marginTop">20px</dimen>
 
     <!--    module_ext_layout_extensions.xml-->
-    <dimen name="module_ext_height">100px</dimen>
+    <dimen name="module_ext_height">120px</dimen>
     <dimen name="module_ext_paddingRight">60px</dimen>
     <dimen name="module_ext_paddingLeft">60px</dimen>
     <dimen name="module_ext_voice_textSize">32px</dimen>

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

@@ -2,4 +2,5 @@
 <resources>
     <color name="module_ext_color_voice_text">#FFFFFF</color>
     <color name="module_ext_weather_bkg_color">#BF30334C</color>
+    <color name="module_ext_weather_text_color">#fff</color>
 </resources>

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

@@ -56,11 +56,11 @@
     <dimen name="module_entrance_id_button_marginTop">8px</dimen>
 
     <!--    module_ext_layout_extensions.xml-->
-    <dimen name="module_ext_height">56px</dimen>
+    <dimen name="module_ext_height">66px</dimen>
     <dimen name="module_ext_paddingRight">32px</dimen>
     <dimen name="module_ext_paddingLeft">32px</dimen>
 
-    <dimen name="module_ext_notice_margin_start">98px</dimen>
+    <dimen name="module_ext_notice_margin_start">90px</dimen>
 
     <dimen name="module_ext_voice_textSize">22px</dimen>
     <dimen name="module_ext_time_textSize">28px</dimen>

modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java

@@ -14,6 +14,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -59,7 +60,6 @@ import com.mogo.module.media.widget.NoScrollSeekBar;
 import com.mogo.module.media.widget.RoundedImageView;
 import com.mogo.module.media.widget.ScrollingTextView;
 import com.mogo.module.media.widget.surfaceview.FrameTextureView;
-import com.mogo.module.service.marker.MapMarkerManager;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
@@ -71,6 +71,7 @@ import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -130,14 +131,14 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
     private View mWindowView;
     private IMogoMarker mLastClickedMarker;
     private AnimCircleImageView mCircleImg;
-    private ScrollingTextView mScrollText;
+    private TextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
     private MediaShareDialogFragment mShareDilogFragment;
     private MediaMogoVoiceListener mMediaVoiceListener;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
-    private NoScrollSeekBar mWindowProgress;
+    private SeekBar mWindowProgress;
     private ImageView mBlurBg;
     private ShareLikeData.ShareLikeDataResult mLikeDataResult;
     private NoDoubleClickListener mNoDoubleClickListener;

modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.mogo.map.marker.IMogoMarker;
@@ -30,8 +31,6 @@ import com.mogo.module.media.utils.StorageManager;
 import com.mogo.module.media.utils.Utils;
 import com.mogo.module.media.view.MediaView;
 import com.mogo.module.media.widget.AnimCircleImageView;
-import com.mogo.module.media.widget.NoScrollSeekBar;
-import com.mogo.module.media.widget.ScrollingTextView;
 import com.mogo.utils.ActivityLifecycleManager;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
@@ -55,12 +54,12 @@ public class MediaWindow implements MediaView{
 
     private View mWindowView;
     private AnimCircleImageView mCircleImg;
-    private ScrollingTextView mScrollText;
+    private TextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
-    private NoScrollSeekBar mWindowProgress;
+    private SeekBar mWindowProgress;
 
     private boolean mHasAddWindow = false;
     private boolean mTwoChange = false;

modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java

@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.mogo.commons.debug.DebugConfig;
@@ -23,9 +24,6 @@ import com.mogo.module.media.presenter.PresenterFactory;
 import com.mogo.module.media.utils.Utils;
 import com.mogo.module.media.view.IMusicView;
 import com.mogo.module.media.widget.AnimCircleImageView;
-import com.mogo.module.media.widget.NoScrollSeekBar;
-import com.mogo.module.media.widget.ScrollingTextView;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.WindowUtils;
 import com.mogo.utils.glide.GlideApp;
@@ -49,12 +47,12 @@ public class MediaWindow2 implements IMusicView {
 
     private View mWindowView;
     private AnimCircleImageView mCircleImg;
-    private ScrollingTextView mScrollText;
+    private TextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
-    private NoScrollSeekBar mWindowProgress;
+    private SeekBar mWindowProgress;
 
     private boolean mHasAddWindow = false;
     private boolean mTwoChange = false;

modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml

@@ -19,7 +19,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"/>
 
-    <com.mogo.module.media.widget.ScrollingTextView
+    <TextView
         android:id="@+id/window_scroll_txt"
         android:layout_width="@dimen/module_media_pop_window_text_width"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="is my life"
-        android:textColor="#ffffff"
+        android:textColor="@color/modules_media_music_title_text_color"
         android:layout_marginStart="@dimen/module_media_pop_window_text_margin"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -42,7 +42,7 @@
         android:id="@+id/window_current_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#7aFFFFFF"
+        android:textColor="@color/modules_media_music_time_text_color"
         tools:text="00:00"
         app:layout_constraintTop_toBottomOf="@+id/window_scroll_txt"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -53,7 +53,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="/"
-        android:textColor="#7aFFFFFF"
+        android:textColor="@color/modules_media_music_time_text_color"
         app:layout_constraintTop_toTopOf="@+id/window_current_time"
         app:layout_constraintLeft_toRightOf="@+id/window_current_time"
         android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
@@ -62,7 +62,7 @@
         android:id="@+id/window_max_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#7aFFFFFF"
+        android:textColor="@color/modules_media_music_time_text_color"
         tools:text = "06:50"
         app:layout_constraintTop_toTopOf="@+id/window_divide"
         app:layout_constraintLeft_toRightOf="@+id/window_divide"
@@ -92,7 +92,7 @@
         android:background="@drawable/module_media_next_bg_selector"
         android:src="@drawable/module_media_next_song" />
 
-    <com.mogo.module.media.widget.NoScrollSeekBar
+    <SeekBar
         android:id="@+id/window_progress_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_media_pop_window_progress_height"

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="modules_media_music_title_text_color">#fff</color>
+    <color name="modules_media_music_time_text_color">#7affffff</color>
 </resources>

modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="oval">
             <size android:width="@dimen/dp_160" android:height="@dimen/dp_160" />
-            <gradient android:startColor="#474C6F" android:endColor="#353956" android:angle="-90"/>
+            <gradient android:startColor="#FF3C426B" android:endColor="#FF52577C" android:angle="-45"/>
         </shape>
     </item>
 </selector>

modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml

@@ -22,149 +22,258 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/share_module_title_margin_top"
-        android:text="我要分享"
-        android:textColor="@color/module_share_dialog_title_text_color"
         android:drawableLeft="@drawable/module_share_title_icon_left"
         android:drawableRight="@drawable/module_share_title_icon_right"
         android:drawablePadding="@dimen/dp_40"
+        android:text="我要分享"
+        android:textColor="@color/module_share_dialog_title_text_color"
         android:textSize="@dimen/share_module_title_content"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@+id/vBg"
         app:layout_constraintStart_toStartOf="@+id/vBg"
         app:layout_constraintTop_toTopOf="@+id/vBg" />
 
+    <ImageView
+        android:id="@+id/ivBlock"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginStart="@dimen/share_module_btn_margin_left_right"
+        android:layout_marginTop="@dimen/share_module_first_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_block_up"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintLeft_toLeftOf="@+id/vBg"
+        app:layout_constraintRight_toLeftOf="@+id/ivTrafficCheck"
+        app:layout_constraintTop_toBottomOf="@+id/btn_share_title" />
+
+    <ImageView
+        android:id="@+id/ivTrafficCheck"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_traffic_check"
+        app:layout_constraintLeft_toRightOf="@id/ivBlock"
+        app:layout_constraintRight_toLeftOf="@+id/ivClosure"
+        app:layout_constraintTop_toTopOf="@+id/ivBlock" />
+
+    <ImageView
+        android:id="@+id/ivClosure"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_road_closure"
+        app:layout_constraintLeft_toRightOf="@+id/ivTrafficCheck"
+        app:layout_constraintRight_toLeftOf="@+id/ivAccident"
+        app:layout_constraintTop_toTopOf="@+id/ivBlock" />
+
+    <ImageView
+        android:id="@+id/ivAccident"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_accident"
+        app:layout_constraintLeft_toRightOf="@+id/ivClosure"
+        app:layout_constraintRight_toLeftOf="@+id/ivConstruction"
+        app:layout_constraintTop_toTopOf="@+id/ivBlock" />
+
+    <ImageView
+        android:id="@+id/ivConstruction"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginEnd="@dimen/share_module_btn_margin_left_right"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_road_construction"
+        app:layout_constraintLeft_toRightOf="@+id/ivAccident"
+        app:layout_constraintRight_toRightOf="@+id/vBg"
+        app:layout_constraintTop_toTopOf="@+id/ivBlock" />
+
+    <ImageView
+        android:id="@+id/ivRealTimeTraffic"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_real_time_traffic"
+        app:layout_constraintLeft_toLeftOf="@+id/ivBlock"
+        app:layout_constraintTop_toBottomOf="@+id/tvBlock" />
+
+    <ImageView
+        android:id="@+id/ivSeekHelp"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_seek_help"
+        app:layout_constraintLeft_toLeftOf="@+id/ivTrafficCheck"
+        app:layout_constraintTop_toBottomOf="@+id/tvTrafficCheck" />
+
+    <ImageView
+        android:id="@+id/ivStagnantWater"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_stagnant_water"
+        app:layout_constraintLeft_toLeftOf="@+id/ivClosure"
+        app:layout_constraintTop_toBottomOf="@+id/tvClosure" />
+
+    <ImageView
+        android:id="@+id/ivRoadIcy"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_road_icy"
+        app:layout_constraintLeft_toLeftOf="@+id/ivAccident"
+        app:layout_constraintTop_toBottomOf="@+id/tvAccident" />
+
+    <ImageView
+        android:id="@+id/ivDenseFog"
+        android:layout_width="@dimen/share_module_image_width"
+        android:layout_height="@dimen/share_module_image_width"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:background="@drawable/module_share_btn_bg"
+        android:scaleType="center"
+        android:src="@drawable/share_dense_fog"
+        app:layout_constraintLeft_toLeftOf="@+id/ivConstruction"
+        app:layout_constraintTop_toBottomOf="@+id/tvConstruction" />
+
     <TextView
         android:id="@+id/tvBlock"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_block_up"
-        android:text="拥堵"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@+id/btn_share_title"
-        app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
-        app:layout_constraintLeft_toLeftOf="@+id/vBg"
-        android:layout_marginStart="@dimen/share_module_btn_margin_left_right"
-        android:layout_marginTop="@dimen/share_module_first_btn_margin_top"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="拥堵"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivBlock"
+        app:layout_constraintRight_toRightOf="@id/ivBlock"
+        app:layout_constraintTop_toBottomOf="@id/ivBlock" />
+
     <TextView
         android:id="@+id/tvTrafficCheck"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_traffic_check"
-        android:text="交通检查"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock"
-        app:layout_constraintLeft_toRightOf="@id/tvBlock"
-        app:layout_constraintRight_toLeftOf="@+id/tvClosure"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="交通检查"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivTrafficCheck"
+        app:layout_constraintRight_toRightOf="@id/ivTrafficCheck"
+        app:layout_constraintTop_toBottomOf="@id/ivTrafficCheck" />
+
     <TextView
         android:id="@+id/tvClosure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_road_closure"
-        android:text="封路"
-        android:textSize="@dimen/share_module_btn_text_size"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock"
-        app:layout_constraintLeft_toRightOf="@+id/tvTrafficCheck"
-        app:layout_constraintRight_toLeftOf="@+id/tvAccident"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="封路"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivClosure"
+        app:layout_constraintRight_toRightOf="@id/ivClosure"
+        app:layout_constraintTop_toBottomOf="@id/ivClosure" />
+
     <TextView
         android:id="@+id/tvAccident"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_accident"
-        android:text="事故"
-        android:textSize="@dimen/share_module_btn_text_size"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock"
-        app:layout_constraintLeft_toRightOf="@+id/tvClosure"
-        app:layout_constraintRight_toLeftOf="@+id/tvConstruction"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="事故"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivAccident"
+        app:layout_constraintRight_toRightOf="@id/ivAccident"
+        app:layout_constraintTop_toBottomOf="@id/ivAccident" />
+
     <TextView
         android:id="@+id/tvConstruction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_road_construction"
-        android:text="施工"
-        android:textSize="@dimen/share_module_btn_text_size"
-        app:layout_constraintTop_toTopOf="@+id/tvBlock"
-        app:layout_constraintLeft_toRightOf="@+id/tvAccident"
-        app:layout_constraintRight_toRightOf="@+id/vBg"
-        android:layout_marginEnd="@dimen/share_module_btn_margin_left_right"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="施工"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivConstruction"
+        app:layout_constraintRight_toRightOf="@id/ivConstruction"
+        app:layout_constraintTop_toBottomOf="@id/ivConstruction" />
+
     <TextView
         android:id="@+id/tvRealTimeTraffic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_real_time_traffic"
-        android:text="实时路况"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@+id/tvBlock"
-        app:layout_constraintLeft_toLeftOf="@+id/tvBlock"
-        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="实时路况"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivRealTimeTraffic"
+        app:layout_constraintRight_toRightOf="@id/ivRealTimeTraffic"
+        app:layout_constraintTop_toBottomOf="@id/ivRealTimeTraffic" />
+
     <TextView
         android:id="@+id/tvSeekHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_seek_help"
-        android:text="故障求助"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@+id/tvTrafficCheck"
-        app:layout_constraintLeft_toLeftOf="@+id/tvTrafficCheck"
-        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="故障求助"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivSeekHelp"
+        app:layout_constraintRight_toRightOf="@id/ivSeekHelp"
+        app:layout_constraintTop_toBottomOf="@id/ivSeekHelp" />
+
     <TextView
         android:id="@+id/tvStagnantWater"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_stagnant_water"
-        android:text="道路积水"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@+id/tvClosure"
-        app:layout_constraintLeft_toLeftOf="@+id/tvClosure"
-        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="道路积水"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivStagnantWater"
+        app:layout_constraintRight_toRightOf="@id/ivStagnantWater"
+        app:layout_constraintTop_toBottomOf="@id/ivStagnantWater" />
+
     <TextView
         android:id="@+id/tvRoadIcy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_road_icy"
-        android:text="道路结冰"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
-        app:layout_constraintTop_toBottomOf="@+id/tvAccident"
-        app:layout_constraintLeft_toLeftOf="@+id/tvAccident"
-        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="道路结冰"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivRoadIcy"
+        app:layout_constraintRight_toRightOf="@id/ivRoadIcy"
+        app:layout_constraintTop_toBottomOf="@id/ivRoadIcy" />
+
     <TextView
         android:id="@+id/tvDenseFog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_dense_fog"
-        android:text="浓雾"
-        android:textSize="@dimen/share_module_btn_text_size"
-        android:textColor="@color/module_share_dialog_icon_text_color"
-        app:layout_constraintTop_toBottomOf="@+id/tvConstruction"
-        app:layout_constraintLeft_toLeftOf="@+id/tvConstruction"
-        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
+        android:layout_marginTop="@dimen/share_module_drawable_padding"
         android:gravity="center"
-        android:drawablePadding="@dimen/share_module_drawable_padding" />
+        android:text="浓雾"
+        android:textColor="@color/module_share_dialog_icon_text_color"
+        android:textSize="@dimen/share_module_btn_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivDenseFog"
+        app:layout_constraintRight_toRightOf="@id/ivDenseFog"
+        app:layout_constraintTop_toBottomOf="@id/ivDenseFog" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,7 +8,7 @@
     <dimen name="share_module_first_margin_left">100px</dimen>
     <dimen name="share_module_margin_left">118px</dimen>
     <dimen name="share_module_tv_margin_top">15px</dimen>
-    <dimen name="share_module_image_width">85px</dimen>
+    <dimen name="share_module_image_width">88px</dimen>
     <dimen name="share_module_image_width_second">110px</dimen>
     <dimen name="share_module_bottom_margin_top">28px</dimen>
     <dimen name="share_module_first_btn_margin_top">42.6px</dimen>

skin/mogo-skin-light/build.gradle

@@ -39,6 +39,8 @@ android {
                     'src/main/module-push-res',
                     'src/main/module-share-res',
                     'src/main/module-tanlu-res',
+                    'src/main/module-commons-res',
+                    'src/main/module-media-res',
             ]
         }
     }

skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="90dp" />
+    <gradient
+        android:angle="180"
+        android:endColor="#E5F5F5F5"
+        android:startColor="#FFFFFFFF" />
+</shape>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="modules_commons_toast_text_color_light">#FF333333</color>
+</resources>