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 f5783b8fd..1e592a088 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
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import com.android.cast.dlna.dmr.DLNARendererService;
+import com.bumptech.glide.Glide;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.Product;
import com.fongmi.android.tv.R;
@@ -173,6 +174,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
getHistory();
getVideo();
setFocus();
+ setLogo();
}
@Override
@@ -201,6 +203,12 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
if (!mBinding.title.hasFocus()) mBinding.recycler.requestFocus();
}
+ private void setLogo() {
+ String logo = VodConfig.get().getConfig().getLogo();
+ mBinding.logo.setVisibility(TextUtils.isEmpty(logo) ? View.GONE : View.VISIBLE);
+ Glide.with(this).load(logo).error(R.drawable.ic_logo).circleCrop().into(mBinding.logo);
+ }
+
private void getVideo() {
mResult = Result.empty();
int index = getRecommendIndex();
@@ -368,6 +376,9 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
public void onRefreshEvent(RefreshEvent event) {
super.onRefreshEvent(event);
switch (event.getType()) {
+ case CONFIG:
+ setLogo();
+ break;
case VIDEO:
getVideo();
break;
@@ -411,6 +422,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override
public void success() {
RefreshEvent.history();
+ RefreshEvent.config();
RefreshEvent.video();
onCastEvent(event);
}
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
index f8b3e1ff5..b0dfdcb10 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java
@@ -59,6 +59,7 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
public void success() {
VideoActivity.start(getActivity(), item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic());
RefreshEvent.history();
+ RefreshEvent.config();
RefreshEvent.video();
}
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
index 9b4dc12b4..77dd6becc 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
@@ -181,6 +181,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
setCacheText();
Notify.dismiss();
RefreshEvent.video();
+ RefreshEvent.config();
RefreshEvent.history();
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
diff --git a/app/src/leanback/res/layout/activity_home.xml b/app/src/leanback/res/layout/activity_home.xml
index 829ce5610..706337016 100644
--- a/app/src/leanback/res/layout/activity_home.xml
+++ b/app/src/leanback/res/layout/activity_home.xml
@@ -16,15 +16,33 @@
android:paddingEnd="24dp"
android:paddingBottom="8dp">
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+
+
+
+
+
() {
- @Override
- public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition super Drawable> transition) {
- mBinding.logo.setShapeAppearanceModel(new ShapeAppearanceModel.Builder().setAllCornerSizes(new RelativeCornerSize(0.5f)).build());
- mBinding.logo.setScaleType(ImageView.ScaleType.CENTER_CROP);
- mBinding.logo.setImageDrawable(drawable);
- }
-
- @Override
- public void onLoadFailed(@Nullable Drawable errorDrawable) {
- mBinding.logo.setShapeAppearanceModel(new ShapeAppearanceModel.Builder().setAllCornerSizes(0).build());
- mBinding.logo.setScaleType(ImageView.ScaleType.FIT_CENTER);
- mBinding.logo.setImageResource(R.drawable.ic_logo);
- }
-
- @Override
- public void onLoadCleared(@Nullable Drawable drawable) {
- }
- });
+ String logo = VodConfig.get().getConfig().getLogo();
+ if (TextUtils.isEmpty(logo)) mBinding.logo.setImageResource(R.drawable.ic_logo);
+ else Glide.with(this).load(logo).error(R.drawable.ic_logo).circleCrop().into(mBinding.logo);
}
public Result getResult() {
diff --git a/app/src/mobile/res/layout/fragment_vod.xml b/app/src/mobile/res/layout/fragment_vod.xml
index 34b4dcf77..2ce09d4c8 100644
--- a/app/src/mobile/res/layout/fragment_vod.xml
+++ b/app/src/mobile/res/layout/fragment_vod.xml
@@ -24,7 +24,7 @@
android:paddingBottom="4dp"
app:layout_scrollFlags="scroll|enterAlways">
-