Merge branch 'dev' into release

app/build.gradle

@@ -21,13 +21,13 @@ android {
     productFlavors {
         leanback {
             dimension "mode"
-            versionCode 74
-            versionName "1.7.4"
+            versionCode 75
+            versionName "1.7.5"
         }
         mobile {
             dimension "mode"
-            versionCode 11
-            versionName "20230426#1"
+            versionCode 12
+            versionName "1.1.2"
         }
         java {
             dimension "api"

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/FlagPresenter.java

@@ -30,7 +30,7 @@ public class FlagPresenter extends Presenter {
     public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object object) {
         Vod.Flag item = (Vod.Flag) object;
         ViewHolder holder = (ViewHolder) viewHolder;
-        holder.binding.text.setText(item.getFlag());
+        holder.binding.text.setText(item.getShow());
         holder.binding.text.setActivated(item.isActivated());
         setOnClickListener(holder, view -> mListener.onItemClick(item));
     }

app/src/main/java/com/fongmi/android/tv/bean/Vod.java

@@ -228,7 +228,7 @@ public class Vod {
         }
 
         public String getShow() {
-            return TextUtils.isEmpty(show) ? "" : show;
+            return TextUtils.isEmpty(show) ? getFlag() : show;
         }
 
         public String getFlag() {