diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index da82ad1ec..2d584f9ae 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -269,7 +269,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownVod.Liste private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); - App.post(mR2, Constant.INTERVAL_TRAFFIC); + App.post(mR2, 1000); } private void setR1Callback() { 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 6a552ec7d..8ddead8e2 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 @@ -498,7 +498,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); - App.post(mR2, Constant.INTERVAL_TRAFFIC); + App.post(mR2, 1000); } private void setR1Callback() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 95c0d9a71..65533dc28 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -901,7 +901,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); - App.post(mR3, Constant.INTERVAL_TRAFFIC); + App.post(mR3, 1000); } private void setR1Callback() { diff --git a/app/src/main/java/com/fongmi/android/tv/Constant.java b/app/src/main/java/com/fongmi/android/tv/Constant.java index b57257bfd..ff1834607 100644 --- a/app/src/main/java/com/fongmi/android/tv/Constant.java +++ b/app/src/main/java/com/fongmi/android/tv/Constant.java @@ -6,7 +6,6 @@ public class Constant { public static final long INTERVAL_SEEK = TimeUnit.SECONDS.toMillis(10); public static final long INTERVAL_HIDE = TimeUnit.SECONDS.toMillis(5); - public static final long INTERVAL_TRAFFIC = TimeUnit.SECONDS.toMillis(1); public static final long TIMEOUT_VOD = TimeUnit.SECONDS.toMillis(30); public static final long TIMEOUT_LIVE = TimeUnit.SECONDS.toMillis(30); public static final long TIMEOUT_EPG = TimeUnit.SECONDS.toMillis(5); diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Traffic.java b/app/src/main/java/com/fongmi/android/tv/utils/Traffic.java index a95644d6d..4d38c2031 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Traffic.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Traffic.java @@ -11,24 +11,22 @@ import java.text.DecimalFormat; public class Traffic { private static final DecimalFormat format = new DecimalFormat("#.0"); + private static final int UID = App.get().getApplicationInfo().uid; private static final String UNIT_KB = " KB/s"; private static final String UNIT_MB = " MB/s"; + private static long lastTotalRxBytes; private static long lastTimeStamp; public static void setSpeed(TextView view) { - if (unsupported()) return; - view.setText(getSpeed()); + if (TrafficStats.getUidRxBytes(UID) == TrafficStats.UNSUPPORTED) return; view.setVisibility(View.VISIBLE); - } - - private static boolean unsupported() { - return TrafficStats.getUidRxBytes(App.get().getApplicationInfo().uid) == TrafficStats.UNSUPPORTED; + view.setText(getSpeed()); } private static String getSpeed() { long nowTimeStamp = System.currentTimeMillis(); - long nowTotalRxBytes = TrafficStats.getTotalRxBytes() / 1024; + long nowTotalRxBytes = TrafficStats.getUidRxBytes(UID) / 1024; long speed = (nowTotalRxBytes - lastTotalRxBytes) * 1000 / Math.max(nowTimeStamp - lastTimeStamp, 1); lastTimeStamp = nowTimeStamp; lastTotalRxBytes = nowTotalRxBytes; 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 8f284e586..3b90feab6 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 @@ -513,7 +513,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); - App.post(mR2, Constant.INTERVAL_TRAFFIC); + App.post(mR2, 1000); } private void setR1Callback() { 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 eea1b00e2..13d55e8db 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 @@ -987,7 +987,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); - App.post(mR2, Constant.INTERVAL_TRAFFIC); + App.post(mR2, 1000); } private void setOrient() {