diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 1cfd6bffde..8bdd89ac6a 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -82,11 +82,11 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { sendShareReceiver("1"); traceTypeData("1"); } else if (id == R.id.oil_price_layout) { -// traceData("1"); -// Intent intent = new Intent(); -// intent.setData(Uri.parse("reshthing://com.zhidao.fresh.things/shareOilPrice")); -// mContext.startActivity(intent); -// traceTypeData("2"); + traceData("1"); + Intent intent = new Intent(); + intent.setData(Uri.parse("freshthing://com.zhidao.fresh.things/shareOilPrice")); + mContext.startActivity(intent); + traceTypeData("2"); } else if (id == R.id.traffic_check_layout) { //交通检查 traceData("1"); sendShareReceiver("2"); 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 298b0054db..b07cd17667 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 @@ -105,7 +105,7 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToCompleteShow() { super.changeUiToCompleteShow() - setViewShowState(mBottomContainer, View.INVISIBLE) +// setViewShowState(mBottomContainer, View.INVISIBLE) } override fun onAutoCompletion() { diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt index a27b37a2e1..e0239d7ee5 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt @@ -76,7 +76,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToCompleteShow() { super.changeUiToCompleteShow() - setViewShowState(mBottomContainer, View.INVISIBLE) +// setViewShowState(mBottomContainer, View.INVISIBLE) } override fun onAutoCompletion() { diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml index 24614c444e..8aa748c588 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/loading_bg.xml @@ -9,7 +9,7 @@ android:thickness="4mm" android:useLevel="false"> diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml new file mode 100644 index 0000000000..05611fb94a --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/small_video_seekbar_style.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ 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 a9fa5332df..362eb31478 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 @@ -31,30 +31,27 @@ + + android:maxHeight="@dimen/tanlu_module_small_player_height" + android:minHeight="@dimen/tanlu_module_small_player_height" + android:progressDrawable="@drawable/small_video_seekbar_style" + android:thumb="@null" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml index 1369cbda37..960548fd7f 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml @@ -12,8 +12,8 @@ 56px 96px 96px - 144px - 760px + 90px + 700px 10px 72px 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 ed17bded92..08d5243a1f 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 @@ -13,8 +13,8 @@ 106px 96px 96px - 144px - 760px + 100px + 700px 10px 135px @@ -41,6 +41,9 @@ 90px 80px + + 10px + 38px 26px