优化多媒体浮框

.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-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java

@@ -125,8 +125,12 @@ public class ExtensionsPresenter extends Presenter< ExtensionsView > implements
             @Override
             public void onSuccess(UserInfoResponse userInfoBaseResponse) {
                 userInfo = userInfoBaseResponse.getResult();
-                Logger.d(TAG, "获取个人信息成功: " + userInfo);
-                mView.renderUserInfo(userInfo);
+                if(userInfo!=null) {
+                    Logger.d(TAG, "获取个人信息成功: " + userInfo);
+                    mView.renderUserInfo(userInfo);
+                }else{
+                    Logger.e(TAG,"获取个人信息失败");
+                }
             }
 
             @Override

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

@@ -141,7 +141,6 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
     private ImageView mWindowPlayNext;
     private MediaShareDialogFragment mShareDilogFragment;
     private MediaMogoVoiceListener mMediaVoiceListener;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -626,7 +625,6 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -637,7 +635,7 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
             int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
             ServiceMediaHandler.getMogoWindowManager().addView( mWindowView, xPos, yPos, false);
             updateWindowUI(true);
-            mWindowMediaCenter.setOnClickListener(new NoDoubleClickListener() {
+            mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override
                 public void onClicks(View view) {
                     if (mMediaInfoData != null) {

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

@@ -57,7 +57,6 @@ public class MediaWindow implements MediaView{
     private ScrollingTextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -112,7 +111,6 @@ public class MediaWindow implements MediaView{
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -123,7 +121,7 @@ public class MediaWindow implements MediaView{
             int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
             ServiceMediaHandler.getMogoWindowManager().addView( mWindowView, xPos, yPos, false);
             updateWindowUI(true);
-            mWindowMediaCenter.setOnClickListener(new NoDoubleClickListener() {
+            mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override
                 public void onClicks(View view) {
                     if (mMediaInfoData != null) {

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

@@ -1,10 +1,11 @@
 package com.mogo.module.media;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.mogo.commons.debug.DebugConfig;
@@ -15,13 +16,11 @@ import com.mogo.module.media.listener.NoDoubleClickListener;
 import com.mogo.module.media.model.MediaInfoData;
 import com.mogo.module.media.presenter.WeCarFlowPresenter;
 import com.mogo.module.media.utils.LaunchUtils;
-import com.mogo.module.media.utils.MusicControlBroadCast;
 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.utils.TipToast;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
 import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
@@ -44,7 +43,6 @@ public class MediaWindow2 implements IMusicView {
     private ScrollingTextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -87,7 +85,6 @@ public class MediaWindow2 implements IMusicView {
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -98,7 +95,11 @@ public class MediaWindow2 implements IMusicView {
                     getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location);
             int xPos =
                     getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
-            ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, xPos, yPos, false);
+            FrameLayout.LayoutParams params =
+                    new FrameLayout.LayoutParams((int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_width), (int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_height));
+            params.leftMargin = xPos;
+            params.topMargin = yPos;
+            ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, params, false);
             updateWindowUI(true);
             mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override

modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#42435A" />
+            <corners android:bottomRightRadius="@dimen/module_media_window_corner" android:topRightRadius="@dimen/module_media_window_corner" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+        </shape>
+    </item>
+</selector>

modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#42435A" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+        </shape>
+    </item>
+</selector>

modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:angle="0"
+        android:angle="180"
         android:startColor="#5E6079"
         android:endColor="#3F4057"
         android:type="linear" />

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

@@ -1,87 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/module_media_pop_window_width"
     android:layout_height="@dimen/module_media_pop_window_height"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    tools:layout_marginLeft="@dimen/module_media_music_state_location_x"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginTop="@dimen/module_media_music_state_location"
-    android:background="@drawable/module_media_window_alert_bg">
-    <LinearLayout
-        android:layout_width="@dimen/module_media_pop_window_width"
-        android:layout_height="@dimen/module_media_pop_window_inner_height"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/module_media_pop_window_inner_padding"
-        android:paddingRight="@dimen/module_media_pop_window_inner_padding">
+    android:background="@drawable/module_media_window_alert_bg"
+    tools:layout_marginLeft="@dimen/module_media_music_state_location_x">
 
-        <com.mogo.module.media.widget.AnimCircleImageView
-            android:id="@+id/window_circle_img"
-            android:layout_width="@dimen/module_media_pop_window_anim_img_size"
-            android:layout_height="@dimen/module_media_pop_window_anim_img_size"
-            android:src="@drawable/module_media_play"/>
+    <com.mogo.module.media.widget.AnimCircleImageView
+        android:id="@+id/window_circle_img"
+        android:layout_width="@dimen/module_media_pop_window_anim_img_size"
+        android:layout_height="@dimen/module_media_pop_window_anim_img_size"
+        android:src="@drawable/module_media_default_music_img"
+        android:layout_marginStart="@dimen/module_media_pop_window_inner_padding"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
-        <LinearLayout
-            android:id="@+id/window_media_center"
-            android:layout_width="@dimen/module_media_pop_window_text_width"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/module_media_pop_window_text_margin"
-            android:layout_marginRight="@dimen/module_media_pop_window_text_margin"
-            android:orientation="vertical">
-            <com.mogo.module.media.widget.ScrollingTextView
-                android:id="@+id/window_scroll_txt"
-                android:layout_width="@dimen/module_media_pop_window_text_width"
-                android:layout_height="wrap_content"
-                android:text="is my life"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/module_media_pop_window_text_top_size"
-                android:ellipsize="end"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"/>
+    <com.mogo.module.media.widget.ScrollingTextView
+        android:id="@+id/window_scroll_txt"
+        android:layout_width="@dimen/module_media_pop_window_text_width"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:text="is my life"
+        android:textColor="#ffffff"
+        android:layout_marginStart="@dimen/module_media_pop_window_text_margin"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/window_current_time"
+        app:layout_constraintLeft_toRightOf="@+id/window_circle_img"
+        android:textSize="@dimen/module_media_pop_window_text_top_size" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/window_current_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF"
-                    android:text="/"/>
+    <TextView
+        android:id="@+id/window_current_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#7aFFFFFF"
+        tools:text="00:00"
+        app:layout_constraintTop_toBottomOf="@+id/window_scroll_txt"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/window_scroll_txt"
+        android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
+    <TextView
+        android:id="@+id/window_divide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="/"
+        android:textColor="#7aFFFFFF"
+        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" />
 
-                <TextView
-                    android:id="@+id/window_max_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF" />
-            </LinearLayout>
-        </LinearLayout>
+    <TextView
+        android:id="@+id/window_max_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#7aFFFFFF"
+        tools:text = "06:50"
+        app:layout_constraintTop_toTopOf="@+id/window_divide"
+        app:layout_constraintLeft_toRightOf="@+id/window_divide"
+        android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
 
-        <ImageView
-            android:id="@+id/window_play_pause"
-            android:layout_width="@dimen/module_media_pop_window_control_img_size"
-            android:layout_height="@dimen/module_media_pop_window_control_img_size"
-            android:layout_marginRight="@dimen/module_media_pop_window_control_margin_right"
-            android:scaleType="fitCenter"
-            android:src="@drawable/module_media_window_pop_play"/>
+    <ImageView
+        android:id="@+id/window_play_pause"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        app:layout_constraintLeft_toRightOf="@+id/window_scroll_txt"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/window_music_next"
+        android:background="@drawable/module_media_play_bg_selector"
+        android:src="@drawable/module_media_window_pop_play" />
+
+    <ImageView
+        android:id="@+id/window_music_next"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/window_play_pause"
+        android:background="@drawable/module_media_next_bg_selector"
+        android:src="@drawable/module_media_next_song" />
 
-        <ImageView
-            android:id="@+id/window_music_next"
-            android:layout_width="@dimen/module_media_pop_window_control_img_size"
-            android:layout_height="@dimen/module_media_pop_window_control_img_size"
-            android:scaleType="fitCenter"
-            android:src="@drawable/module_media_next_song"/>
-    </LinearLayout>
     <com.mogo.module.media.widget.NoScrollSeekBar
         android:id="@+id/window_progress_bar"
         android:layout_width="match_parent"
@@ -89,13 +99,14 @@
         android:layout_marginLeft="@dimen/module_media_pop_window_radius_margin"
         android:layout_marginRight="@dimen/module_media_pop_window_radius_margin"
         android:max="100"
+        android:paddingStart="0dp"
+        android:paddingLeft="0dp"
+        android:paddingEnd="0dp"
+        android:paddingRight="0dp"
         android:progress="50"
         android:progressDrawable="@drawable/module_media_window_progress_bar"
         android:splitTrack="false"
-        android:thumbOffset="0dp"
         android:thumb="@drawable/module_media_progress_pop_bg"
-        android:paddingLeft="0dp"
-        android:paddingRight="0dp"
-        android:paddingStart="0dp"
-        android:paddingEnd="0dp"/>
-</LinearLayout>
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:thumbOffset="0dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_media_music_state_location">483px</dimen>
-    <dimen name="module_media_music_state_location_x">573px</dimen>
-
-    <!-- lcc start-->
-    <dimen name="module_media_back_width">352px</dimen>
-    <dimen name="module_media_back_height">352px</dimen>
-    <dimen name="module_media_back_radius">10.67px</dimen>
-    <dimen name="module_media_share_full_screen_back_top">12px</dimen>
-    <dimen name="module_media_share_share_icon_width">36px</dimen>
-    <dimen name="module_media_share_full_screen_width">36px</dimen>
-    <dimen name="module_media_share_full_screen_height">36px</dimen>
-    <dimen name="module_media_share_full_screen_pading">5px</dimen>
-    <dimen name="module_media_share_full_screen_margin_left_right">12px</dimen>
-    <dimen name="module_media_share_back_top">62px</dimen>
-    <dimen name="module_media_share_user_back_margin_left_right">16px</dimen>
-    <dimen name="module_media_share_user_back_margin_height">78px</dimen>
-    <dimen name="module_media_share_user_back_radius">10.6px</dimen>
-    <dimen name="module_media_share_user_head_image_left">16px</dimen>
-    <dimen name="module_media_share_user_head_image_width">48px</dimen>
-    <dimen name="module_media_share_user_head_image_height">48px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_left">11px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_right">12px</dimen>
-    <dimen name="module_media_share_user_from_size">12px</dimen>
-    <dimen name="module_media_share_user_name_size">14px</dimen>
-    <dimen name="module_media_share_user_of_share_size">16px</dimen>
-    <dimen name="module_media_share_user_like_back_margin_right">8px</dimen>
-    <dimen name="module_media_share_user_like_width">36px</dimen>
-    <dimen name="module_media_share_user_like_height">36px</dimen>
-    <dimen name="module_media_share_user_like_size">12px</dimen>
-    <dimen name="module_media_share_media_back_top">18px</dimen>
-    <dimen name="module_media_share_media_back_margin_left">30px</dimen>
-    <dimen name="module_media_share_media_back_margin_right">30px</dimen>
-    <dimen name="module_media_share_media_back_height">67.2px</dimen>
-    <dimen name="module_media_share_media_image_radius">3px</dimen>
-    <dimen name="module_media_share_media_image_height">62px</dimen>
-    <dimen name="module_media_share_media_image_width">62px</dimen>
-    <dimen name="module_media_share_media_name_back_left">12px</dimen>
-    <dimen name="module_media_share_media_song_name_size">20px</dimen>
-    <dimen name="module_media_share_media_singer_name_size">15px</dimen>
-    <!-- lcc end-->
-
-   <!-- lidongxiu start-->
-    <dimen name="module_media_share_fragment_width">421px</dimen>
-    <dimen name="module_media_share_fragment_height">280px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_top">28px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_left">32.5px</dimen>
-    <dimen name="module_media_share_fragment_bg_radius">11.5px</dimen>
-    <dimen name="module_media_share_fragment_title_img_size">72.5px</dimen>
-    <dimen name="module_media_share_fragment_title_img_right">10.7px</dimen>
-    <dimen name="module_media_share_fragment_title_height">72.5px</dimen>
-    <dimen name="module_media_share_fragment_title_padding">10px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv1_size">22px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv2_size">16px</dimen>
-    <dimen name="module_media_share_fragment_center_text_size">18px</dimen>
-    <dimen name="module_media_share_fragment_btn_size">22px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_top">32px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_bottom">51px</dimen>
-    <dimen name="module_media_share_fragment_btn_height">68px</dimen>
-    <dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
-    <dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
-
-    <dimen name="module_media_pop_window_width">322px</dimen>
-    <dimen name="module_media_pop_window_height">66.7px</dimen>
-    <dimen name="module_media_pop_window_inner_height">60px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">12px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
-    <dimen name="module_media_pop_window_text_width">123px</dimen>
-    <dimen name="module_media_pop_window_text_margin">13px</dimen>
-    <dimen name="module_media_pop_window_text_top_size">18px</dimen>
-    <dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
-    <dimen name="module_media_pop_window_control_img_size">30px</dimen>
-    <dimen name="module_media_pop_window_control_margin_right">21px</dimen>
-    <dimen name="module_media_pop_window_progress_height">4px</dimen>
-    <dimen name="module_media_pop_window_radius">8px</dimen>
-    <dimen name="module_media_pop_window_radius_margin">7px</dimen>
-
-    <dimen name="module_media_toast_share_width">267px</dimen>
-    <dimen name="module_media_toast_share_height">187px</dimen>
-    <dimen name="module_media_toast_share_bg_radius">10px</dimen>
-    <dimen name="module_media_toast_share_img_size">64px</dimen>
-    <dimen name="module_media_toast_share_text_size">18px</dimen>
-    <dimen name="module_media_toast_share_margin_top">11px</dimen>
-
-    <dimen name="module_media_card_width">352px</dimen>
-    <dimen name="module_media_card_height">352px</dimen>
-    <dimen name="module_media_card_radius">10.5px</dimen>
-    <dimen name="module_media_card_radius_blur">11px</dimen>
-    <dimen name="module_media_card_share_full_margin_top">11.5px</dimen>
-    <dimen name="module_media_card_no_share_anim_width">175px</dimen>
-    <dimen name="module_media_card_no_share_anim_height">175px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_width">114px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_height">114px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_size">20px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_size">15px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
-    <dimen name="module_media_card_progress_height">6px</dimen>
-    <dimen name="module_media_card_progress_time_text_size">12px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_left">11px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_bottom">4px</dimen>
-    <dimen name="module_media_card_control_icon_margin_bottom">1px</dimen>
-
-    <dimen name="module_media_card_control_icon_left_padding">8px</dimen>
-    <dimen name="module_media_card_control_icon_size">44px</dimen>
-    <dimen name="module_media_card_control_play_icon_size">62px</dimen>
-    <dimen name="module_media_card_control_play_icon_margin">28px</dimen>
-    <dimen name="module_media_card_progress_margin">1px</dimen>
-    <dimen name="module_media_card_no_share_title_margin">35px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_width">3.2px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_height">6.4px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_width">3px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_height">4px</dimen>
-    <dimen name="module_media_card_share_user_text_width_max">96px</dimen>
-
-    <dimen name="module_media_draw_rect_map_bottom">32px</dimen>
-    <dimen name="module_media_draw_rect_map_left">400px</dimen>
-    <dimen name="module_media_draw_rect_map_right">80px</dimen>
-    <dimen name="module_media_draw_rect_map_top">150px</dimen>
-    <dimen name="module_media_window_corner">16px</dimen>
-    <!-- lidongxiu end-->
-</resources>

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

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">mogo-module-media</string>
-</resources>

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

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

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

@@ -1,123 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_media_music_state_location">881px</dimen>
-    <dimen name="module_media_music_state_location_x">1067px</dimen>
+    <dimen name="module_media_music_state_location">483px</dimen>
+    <dimen name="module_media_music_state_location_x">573px</dimen>
 
     <!-- lcc start-->
-    <dimen name="module_media_back_width">660px</dimen>
-    <dimen name="module_media_back_height">660px</dimen>
-    <dimen name="module_media_back_radius">20px</dimen>
-    <dimen name="module_media_share_full_screen_back_top">23px</dimen>
-    <dimen name="module_media_share_share_icon_width">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_width">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_height">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_pading">10px</dimen>
-    <dimen name="module_media_share_full_screen_margin_left_right">23px</dimen>
-    <dimen name="module_media_share_back_top">116px</dimen>
-    <dimen name="module_media_share_user_back_margin_left_right">30px</dimen>
-    <dimen name="module_media_share_user_back_margin_height">145px</dimen>
-    <dimen name="module_media_share_user_back_radius">20px</dimen>
-    <dimen name="module_media_share_user_head_image_left">30px</dimen>
-    <dimen name="module_media_share_user_head_image_width">90px</dimen>
-    <dimen name="module_media_share_user_head_image_height">90px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_left">21px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_right">24px</dimen>
-    <dimen name="module_media_share_user_from_size">23px</dimen>
-    <dimen name="module_media_share_user_name_size">26px</dimen>
-    <dimen name="module_media_share_user_of_share_size">30px</dimen>
-    <dimen name="module_media_share_user_like_back_margin_right">16px</dimen>
-    <dimen name="module_media_share_user_like_width">68px</dimen>
-    <dimen name="module_media_share_user_like_height">68px</dimen>
-    <dimen name="module_media_share_user_like_size">23px</dimen>
-    <dimen name="module_media_share_media_back_top">35px</dimen>
-    <dimen name="module_media_share_media_back_margin_left">56px</dimen>
-    <dimen name="module_media_share_media_back_margin_right">56px</dimen>
-    <dimen name="module_media_share_media_back_height">126px</dimen>
+    <dimen name="module_media_back_width">352px</dimen>
+    <dimen name="module_media_back_height">352px</dimen>
+    <dimen name="module_media_back_radius">10.67px</dimen>
+    <dimen name="module_media_share_full_screen_back_top">12px</dimen>
+    <dimen name="module_media_share_share_icon_width">36px</dimen>
+    <dimen name="module_media_share_full_screen_width">36px</dimen>
+    <dimen name="module_media_share_full_screen_height">36px</dimen>
+    <dimen name="module_media_share_full_screen_pading">5px</dimen>
+    <dimen name="module_media_share_full_screen_margin_left_right">12px</dimen>
+    <dimen name="module_media_share_back_top">62px</dimen>
+    <dimen name="module_media_share_user_back_margin_left_right">16px</dimen>
+    <dimen name="module_media_share_user_back_margin_height">78px</dimen>
+    <dimen name="module_media_share_user_back_radius">10.6px</dimen>
+    <dimen name="module_media_share_user_head_image_left">16px</dimen>
+    <dimen name="module_media_share_user_head_image_width">48px</dimen>
+    <dimen name="module_media_share_user_head_image_height">48px</dimen>
+    <dimen name="module_media_share_user_name_back_margin_left">11px</dimen>
+    <dimen name="module_media_share_user_name_back_margin_right">12px</dimen>
+    <dimen name="module_media_share_user_from_size">12px</dimen>
+    <dimen name="module_media_share_user_name_size">14px</dimen>
+    <dimen name="module_media_share_user_of_share_size">16px</dimen>
+    <dimen name="module_media_share_user_like_back_margin_right">8px</dimen>
+    <dimen name="module_media_share_user_like_width">36px</dimen>
+    <dimen name="module_media_share_user_like_height">36px</dimen>
+    <dimen name="module_media_share_user_like_size">12px</dimen>
+    <dimen name="module_media_share_media_back_top">18px</dimen>
+    <dimen name="module_media_share_media_back_margin_left">30px</dimen>
+    <dimen name="module_media_share_media_back_margin_right">30px</dimen>
+    <dimen name="module_media_share_media_back_height">67.2px</dimen>
     <dimen name="module_media_share_media_image_radius">3px</dimen>
-    <dimen name="module_media_share_media_image_height">116px</dimen>
-    <dimen name="module_media_share_media_image_width">116px</dimen>
-    <dimen name="module_media_share_media_name_back_left">22px</dimen>
-    <dimen name="module_media_share_media_song_name_size">37.5px</dimen>
-    <dimen name="module_media_share_media_singer_name_size">28px</dimen>
+    <dimen name="module_media_share_media_image_height">62px</dimen>
+    <dimen name="module_media_share_media_image_width">62px</dimen>
+    <dimen name="module_media_share_media_name_back_left">12px</dimen>
+    <dimen name="module_media_share_media_song_name_size">20px</dimen>
+    <dimen name="module_media_share_media_singer_name_size">15px</dimen>
     <!-- lcc end-->
 
     <!-- lidongxiu start-->
-    <dimen name="module_media_share_fragment_width">790px</dimen>
-    <dimen name="module_media_share_fragment_height">525px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_top">55px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_left">61px</dimen>
-    <dimen name="module_media_share_fragment_bg_radius">20px</dimen>
-    <dimen name="module_media_share_fragment_title_img_size">136px</dimen>
-    <dimen name="module_media_share_fragment_title_img_right">20px</dimen>
-    <dimen name="module_media_share_fragment_title_height">136px</dimen>
-    <dimen name="module_media_share_fragment_title_padding">34px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv1_size">40px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv2_size">30px</dimen>
-    <dimen name="module_media_share_fragment_center_text_size">34px</dimen>
-    <dimen name="module_media_share_fragment_btn_size">40px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_top">60px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_bottom">96px</dimen>
-    <dimen name="module_media_share_fragment_btn_height">130px</dimen>
-    <dimen name="module_media_share_fragment_tv2_margin_top">4px</dimen>
-    <dimen name="module_media_share_fragment_img_radius">6px</dimen>
+    <dimen name="module_media_share_fragment_width">421px</dimen>
+    <dimen name="module_media_share_fragment_height">280px</dimen>
+    <dimen name="module_media_share_fragment_title_padding_top">28px</dimen>
+    <dimen name="module_media_share_fragment_title_padding_left">32.5px</dimen>
+    <dimen name="module_media_share_fragment_bg_radius">11.5px</dimen>
+    <dimen name="module_media_share_fragment_title_img_size">72.5px</dimen>
+    <dimen name="module_media_share_fragment_title_img_right">10.7px</dimen>
+    <dimen name="module_media_share_fragment_title_height">72.5px</dimen>
+    <dimen name="module_media_share_fragment_title_padding">10px</dimen>
+    <dimen name="module_media_share_fragment_title_scroll_tv1_size">22px</dimen>
+    <dimen name="module_media_share_fragment_title_scroll_tv2_size">16px</dimen>
+    <dimen name="module_media_share_fragment_center_text_size">18px</dimen>
+    <dimen name="module_media_share_fragment_btn_size">22px</dimen>
+    <dimen name="module_media_share_fragment_center_margin_top">32px</dimen>
+    <dimen name="module_media_share_fragment_center_margin_bottom">51px</dimen>
+    <dimen name="module_media_share_fragment_btn_height">68px</dimen>
+    <dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
+    <dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
 
-    <dimen name="module_media_pop_window_width">580px</dimen>
-    <dimen name="module_media_pop_window_height">120px</dimen>
-    <dimen name="module_media_pop_window_inner_height">112px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">20px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">90px</dimen>
-    <dimen name="module_media_pop_window_text_width">230px</dimen>
-    <dimen name="module_media_pop_window_text_margin">20px</dimen>
-    <dimen name="module_media_pop_window_text_top_size">35px</dimen>
-    <dimen name="module_media_pop_window_text_bottom_size">24px</dimen>
-    <dimen name="module_media_pop_window_control_img_size">56px</dimen>
-    <dimen name="module_media_pop_window_control_margin_right">40px</dimen>
-    <dimen name="module_media_pop_window_progress_height">8px</dimen>
-    <dimen name="module_media_pop_window_radius">16px</dimen>
-    <dimen name="module_media_pop_window_radius_margin">16px</dimen>
-    <dimen name="module_media_toast_share_width">500px</dimen>
-    <dimen name="module_media_toast_share_height">350px</dimen>
-    <dimen name="module_media_toast_share_bg_radius">20px</dimen>
-    <dimen name="module_media_toast_share_img_size">120px</dimen>
-    <dimen name="module_media_toast_share_text_size">36px</dimen>
-    <dimen name="module_media_toast_share_margin_top">20px</dimen>
+    <dimen name="module_media_pop_window_width">322px</dimen>
+    <dimen name="module_media_pop_window_height">66.7px</dimen>
+    <dimen name="module_media_pop_window_inner_height">60px</dimen>
+    <dimen name="module_media_pop_window_inner_padding">12px</dimen>
+    <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
+    <dimen name="module_media_pop_window_text_width">123px</dimen>
+    <dimen name="module_media_pop_window_text_margin">13px</dimen>
+    <dimen name="module_media_pop_window_text_top_size">18px</dimen>
+    <dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
+    <dimen name="module_media_pop_window_control_img_size">30px</dimen>
+    <dimen name="module_media_pop_window_control_margin_right">21px</dimen>
+    <dimen name="module_media_pop_window_progress_height">4px</dimen>
+    <dimen name="module_media_pop_window_radius">8px</dimen>
+    <dimen name="module_media_pop_window_radius_margin">7px</dimen>
 
-    <dimen name="module_media_card_width">660px</dimen>
-    <dimen name="module_media_card_height">660px</dimen>
-    <dimen name="module_media_card_radius">20px</dimen>
-    <dimen name="module_media_card_radius_blur">22px</dimen>
-    <dimen name="module_media_card_share_full_margin_top">22px</dimen>
-    <dimen name="module_media_card_no_share_anim_width">348px</dimen>
-    <dimen name="module_media_card_no_share_anim_height">348px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_width">226px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_height">226px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_size">36px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_size">28px</dimen>
+    <dimen name="module_media_toast_share_width">267px</dimen>
+    <dimen name="module_media_toast_share_height">187px</dimen>
+    <dimen name="module_media_toast_share_bg_radius">10px</dimen>
+    <dimen name="module_media_toast_share_img_size">64px</dimen>
+    <dimen name="module_media_toast_share_text_size">18px</dimen>
+    <dimen name="module_media_toast_share_margin_top">11px</dimen>
+
+    <dimen name="module_media_card_width">352px</dimen>
+    <dimen name="module_media_card_height">352px</dimen>
+    <dimen name="module_media_card_radius">10.5px</dimen>
+    <dimen name="module_media_card_radius_blur">11px</dimen>
+    <dimen name="module_media_card_share_full_margin_top">11.5px</dimen>
+    <dimen name="module_media_card_no_share_anim_width">175px</dimen>
+    <dimen name="module_media_card_no_share_anim_height">175px</dimen>
+    <dimen name="module_media_card_no_share_anim_img_width">114px</dimen>
+    <dimen name="module_media_card_no_share_anim_img_height">114px</dimen>
+    <dimen name="module_media_card_no_share_music_top_title_size">20px</dimen>
+    <dimen name="module_media_card_no_share_music_bottom_title_size">15px</dimen>
     <dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
     <dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
-    <dimen name="module_media_card_progress_height">11px</dimen>
-    <dimen name="module_media_card_progress_time_text_size">22px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_left">21px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_right">4px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_bottom">6px</dimen>
-    <dimen name="module_media_card_control_icon_margin_bottom">2px</dimen>
+    <dimen name="module_media_card_progress_height">6px</dimen>
+    <dimen name="module_media_card_progress_time_text_size">12px</dimen>
+    <dimen name="module_media_card_progress_time_text_margin_left">11px</dimen>
+    <dimen name="module_media_card_progress_time_text_margin_bottom">4px</dimen>
+    <dimen name="module_media_card_control_icon_margin_bottom">1px</dimen>
 
-    <dimen name="module_media_card_control_icon_left_padding">15px</dimen>
-    <dimen name="module_media_card_control_icon_size">78px</dimen>
-    <dimen name="module_media_card_control_play_icon_size">107px</dimen>
-    <dimen name="module_media_card_control_play_icon_margin">53px</dimen>
-    <dimen name="module_media_card_progress_margin">2px</dimen>
-    <dimen name="module_media_card_no_share_title_margin">64px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_width">6px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_height">12px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_width">6px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_height">8px</dimen>
-    <dimen name="module_media_card_share_user_text_width_max">180px</dimen>
+    <dimen name="module_media_card_control_icon_left_padding">8px</dimen>
+    <dimen name="module_media_card_control_icon_size">44px</dimen>
+    <dimen name="module_media_card_control_play_icon_size">62px</dimen>
+    <dimen name="module_media_card_control_play_icon_margin">28px</dimen>
+    <dimen name="module_media_card_progress_margin">1px</dimen>
+    <dimen name="module_media_card_no_share_title_margin">35px</dimen>
+    <dimen name="module_media_card_progress_bg_drawable_width">3.2px</dimen>
+    <dimen name="module_media_card_progress_bg_drawable_height">6.4px</dimen>
+    <dimen name="module_media_card_progress_pop_bg_drawable_width">3px</dimen>
+    <dimen name="module_media_card_progress_pop_bg_drawable_height">4px</dimen>
+    <dimen name="module_media_card_share_user_text_width_max">96px</dimen>
 
-    <dimen name="module_media_draw_rect_map_bottom">60px</dimen>
-    <dimen name="module_media_draw_rect_map_left">750px</dimen>
-    <dimen name="module_media_draw_rect_map_right">120px</dimen>
-    <dimen name="module_media_draw_rect_map_top">270px</dimen>
-    <dimen name="module_media_window_corner">30px</dimen>
+    <dimen name="module_media_draw_rect_map_bottom">32px</dimen>
+    <dimen name="module_media_draw_rect_map_left">400px</dimen>
+    <dimen name="module_media_draw_rect_map_right">80px</dimen>
+    <dimen name="module_media_draw_rect_map_top">150px</dimen>
+    <dimen name="module_media_window_corner">16px</dimen>
     <!-- lidongxiu end-->
 </resources>