From 89ccee479f7e5f59f04947d48b2c290d4f35c1b9 Mon Sep 17 00:00:00 2001
From: luozhang002 <luozhang002@126.com>
Date: Tue, 9 Oct 2018 11:53:49 +0800
Subject: [PATCH 1/4] feat: extend asynclistObject support
 delimiter|marker|maxkeys to list object in Android

---
 Example/Component/ObjectManager.js            | 83 ++++++++++---------
 README-CN.md                                  | 15 +++-
 README.md                                     | 14 +++-
 .../com/reactlibrary/AliyunObjectManager.java | 21 ++++-
 .../com/reactlibrary/RNAliyunOssModule.java   |  4 +-
 5 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/Example/Component/ObjectManager.js b/Example/Component/ObjectManager.js
index 47f5deb..4a82d32 100644
--- a/Example/Component/ObjectManager.js
+++ b/Example/Component/ObjectManager.js
@@ -16,51 +16,51 @@ import { styles } from '../CSS/global.js'
 export class ObjectManager extends Component {  
   render() {  
      return(
-           <View style={styles.item}>
-      <Text style={styles.description}>管理文件</Text>
-      <View style={styles.detailitem}>
-        <View style={styles.button}>
-          <Button  style={styles.button}
-            onPress={this.clickHandle.bind(this,"asyncHeadObject")}
-            title="asyncHeadObject"
-            color="#841584"
-          />
-        </View>
+      <View style={styles.item}>
+        <Text style={styles.description}>管理文件</Text>
+        <View style={styles.detailitem}>
+          <View style={styles.button}>
+            <Button  style={styles.button}
+              onPress={this.clickHandle.bind(this,"asyncHeadObject")}
+              title="asyncHeadObject"
+              color="#841584"
+            />
+          </View>
 
-        <View style={styles.button}>
-          <Button  style={styles.button}
-            onPress={this.clickHandle.bind(this,"asyncListObjects")}
-            title="asyncListObjects"
-            color="#841584"
-          />
-        </View>
+          <View style={styles.button}>
+            <Button  style={styles.button}
+              onPress={this.clickHandle.bind(this,"asyncListObjects")}
+              title="asyncListObjects"
+              color="#841584"
+            />
+          </View>
 
-        <View style={styles.button}>
-          <Button  style={styles.button}
-            onPress={this.clickHandle.bind(this,"asyncCopyObject")}
-            title="asyncCopyObject"
-            color="#841584"
-          />
-        </View>
+          <View style={styles.button}>
+            <Button  style={styles.button}
+              onPress={this.clickHandle.bind(this,"asyncCopyObject")}
+              title="asyncCopyObject"
+              color="#841584"
+            />
+          </View>
 
-        <View style={styles.button}>
-          <Button  style={styles.button}
-            onPress={this.clickHandle.bind(this,"doesObjectExist")}
-            title="doesObjectExist"
-            color="#841584"
-          />
-        </View>
+          <View style={styles.button}>
+            <Button  style={styles.button}
+              onPress={this.clickHandle.bind(this,"doesObjectExist")}
+              title="doesObjectExist"
+              color="#841584"
+            />
+          </View>
 
-        <View style={styles.button}>
-          <Button  style={styles.button}
-            onPress={this.clickHandle.bind(this,"asyncDeleteObject")}
-            title="asyncDeleteObject"
-            color="#841584"
-          />
+          <View style={styles.button}>
+            <Button  style={styles.button}
+              onPress={this.clickHandle.bind(this,"asyncDeleteObject")}
+              title="asyncDeleteObject"
+              color="#841584"
+            />
+          </View>
         </View>
       </View>
-    </View>
-     )  
+    )  
   } 
   clickHandle(e) {
     switch(e) {
@@ -74,7 +74,9 @@ export class ObjectManager extends Component {
 
       case "asyncListObjects" : {
         console.log("asyncListObjects")
-        AliyunOSS.asyncListObjects('luozhang002').then((e) => {
+        AliyunOSS.asyncListObjects('luozhang002',{
+          prefix:'xxxx'
+        }).then((e) => {
           console.log(e)
         }).catch((e)=>{
           console.log(e)
@@ -108,5 +110,4 @@ export class ObjectManager extends Component {
       default :break;
     }
   }
-
  }
\ No newline at end of file
diff --git a/README-CN.md b/README-CN.md
index ee1007f..3c3ace7 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -334,8 +334,21 @@ AliyunOSS.asyncListBuckets().then((e) => {
 ```
 ### asyncListObjects
 
+列举指定bucket下的objects
+
+parameters:
+
+- name {String} bucket name
+- options {Object}
+  - [delimiter] {String} 用于对Object名字进行分组的字符。所有名字包含指定的前缀且第一次出现delimiter字符之间的object作为一组元素: CommonPrefixes。
+  - [marker] {String} 设定结果从marker之后按字母排序的第一个开始返回。
+  - [maxkeys] {Number} 限定此次返回object的最大数，如果不设定，默认为100，maxkeys取值不能大于1000。
+  - [prefix]  {String} 限定返回的object key必须以prefix作为前缀。注意使用prefix查询时，返回的key中仍会包含prefix。
+
 ```
- AliyunOSS.asyncListObjects('luozhang002').then((e)=>{
+ AliyunOSS.asyncListObjects('luozhang002',{
+    prefix:'xxxx'
+  }).then((e)=>{
     console.log(e)
   }).catch((e)=>{
      console.log(e)
diff --git a/README.md b/README.md
index 458733b..a840e96 100644
--- a/README.md
+++ b/README.md
@@ -344,8 +344,20 @@ AliyunOSS.asyncListBuckets().then((e) => {
 ```
 ### asyncListObjects
 
+list objects in some conditions
+
+parameters:
+
+- name {String} bucket name
+- options {Object}
+  - [delimiter] {String} 
+  - [prefix] {String} search buckets using `prefix` key
+  - [marker] {String} search start from `marker`, including `marker` key
+  - [max-keys] {String|Number} max buckets, default is `100`, limit to `1000` 
 ```
- AliyunOSS.asyncListObjects('luozhang002').then((e)=>{
+ AliyunOSS.asyncListObjects('luozhang002', {
+    prefix:'xxxx'
+}).then((e)=>{
     console.log(e)
   }).catch((e)=>{
      console.log(e)
diff --git a/android/src/main/java/com/reactlibrary/AliyunObjectManager.java b/android/src/main/java/com/reactlibrary/AliyunObjectManager.java
index 028b150..96ff6a2 100644
--- a/android/src/main/java/com/reactlibrary/AliyunObjectManager.java
+++ b/android/src/main/java/com/reactlibrary/AliyunObjectManager.java
@@ -92,12 +92,27 @@ public class AliyunObjectManager {
     /**
      * asyncListObjects
      * @param bucketName
-     * @param prefix
+     * @param opitons {delimiter|prefix|marker|maxkeys}
      * @param promise
      */
-    public void asyncListObjects(String bucketName,String prefix,final Promise promise) {
+    public void asyncListObjects(String bucketName, ReadableMap options, final Promise promise) {
         ListObjectsRequest listObjects = new ListObjectsRequest(bucketName);
-        listObjects.setPrefix(prefix);
+
+        if(options.hasKey("prefix")) {
+            listObjects.setPrefix(options.getString("prefix"));
+        }
+
+        if(options.hasKey("delimiter")) {
+            listObjects.setDelimiter(options.getString("delimiter"));
+        }
+
+        if(options.hasKey("marker")) {
+            listObjects.setMarker(options.getString("delimiter"));
+        }
+
+        if(options.hasKey("maxkeys")) {
+            listObjects.setMaxKeys(options.getInt(String.valueOf(options.getInt("maxkeys"))));
+        }
 
         // set success 、set fail 、set async request
         OSSAsyncTask task = mOSS.asyncListObjects(listObjects, new OSSCompletedCallback<ListObjectsRequest, ListObjectsResult>() {
diff --git a/android/src/main/java/com/reactlibrary/RNAliyunOssModule.java b/android/src/main/java/com/reactlibrary/RNAliyunOssModule.java
index cb49b66..64c2800 100644
--- a/android/src/main/java/com/reactlibrary/RNAliyunOssModule.java
+++ b/android/src/main/java/com/reactlibrary/RNAliyunOssModule.java
@@ -332,8 +332,8 @@ public class RNAliyunOssModule extends ReactContextBaseJavaModule {
      * @param promise
      */
     @ReactMethod
-    public void asyncListObjects(String bucketName,String prefix,final Promise promise) {
-        mObjectManager.asyncListObjects(bucketName, prefix, promise);
+    public void asyncListObjects(String bucketName,ReadableMap options,final Promise promise) {
+        mObjectManager.asyncListObjects(bucketName, options, promise);
     }
 
     /**

From 55b1aaa795cf9a31de81fb3f19d5799168017831 Mon Sep 17 00:00:00 2001
From: luozhang002 <luozhang002@126.com>
Date: Tue, 9 Oct 2018 12:13:57 +0800
Subject: [PATCH 2/4] chore: modify index.js listobject api

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 1276eba..e53b510 100644
--- a/index.js
+++ b/index.js
@@ -143,8 +143,8 @@ export default AliyunOSS = {
      * Asynchronously getAsyncObjects
      */
 
-    asyncListObjects (bucketName,prefix='') {
-        return RNAliyunOSS.asyncListObjects(bucketName,prefix,)
+    asyncListObjects (bucketName,options) {
+        return RNAliyunOSS.asyncListObjects(bucketName,options)
     },
 
 

From 33399a6877da68a986dcca218217cb04452cfdf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E7=AB=A0?= <luozhang002@126.com>
Date: Tue, 9 Oct 2018 16:04:36 +0800
Subject: [PATCH 3/4] chore: modify asyncListObjects in web platform

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 1276eba..e53b510 100644
--- a/index.js
+++ b/index.js
@@ -143,8 +143,8 @@ export default AliyunOSS = {
      * Asynchronously getAsyncObjects
      */
 
-    asyncListObjects (bucketName,prefix='') {
-        return RNAliyunOSS.asyncListObjects(bucketName,prefix,)
+    asyncListObjects (bucketName,options) {
+        return RNAliyunOSS.asyncListObjects(bucketName,options)
     },
 
 

From 6f0eadc15ea369d4fd84eab19da0d89e64acf0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E7=AB=A0?= <luozhang002@126.com>
Date: Tue, 9 Oct 2018 16:40:24 +0800
Subject: [PATCH 4/4] chore: modify asyncListObjects in ios platform

---
 ios/RNAliyunOSS+OBJECT.m | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/ios/RNAliyunOSS+OBJECT.m b/ios/RNAliyunOSS+OBJECT.m
index 31dfb51..61f0260 100644
--- a/ios/RNAliyunOSS+OBJECT.m
+++ b/ios/RNAliyunOSS+OBJECT.m
@@ -13,21 +13,33 @@
  asyncListObjects
  */
 
-RCT_REMAP_METHOD(asyncListObjects, bucketName:(NSString*)bucketName prefix:(NSString*)prefix resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_REMAP_METHOD(asyncListObjects, bucketName:(NSString*)bucketName options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     OSSGetBucketRequest * getBucket = [OSSGetBucketRequest new];
     getBucket.bucketName = bucketName;
     // 可选参数，具体含义参考：https://docs.aliyun.com/#/pub/oss/api-reference/bucket&GetBucket
     // getBucket.marker = @"";
-    getBucket.prefix = prefix;
     // getBucket.delimiter = @"";
+    
+    if([options objectForKey:@"delimiter"]) {
+        getBucket.delimiter = [options objectForKey:@"delimiter"];
+    }
+    
+    if([options objectForKey:@"marker"]) {
+        getBucket.delimiter = [options objectForKey:@"marker"];
+    }
+    
+    if([options objectForKey:@"prefix"]) {
+        getBucket.delimiter = [options objectForKey:@"prefix"];
+    }
+    
+    if([options objectForKey:@"maxkeys"]) {
+        getBucket.delimiter = [options objectForKey:@"maxkeys"];
+    }
+    
     OSSTask * getBucketTask = [self.client getBucket:getBucket];
     [getBucketTask continueWithBlock:^id(OSSTask *task) {
         if (!task.error) {
             OSSGetBucketResult * result = task.result;
-            //            NSLog(@"get bucket success!");
-            //            for (NSDictionary * objectInfo in result.contents) {
-            //                NSLog(@"list object: %@", objectInfo);
-            //            }
             resolve(result.contents);
         } else {
             NSLog(@"get bucket failed, error: %@", task.error);