From b2fb77d9479221dc9fd2e633a9a2fe7ff59df5a5 Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 18 Oct 2018 23:10:38 +0800
Subject: [PATCH] =?UTF-8?q?APK=E5=9B=BE=E7=89=87=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=BD=AE=E6=92=AD=E6=B5=81=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=8A=93=E5=8F=96=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?4.2=E7=89=88=E6=9C=AC=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  |  2 +-
 .../main/java/com/duolebo/blyrobot/data/Task.kt   |  1 +
 .../java/com/duolebo/blyrobot/util/AppUtil.kt     | 15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b682b3f..7102391 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 static def releaseTime() {
-    return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
+    return new Date().format("yyyyMMddHHmm", TimeZone.getTimeZone("UTC"))
 }
 
 android {
diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
index 70fd195..ba10a19 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -256,6 +256,7 @@ class Task : IAppBaseCallback {
 
                 if (add) {
                     // 这里进行媒体视频播放地址识别
+                    add = false
                     val extArr = this.apkInfo.mediaExt.split("|")
                     for (ext in extArr) {
                         if (url.contains(ext)) {
diff --git a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
index f027431..9e6d28a 100644
--- a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt
@@ -156,15 +156,16 @@ object AppUtil {
             sdcardAbsPath = Environment.getExternalStorageDirectory().absolutePath
 
         // 4.2系统存在legacy|0读取问题
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            sdcardAbsPath = "/sdcard"
-        }
-//        val p = Pattern.compile("/?storage/emulated/\\d{1,2}")
-//        val m = p.matcher(sdcardAbsPath)
-//        if (m.find()) {
-//            sdcardAbsPath = sdcardAbsPath.replace("storage/emulated/", "storage/sdcard")
+//        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN_MR1) {
+//            sdcardAbsPath = "/sdcard"
 //        }
 
+        val p = Pattern.compile("/?storage/emulated/\\d{1,2}")
+        val m = p.matcher(sdcardAbsPath)
+        if (m.find()) {
+            sdcardAbsPath = sdcardAbsPath.replace("storage/emulated/0", "storage/emulated/legacy")
+        }
+
         return sdcardAbsPath
     }
 }
\ No newline at end of file
-- 
2.21.0