Update logo

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<Drawable> getListener() {
-        return new RequestListener<>() {
-            @Override
-            public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target<Drawable> target, boolean isFirstResource) {
-                mBinding.logo.setVisibility(View.GONE);
-                return false;
-            }
-
-            @Override
-            public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target<Drawable> 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)

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" />
 
         <com.fongmi.android.tv.ui.custom.CustomTitleView
             android:id="@+id/site"
@@ -35,8 +33,6 @@
             android:layout_weight="1"
             android:ellipsize="marquee"
             android:focusable="false"
-            android:nextFocusLeft="@id/site"
-            android:nextFocusRight="@id/site"
             android:singleLine="true"
             android:text="@string/app_name"
             android:textColor="@color/white"
@@ -49,7 +45,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:textSize="24sp"
-            tools:text="07/25 09:20:00" />
+            tools:text="09:20:00" />
 
     </LinearLayout>
 

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());

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<Drawable> getListener() {
-        return new RequestListener<>() {
-            @Override
-            public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target<Drawable> 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<Drawable> 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)

app/src/mobile/res/layout/fragment_vod.xml

@@ -26,8 +26,9 @@
 
             <ImageView
                 android:id="@+id/logo"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="8dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:src="@drawable/ic_logo" />
 
@@ -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"