pull/123/head
FongMi 3 years ago
parent ad0300e394
commit 9bc7ba4497
  1. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
  2. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
  3. 17
      app/src/main/java/com/fongmi/android/tv/api/WallConfig.java

@ -123,7 +123,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
LiveConfig.get().clear().config(config).load(getCallback());
break;
case 2:
Notify.progress(this);
mBinding.wallUrl.setText(config.getUrl());
WallConfig.get().clear().config(config).load(getCallback());
break;
@ -158,7 +157,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
Notify.dismiss();
break;
case 2:
Notify.dismiss();
mBinding.wallUrl.setText(WallConfig.getUrl());
break;
}
@ -210,6 +208,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
}
private void setWallRefresh() {
WallConfig.get().load(new Callback());
WallConfig.get().load();
}
}

@ -97,10 +97,9 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
}
private void onPositive(View view) {
String text = binding.text.getText().toString().trim();
Config item = Config.find(Utils.checkClan(text), type);
String text = Utils.checkClan(binding.text.getText().toString().trim());
if (!url.equals(text)) callback.setConfig(Config.find(text, type));
if (text.isEmpty()) Config.delete(url, type);
callback.setConfig(item);
dialog.dismiss();
}

@ -11,6 +11,7 @@ import com.fongmi.android.tv.utils.FileUtil;
import com.fongmi.android.tv.utils.Prefers;
import java.io.File;
import java.io.IOException;
public class WallConfig {
@ -49,16 +50,17 @@ public class WallConfig {
this.url = url;
}
public void load() {
load(new Callback());
}
public void load(Callback callback) {
new Thread(() -> parse(callback)).start();
}
private void parse(Callback callback) {
try {
File file = FileUtil.getWall(0);
if (url.startsWith("file")) FileUtil.copy(FileUtil.getLocal(url), file);
else if (url.startsWith("http")) FileUtil.write(file, OKHttp.newCall(url).execute().body().bytes());
else file.delete();
File file = write(FileUtil.getWall(0));
if (file.exists() && file.length() > 0) refresh(0);
else setUrl(ApiConfig.get().getWall());
handler.post(callback::success);
@ -69,6 +71,13 @@ public class WallConfig {
}
}
private File write(File file) throws IOException {
if (url.startsWith("file")) FileUtil.copy(FileUtil.getLocal(url), file);
else if (url.startsWith("http")) FileUtil.write(file, OKHttp.newCall(url).execute().body().bytes());
else file.delete();
return file;
}
public static void refresh(int index) {
Prefers.putWall(index);
RefreshEvent.wall();

Loading…
Cancel
Save