From afc1ced3a5eac455f76bc9b4ea5a46935f92a388 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Sat, 13 Sep 2025 15:27:09 +0800 Subject: [PATCH] Update logo --- .../android/tv/ui/activity/HomeActivity.java | 24 ++-------------- app/src/leanback/res/layout/activity_home.xml | 10 ++----- .../android/tv/service/PlaybackService.java | 2 +- app/src/main/res/drawable-nodpi/ic_logo.png | Bin 7107 -> 14931 bytes .../res/drawable-nodpi/ic_notification.png | Bin 0 -> 7107 bytes .../android/tv/ui/fragment/VodFragment.java | 26 +----------------- app/src/mobile/res/layout/fragment_vod.xml | 6 ++-- 7 files changed, 10 insertions(+), 58 deletions(-) create mode 100644 app/src/main/res/drawable-nodpi/ic_notification.png 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 961d18047f8884e1c9bbf8b239afe1361f108448..a9f08a2960c0150f3cd6bc92540b0031f2eb8b0e 100644 GIT binary patch literal 14931 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 literal 7107 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 V?YHqw&v#flIefb8j8y*J{{mh=Gm!uQ 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 0000000000000000000000000000000000000000..961d18047f8884e1c9bbf8b239afe1361f108448 GIT binary patch literal 7107 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 V?YHqw&v#flIefb8j8y*J{{mh=Gm!uQ literal 0 HcmV?d00001 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"