diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java index 049e044e..bca5c904 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java @@ -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, Hawk.get(HawkConfig.API_URL))); + inputApiLive.setText(Hawk.get(HawkConfig.LIVE_API_URL, "")); findViewById(R.id.inputSubmit).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java index 30d2ded1..60862daf 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java @@ -126,6 +126,7 @@ 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) { @@ -319,6 +320,7 @@ public class ModelSettingFragment extends BaseLazyFragment { @Override public void click(String value) { Hawk.put(HawkConfig.API_URL, value); + Hawk.put(HawkConfig.LIVE_API_URL, value); tvApi.setText(value); dialog.dismiss(); } diff --git a/app/src/main/res/layout/dialog_api.xml b/app/src/main/res/layout/dialog_api.xml index b554f1c6..664627d1 100644 --- a/app/src/main/res/layout/dialog_api.xml +++ b/app/src/main/res/layout/dialog_api.xml @@ -56,7 +56,7 @@ android:focusable="true" android:gravity="center" android:padding="@dimen/vs_10" - android:text="直播历史" + android:text="历史直播" android:textColor="@color/color_FFFFFF" android:textSize="@dimen/ts_22" android:layout_marginRight="@dimen/vs_5" />