Fix some bug

pull/123/head
FongMi 3 years ago
parent 653a5adfcd
commit 443fc6b683
  1. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 3
      app/src/leanback/res/layout/view_widget_live.xml
  4. 3
      app/src/leanback/res/layout/view_widget_vod.xml
  5. 29
      app/src/main/java/com/fongmi/android/tv/utils/Traffic.java
  6. 14
      drpy/src/main/java/com/hiker/drpy/bean/Info.java

@ -593,7 +593,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private void showProgress() {
mBinding.widget.progress.setVisibility(View.VISIBLE);
App.post(mR3, 250);
App.post(mR3, 500);
}
private void hideProgress() {
@ -637,8 +637,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void setTraffic() {
mBinding.widget.traffic.setText(Traffic.get());
App.post(mR3, 250);
Traffic.setSpeed(mBinding.widget.traffic);
App.post(mR3, 500);
}
private void setR1Callback() {

@ -255,8 +255,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void setTraffic() {
mBinding.widget.traffic.setText(Traffic.get());
App.post(mR5, 250);
Traffic.setSpeed(mBinding.widget.traffic);
App.post(mR5, 500);
}
private void onToggle() {
@ -330,7 +330,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private void showProgress() {
mBinding.widget.progress.setVisibility(View.VISIBLE);
App.post(mR5, 250);
App.post(mR5, 500);
}
private void hideProgress() {

@ -18,9 +18,10 @@
android:id="@+id/traffic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="8dp"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone"
tools:text="120KB/s" />
</LinearLayout>

@ -73,9 +73,10 @@
android:id="@+id/traffic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="8dp"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone"
tools:text="120KB/s" />
</LinearLayout>

@ -1,7 +1,8 @@
package com.fongmi.android.tv.utils;
import android.content.pm.PackageManager;
import android.net.TrafficStats;
import android.view.View;
import android.widget.TextView;
import com.fongmi.android.tv.App;
@ -12,8 +13,18 @@ public class Traffic {
private static long lastTotalRxBytes = 0;
private static long lastTimeStamp = 0;
public static String get() {
long total = getTotalRxBytes(getUid());
public static void setSpeed(TextView view) {
if (unsupported()) return;
view.setText(getSpeed());
view.setVisibility(View.VISIBLE);
}
private static boolean unsupported() {
return TrafficStats.getUidRxBytes(App.get().getApplicationInfo().uid) == TrafficStats.UNSUPPORTED;
}
private static String getSpeed() {
long total = TrafficStats.getTotalRxBytes() / 1024;
long time = System.currentTimeMillis();
long diff = (total - lastTotalRxBytes) * 1000;
long speed = diff / Math.max(time - lastTimeStamp, 1);
@ -27,16 +38,4 @@ public class Traffic {
lastTotalRxBytes = 0;
lastTimeStamp = 0;
}
private static long getTotalRxBytes(int uid) {
return TrafficStats.getUidRxBytes(uid) == TrafficStats.UNSUPPORTED ? 0 : (TrafficStats.getTotalRxBytes() / 1024);
}
private static int getUid() {
try {
return App.get().getPackageManager().getApplicationInfo(App.get().getPackageName(), PackageManager.GET_META_DATA).uid;
} catch (Exception e) {
return 0;
}
}
}

@ -23,11 +23,14 @@ public class Info {
String[] rules = rule.split("--");
setExcludes(rules);
setRule(rules[0]);
setIndex(pos);
} else if (pos.contains("--")) {
String[] rules = pos.split("--");
setExcludes(rules);
setIndex(rules[0]);
pos = rules[0];
}
try {
index = Integer.parseInt(pos.split("\\(")[1].split("\\)")[0]);
} catch (Exception ignored) {
}
}
@ -35,11 +38,4 @@ public class Info {
excludes = new ArrayList<>(Arrays.asList(rules));
excludes.remove(0);
}
public void setIndex(String pos) {
try {
index = Integer.parseInt(pos.split("\\(")[1].split("\\)")[0]);
} catch (Exception ignored) {
}
}
}

Loading…
Cancel
Save