fix live setting bug

pull/142/head
于俊 1 year ago
parent a9b3795bd3
commit 51003577bd
  1. 3
      app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
  2. 10
      app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java
  3. 14
      app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java
  4. 1
      app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java

@ -447,7 +447,8 @@ public class ApiConfig {
}
// 直播源
if(apiUrl.equals(Hawk.get(HawkConfig.LIVE_API_URL,""))){
String live_api_url=Hawk.get(HawkConfig.LIVE_API_URL,"");
if(live_api_url.isEmpty() || apiUrl.equals(live_api_url)){
LOG.i("echo-load-config_live");
initLiveSettings();
if(infoJson.has("lives")){

@ -1548,8 +1548,14 @@ public class LivePlayActivity extends BaseActivity {
if(Hawk.get(HawkConfig.LIVE_GROUP_INDEX, 0)!=0){
Hawk.put(HawkConfig.LIVE_GROUP_INDEX, 0);
JsonArray live_groups=Hawk.get(HawkConfig.LIVE_GROUP_LIST,new JsonArray());
JsonObject livesOBJ = live_groups.get(0).getAsJsonObject();
ApiConfig.get().loadLiveApi(livesOBJ);
if(!live_groups.isEmpty()){
JsonObject livesOBJ = live_groups.get(0).getAsJsonObject();
ApiConfig.get().loadLiveApi(livesOBJ);
}else {
Toast.makeText(App.getInstance(), "频道列表为空", Toast.LENGTH_SHORT).show();
finish();
return;
}
}else {
Toast.makeText(App.getInstance(), "频道列表为空", Toast.LENGTH_SHORT).show();
finish();

@ -61,7 +61,7 @@ public class ApiDialog extends BaseDialog {
inputApiLive = findViewById(R.id.inputLive);
//内置网络接口在此处添加
inputApi.setText(Hawk.get(HawkConfig.API_URL, ""));
inputApiLive.setText(Hawk.get(HawkConfig.LIVE_API_URL, ""));
inputApiLive.setText(Hawk.get(HawkConfig.LIVE_API_URL, Hawk.get(HawkConfig.API_URL)));
findViewById(R.id.inputSubmit).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -89,16 +89,16 @@ public class ApiDialog extends BaseDialog {
String newApi = inputApiLive.getText().toString().trim();
if (!newApi.isEmpty()) {
ArrayList<String> history = Hawk.get(HawkConfig.LIVE_API_HISTORY, new ArrayList<String>());
if (!history.contains(newApi))
if (!history.contains(newApi)) {
history.add(0, newApi);
if (history.size() > 30)
}
if (history.size() > 30) {
history.remove(30);
}
Hawk.put(HawkConfig.LIVE_API_HISTORY, history);
Hawk.put(HawkConfig.LIVE_API_URL, newApi);
inputApiLive.setText(newApi);
dismiss();
}
Hawk.put(HawkConfig.LIVE_API_URL, newApi);
dismiss();
}
});
findViewById(R.id.apiHistory).setOnClickListener(new View.OnClickListener() {

@ -126,7 +126,6 @@ public class ModelSettingFragment extends BaseLazyFragment {
tvPlay.setText(PlayerHelper.getPlayerName(Hawk.get(HawkConfig.PLAY_TYPE, 0)));
tvRender.setText(PlayerHelper.getRenderName(Hawk.get(HawkConfig.PLAY_RENDER, 0)));
tvIjkCachePlay.setText(Hawk.get(HawkConfig.IJK_CACHE_PLAY, false) ? "开启" : "关闭");
if("".equals(Hawk.get(HawkConfig.LIVE_API_URL,"")) && !Hawk.get(HawkConfig.API_URL,"").isEmpty())Hawk.put(HawkConfig.LIVE_API_URL,Hawk.get(HawkConfig.API_URL));
findViewById(R.id.llDebug).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

Loading…
Cancel
Save