Merge pull request #230 from okcaptain/dev

update

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 222
-        versionName "0117"
+        versionName "0118"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

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

@@ -415,9 +415,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
 
     private void setDanmuView() {
         int maxLine = Setting.getDanmuLine(3);
+        int danmuSpeed = Setting.getDanmuSpeed();
         mPlayers.setDanmuView(mBinding.danmaku);
         float alpha = Setting.getDanmuAlpha() / 100.0f;
-        float speed = 1.6f - Setting.getDanmuSpeed() * 0.2f;
+        float[] speedRange = {2.4f, 1.8f, 1.2f, 0.8f };
+        float speed = danmuSpeed < speedRange.length ? speedRange[danmuSpeed] : 1.2f;
         HashMap<Integer, Integer> maxLines = new HashMap<>();
         maxLines.put(BaseDanmaku.TYPE_FIX_TOP, maxLine);
         maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, maxLine);

app/src/main/java/com/fongmi/android/tv/Setting.java

@@ -250,7 +250,7 @@ public class Setting {
     }
 
     public static boolean isDanmuLoad() {
-        return Prefers.getBoolean("danmu_load");
+        return Prefers.getBoolean("danmu_load", true);
     }
 
     public static void putDanmuLoad(boolean load) {

app/src/main/res/values-zh-rCN/strings.xml

@@ -156,7 +156,6 @@
         <item>慢</item>
         <item>适中</item>
         <item>快</item>
-        <item>超快</item>
     </string-array>
 
     <string-array name="select_quality">

app/src/main/res/values-zh-rTW/strings.xml

@@ -156,7 +156,6 @@
         <item>慢</item>
         <item>適中</item>
         <item>快</item>
-        <item>超快</item>
     </string-array>
 
     <string-array name="select_quality">

app/src/main/res/values/strings.xml

@@ -156,7 +156,6 @@
         <item>Slow</item>
         <item>Moderate</item>
         <item>Fast</item>
-        <item>Super fast</item>
     </string-array>
 
     <string-array name="select_render">

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

@@ -413,9 +413,11 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
 
     private void setDanmuView() {
         int maxLine = Setting.getDanmuLine(2);
+        int danmuSpeed = Setting.getDanmuSpeed();
         mPlayers.setDanmuView(mBinding.danmaku);
         float alpha = Setting.getDanmuAlpha() / 100.0f;
-        float speed = 1.6f - Setting.getDanmuSpeed() * 0.2f;
+        float[] speedRange = {2.4f, 1.8f, 1.2f, 0.8f };
+        float speed = danmuSpeed < speedRange.length ? speedRange[danmuSpeed] : 1.2f;
         HashMap<Integer, Integer> maxLines = new HashMap<>();
         maxLines.put(BaseDanmaku.TYPE_FIX_TOP, maxLine);
         maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, maxLine);