From 0bd68ef2a71023c1816dd3a1d7f24bb1f9366423 Mon Sep 17 00:00:00 2001
From: hackycy <qa894178522@qq.com>
Date: Sun, 16 Aug 2020 01:27:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Afix=20qiniu=20repo=20page=20item=20?=
 =?UTF-8?q?dir=20show=20name=20semantic=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/views/manage_page/qiniu_page/qiniu_repo_page.dart      | 4 ++--
 .../manage_page/qiniu_page/qiniu_repo_page_presenter.dart  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/views/manage_page/qiniu_page/qiniu_repo_page.dart b/lib/views/manage_page/qiniu_page/qiniu_repo_page.dart
index 3b165ea..2e6152d 100644
--- a/lib/views/manage_page/qiniu_page/qiniu_repo_page.dart
+++ b/lib/views/manage_page/qiniu_page/qiniu_repo_page.dart
@@ -34,7 +34,7 @@ class _QiniuRepoPageState extends BaseLoadingPageState<QiniuRepoPage>
 
   @override
   AppBar get appBar => AppBar(
-        title: Text('图床仓库'),
+        title: Text(this._prefix == '/' ? '图床仓库' : this._prefix),
         centerTitle: true,
       );
 
@@ -97,7 +97,7 @@ class _QiniuRepoPageState extends BaseLoadingPageState<QiniuRepoPage>
             onTap: () {
               if (contents[index].type == FileContentType.DIR) {
                 Application.router.navigateTo(context,
-                    '${Routes.settingPbQiniuRepo}?path=${Uri.encodeComponent(contents[index].key)}',
+                    '${Routes.settingPbQiniuRepo}?path=${Uri.encodeComponent(contents[index].url)}',
                     transition: TransitionType.cupertino);
               } else {
                 launch(contents[index].url);
diff --git a/lib/views/manage_page/qiniu_page/qiniu_repo_page_presenter.dart b/lib/views/manage_page/qiniu_page/qiniu_repo_page_presenter.dart
index ef3a015..40bf6ad 100644
--- a/lib/views/manage_page/qiniu_page/qiniu_repo_page_presenter.dart
+++ b/lib/views/manage_page/qiniu_page/qiniu_repo_page_presenter.dart
@@ -40,9 +40,9 @@ class QiniuRepoPagePresenter {
         c.type = FileContentType.FILE;
         c.url = pathlib.joinAll([
           config.url,
-          prefix == '/' ? '' : prefix,
           c.key,
         ]);
+        c.key = '${c.key}'.replaceFirst(prefix == '/' ? '' : prefix, '');
         return c;
       }).toList();
       if (result['commonPrefixes'] != null) {
@@ -50,7 +50,10 @@ class QiniuRepoPagePresenter {
           QiniuContent c = QiniuContent();
           c.type = FileContentType.DIR;
           c.url = element;
-          c.key = element;
+          /// 例如 xin/ax 去除 xin/ 只显示最后一个 ax
+          List<String> keys = '$element'.split('/');
+          print(keys);
+          c.key = keys[keys.length -2];
           data.add(c);
         });
       }