diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java index ca44b3de0..2478fc65b 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java @@ -10,7 +10,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Configuration; -import android.net.Uri; import android.os.Build; import android.os.IBinder; import android.os.Parcelable; @@ -174,10 +173,4 @@ public class Util { return false; } - public static String getDownloadUrl(String url) { - if (url == null) return ""; - if (!url.startsWith("http://127.0.0.1:7777")) return url; - return Uri.parse(url).getQueryParameter("url"); - } - } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 363c60476..9acfe14ec 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1663,7 +1663,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onShare(CharSequence title, String url) { - if (IDMUtil.downloadFile(this, Util.getDownloadUrl(url), title.toString(), mPlayers.getHeaders(), false, false)) return; + if (IDMUtil.downloadFile(this, url, title.toString(), mPlayers.getHeaders(), false, false)) return; Intent intent = new Intent(Intent.ACTION_SEND); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(Intent.EXTRA_TEXT, url); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java index 0a582558b..afcdcae4a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java @@ -89,7 +89,7 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis protected void initView() { if (player == null) dismiss(); if (player == null) return; - binding.speed.setValue(Math.max(player.getSpeed(), 0.5f)); + binding.speed.setValue(Math.max(player.getSpeed(), 0.2f)); binding.player.setText(parent.control.action.player.getText()); binding.decode.setText(parent.control.action.decode.getText()); binding.ending.setText(parent.control.action.ending.getText()); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java index 9053c7eea..c59fcf8ed 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java @@ -1,6 +1,7 @@ package com.fongmi.android.tv.ui.dialog; import android.app.Activity; +import android.net.Uri; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -77,7 +78,7 @@ public class InfoDialog { } private void onShare(View view) { - callback.onShare(title, url); + callback.onShare(title, convert(url)); dialog.dismiss(); } @@ -87,6 +88,10 @@ public class InfoDialog { return true; } + private String convert(String url) { + return url.startsWith("http://127.0.0.1:7777") ? Uri.parse(url).getQueryParameter("url") : url; + } + public interface Listener { void onShare(CharSequence title, String url); diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml index 97acc5e21..e8d191620 100644 --- a/app/src/mobile/res/layout/dialog_control.xml +++ b/app/src/mobile/res/layout/dialog_control.xml @@ -19,8 +19,8 @@ android:id="@+id/speed" android:layout_width="match_parent" android:layout_height="wrap_content" - android:stepSize="0.25" - android:valueFrom="0.5" + android:stepSize="0.1" + android:valueFrom="0.2" android:valueTo="5" app:trackColorInactive="@color/blue_50" />