diff --git a/app/src/main/res/layout/view_progress.xml b/app/src/main/res/layout/view_progress.xml
index 46d8835df..b8a49513b 100644
--- a/app/src/main/res/layout/view_progress.xml
+++ b/app/src/main/res/layout/view_progress.xml
@@ -1,6 +1,27 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file
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 7b0a03375..95e3b67b5 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
@@ -475,15 +475,13 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
}
private void showProgress() {
- mBinding.widget.progress.setVisibility(View.VISIBLE);
- mBinding.widget.traffic.setVisibility(View.VISIBLE);
+ mBinding.progress.getRoot().setVisibility(View.VISIBLE);
App.post(mR2, 0);
hideError();
}
private void hideProgress() {
- mBinding.widget.progress.setVisibility(View.GONE);
- mBinding.widget.traffic.setVisibility(View.GONE);
+ mBinding.progress.getRoot().setVisibility(View.GONE);
App.removeCallbacks(mR2);
Traffic.reset();
}
@@ -533,7 +531,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
}
private void setTraffic() {
- Traffic.setSpeed(mBinding.widget.traffic);
+ Traffic.setSpeed(mBinding.progress.traffic);
App.post(mR2, 1000);
}
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 be589b1ed..ee0d595c9 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
@@ -926,15 +926,13 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void showProgress() {
- mBinding.widget.progress.setVisibility(View.VISIBLE);
- mBinding.widget.traffic.setVisibility(View.VISIBLE);
+ mBinding.progress.getRoot().setVisibility(View.VISIBLE);
App.post(mR2, 0);
hideError();
}
private void hideProgress() {
- mBinding.widget.progress.setVisibility(View.GONE);
- mBinding.widget.traffic.setVisibility(View.GONE);
+ mBinding.progress.getRoot().setVisibility(View.GONE);
App.removeCallbacks(mR2);
Traffic.reset();
}
@@ -987,7 +985,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void setTraffic() {
- Traffic.setSpeed(mBinding.widget.traffic);
+ Traffic.setSpeed(mBinding.progress.traffic);
App.post(mR2, 1000);
}
diff --git a/app/src/mobile/res/drawable/ic_widget_error.xml b/app/src/mobile/res/drawable/ic_widget_error.xml
deleted file mode 100644
index 006b531b6..000000000
--- a/app/src/mobile/res/drawable/ic_widget_error.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/app/src/mobile/res/drawable/shape_widget_error.xml b/app/src/mobile/res/drawable/shape_widget_error.xml
deleted file mode 100644
index ce9fc6b3b..000000000
--- a/app/src/mobile/res/drawable/shape_widget_error.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/mobile/res/layout-sw600dp/activity_video.xml b/app/src/mobile/res/layout-sw600dp/activity_video.xml
index 4bef8f606..9cd2472f9 100644
--- a/app/src/mobile/res/layout-sw600dp/activity_video.xml
+++ b/app/src/mobile/res/layout-sw600dp/activity_video.xml
@@ -40,6 +40,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
+
+
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index 2f23b7347..99af2ef8f 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -21,20 +21,26 @@
android:layout_height="match_parent"
app:surface_type="none" />
-
+
-
+
-
+
+
+
+
+
diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml
index 99437c8dc..5d7650593 100644
--- a/app/src/mobile/res/layout/view_widget_live.xml
+++ b/app/src/mobile/res/layout/view_widget_live.xml
@@ -9,40 +9,16 @@
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:background="@drawable/shape_widget_error"
- android:drawableTop="@drawable/ic_widget_error"
- android:drawablePadding="8dp"
+ android:layout_gravity="top|center"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/shape_widget"
android:gravity="center"
android:textColor="@color/white"
- android:textSize="12sp"
+ android:textSize="14sp"
android:visibility="gone"
tools:text="@string/error_play_url"
tools:visibility="visible" />
-
-
-
-
-
-
-
-