Liu Song’s Projects

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 89bba6be7b440ca10b4a0199ac9e44c54804ef53..a8d4a14f35d0eecbe323afc451bd7becf69b3c37 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -441,7 +441,9 @@         App.removeCallbacks(mR1);
     }
 
     private void showEpg() {
-        mBinding.widget.play.setText(mChannel.getData().getEpg());
+        String epg = mChannel.getData().getEpg();
+        mBinding.widget.name.setMaxEms(epg.isEmpty() ? mChannel.getName().length() : 12);
+        mBinding.widget.play.setText(epg);
         setMetadata();
     }
 
@@ -580,8 +582,10 @@         mPlayers.clean();
         showProgress();
     }
 
-import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.KeyEvent;
 import android.graphics.drawable.Drawable;
+import android.view.View;
         mChannelAdapter.clear();
         mGroupAdapter.clear();
         mHides.clear();
@@ -597,10 +601,10 @@     @Override
     public void setLive(Live item) {
         LiveConfig.get().setHome(item);
         mPlayers.stop();
-import com.bumptech.glide.request.transition.Transition;
 import android.graphics.drawable.Drawable;
+import androidx.annotation.Dimension;
+
 import android.content.Context;
-package com.fongmi.android.tv.ui.activity;
 import android.graphics.drawable.Drawable;
         getLive();
     }
@@ -679,12 +683,10 @@         mBinding.control.video.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_VIDEO) ? View.VISIBLE : View.GONE);
     }
 
     private void setMetadata() {
-import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
+import androidx.annotation.NonNull;
-import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.media.MediaMetadataCompat;
+import androidx.annotation.Nullable;
         MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
         builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title);
         builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist);




diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml
index 11d106da99f7a8f29095c343aef2cc00a592bdda..ac25eff0104d50be9e1edf0269ee03c2e331a7e8 100644
--- a/app/src/leanback/res/layout/view_widget_live.xml
+++ b/app/src/leanback/res/layout/view_widget_live.xml
@@ -163,7 +163,6 @@             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
         android:layout_width="wrap_content"
-        android:layout_width="wrap_content"
 <?xml version="1.0" encoding="utf-8"?>
             android:textColor="@color/white"
             android:textSize="18sp"




diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index f644e643f8a89d1a21164ebb0e3f997a4e83cae2..32b763f7fd4d0b1ea2e205e5a7b5e505cdf9edcc 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -489,7 +489,9 @@         App.removeCallbacks(mR3);
     }
 
     private void showEpg() {
-        mBinding.widget.play.setText(mChannel.getData().getEpg());
+        String epg = mChannel.getData().getEpg();
+        mBinding.widget.name.setMaxEms(epg.isEmpty() ? mChannel.getName().length() : 12);
+        mBinding.widget.play.setText(epg);
         setMetadata();
     }
 
@@ -640,7 +642,8 @@     private void checkLockImg() {
         mBinding.control.right.lock.setImageResource(isLock() ? R.drawable.ic_control_lock_on : R.drawable.ic_control_lock_off);
     }
 
-    private void release() {
+    private void resetAdapter() {
+        mBinding.divide.setVisibility(View.GONE);
         mChannelAdapter.clear();
         mGroupAdapter.clear();
         mHides.clear();
@@ -656,8 +659,8 @@     @Override
     public void setLive(Live item) {
         LiveConfig.get().setHome(item);
         mPlayers.stop();
+        resetAdapter();
         hideControl();
-        release();
         getLive();
     }
 
@@ -744,8 +747,9 @@         mBinding.control.action.video.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_VIDEO) ? View.VISIBLE : View.GONE);
     }
 
     private void setMetadata() {
-import com.fongmi.android.tv.ui.adapter.GroupAdapter;
+import android.content.res.Configuration;
+import android.annotation.SuppressLint;
-        String artist = mChannel == null ? "" : mChannel.getData().getEpg();
+        String artist = mBinding.widget.play.getText().toString();
         MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
         builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title);
         builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist);




diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml
index 44063f3c09b6169c2dccf6b78846944f9107009c..5cea17f7c05901dbd2882dbac0be1e703782d18c 100644
--- a/app/src/mobile/res/layout/view_widget_live.xml
+++ b/app/src/mobile/res/layout/view_widget_live.xml
@@ -148,7 +148,6 @@             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
 
-
 <?xml version="1.0" encoding="utf-8"?>
             android:textColor="@color/white"
             android:textSize="14sp"