Selaa lähdekoodia

修改kt返回

yanyi 4 vuotta sitten
vanhempi
commit
61651ccf52

+ 2 - 2
app/build.gradle

@@ -36,7 +36,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
-//    implementation project(':permission_kt')
+    implementation project(':permission_kt')
 //    implementation project(':permissionlib')
-    implementation('com.yanyi.benyanyi:PermissionHelper-kt:1.1.3')
+//    implementation('com.yanyi.benyanyi:PermissionHelper-kt:1.1.3')
 }

+ 18 - 2
app/src/main/java/com/yanyi/basepermission/MainActivity.java

@@ -28,15 +28,31 @@ public class MainActivity extends AppCompatActivity {
                         Manifest.permission.ACCESS_FINE_LOCATION)
                 .setDefaultPermissionDialogInfo()
                 .request()
-                .onPermissionSuccess(() -> log("请求成功"))
+                .onPermissionSuccess(() -> {
+                    log("请求成功");
+                    return null;
+                })
                 .onPermissionFailure(strings -> {
                     StringBuilder str = new StringBuilder();
                     for (String s : strings) {
                         str.append("\n").append(s);
                     }
                     log(str.toString());
+                    return null;
                 })
-                .onPermissionComplete(() -> log("请求完成"));
+                .onPermissionComplete(() -> {
+                    log("请求完成");
+                    return null;
+                });
+//                .onPermissionSuccess(() -> log("请求成功"))
+//                .onPermissionFailure(strings -> {
+//                    StringBuilder str = new StringBuilder();
+//                    for (String s : strings) {
+//                        str.append("\n").append(s);
+//                    }
+//                    log(str.toString());
+//                })
+//                .onPermissionComplete(() -> log("请求完成"));
     }
 
 

+ 18 - 6
permission_kt/src/main/java/com/benyanyi/permission/kt/PermissionRequest.kt

@@ -35,18 +35,30 @@ class PermissionRequest {
         return callBack
     }
 
-    fun onPermissionSuccess(action: PermissionAction): PermissionRequest {
-        this.successAction = action
+    fun onPermissionSuccess(action: () -> Unit): PermissionRequest {
+        this.successAction = object : PermissionAction {
+            override fun accept() {
+                action()
+            }
+        }
         return this
     }
 
-    fun onPermissionFailure(consumer: PermissionConsumer<Array<out String>>): PermissionRequest {
-        this.failureConsumer = consumer
+    fun onPermissionFailure(consumer: (Array<out String>) -> Unit): PermissionRequest {
+        this.failureConsumer = object : PermissionConsumer<Array<out String>> {
+            override fun accept(t: Array<out String>) {
+                consumer(t)
+            }
+        }
         return this
     }
 
-    fun onPermissionComplete(action: PermissionAction): PermissionRequest {
-        this.completeAction = action
+    fun onPermissionComplete(action: () -> Unit): PermissionRequest {
+        this.completeAction = object : PermissionAction {
+            override fun accept() {
+                action()
+            }
+        }
         return this
     }
 }