Update: 1. 自动重启B站客户端

2. 学了一下SQL语言(map, filter)
3. 设置内添加了一项
TODO: 自动关闭SSR
看看能不能直接从B站下资源?

Author: Brainor

.idea/vcs.xml

@@ -6,8 +6,8 @@ android {
         applicationId "com.brainor.bilihelper"
         minSdkVersion 24
         targetSdkVersion 26
-        versionCode 7
-        versionName '1.6'
+        versionCode 8
+        versionName '1.7'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "zh"
     }
@@ -40,10 +40,10 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0-alpha02'
 }

app/build.gradle

@@ -43,7 +43,8 @@
             android:label="@string/about"
             android:parentActivityName=".MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".Settings"
+        <activity
+            android:name=".Settings"
             android:label="@string/action_settings"
             android:parentActivityName=".MainActivity" />
     </application>

app/src/androidTest/java/com/brainor/bilihelper/ExampleInstrumentedTest.java

@@ -44,8 +44,10 @@ protected void onCreate(Bundle savedInstanceState) {
                 "<h1><a id=\"_15\"></a>已知问题</h1>\n" +
                 "<ol>\n" +
                 "<li>可能BiliPlus也没有相关资源的下载链接</li>\n" +
-                "<li>B站和BiliPlus提供的链接都是acgvideo.com域名下的, 需要特定的headers或者有IP限制, 会导致下载失败. 前者可以解决, 后者无法解决</li>\n" +
-                "</ol>\n", Html.FROM_HTML_MODE_LEGACY);
+                "<li>B站和BiliPlus提供的链接都是acgvideo.com域名下的, 需要特定的headers或者有IP限制, 会导致下载失败. 前者可以解决, 后者无法解决.</li>\n" +
+                "<li>B站账户必须超过5级才可以看会员视频(Biliplus限制).</li>" +
+                "<li><font color=\"red\"><b>目前Biliplus已挂.</b></font></li>" +
+                "</ol>\n", Html.FROM_HTML_SEPARATOR_LINE_BREAK_LIST_ITEM);
         aboutTextView.setText(styledText);
         aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
     }

app/src/main/AndroidManifest.xml

@@ -33,6 +33,7 @@
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -62,9 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
         titleTextView = findViewById(R.id.titleTextView);
         LoadCookies();
         LoadHistory();
-        Settings.videoQuality = VideoQuality.list[Arrays.asList(VideoQuality.getEntries()).indexOf(Objects.requireNonNull(getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("quality", VideoQuality._2.description)))];
+        Settings.videoQuality = VideoQuality.values()[Arrays.asList(VideoQuality.getEntries()).indexOf(Objects.requireNonNull(getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("quality", VideoQuality._2.description)))];
+        Settings.clientType=Stream.of(ClientType.values()).filter(item -> Objects.equals(item.packageName, getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("clientType", ClientType.release.packageName))).findFirst().get();
         Settings.clientDownload = getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("clientDown", true);
         searchButton.setOnClickListener(v -> {
+//            sendBroadcast(new Intent("com.github.shadowsocks.CLOSE"));
             String URL = inputTextView.getText().toString();
             new getList().execute(URL);
         });
@@ -85,20 +88,25 @@ protected void onCancelled(String errMsg) {
                     if (errMsg.contains("需要Cookies")) {
                         PopupWebview();
                     } else if (errMsg.contains("timeout"))
-                        Api.BiliplusHost = "https://" + (Api.BiliplusHost == "https://www.biliplus.com" ? "backup" : "www") + ".biliplus.com";
+                        Api.BiliplusHost = "https://" + (Api.BiliplusHost.equals("https://www.biliplus.com") ? "backup" : "www") + ".biliplus.com";
                 }
 
                 @Override
                 protected void onPostExecute(String successMsg) {
-                    if (successMsg.contains("成功"))
+                    if (successMsg.contains("成功")) {
                         Toast.makeText(MainActivity.this, successMsg, Toast.LENGTH_LONG).show();
+                        //重启哔哩哔哩
+                        Intent intent=getPackageManager().getLaunchIntentForPackage(Settings.clientType.packageName);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                        startActivity(intent);
+                    }
                     else {//创建下载任务, 返回值是创建文件的路径
                         for (int i = 0; i < seriesInfo.downloadSegmentInfo.size(); i++) {
                             DownloadSegmentInfo downSegInfo = seriesInfo.downloadSegmentInfo.get(i);
                             EpInfo epInfo = seriesInfo.epInfo.get(seriesInfo.position);
                             DownloadTask(downSegInfo.url, successMsg + i + ".blv", seriesInfo.title + epInfo.index + epInfo.index_title + i);
                         }
-                        Toast.makeText(MainActivity.this, "成功: 正在下载文件", Toast.LENGTH_LONG).show();
+                        Toast.makeText(MainActivity.this, "成功: 正在下载文件\n需要关闭VPN", Toast.LENGTH_LONG).show();
                     }
                     int position = HistoryList.get(0).position;//历史记录中的位置
                     if (position != seriesInfo.position) {
@@ -301,6 +309,7 @@ static void StoreHistory(Context context) {
     }
 
     void DownloadTask(String url, String filePath, String title) {
+        //关闭VPN
         DownloadManager downloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
         DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
         request.setAllowedOverMetered(false);

app/src/main/java/com/brainor/bilihelper/AboutSettingsActivity.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 import androidx.annotation.NonNull;
 
@@ -56,13 +57,18 @@ public String toString() {
 }
 
 enum ClientType {
-    release("tv.danmaku.bili/download/"),//正式版
-    blue("com.bilibili.app.blue/download/"),//概念版
-    play("com.bilibili.app.in/download/");//Play商店版
+    release("tv.danmaku.bili"),//正式版
+    blue("com.bilibili.app.blue"),//概念版
+    play("com.bilibili.app.in");//Play商店版
     String appPath;
+    String packageName;
 
-    ClientType(String appPath) {
-        this.appPath = appPath;
+    ClientType(String packageName) {
+        this.appPath = packageName + "/download/";
+        this.packageName = packageName;
+    }
+    public static String[] getEntries() {
+        return Stream.of(ClientType.values()).map(cT -> cT.packageName).toArray(String[]::new);
     }
 }
 
@@ -111,11 +117,7 @@ enum VideoQuality {
         this.description = description;
     }
 
-    static VideoQuality[] list = VideoQuality.values();
-
     public static String[] getEntries() {
-        String[] entries = new String[list.length];
-        for (int i = 0; i < list.length; i++) entries[i] = list[i].description;
-        return entries;
+        return Stream.of(VideoQuality.values()).map(vQ -> vQ.description).toArray(String[]::new);
     }
 }

app/src/main/java/com/brainor/bilihelper/MainActivity.java

@@ -5,13 +5,19 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
+import android.widget.RelativeLayout;
 
 import java.util.Arrays;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceGroupAdapter;
 import androidx.preference.PreferenceScreen;
@@ -38,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     public static class MySettingsFragment extends PreferenceFragmentCompat {
+
         @Override//去除前面的空白
         protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
             return new PreferenceGroupAdapter(preferenceScreen) {
@@ -58,36 +65,75 @@ public void onBindViewHolder(PreferenceViewHolder holder, int position) {
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             Context context = getPreferenceManager().getContext();
             PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(context);
+            screen.setIconSpaceReserved(false);
 
-            ListPreference quality = new ListPreference(context);
-            quality.setKey("quality");
-            quality.setEntries(VideoQuality.getEntries());
-            quality.setEntryValues(VideoQuality.getEntries());
-            quality.setTitle("视频清晰度");
-            quality.setSummary(PreferenceManager.getDefaultSharedPreferences(quality.getContext()).getString(quality.getKey(), VideoQuality._2.description));
-            quality.setValue((String) quality.getSummary());
-            quality.setOnPreferenceChangeListener((preference, newValue) -> {
-                preference.setSummary(newValue.toString());
-                videoQuality = VideoQuality.list[Arrays.asList(VideoQuality.getEntries()).indexOf(newValue.toString())];
+            PreferenceCategory downCategory = new PreferenceCategory(context) {
+                @Override
+                public void onBindViewHolder(PreferenceViewHolder holder) {
+                    super.onBindViewHolder(holder);
+                    holder.itemView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT));
+                }
+            };
+            downCategory.setTitle("下载设置");
+
+            ListPreference qualityList = new ListPreference(context);
+            qualityList.setNegativeButtonText("");
+            qualityList.setKey("quality");
+            qualityList.setEntries(VideoQuality.getEntries());
+            qualityList.setEntryValues(VideoQuality.getEntries());
+            qualityList.setTitle("视频清晰度");
+            qualityList.setSummary(PreferenceManager.getDefaultSharedPreferences(context).getString(qualityList.getKey(), VideoQuality._2.description));
+            qualityList.setValue((String) qualityList.getSummary());
+            qualityList.setOnPreferenceChangeListener((preference, newValue) -> {
+                preference.setSummary((String) newValue);
+                videoQuality = Stream.of(VideoQuality.values()).filter(item -> Objects.equals(item.description, newValue)).findFirst().get();
+//                videoQuality = VideoQuality.values()[Arrays.asList(VideoQuality.getEntries()).indexOf(newValue.toString())];
                 return true;
             });
+
             SwitchPreference clientDownloadSwitch = new SwitchPreference(context);
             clientDownloadSwitch.setSummaryOn("B站");
             clientDownloadSwitch.setSummaryOff("系统");
             clientDownloadSwitch.setKey("clientDown");
-            clientDownloadSwitch.setChecked(PreferenceManager.getDefaultSharedPreferences(clientDownloadSwitch.getContext()).getBoolean(clientDownloadSwitch.getKey(), true));
+            clientDownloadSwitch.setChecked(PreferenceManager.getDefaultSharedPreferences(context).getBoolean(clientDownloadSwitch.getKey(), true));
             clientDownloadSwitch.setTitle("下载方式");
             clientDownloadSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
                 clientDownload = (boolean) newValue;
                 return true;
             });
 
-            screen.addPreference(quality);
-            screen.addPreference(clientDownloadSwitch);
-            setPreferenceScreen(screen);
+            PreferenceCategory paraCategory = new PreferenceCategory(context) {
+                @Override
+                public void onBindViewHolder(PreferenceViewHolder holder) {
+                    super.onBindViewHolder(holder);
+                    holder.itemView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT));
+                }
+            };
+            paraCategory.setTitle("参数设置");
 
-        }
+            ListPreference clientTypeList = new ListPreference(context);
+            clientTypeList.setNegativeButtonText("");
+            clientTypeList.setKey("clientType");
+            clientTypeList.setEntries(ClientType.getEntries());
+            Set<String> packageNames = context.getPackageManager().getInstalledApplications(0).stream().map(item -> item.packageName).collect(Collectors.toSet());
+            clientTypeList.setEntries(Stream.of(ClientType.values()).map(cT -> cT.packageName).filter(item -> !packageNames.add(item)).toArray(String[]::new));
+            clientTypeList.setEntryValues(clientTypeList.getEntries());
+            clientTypeList.setTitle("客户端类型");
+            clientTypeList.setSummary(PreferenceManager.getDefaultSharedPreferences(context).getString(clientTypeList.getKey(), ClientType.release.packageName));
+            clientTypeList.setValue((String) clientTypeList.getSummary());
+            clientTypeList.setOnPreferenceChangeListener((preference, newValue) -> {
+                preference.setSummary(newValue.toString());
+                clientType = ClientType.values()[Arrays.asList(ClientType.getEntries()).indexOf((String) newValue)];
+                return true;
+            });
 
+            screen.addPreference(downCategory);
+            downCategory.addPreference(qualityList);
+            downCategory.addPreference(clientDownloadSwitch);
+            screen.addPreference(paraCategory);
+            paraCategory.addPreference(clientTypeList);
+            setPreferenceScreen(screen);
+        }
     }
 
 }