更新代码

Brook007 · May 7, 2019 · e25360d · e25360d
1 parent 864949f
commit e25360d
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 96 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.brook.app.android.permissionutil"
+        applicationId "com.brook.app.android.supportlibrary.permissionutil"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 1

diff --git a/app/src/androidTest/java/com/brook/app/android/permissionutil/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/brook/app/android/permissionutil/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.brook.app.android.permissionutil.MainActivity">
+        <activity android:name="com.brook.app.android.supportlibrary.permissionutil.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

diff --git a/.../android/permissionutil/MainActivity.java → ...tlibrary/permissionutil/MainActivity.java b/.../android/permissionutil/MainActivity.java → ...tlibrary/permissionutil/MainActivity.java
@@ -1,12 +1,12 @@
-package com.brook.app.android.permissionutil;
+package com.brook.app.android.supportlibrary.permissionutil;
 
 import android.Manifest;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
-import com.brook.app.android.supportlibrary.permissionutil.R;
+import com.brook.app.android.permissionutil.PermissionUtil;
 
 import java.util.List;
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="com.brook.app.android.supportlibrary.permissionutil.MainActivity">
 
     <Button
         android:layout_width="wrap_content"

diff --git a/app/src/test/java/com/brook/app/android/permissionutil/ExampleUnitTest.java b/app/src/test/java/com/brook/app/android/permissionutil/ExampleUnitTest.java
diff --git a/...ry/src/androidTest/java/com/brook/app/android/permissionutil/ExampleInstrumentedTest.java b/...ry/src/androidTest/java/com/brook/app/android/permissionutil/ExampleInstrumentedTest.java
diff --git a/library/src/main/java/com/brook/app/android/permissionutil/PermissionActivity.java b/library/src/main/java/com/brook/app/android/permissionutil/PermissionActivity.java
@@ -37,8 +37,9 @@
 /**
  * @author Brook
  * @time 2017年11月15日
+ * @hide
  */
-public class PermissionActivity extends AppCompatActivity {
+class PermissionActivity extends AppCompatActivity {
 
     private static volatile WeakReference<PermissionUtil.PermissionCallback> sCallback;
 

diff --git a/library/src/main/java/com/brook/app/android/permissionutil/PermissionUtil.java b/library/src/main/java/com/brook/app/android/permissionutil/PermissionUtil.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 /**
- * @auther Brook
+ * @author Brook
  * @time 2017年11月15日 9:37
  */
 public class PermissionUtil {
@@ -77,10 +77,10 @@ public void request(PermissionCallback callback) {
         List<String> requestPermission = new ArrayList<>();
 
         if (permission != null) {
-            for (int i = 0; i < permission.length; i++) {
-                if (ContextCompat.checkSelfPermission(context, permission[i])
+            for (String s : permission) {
+                if (ContextCompat.checkSelfPermission(context, s)
                         != PackageManager.PERMISSION_GRANTED) {
-                    requestPermission.add(permission[i]);
+                    requestPermission.add(s);
                 }
             }
         }

diff --git a/library/src/test/java/com/brook/app/android/permissionutil/ExampleUnitTest.java b/library/src/test/java/com/brook/app/android/permissionutil/ExampleUnitTest.java