Selaa lähdekoodia

提交1.1.1版本

yanyi 4 vuotta sitten
vanhempi
commit
02847892bc

+ 4 - 3
README.md

@@ -7,13 +7,13 @@
 ~~~
 repositories {
         maven {
-            url "http://maven.benyanyi.com:8081/nexus/content/repositories/mylove/"
+            url "http://maven.benyanyi.com/nexus/content/repositories/mylove/"
         }
     }
 ~~~
 ### module 下添加
 ~~~
-implementation 'com.yanyi.benyanyi:PermissionHelper:1.1.0'
+implementation 'com.yanyi.benyanyi:PermissionHelper:1.1.1'
 ~~~
 
 或者
@@ -21,12 +21,13 @@ implementation 'com.yanyi.benyanyi:PermissionHelper:1.1.0'
 <dependency>
   <groupId>com.yanyi.benyanyi</groupId>
   <artifactId>PermissionHelper</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <type>aar</type>
 </dependency>
 ~~~
 
 ### 版本更新
+* 2021-02-03更新(1.1.1) 将接收FragmentActivity更改为Activity
 * 2020-05-18更新(1.1.0) 将android support转成androidx支持,并将Maven库存放到个人服务器上
 * 2019-07-18更新(1.0.9) 优化拒绝权限通知弹窗,添加注解配置弹窗方法,优化注解方法,去除多余配置
 * 2019-06-26更新(1.0.8) 删除重复方法

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven{ url 'http://maven.yanyi.online:8081/nexus/content/repositories/mylove/'}
+        maven{ url 'http://maven.benyanyi.com/nexus/content/repositories/mylove/'}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0'

+ 5 - 5
permissionlib/src/main/java/com/benyanyi/permissionlib/PermissionBind.java

@@ -1,6 +1,6 @@
 package com.benyanyi.permissionlib;
 
-import androidx.fragment.app.FragmentActivity;
+import android.app.Activity;
 
 import com.benyanyi.permissionlib.annotation.GetPermissionComplete;
 import com.benyanyi.permissionlib.annotation.GetPermissionDialogInfo;
@@ -22,15 +22,15 @@ public final class PermissionBind {
     private PermissionConfig permissionConfig;
     private Object object;
 
-    private PermissionBind(FragmentActivity fragmentActivity, Object object) {
+    private PermissionBind(Activity activity, Object object) {
         this.object = object;
-        this.permissionConfig = PermissionHelper.getInstance(fragmentActivity);
+        this.permissionConfig = PermissionHelper.getInstance(activity);
         initPermission();
     }
 
-    public static PermissionBind request(FragmentActivity fragmentActivity, Object object) {
+    public static PermissionBind request(Activity activity, Object object) {
         if (instance == null) {
-            instance = new PermissionBind(fragmentActivity, object);
+            instance = new PermissionBind(activity, object);
         }
         return instance;
     }

+ 1 - 1
permissionlib/src/main/java/com/benyanyi/permissionlib/PermissionFragment.java

@@ -2,6 +2,7 @@ package com.benyanyi.permissionlib;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
+import android.app.Fragment;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -13,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
 
 import com.benyanyi.permissionlib.msg.FailureMsg;
 

+ 9 - 9
permissionlib/src/main/java/com/benyanyi/permissionlib/PermissionHelper.java

@@ -1,7 +1,7 @@
 package com.benyanyi.permissionlib;
 
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
+import android.app.Activity;
+import android.app.FragmentManager;
 
 /**
  * @author YanYi
@@ -11,20 +11,20 @@ import androidx.fragment.app.FragmentManager;
  */
 public class PermissionHelper implements PermissionConfig {
     private static PermissionConfig instance;
-    private FragmentActivity mActivity;
+    private Activity mActivity;
 
     private String tag = "PermissionHelper";
 
     private PermissionFragment permissionFragment;
 
-    private PermissionHelper(FragmentActivity fragmentActivity) {
-        this.mActivity = fragmentActivity;
+    private PermissionHelper(Activity activity) {
+        this.mActivity = activity;
         permissionFragment = getFragment();
     }
 
-    public static PermissionConfig getInstance(FragmentActivity fragmentActivity) {
+    public static PermissionConfig getInstance(Activity activity) {
         if (instance == null) {
-            instance = new PermissionHelper(fragmentActivity);
+            instance = new PermissionHelper(activity);
         }
         return instance;
     }
@@ -32,10 +32,10 @@ public class PermissionHelper implements PermissionConfig {
     private PermissionFragment getFragment() {
 //        PermissionFragment fragment = (PermissionFragment) this.mActivity.getFragmentManager()
 //                .findFragmentByTag(tag);
-        PermissionFragment fragment = (PermissionFragment) this.mActivity.getSupportFragmentManager().findFragmentByTag(tag);
+        PermissionFragment fragment = (PermissionFragment) this.mActivity.getFragmentManager().findFragmentByTag(tag);
         if (fragment == null) {
             fragment = new PermissionFragment();
-            FragmentManager fragmentManager = this.mActivity.getSupportFragmentManager();
+            FragmentManager fragmentManager = this.mActivity.getFragmentManager();
             fragmentManager
                     .beginTransaction()
                     .add(fragment, tag)