diff --git a/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java b/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java index 656f963f..a3f72200 100644 --- a/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java +++ b/app/src/main/java/com/github/tvbox/osc/server/ControlManager.java @@ -71,7 +71,6 @@ public class ControlManager { @Override public void onApiReceived(String url) { - Hawk.put(HawkConfig.API_URL, url); EventBus.getDefault().post(new RefreshEvent(RefreshEvent.TYPE_API_URL_CHANGE, url)); } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java index a15357a1..9b24049b 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java @@ -406,9 +406,7 @@ public class HomeActivity extends BaseActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void refresh(RefreshEvent event) { - if (event.type == RefreshEvent.TYPE_API_URL_CHANGE) { - Toast.makeText(mContext, "配置地址设置为" + (String) event.obj + ",重启应用生效!", Toast.LENGTH_SHORT).show(); - } else if (event.type == RefreshEvent.TYPE_PUSH_URL) { + if (event.type == RefreshEvent.TYPE_PUSH_URL) { if (ApiConfig.get().getSource("push_agent") != null) { Intent newIntent = new Intent(mContext, DetailActivity.class); newIntent.putExtra("id", (String) event.obj); 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 1b39f98a..2a00358d 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 @@ -11,6 +11,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import com.github.tvbox.osc.R; +import com.github.tvbox.osc.event.RefreshEvent; import com.github.tvbox.osc.server.ControlManager; import com.github.tvbox.osc.ui.adapter.ApiHistoryDialogAdapter; import com.github.tvbox.osc.ui.tv.QRCodeGen; @@ -20,6 +21,8 @@ import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; import com.orhanobut.hawk.Hawk; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -38,6 +41,13 @@ public class ApiDialog extends BaseDialog { private TextView tvAddress; private EditText inputApi; + @Subscribe(threadMode = ThreadMode.MAIN) + public void refresh(RefreshEvent event) { + if (event.type == RefreshEvent.TYPE_API_URL_CHANGE) { + inputApi.setText((String) event.obj); + } + } + public ApiDialog(@NonNull @NotNull Context context) { super(context); setContentView(R.layout.dialog_api); 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 e7262cb6..d16eac17 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 @@ -26,6 +26,7 @@ import com.github.tvbox.osc.util.PlayerHelper; import com.github.tvbox.osc.util.XWalkUtils; import com.orhanobut.hawk.Hawk; +import org.greenrobot.eventbus.EventBus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -173,6 +174,7 @@ public class ModelSettingFragment extends BaseLazyFragment { public void onClick(View v) { FastClickCheckUtil.check(v); ApiDialog dialog = new ApiDialog(mActivity); + EventBus.getDefault().register(dialog); dialog.setOnListener(new ApiDialog.OnListener() { @Override public void onchange(String api) { @@ -184,6 +186,7 @@ public class ModelSettingFragment extends BaseLazyFragment { @Override public void onDismiss(DialogInterface dialog) { ((BaseActivity) mActivity).hideSysBar(); + EventBus.getDefault().unregister(dialog); } }); dialog.show(); diff --git a/app/src/main/res/layout/fragment_model.xml b/app/src/main/res/layout/fragment_model.xml index d0b8f047..9b9a8caa 100644 --- a/app/src/main/res/layout/fragment_model.xml +++ b/app/src/main/res/layout/fragment_model.xml @@ -407,6 +407,48 @@ android:textSize="@dimen/ts_30" /> + + + + + + + + + + +