From 8085f6255d8ad6cfeebb64ad6b0cb492d14f7c94 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 5 Jun 2024 00:56:20 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/db/AppDatabase.java | 24 ++++++++++++++++++- .../android/tv/ui/custom/CustomSeekView.java | 8 +++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java index e7ba7d3b8..41843309b 100644 --- a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java +++ b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java @@ -80,7 +80,29 @@ public abstract class AppDatabase extends RoomDatabase { } private static AppDatabase create(Context context) { - return Room.databaseBuilder(context, AppDatabase.class, NAME).addMigrations(MIGRATION_11_12).addMigrations(MIGRATION_12_13).addMigrations(MIGRATION_13_14).addMigrations(MIGRATION_14_15).addMigrations(MIGRATION_15_16).addMigrations(MIGRATION_16_17).addMigrations(MIGRATION_17_18).addMigrations(MIGRATION_18_19).addMigrations(MIGRATION_19_20).addMigrations(MIGRATION_20_21).addMigrations(MIGRATION_21_22).addMigrations(MIGRATION_22_23).addMigrations(MIGRATION_23_24).addMigrations(MIGRATION_24_25).addMigrations(MIGRATION_25_26).addMigrations(MIGRATION_26_27).addMigrations(MIGRATION_27_28).addMigrations(MIGRATION_28_29).addMigrations(MIGRATION_29_30).addMigrations(MIGRATION_30_31).addMigrations(MIGRATION_31_32).allowMainThreadQueries().fallbackToDestructiveMigration().build(); + return Room.databaseBuilder(context, AppDatabase.class, NAME) + .addMigrations(MIGRATION_11_12) + .addMigrations(MIGRATION_12_13) + .addMigrations(MIGRATION_13_14) + .addMigrations(MIGRATION_14_15) + .addMigrations(MIGRATION_15_16) + .addMigrations(MIGRATION_16_17) + .addMigrations(MIGRATION_17_18) + .addMigrations(MIGRATION_18_19) + .addMigrations(MIGRATION_19_20) + .addMigrations(MIGRATION_20_21) + .addMigrations(MIGRATION_21_22) + .addMigrations(MIGRATION_22_23) + .addMigrations(MIGRATION_23_24) + .addMigrations(MIGRATION_24_25) + .addMigrations(MIGRATION_25_26) + .addMigrations(MIGRATION_26_27) + .addMigrations(MIGRATION_27_28) + .addMigrations(MIGRATION_28_29) + .addMigrations(MIGRATION_29_30) + .addMigrations(MIGRATION_30_31) + .addMigrations(MIGRATION_31_32) + .allowMainThreadQueries().fallbackToDestructiveMigration().build(); } public abstract KeepDao getKeepDao(); diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomSeekView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomSeekView.java index 7c2efaa2c..7d5692098 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomSeekView.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomSeekView.java @@ -88,14 +88,14 @@ public class CustomSeekView extends FrameLayout implements TimeBar.OnScrubListen if (bufferedChanged) { timeBar.setBufferedPosition(buffered); } + removeCallbacks(refresh); if (player.isEmpty()) { positionView.setText("00:00"); durationView.setText("00:00"); - timeBar.setPosition(currentDuration = 0); + timeBar.setPosition(currentPosition = 0); timeBar.setDuration(currentDuration = 0); - } - removeCallbacks(refresh); - if (player.isPlaying()) { + postDelayed(refresh, MIN_UPDATE_INTERVAL_MS); + } else if (player.isPlaying()) { postDelayed(refresh, delayMs(position)); } else { postDelayed(refresh, MAX_UPDATE_INTERVAL_MS);