diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 32eafae50..0b5e07284 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -1,7 +1,6 @@ package com.fongmi.android.tv.ui.activity; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.view.KeyEvent; import android.view.View; @@ -16,9 +15,6 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Product; @@ -98,7 +94,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override protected void initView() { - mClock = Clock.create(mBinding.clock).format("MM/dd HH:mm:ss"); + mClock = Clock.create(mBinding.clock).format("HH:mm:ss"); mBinding.progressLayout.showProgress(); Updater.create().release().start(this); mResult = Result.empty(); @@ -296,23 +292,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen } private void setLogo() { - Glide.with(mBinding.logo).load(UrlUtil.convert(VodConfig.get().getConfig().getLogo())).circleCrop().override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).listener(getListener()).into(mBinding.logo); - } - - private RequestListener getListener() { - return new RequestListener<>() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target target, boolean isFirstResource) { - mBinding.logo.setVisibility(View.GONE); - return false; - } - - @Override - public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { - mBinding.logo.setVisibility(View.VISIBLE); - return false; - } - }; + Glide.with(mBinding.logo).load(UrlUtil.convert(VodConfig.get().getConfig().getLogo())).circleCrop().override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).error(R.drawable.ic_logo).into(mBinding.logo); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/leanback/res/layout/activity_home.xml b/app/src/leanback/res/layout/activity_home.xml index 09459be3a..b5322acc8 100644 --- a/app/src/leanback/res/layout/activity_home.xml +++ b/app/src/leanback/res/layout/activity_home.xml @@ -22,10 +22,8 @@ android:id="@+id/logo" android:layout_width="48dp" android:layout_height="48dp" - android:layout_marginEnd="16dp" - android:visibility="gone" - tools:src="@drawable/ic_logo" - tools:visibility="visible" /> + android:layout_marginEnd="12dp" + android:src="@drawable/ic_logo" /> + tools:text="09:20:00" /> diff --git a/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java b/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java index 9d6768670..3fc45cb97 100644 --- a/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java +++ b/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java @@ -109,7 +109,7 @@ public class PlaybackService extends Service { builder.setOnlyAlertOnce(true); builder.setContentText(getArtist()); builder.setContentTitle(getTitle()); - builder.setSmallIcon(R.drawable.ic_logo); + builder.setSmallIcon(R.drawable.ic_notification); builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); builder.setDeleteIntent(ActionReceiver.getPendingIntent(this, ActionEvent.STOP)); if (nonNull()) builder.setContentIntent(player.getSession().getController().getSessionActivity()); diff --git a/app/src/main/res/drawable-nodpi/ic_logo.png b/app/src/main/res/drawable-nodpi/ic_logo.png index 961d18047..a9f08a296 100644 Binary files a/app/src/main/res/drawable-nodpi/ic_logo.png and b/app/src/main/res/drawable-nodpi/ic_logo.png differ diff --git a/app/src/main/res/drawable-nodpi/ic_notification.png b/app/src/main/res/drawable-nodpi/ic_notification.png new file mode 100644 index 000000000..961d18047 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_notification.png differ diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index fedaf1b69..a8277491f 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -2,7 +2,6 @@ package com.fongmi.android.tv.ui.fragment; import android.app.Activity; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,11 +18,7 @@ import androidx.viewbinding.ViewBinding; import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; -import com.fongmi.android.tv.App; import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Class; @@ -53,7 +48,6 @@ import com.fongmi.android.tv.ui.dialog.ReceiveDialog; import com.fongmi.android.tv.ui.dialog.SiteDialog; import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.Notify; -import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.UrlUtil; import org.greenrobot.eventbus.EventBus; @@ -220,25 +214,7 @@ public class VodFragment extends BaseFragment implements ConfigCallback, SiteCal } private void setLogo() { - Glide.with(mBinding.logo).load(UrlUtil.convert(VodConfig.get().getConfig().getLogo())).circleCrop().override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).error(R.drawable.ic_logo).listener(getListener()).into(mBinding.logo); - } - - private RequestListener getListener() { - return new RequestListener<>() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target target, boolean isFirstResource) { - mBinding.logo.getLayoutParams().width = ResUtil.dp2px(24); - mBinding.logo.getLayoutParams().height = ResUtil.dp2px(24); - return false; - } - - @Override - public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { - mBinding.logo.getLayoutParams().width = ResUtil.dp2px(36); - mBinding.logo.getLayoutParams().height = ResUtil.dp2px(36); - return false; - } - }; + Glide.with(mBinding.logo).load(UrlUtil.convert(VodConfig.get().getConfig().getLogo())).circleCrop().override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).error(R.drawable.ic_logo).into(mBinding.logo); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/mobile/res/layout/fragment_vod.xml b/app/src/mobile/res/layout/fragment_vod.xml index 861eeb527..bff4280df 100644 --- a/app/src/mobile/res/layout/fragment_vod.xml +++ b/app/src/mobile/res/layout/fragment_vod.xml @@ -26,8 +26,9 @@ @@ -35,7 +36,6 @@ android:id="@+id/site" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_weight="1" android:ellipsize="marquee"