Merge pull request #303 from okcaptain/dev

Dev

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java

@@ -13,6 +13,8 @@ import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.utils.ResUtil;
 
+import java.util.Locale;
+
 public class SettingCustomActivity extends BaseActivity {
 
     private ActivitySettingCustomBinding mBinding;
@@ -45,7 +47,7 @@ public class SettingCustomActivity extends BaseActivity {
         mBinding.displayNetspeedText.setText(getSwitch(Setting.isDisplaySpeed()));
         mBinding.displayDurationText.setText(getSwitch(Setting.isDisplayDuration()));
         mBinding.displayMiniProgressText.setText(getSwitch(Setting.isDisplayMiniProgress()));
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
         mBinding.fullscreenMenuKeyText.setText((fullscreenMenuKey = ResUtil.getStringArray(R.array.select_fullscreen_menu_key))[Setting.getFullscreenMenuKey()]);
         mBinding.homeSiteLockText.setText(getSwitch(Setting.isHomeSiteLock()));
         mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
@@ -109,17 +111,21 @@ public class SettingCustomActivity extends BaseActivity {
         mBinding.displayMiniProgressText.setText(getSwitch(Setting.isDisplayMiniProgress()));
     }
 
+    private String getSpeedText() {
+        return String.format(Locale.getDefault(), "%.2f", Setting.getPlaySpeed());
+    }
+
     private void setSpeed(View view) {
         float speed = Setting.getPlaySpeed();
-        float addon = speed >= 2 ? 1f : 0.1f;
+        float addon = speed >= 2 ? 1.0f : 0.1f;
         speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f);
         Setting.putPlaySpeed(speed);
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
     }
 
     private boolean resetSpeed(View view) {
         Setting.putPlaySpeed(1.0f);
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
         return true;
     }
 

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -897,12 +897,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     }
 
     private void onSpeedAdd() {
-        mBinding.control.speed.setText(mPlayers.addSpeed(0.25f));
+        mBinding.control.speed.setText(mPlayers.addSpeed(0.1f));
         mHistory.setSpeed(mPlayers.getSpeed());
     }
 
     private void onSpeedSub() {
-        mBinding.control.speed.setText(mPlayers.subSpeed(0.25f));
+        mBinding.control.speed.setText(mPlayers.subSpeed(0.1f));
         mHistory.setSpeed(mPlayers.getSpeed());
     }
 

app/src/main/java/com/fongmi/android/tv/player/Players.java

@@ -306,8 +306,8 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
 
     public String addSpeed() {
         float speed = getSpeed();
-        float addon = speed >= 2 ? 1f : 0.25f;
+        float addon = speed >= 2 ? 1f : 0.1f;
-        speed = speed >= 5 ? 0.25f : Math.min(speed + addon, 5.0f);
+        speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f);
         return setSpeed(speed);
     }
 
@@ -319,7 +319,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
 
     public String subSpeed(float value) {
         float speed = getSpeed();
-        speed = Math.max(speed - value, 0.25f);
+        speed = Math.max(speed - value, 0.2f);
         return setSpeed(speed);
     }
 

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java

@@ -16,6 +16,8 @@ import com.fongmi.android.tv.ui.base.BaseFragment;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import java.util.Locale;
+
 public class SettingCustomFragment extends BaseFragment {
 
     private FragmentSettingCustomBinding mBinding;
@@ -38,7 +40,7 @@ public class SettingCustomFragment extends BaseFragment {
     protected void initView() {
         mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]);
         mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync()));
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
         mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
     }
 
@@ -71,17 +73,21 @@ public class SettingCustomFragment extends BaseFragment {
         mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync()));
     }
 
+    private String getSpeedText() {
+        return String.format(Locale.getDefault(), "%.2f", Setting.getPlaySpeed());
+    }
+
     private void setSpeed(View view) {
         float speed = Setting.getPlaySpeed();
-        float addon = speed >= 2 ? 1f : 0.1f;
+        float addon = speed >= 2 ? 1.0f : 0.1f;
         speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f);
         Setting.putPlaySpeed(speed);
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
     }
 
     private boolean resetSpeed(View view) {
         Setting.putPlaySpeed(1.0f);
-        mBinding.speedText.setText(Setting.getPlaySpeed() + "x");
+        mBinding.speedText.setText(getSpeedText());
         return true;
     }