diff --git a/app/src/main/res/drawable/ic_filter_off.xml b/app/src/leanback/res/drawable/ic_type_filter_off.xml similarity index 100% rename from app/src/main/res/drawable/ic_filter_off.xml rename to app/src/leanback/res/drawable/ic_type_filter_off.xml diff --git a/app/src/main/res/drawable/ic_filter_on.xml b/app/src/leanback/res/drawable/ic_type_filter_on.xml similarity index 100% rename from app/src/main/res/drawable/ic_filter_on.xml rename to app/src/leanback/res/drawable/ic_type_filter_on.xml diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Class.java b/app/src/main/java/com/fongmi/android/tv/bean/Class.java index f81dc2bc8..270f0e8d0 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Class.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Class.java @@ -72,7 +72,7 @@ public class Class { } public int getIcon() { - return getFilter() == null ? 0 : getFilter() ? R.drawable.ic_filter_off_small : R.drawable.ic_filter_on_small; + return getFilter() == null ? 0 : getFilter() ? R.drawable.ic_type_filter_off : R.drawable.ic_type_filter_on; } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index e7e4c7607..37992b257 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -9,10 +9,12 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.ApiConfig; import com.fongmi.android.tv.api.LiveConfig; +import com.fongmi.android.tv.api.Updater; import com.fongmi.android.tv.api.WallConfig; import com.fongmi.android.tv.databinding.ActivityMainBinding; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.net.Callback; +import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.fragment.SettingFragment; import com.fongmi.android.tv.ui.fragment.VodFragment; import com.fongmi.android.tv.utils.Notify; @@ -54,6 +56,8 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt WallConfig.get().init(); LiveConfig.get().init(); ApiConfig.get().init().load(getCallback()); + Updater.get().start(this); + Server.get().start(); } private Callback getCallback() { @@ -83,4 +87,19 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt return false; } } + + @Override + public void onBackPressed() { + super.onBackPressed(); + finish(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + WallConfig.get().clear(); + LiveConfig.get().clear(); + ApiConfig.get().clear(); + Server.get().stop(); + } } diff --git a/app/src/main/res/drawable/ic_filter_off_small.xml b/app/src/mobile/res/drawable/ic_type_filter_off.xml similarity index 90% rename from app/src/main/res/drawable/ic_filter_off_small.xml rename to app/src/mobile/res/drawable/ic_type_filter_off.xml index 14e61c955..9cf37244a 100644 --- a/app/src/main/res/drawable/ic_filter_off_small.xml +++ b/app/src/mobile/res/drawable/ic_type_filter_off.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/drawable/ic_filter_on_small.xml b/app/src/mobile/res/drawable/ic_type_filter_on.xml similarity index 88% rename from app/src/main/res/drawable/ic_filter_on_small.xml rename to app/src/mobile/res/drawable/ic_type_filter_on.xml index 11c2b145f..68391885a 100644 --- a/app/src/main/res/drawable/ic_filter_on_small.xml +++ b/app/src/mobile/res/drawable/ic_type_filter_on.xml @@ -1,6 +1,6 @@ diff --git a/app/src/mobile/res/layout/adapter_config.xml b/app/src/mobile/res/layout/adapter_config.xml index d2a5f929b..c5a6e322e 100644 --- a/app/src/mobile/res/layout/adapter_config.xml +++ b/app/src/mobile/res/layout/adapter_config.xml @@ -8,7 +8,7 @@ diff --git a/app/src/mobile/res/layout/adapter_site.xml b/app/src/mobile/res/layout/adapter_site.xml index 8ccfcc18d..b9f952478 100644 --- a/app/src/mobile/res/layout/adapter_site.xml +++ b/app/src/mobile/res/layout/adapter_site.xml @@ -9,7 +9,7 @@ @@ -32,10 +32,10 @@ diff --git a/app/src/mobile/res/layout/dialog_live.xml b/app/src/mobile/res/layout/dialog_live.xml index 5c71ec7bf..0aa7da958 100644 --- a/app/src/mobile/res/layout/dialog_live.xml +++ b/app/src/mobile/res/layout/dialog_live.xml @@ -6,4 +6,4 @@ android:layout_height="wrap_content" android:padding="16dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:maxHeight="296dp" /> \ No newline at end of file + app:maxHeight="286dp" /> \ No newline at end of file