diff --git a/app/src/main/res/drawable/ic_widget_error.xml b/app/src/leanback/res/drawable/ic_widget_error.xml similarity index 100% rename from app/src/main/res/drawable/ic_widget_error.xml rename to app/src/leanback/res/drawable/ic_widget_error.xml diff --git a/app/src/leanback/res/drawable/shape_widget.xml b/app/src/leanback/res/drawable/shape_widget.xml index 78cfa62ed..2514944ee 100644 --- a/app/src/leanback/res/drawable/shape_widget.xml +++ b/app/src/leanback/res/drawable/shape_widget.xml @@ -6,4 +6,10 @@ + + \ No newline at end of file diff --git a/app/src/leanback/res/layout/view_widget_cast.xml b/app/src/leanback/res/layout/view_widget_cast.xml index cb51167e4..2057d7a43 100644 --- a/app/src/leanback/res/layout/view_widget_cast.xml +++ b/app/src/leanback/res/layout/view_widget_cast.xml @@ -77,7 +77,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> @@ -90,7 +89,6 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -106,7 +104,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml index 8b6333652..35eedee64 100644 --- a/app/src/leanback/res/layout/view_widget_live.xml +++ b/app/src/leanback/res/layout/view_widget_live.xml @@ -78,7 +78,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> @@ -91,7 +90,6 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -107,7 +105,6 @@ android:background="@drawable/shape_widget" android:includeFontPadding="false" android:letterSpacing="0.05" - android:padding="16dp" android:textColor="@color/white" android:textSize="64sp" android:visibility="gone" @@ -122,7 +119,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml index 5577d311c..cf8760aab 100644 --- a/app/src/leanback/res/layout/view_widget_vod.xml +++ b/app/src/leanback/res/layout/view_widget_vod.xml @@ -76,7 +76,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> @@ -89,7 +88,6 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:gravity="center" android:textColor="@color/white" android:textSize="16sp" @@ -105,7 +103,6 @@ android:background="@drawable/shape_widget" android:gravity="center" android:orientation="vertical" - android:padding="16dp" android:visibility="gone" tools:visibility="visible"> 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 b1044547b..7b0a03375 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 @@ -490,13 +490,13 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener private void showError(String text) { mBinding.widget.error.setVisibility(View.VISIBLE); - mBinding.widget.text.setText(text); + mBinding.widget.error.setText(text); hideProgress(); } private void hideError() { mBinding.widget.error.setVisibility(View.GONE); - mBinding.widget.text.setText(""); + mBinding.widget.error.setText(""); } private void showControl() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 07ad3c83e..be589b1ed 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -941,13 +941,13 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void showError(String text) { mBinding.widget.error.setVisibility(View.VISIBLE); - mBinding.widget.text.setText(text); + mBinding.widget.error.setText(text); hideProgress(); } private void hideError() { mBinding.widget.error.setVisibility(View.GONE); - mBinding.widget.text.setText(""); + mBinding.widget.error.setText(""); } private void showDanmaku() { diff --git a/app/src/mobile/res/drawable/ic_widget_error.xml b/app/src/mobile/res/drawable/ic_widget_error.xml new file mode 100644 index 000000000..006b531b6 --- /dev/null +++ b/app/src/mobile/res/drawable/ic_widget_error.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml index db1c46737..99437c8dc 100644 --- a/app/src/mobile/res/layout/view_widget_live.xml +++ b/app/src/mobile/res/layout/view_widget_live.xml @@ -5,33 +5,20 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - + tools:text="@string/error_play_url" + tools:visibility="visible" /> - - - - - - - + tools:text="@string/error_play_url" + tools:visibility="visible" />