fix: #34

Author: 石工

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 

gradle.properties

@@ -15,6 +15,6 @@
 COMPILE_SDK_VERSION=26
 BUILD_TOOLS_VERSION=26.0.3
 MIN_SDK_VERSION=14
-TARGET_SDK_VERSION=25
+TARGET_SDK_VERSION=22
 VERSION_CODE=201
 VERSION_NAME=2.1.0

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

lrcview/src/main/java/me/wcy/lrcview/LrcView.java

@@ -267,7 +267,12 @@ public void loadLrc(final File mainLrcFile, final File secondLrcFile) {
             public void run() {
                 reset();
 
-                final String flag = "file://" + mainLrcFile.getPath() + "#" + secondLrcFile.getPath();
+                StringBuilder sb = new StringBuilder("file://");
+                sb.append(mainLrcFile.getPath());
+                if (secondLrcFile != null) {
+                    sb.append("#").append(secondLrcFile.getPath());
+                }
+                final String flag = sb.toString();
                 setFlag(flag);
                 new AsyncTask<File, Integer, List<LrcEntry>>() {
                     @Override
@@ -309,7 +314,12 @@ public void loadLrc(final String mainLrcText, final String secondLrcText) {
             public void run() {
                 reset();
 
-                final String flag = "text://" + mainLrcText + "#" + secondLrcText;
+                StringBuilder sb = new StringBuilder("file://");
+                sb.append(mainLrcText);
+                if (secondLrcText != null) {
+                    sb.append("#").append(secondLrcText);
+                }
+                final String flag = sb.toString();
                 setFlag(flag);
                 new AsyncTask<String, Integer, List<LrcEntry>>() {
                     @Override

sample/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="me.wcy.lrcviewsample">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

sample/src/main/java/me/wcy/lrcviewsample/MainActivity.java

@@ -56,6 +56,9 @@ public void onCompletion(MediaPlayer mp) {
         String mainLrcText = getLrcText("send_it_en.lrc");
         String secondLrcText = getLrcText("send_it_cn.lrc");
         lrcView.loadLrc(mainLrcText, secondLrcText);
+        // File mainLrcFile = new File("/sdcard/Download/send_it_cn.lrc");
+        // File secondLrcFile = new File("/sdcard/Download/send_it_en.lrc");
+        // lrcView.loadLrc(mainLrcFile, secondLrcFile);
 
         lrcView.setDraggable(true, new LrcView.OnPlayClickListener() {
             @Override