Merge pull request #39 from TejNote/master

Root folder issue resolved
JessYanCoding · Jun 25, 2021 · c3df73c · c3df73c
2 parents 55b9689 + aaf0c57
commit c3df73c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/app/src/main/java/com/luck/pictureselector/MainActivity.java b/app/src/main/java/com/luck/pictureselector/MainActivity.java
@@ -142,7 +142,7 @@ protected void onCreate(Bundle savedInstanceState) {
                                 .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)// 设置相册Activity方向，不设置默认使用系统
                                 .isNotPreviewDownload(true)// 预览图片长按是否可以下载
                                 //.bindCustomPlayVideoCallback(callback)// 自定义播放回调控制，用户可以使用自己的视频播放界面
-                                .loadImageEngine(GlideEngine.createGlideEngine())// 外部传入图片加载引擎，必传项
+                                .imageEngine(GlideEngine.createGlideEngine())// 外部传入图片加载引擎，必传项
                                 .openExternalPreview(position, selectList);
                         break;
                 }

diff --git a/picture_library/src/main/java/com/luck/picture/lib/model/LocalMediaLoader.java b/picture_library/src/main/java/com/luck/picture/lib/model/LocalMediaLoader.java
@@ -348,6 +348,9 @@ private String getRealPathAndroid_Q(long id) {
      */
     private LocalMediaFolder getImageFolder(String path, String folderName, List<LocalMediaFolder> imageFolders) {
         if (!config.isFallbackVersion) {
+            if(TextUtils.isEmpty(folderName)) {
+                folderName = "/";
+            }
             for (LocalMediaFolder folder : imageFolders) {
                 // Under the same folder, return yourself, otherwise create a new folder
                 String name = folder.getName();

diff --git a/picture_library/src/main/res/values-ko-rKR/strings.xml b/picture_library/src/main/res/values-ko-rKR/strings.xml
@@ -52,12 +52,32 @@
     <string name="picture_data_exception">앨범 정보 이상 가져오기…</string>
     <string name="picture_recording_time_is_short">녹화 시간이 너무 짧다</string>
     <string name="picture_photo_camera">사진 찍기</string>
+    <string name="picture_photo_pictures">사진 찍기 클릭</string>
+    <string name="picture_photo_recording">카메라</string>
     <string name="picture_choose_max_seconds">최대 %1$ds 초 이내의 영상을 선택할 수 있습니다</string>
     <string name="picture_choose_min_seconds">%1$ds 내의 영상을 선택할 수 없습니다</string>
     <string name="picture_choose_limit_seconds">%1$ds~%2$ds 내의 영상만 선택할 수 있습니다</string>
-    <string name="picture_photo_pictures">사진 찍기 클릭</string>
-    <string name="picture_photo_recording">카메라</string>
     <string name="picture_go_setting">설치</string>
-    <string name="picture_know">알 겠 습 니 다</string>
-    <string name="picture_data_null">데이터 없 음…</string>
+    <string name="gallery">갤러리</string>
+    <string name="photo">사진</string>
+    <string name="video">동영상</string>
+    <string name="press_to_record">동영상를 녹화하려면 길게 눌러주세요</string>
+    <string name="alert_record">동영상 녹화는 %d초 이상 걸립니다.</string>
+    <string name="camera_access">카메라 접근 권한 활성화</string>
+    <string name="camera_access_content">사진과 동영상을 촬영하려면 권한을 허용해주세요.</string>
+    <string name="enable">허용</string>
+    <string name="done">완료</string>
+    <string name="camera_init">카메라 초기화 중</string>
+    <string name="picture_know">알겠습니다</string>
+    <string name="picture_data_null">데이터 없음</string>
+    <string name="next">다음</string>
+    <string name="discard_edits">편집을 취소 하시겠습니까?</string>
+    <string name="discard_edits_alert">지금 나가면 편집이 취소됩니다.</string>
+    <string name="discard">취소</string>
+    <string name="next_alert">사진을 불러오면 다음 단계로 진행할 수 있습니다!</string>
+    <string name="video_sound_off">동영상 소리 : 끔</string>
+    <string name="video_sound_on">동영상 소리: 켬</string>
+    <string name="trim">편집</string>
+    <string name="cover">커버</string>
+    <string name="video_clip_failed">동영상 편집에 실패하였습니다.</string>
 </resources>