fongmi
jhengazuki 2 months ago
parent 023c197642
commit c8c5de3baf
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  2. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 29
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java

@ -110,7 +110,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
mBinding.progressLayout.showProgress(); mBinding.progressLayout.showProgress();
PermissionUtil.requestNotify(this); PermissionUtil.requestNotify(this);
Updater.create().start(this); Updater.create().start(this);
mResult = Result.empty();
Server.get().start(); Server.get().start();
setRecyclerView(); setRecyclerView();
setViewModel(); setViewModel();
@ -199,7 +198,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override @Override
public void error(String msg) { public void error(String msg) {
mBinding.progressLayout.showContent(); mBinding.progressLayout.showContent();
mResult = Result.empty();
Notify.show(msg); Notify.show(msg);
setFocus(); setFocus();
setFunc(); setFunc();

@ -721,6 +721,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
public void success() { public void success() {
Notify.dismiss(); Notify.dismiss();
setLive(getHome()); setLive(getHome());
RefreshEvent.config();
} }
@Override @Override

@ -2,6 +2,7 @@ package com.fongmi.android.tv.ui.fragment;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -47,6 +48,10 @@ import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Path; import com.github.catvod.utils.Path;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -83,6 +88,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
return mBinding = FragmentSettingBinding.inflate(inflater, container, false); return mBinding = FragmentSettingBinding.inflate(inflater, container, false);
} }
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
EventBus.getDefault().register(this);
}
@Override @Override
protected void initView() { protected void initView() {
mBinding.vodUrl.setText(VodConfig.getDesc()); mBinding.vodUrl.setText(VodConfig.getDesc());
@ -190,15 +201,11 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
Notify.dismiss(); Notify.dismiss();
RefreshEvent.video(); RefreshEvent.video();
RefreshEvent.config(); RefreshEvent.config();
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
break; break;
case 1: case 1:
setCacheText(); setCacheText();
Notify.dismiss(); Notify.dismiss();
RefreshEvent.config(); RefreshEvent.config();
mBinding.liveUrl.setText(LiveConfig.getDesc());
break; break;
case 2: case 2:
setCacheText(); setCacheText();
@ -362,6 +369,14 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
VodConfig.get().init().load(getCallback(0)); VodConfig.get().init().load(getCallback(0));
} }
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreshEvent(RefreshEvent event) {
if (event.getType() != RefreshEvent.Type.CONFIG) return;
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
}
@Override @Override
public void onHiddenChanged(boolean hidden) { public void onHiddenChanged(boolean hidden) {
if (hidden) return; if (hidden) return;
@ -371,6 +386,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
setCacheText(); setCacheText();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
EventBus.getDefault().unregister(this);
}
private final ActivityResultLauncher<Intent> launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { private final ActivityResultLauncher<Intent> launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
if (result.getResultCode() != Activity.RESULT_OK || result.getData() == null || result.getData().getData() == null) return; if (result.getResultCode() != Activity.RESULT_OK || result.getData() == null || result.getData().getData() == null) return;
setConfig(Config.find("file:/" + FileChooser.getPathFromUri(result.getData().getData()).replace(Path.rootPath(), ""), type)); setConfig(Config.find("file:/" + FileChooser.getPathFromUri(result.getData().getData()).replace(Path.rootPath(), ""), type));

Loading…
Cancel
Save