From b138580563d338bdca7383c979a21d5a58c39af8 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 17 Jan 2020 13:09:40 +0800 Subject: [PATCH] add dimen --- .../module/tanlu/video/FullMediaActivity.kt | 3 +- .../tanlu/video/MediaCoverVideoPlayer.kt | 14 ++--- .../res/layout/tanlu_activity_media_full.xml | 20 +++---- .../layout/tanlu_item_main_media_recycler.xml | 58 +++++++++---------- .../res/layout/tanlu_item_video_cover.xml | 15 ++--- .../layout/tanlu_item_video_cover_media.xml | 12 ++-- .../src/main/res/values-ldpi/dimens.xml | 41 +++++++++++++ .../src/main/res/values-xhdpi/dimens.xml | 47 ++++++++++++++- 8 files changed, 145 insertions(+), 65 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt index fa888063a3..be294ba8e2 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt @@ -102,8 +102,7 @@ class FullMediaActivity : AppCompatActivity(), View.OnClickListener { video_view.onCompletionListener(object : MediaCoverVideoPlayer.CompletionListener { override fun onCompletion() { - Log.d("liyz", "FullMediaActivity ---- onCompletion "); - GSYVideoManager.releaseAllVideos() + Log.d("liyz", "FullMediaActivity ----> onAutoCompletion ") finish() } }) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt index 4a49c8a091..298b0054db 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt @@ -111,6 +111,11 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { override fun onAutoCompletion() { super.onAutoCompletion() mProgressBar.progress = 0 + + completionListener.let { + it.onCompletion() + } + Log.d("liyz", "MediaCoverVideoPlayer onAutoCompletion ------->") } @@ -138,14 +143,10 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { } /** - * 多次回调 TODO + * 多次回调 */ override fun onCompletion() { super.onCompletion() - Log.d("liyz", "MediaCoverVideoPlayer onCompletion --------->") - completionListener.let { - it.onCompletion() - } } @@ -161,9 +162,6 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { } } mFullPauseBitmap = null - Log.d("liyz", "recycle.") } - - } \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml index 2996e27a33..335d6bf9de 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml @@ -19,17 +19,17 @@ @@ -54,11 +54,11 @@ android:id="@+id/tv_media_title_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_42" - android:layout_marginRight="@dimen/dp_100" + android:layout_marginTop="@dimen/tanlu_module_full_margin_top" + android:layout_marginRight="@dimen/tanlu_module_full_margin_right" android:gravity="center" android:textColor="@color/white" - android:textSize="@dimen/dp_26" + android:textSize="@dimen/tanlu_module_full_title_time" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml index aab6356f38..00e7d6e523 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml @@ -1,8 +1,8 @@ @@ -21,15 +21,15 @@ android:id="@+id/tv_information_media_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_24" - android:layout_marginTop="@dimen/dp_58" - android:layout_marginRight="@dimen/dp_24" + android:layout_marginLeft="@dimen/tanlu_module_card_margin_left" + android:layout_marginTop="@dimen/tanlu_module_card_address_margin_top" + android:layout_marginRight="@dimen/tanlu_module_card_margin_left" android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" android:text="@string/main_empty_location" android:textColor="@color/white" - android:textSize="@dimen/dp_34" + android:textSize="@dimen/tanlu_module_card_address_size" android:textStyle="bold" /> + android:textSize="@dimen/tanlu_module_card_distance_size" /> + android:layout_marginTop="@dimen/tanlu_module_card_video_marginbottom" + android:layout_marginLeft="@dimen/tanlu_module_card_margin_left" + android:layout_marginRight="@dimen/tanlu_module_card_margin_left"> + android:textSize="@dimen/tanlu_module_card_next_size" /> + android:textSize="@dimen/tanlu_module_card_next_size" /> @@ -125,7 +125,7 @@ + android:textSize="@dimen/tanlu_module_card_address_size" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml index 418a5969c2..a9fa5332df 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml @@ -33,11 +33,11 @@ @@ -60,21 +60,22 @@ android:id="@+id/fullscreen" android:layout_width="@dimen/dp_60" android:layout_height="@dimen/dp_60" + android:visibility="gone" android:scaleType="centerInside" /> @@ -67,16 +67,16 @@ + + 60px + 60px + 48px + 48px + 72px + 5px + 120px + 120px + 96px + 96px + 144px + 760px + 10px + + 135px + 60px + 60px + 30px + 92px + 40px + + 660px + 24px + 58px + 8px + 2px + 613px + 355px + 20px + 300px + 90px + 122px + 70px + + + 38px + 26px + 34px + 26px + 28px \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index 8f6ae1133d..8be5a97307 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -1,9 +1,50 @@ - px + + 60px + 60px + 48px + 48px + 72px + 5px - 666px + 120px + 120px + 96px + 96px + 144px + 760px + 10px + + 135px + 60px + 60px + 30px + 92px + 40px + + 660px + 24px + 58px + 8px + 2px + 613px + 355px + 20px + 300px + 90px + 122px + 70px + + + 38px + 26px + 34px + 26px + 28px + + + - \ No newline at end of file