Skip to content

Commit

Permalink
部分类重命名
Browse files Browse the repository at this point in the history
  • Loading branch information
cuizhen committed Mar 20, 2019
1 parent fe823ce commit abd956f
Show file tree
Hide file tree
Showing 11 changed files with 129 additions and 129 deletions.
52 changes: 26 additions & 26 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,24 @@ private void requestRuntime() {
mRuntimeRequester = AnyPermission.with(this).runtime(1)
.permissions(Manifest.permission.CAMERA,
Manifest.permission.CALL_PHONE)
.onBeforeRequest(new OnPermissionProcess<String>() {
.onBeforeRequest(new RequestInterceptor<String>() {
@Override
public void process(@NonNull final String permission, @NonNull final Processor processor) {
public void interceptor(@NonNull final String permission, @NonNull final Executor executor) {
// TODO 在每个权限申请之前调用，多次回调。可弹窗向用户说明下面将进行某个权限的申请。
// processor有两个方法，必须调用其一，否则申请流程终止。
}
})
.onBeenDenied(new OnPermissionProcess<String>() {
.onBeenDenied(new RequestInterceptor<String>() {
@Override
public void process(@NonNull final String permission, @NonNull final Processor processor) {
public void interceptor(@NonNull final String permission, @NonNull final Executor executor) {
// TODO 在每个权限被拒后调用，多次回调。可弹窗向用户说明为什么需要该权限，否则用户可能在下次申请勾选不再提示。
// processor有两个方法，必须调用其一，否则申请流程终止。
}
})
.onGoSetting(new OnPermissionProcess<String>() {
.onGoSetting(new RequestInterceptor<String>() {
@Override
public void process(@NonNull final String permission, @NonNull final Processor processor) {
// TODO 在每个权限永久被拒后调用（即用户勾选不再提示），多次回调。可弹窗引导用户前往设置打开权限，调用processor.next()会自动跳转设置。
public void interceptor(@NonNull final String permission, @NonNull final Executor executor) {
// TODO 在每个权限永久被拒后调用（即用户勾选不再提示），多次回调。可弹窗引导用户前往设置打开权限，调用executor.execute()会自动跳转设置。
// processor有两个方法，必须调用其一，否则申请流程将终止。
}
})
Expand Down Expand Up @@ -109,9 +109,9 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten

```java
AnyPermission.with(this).install(apkFile)
.onWithoutPermission(new OnPermissionProcess<File>() {
.onWithoutPermission(new RequestInterceptor<File>() {
@Override
public void process(@NonNull final File data, @NonNull final Processor processor) {
public void interceptor(@NonNull final File data, @NonNull final Executor executor) {
// TODO 在安装应用之前如果没有授予未知应用安装权限，则会回调该方法，可在此项用户弹窗提示。
// processor有两个方法，必须调用其一，否则申请流程将终止。
}
Expand All @@ -133,9 +133,9 @@ AnyPermission.with(this).install(apkFile)

```java
AnyPermission.with(this).overlay()
.onWithoutPermission(new OnPermissionProcess<Void>() {
.onWithoutPermission(new RequestInterceptor<Void>() {
@Override
public void process(@NonNull final Void data, @NonNull final Processor processor) {
public void interceptor(@NonNull final Void data, @NonNull final Executor executor) {
// TODO 在申请悬浮窗权限之前调用，可在此项用户弹窗提示。
// processor有两个方法，必须调用其一，否则申请流程将终止。
}
Expand All @@ -157,9 +157,9 @@ AnyPermission.with(this).overlay()

```java
AnyPermission.with(this).notificationShow()
.onWithoutPermission(new OnPermissionProcess<Void>() {
.onWithoutPermission(new RequestInterceptor<Void>() {
@Override
public void process(@NonNull final Void data, @NonNull final Processor processor) {
public void interceptor(@NonNull final Void data, @NonNull final Executor executor) {
// TODO 在申请显示通知权限之前调用，可在此项用户弹窗提示。
// processor有两个方法，必须调用其一，否则申请流程将终止。
}
Expand All @@ -181,9 +181,9 @@ AnyPermission.with(this).notificationShow()

```java
AnyPermission.with(this).notificationAccess()
.onWithoutPermission(new OnPermissionProcess<Void>() {
.onWithoutPermission(new RequestInterceptor<Void>() {
@Override
public void process(@NonNull final Void data, @NonNull final Processor processor) {
public void interceptor(@NonNull final Void data, @NonNull final Executor executor) {
// TODO 在申请访问通知权限之前调用，可在此项用户弹窗提示。
// processor有两个方法，必须调用其一，否则申请流程将终止。
}
Expand All @@ -205,23 +205,23 @@ AnyPermission.with(this).notificationAccess()

# API

## OnPermissionProcess<T>
## RequestInterceptor<T>

权限申请流程中回调，用于弹窗提醒用户。

```java
void process(@NonNull final T data, @NonNull final Processor processor)
void interceptor(@NonNull final T data, @NonNull final Executor executor)
```

## Processor
## Executor

控制流程的执行或取消。

```java
/**
* 继续流程
**/
void next()
void execute()

/**
* 取消流程，即回调到申请失败
Expand Down Expand Up @@ -291,17 +291,17 @@ public RuntimeRequester permissions(String... permissions)
/**
* 每个权限申请之前的回调
**/
public RuntimeRequester onBeforeRequest(OnPermissionProcess<String> onBeforeRequest)
public RuntimeRequester onBeforeRequest(RequestInterceptor<String> onBeforeRequest)

/**
* 每个权限被拒后的回调
**/
public RuntimeRequester onBeenDenied(OnPermissionProcess<String> onBeenDenied)
public RuntimeRequester onBeenDenied(RequestInterceptor<String> onBeenDenied)

/**
* 每个权限被永久拒绝后的回调
**/
public RuntimeRequester onGoSetting(OnPermissionProcess<String> onGoSetting)
public RuntimeRequester onGoSetting(RequestInterceptor<String> onGoSetting)

/**
* 开始申请
Expand All @@ -322,7 +322,7 @@ public void onActivityResult(int requestCode)
/**
* 未授予权限时，在跳转设置页面之前调用
**/
public InstallRequester onWithoutPermission(OnPermissionProcess<File> onWithoutPermission)
public InstallRequester onWithoutPermission(RequestInterceptor<File> onWithoutPermission)

/**
* 开始申请
Expand All @@ -338,7 +338,7 @@ public Void start(final RequestListener listener)
/**
* 未授予权限时，在跳转设置页面之前调用
**/
public OverlayRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission)
public OverlayRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission)

/**
* 开始申请
Expand All @@ -354,7 +354,7 @@ public Void start(final RequestListener listener)
/**
* 未授予权限时，在跳转设置页面之前调用
**/
public NotificationShowRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission)
public NotificationShowRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission)

/**
* 开始申请
Expand All @@ -370,7 +370,7 @@ public Void start(final RequestListener listener)
/**
* 未授予权限时，在跳转设置页面之前调用
**/
public NotificationAccessRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission)
public NotificationAccessRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission)

/**
* 开始申请
Expand Down
1 change: 1 addition & 0 deletions anypermission/src/main/java/per/goweii/anypermission/AnyPermission.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.yanzhenjie.permission.runtime.Permission;

import java.io.File;
import java.util.List;

/**
* 描述：
Expand Down
8 changes: 4 additions & 4 deletions anypermission/src/main/java/per/goweii/anypermission/InstallRequester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ public class InstallRequester implements Requester<Void> {
private final Option mOption;
private final File mApkFile;

private OnPermissionProcess<File> mOnWithoutPermission = null;
private RequestInterceptor<File> mOnWithoutPermission = null;

InstallRequester(Option option, File apkFile) {
this.mOption = option;
this.mApkFile = apkFile;
}

public InstallRequester onWithoutPermission(OnPermissionProcess<File> onWithoutPermission) {
public InstallRequester onWithoutPermission(RequestInterceptor<File> onWithoutPermission) {
mOnWithoutPermission = onWithoutPermission;
return this;
}
Expand All @@ -42,9 +42,9 @@ public void showRationale(Context c, File f, final RequestExecutor e) {
if (mOnWithoutPermission == null) {
e.execute();
} else {
mOnWithoutPermission.process(f, new OnPermissionProcess.Processor() {
mOnWithoutPermission.intercept(f, new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
e.execute();
}

Expand Down
8 changes: 4 additions & 4 deletions anypermission/src/main/java/per/goweii/anypermission/NotificationAccessRequester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public class NotificationAccessRequester implements Requester<Void> {

private final Option mOption;

private OnPermissionProcess<Void> mOnWithoutPermission = null;
private RequestInterceptor<Void> mOnWithoutPermission = null;

NotificationAccessRequester(Option option) {
this.mOption = option;
}

public NotificationAccessRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission) {
public NotificationAccessRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission) {
mOnWithoutPermission = onWithoutPermission;
return this;
}
Expand All @@ -37,9 +37,9 @@ public void showRationale(Context c, Void d, final RequestExecutor e) {
if (mOnWithoutPermission == null) {
e.execute();
} else {
mOnWithoutPermission.process(d, new OnPermissionProcess.Processor() {
mOnWithoutPermission.intercept(d, new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
e.execute();
}

Expand Down
8 changes: 4 additions & 4 deletions anypermission/src/main/java/per/goweii/anypermission/NotificationShowRequester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public class NotificationShowRequester implements Requester<Void> {

private final Option mOption;

private OnPermissionProcess<Void> mOnWithoutPermission = null;
private RequestInterceptor<Void> mOnWithoutPermission = null;

NotificationShowRequester(Option option) {
this.mOption = option;
}

public NotificationShowRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission) {
public NotificationShowRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission) {
mOnWithoutPermission = onWithoutPermission;
return this;
}
Expand All @@ -37,9 +37,9 @@ public void showRationale(Context c, Void d, final RequestExecutor e) {
if (mOnWithoutPermission == null) {
e.execute();
} else {
mOnWithoutPermission.process(d, new OnPermissionProcess.Processor() {
mOnWithoutPermission.intercept(d, new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
e.execute();
}

Expand Down
8 changes: 4 additions & 4 deletions anypermission/src/main/java/per/goweii/anypermission/OverlayRequester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public class OverlayRequester implements Requester<Void> {

private final Option mOption;

private OnPermissionProcess<Void> mOnWithoutPermission = null;
private RequestInterceptor<Void> mOnWithoutPermission = null;

OverlayRequester(Option option) {
this.mOption = option;
}

public OverlayRequester onWithoutPermission(OnPermissionProcess<Void> onWithoutPermission) {
public OverlayRequester onWithoutPermission(RequestInterceptor<Void> onWithoutPermission) {
mOnWithoutPermission = onWithoutPermission;
return this;
}
Expand All @@ -37,9 +37,9 @@ public void showRationale(Context c, Void d, final RequestExecutor e) {
if (mOnWithoutPermission == null) {
e.execute();
} else {
mOnWithoutPermission.process(d, new OnPermissionProcess.Processor() {
mOnWithoutPermission.intercept(d, new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
e.execute();
}

Expand Down
9 changes: 4 additions & 5 deletions ...ii/anypermission/OnPermissionProcess.java → ...eii/anypermission/RequestInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
* @author Cuizhen
* @date 2019/3/16
*/
public interface OnPermissionProcess<T> {
void process(@NonNull final T data, @NonNull final Processor processor);
public interface RequestInterceptor<T> {
void intercept(@NonNull final T data, @NonNull final Executor executor);

interface Processor {
void next();
interface Executor {
void execute();
void cancel();
}

}
24 changes: 12 additions & 12 deletions anypermission/src/main/java/per/goweii/anypermission/RuntimeRequester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ public class RuntimeRequester implements Requester<RuntimeRequester> {

private RequestListener mListener = null;

private OnPermissionProcess<String> mOnBeforeRequest = null;
private OnPermissionProcess<String> mOnBeenDenied = null;
private OnPermissionProcess<String> mOnGoSetting = null;
private RequestInterceptor<String> mOnBeforeRequest = null;
private RequestInterceptor<String> mOnBeenDenied = null;
private RequestInterceptor<String> mOnGoSetting = null;

RuntimeRequester(Option option, Context context, int requestCodeWhenGoSetting) {
this.mOption = option;
Expand All @@ -43,17 +43,17 @@ public RuntimeRequester permissions(String... permissions) {
return this;
}

public RuntimeRequester onBeforeRequest(OnPermissionProcess<String> onBeforeRequest) {
public RuntimeRequester onBeforeRequest(RequestInterceptor<String> onBeforeRequest) {
mOnBeforeRequest = onBeforeRequest;
return this;
}

public RuntimeRequester onBeenDenied(OnPermissionProcess<String> onBeenDenied) {
public RuntimeRequester onBeenDenied(RequestInterceptor<String> onBeenDenied) {
mOnBeenDenied = onBeenDenied;
return this;
}

public RuntimeRequester onGoSetting(OnPermissionProcess<String> onGoSetting) {
public RuntimeRequester onGoSetting(RequestInterceptor<String> onGoSetting) {
mOnGoSetting = onGoSetting;
return this;
}
Expand Down Expand Up @@ -129,9 +129,9 @@ private void onBeforeRequest() {
request();
return;
}
mOnBeforeRequest.process(mUnGrantedPermissions.peek(), new OnPermissionProcess.Processor() {
mOnBeforeRequest.intercept(mUnGrantedPermissions.peek(), new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
request();
}

Expand All @@ -147,9 +147,9 @@ private void onBeenDenied() {
request();
return;
}
mOnBeenDenied.process(mUnGrantedPermissions.peek(), new OnPermissionProcess.Processor() {
mOnBeenDenied.intercept(mUnGrantedPermissions.peek(), new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
request();
}

Expand All @@ -165,9 +165,9 @@ private void onGoSetting() {
setting();
return;
}
mOnGoSetting.process(mUnGrantedPermissions.peek(), new OnPermissionProcess.Processor() {
mOnGoSetting.intercept(mUnGrantedPermissions.peek(), new RequestInterceptor.Executor() {
@Override
public void next() {
public void execute() {
setting();
}

Expand Down
Loading

0 comments on commit abd956f

Please sign in to comment.