fongmi
jhengazuki 1 month ago
parent c8c5de3baf
commit 3da886a0a1
  1. 1
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  2. 43
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
  3. 35
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java

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

@ -43,6 +43,9 @@ import com.github.catvod.bean.Doh;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Path;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
@ -140,18 +143,15 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
case 0:
Notify.progress(this);
VodConfig.load(config, getCallback(0));
mBinding.vodUrl.setText(config.getDesc());
break;
case 1:
Notify.progress(this);
LiveConfig.load(config, getCallback(1));
mBinding.liveUrl.setText(config.getDesc());
break;
case 2:
Setting.putWall(0);
Notify.progress(this);
WallConfig.load(config, getCallback(2));
mBinding.wallUrl.setText(config.getDesc());
break;
}
}
@ -177,29 +177,12 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
}
private void setConfig(int type) {
switch (type) {
case 0:
setCacheText();
Notify.dismiss();
RefreshEvent.video();
RefreshEvent.config();
RefreshEvent.history();
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
break;
case 1:
setCacheText();
Notify.dismiss();
RefreshEvent.config();
mBinding.liveUrl.setText(LiveConfig.getDesc());
break;
case 2:
setCacheText();
Notify.dismiss();
mBinding.wallUrl.setText(WallConfig.getDesc());
break;
}
setCacheText();
Notify.dismiss();
RefreshEvent.config();
if (type != 0) return;
RefreshEvent.video();
RefreshEvent.history();
}
@Override
@ -352,6 +335,14 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
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());
}
private final ActivityResultLauncher<Intent> launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
if (result.getResultCode() != RESULT_OK || result.getData() == null || result.getData().getData() == null) return;
setConfig(Config.find("file:/" + FileChooser.getPathFromUri(result.getData().getData()).replace(Path.rootPath(), ""), type));

@ -88,14 +88,9 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
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
protected void initView() {
EventBus.getDefault().register(this);
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
@ -158,18 +153,15 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
case 0:
Notify.progress(requireActivity());
VodConfig.load(config, getCallback(0));
mBinding.vodUrl.setText(config.getDesc());
break;
case 1:
Notify.progress(requireActivity());
LiveConfig.load(config, getCallback(1));
mBinding.liveUrl.setText(config.getDesc());
break;
case 2:
Setting.putWall(0);
Notify.progress(requireActivity());
WallConfig.load(config, getCallback(2));
mBinding.wallUrl.setText(config.getDesc());
break;
}
}
@ -195,24 +187,10 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
}
private void setConfig(int type) {
switch (type) {
case 0:
setCacheText();
Notify.dismiss();
RefreshEvent.video();
RefreshEvent.config();
break;
case 1:
setCacheText();
Notify.dismiss();
RefreshEvent.config();
break;
case 2:
setCacheText();
Notify.dismiss();
mBinding.wallUrl.setText(WallConfig.getDesc());
break;
}
setCacheText();
Notify.dismiss();
RefreshEvent.config();
if (type == 0) RefreshEvent.video();
}
@Override
@ -380,9 +358,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
@Override
public void onHiddenChanged(boolean hidden) {
if (hidden) return;
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
setCacheText();
}

Loading…
Cancel
Save