[mobile] update setting url to desc

pull/123/head
FongMi 3 years ago
parent 9c70733f9d
commit d941859a26
  1. 2
      app/build.gradle
  2. 4
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  3. 4
      app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java
  4. 14
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
  5. 1
      app/src/mobile/res/layout/activity_main.xml

@ -77,7 +77,7 @@ dependencies {
implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'cat.ereza:customactivityoncrash:2.4.0'
implementation 'com.github.bassaer:materialdesigncolors:1.0.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0'
implementation 'com.github.bumptech.glide:glide:4.14.2' implementation 'com.github.bumptech.glide:glide:4.14.2'
implementation 'com.google.android.material:material:1.8.0' implementation 'com.google.android.material:material:1.9.0-beta01'
implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
implementation 'com.google.zxing:core:3.3.0' implementation 'com.google.zxing:core:3.3.0'

@ -56,6 +56,10 @@ public class ApiConfig {
return get().getConfig().getUrl(); return get().getConfig().getUrl();
} }
public static String getDesc() {
return get().getConfig().getDesc();
}
public static int getHomeIndex() { public static int getHomeIndex() {
return get().getSites().indexOf(get().getHome()); return get().getSites().indexOf(get().getHome());
} }

@ -39,6 +39,10 @@ public class LiveConfig {
return get().getConfig().getUrl(); return get().getConfig().getUrl();
} }
public static String getDesc() {
return get().getConfig().getDesc();
}
public static int getHomeIndex() { public static int getHomeIndex() {
return get().getLives().indexOf(get().getHome()); return get().getLives().indexOf(get().getHome());
} }

@ -60,9 +60,9 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
@Override @Override
protected void initView() { protected void initView() {
mBinding.vodUrl.setText(ApiConfig.getUrl()); mBinding.vodUrl.setText(ApiConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getUrl());
mBinding.wallUrl.setText(WallConfig.getUrl()); mBinding.wallUrl.setText(WallConfig.getUrl());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.versionText.setText(BuildConfig.VERSION_NAME); mBinding.versionText.setText(BuildConfig.VERSION_NAME);
mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Prefers.getSize()]); mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Prefers.getSize()]);
mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Prefers.getScale()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Prefers.getScale()]);
@ -104,12 +104,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
switch (config.getType()) { switch (config.getType()) {
case 0: case 0:
Notify.progress(getActivity(), true); Notify.progress(getActivity(), true);
mBinding.vodUrl.setText(config.getUrl()); mBinding.vodUrl.setText(config.getDesc());
ApiConfig.get().clear().config(config).load(getCallback(config)); ApiConfig.get().clear().config(config).load(getCallback(config));
break; break;
case 1: case 1:
Notify.progress(getActivity(), true); Notify.progress(getActivity(), true);
mBinding.liveUrl.setText(config.getUrl()); mBinding.liveUrl.setText(config.getDesc());
LiveConfig.get().clear().config(config).load(getCallback(config)); LiveConfig.get().clear().config(config).load(getCallback(config));
break; break;
case 2: case 2:
@ -141,13 +141,13 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
case 0: case 0:
Notify.dismiss(); Notify.dismiss();
RefreshEvent.video(); RefreshEvent.video();
mBinding.vodUrl.setText(ApiConfig.getUrl()); mBinding.vodUrl.setText(ApiConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getUrl()); mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getUrl()); mBinding.wallUrl.setText(WallConfig.getUrl());
break; break;
case 1: case 1:
Notify.dismiss(); Notify.dismiss();
mBinding.liveUrl.setText(LiveConfig.getUrl()); mBinding.liveUrl.setText(LiveConfig.getDesc());
break; break;
case 2: case 2:
Notify.dismiss(); Notify.dismiss();

@ -19,7 +19,6 @@
android:background="@color/white_15" android:background="@color/white_15"
app:elevation="0dp" app:elevation="0dp"
app:itemIconTint="@color/nav" app:itemIconTint="@color/nav"
app:itemTextColor="@color/white"
app:labelVisibilityMode="unlabeled" app:labelVisibilityMode="unlabeled"
app:menu="@menu/menu_nav" /> app:menu="@menu/menu_nav" />

Loading…
Cancel
Save