1.更新部分 RequiresPermission 注解

Former-commit-id: c5d1911 Former-commit-id: 1299b10
afkT · Dec 31, 2020 · ec63cc4 · ec63cc4
1 parent 1c6a0c2
commit ec63cc4
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 69 deletions.
diff --git a/app/src/main/java/utils_use/wifi/WifiHotUse.java b/app/src/main/java/utils_use/wifi/WifiHotUse.java
@@ -1,5 +1,6 @@
 package utils_use.wifi;
 
+import android.Manifest;
 import android.net.wifi.WifiConfiguration;
 import android.os.Build;
 
@@ -20,8 +21,8 @@ private WifiHotUse() {
      * Wifi 热点使用方法
      */
     @RequiresPermission(allOf = {
-            android.Manifest.permission.CHANGE_WIFI_STATE,
-            android.Manifest.permission.ACCESS_FINE_LOCATION
+            Manifest.permission.CHANGE_WIFI_STATE,
+            Manifest.permission.ACCESS_FINE_LOCATION
     })
     private void wifiHotUse() {
 

diff --git a/lib/DevApp/src/main/java/dev/utils/app/AppCommonUtils.java b/lib/DevApp/src/main/java/dev/utils/app/AppCommonUtils.java
@@ -1,5 +1,6 @@
 package dev.utils.app;
 
+import android.Manifest;
 import android.os.Build;
 import android.text.TextUtils;
 
@@ -77,7 +78,7 @@ public static String refreshAppDeviceInfo() {
      * 获取设备唯一 UUID
      * @return 设备唯一 UUID
      */
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getUUID() {
         return PhoneUtils.getUUID();
     }

diff --git a/lib/DevApp/src/main/java/dev/utils/app/DeviceUtils.java b/lib/DevApp/src/main/java/dev/utils/app/DeviceUtils.java
@@ -492,6 +492,7 @@ public static boolean isAdbEnabled() {
      * </pre>
      * @return 设备 MAC 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     public static String getMacAddress() {
         String macAddress = getMacAddressByWifiInfo();
         if (!DEFAULT_MAC_ADDRESS.equals(macAddress)) {
@@ -516,6 +517,7 @@ public static String getMacAddress() {
      * 获取 MAC 地址
      * @return MAC 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     private static String getMacAddressByWifiInfo() {
         try {
             @SuppressLint("WifiManagerLeak")

diff --git a/lib/DevApp/src/main/java/dev/utils/app/LocationUtils.java b/lib/DevApp/src/main/java/dev/utils/app/LocationUtils.java
@@ -1,5 +1,6 @@
 package dev.utils.app;
 
+import android.Manifest;
 import android.content.Intent;
 import android.location.Address;
 import android.location.Criteria;
@@ -100,8 +101,8 @@ public static boolean openGpsSettings() {
      * @return {@code true} 初始化成功, {@code false} 初始化失败
      */
     @RequiresPermission(anyOf = {
-            android.Manifest.permission.ACCESS_COARSE_LOCATION,
-            android.Manifest.permission.ACCESS_FINE_LOCATION
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
     })
     public static boolean register(
             final long minTime,
@@ -132,8 +133,8 @@ public static boolean register(
      * @return {@code true} success, {@code false} fail
      */
     @RequiresPermission(anyOf = {
-            android.Manifest.permission.ACCESS_COARSE_LOCATION,
-            android.Manifest.permission.ACCESS_FINE_LOCATION
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
     })
     public static boolean unregister() {
         try {
@@ -162,8 +163,8 @@ public static boolean unregister() {
      * @return {@link Location}
      */
     @RequiresPermission(anyOf = {
-            android.Manifest.permission.ACCESS_COARSE_LOCATION,
-            android.Manifest.permission.ACCESS_FINE_LOCATION
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
     })
     public static Location getLocation(
             final LocationListener listener,

diff --git a/lib/DevApp/src/main/java/dev/utils/app/NetWorkUtils.java b/lib/DevApp/src/main/java/dev/utils/app/NetWorkUtils.java
@@ -1,5 +1,6 @@
 package dev.utils.app;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.net.ConnectivityManager;
 import android.net.Network;
@@ -96,7 +97,7 @@ public static boolean setMobileDataEnabled(final boolean isOpen) {
                 Method method = manager.getClass().getDeclaredMethod("setMobileDataEnabled", Boolean.TYPE);
                 // 设置移动网络
                 method.invoke(manager, isOpen);
-            } else { // 需要 android.Manifest.permission.MODIFY_PHONE_STATE 权限, 普通 APP 无法获取
+            } else { // 需要 Manifest.permission.MODIFY_PHONE_STATE 权限, 普通 APP 无法获取
                 TelephonyManager telephonyManager = AppUtils.getTelephonyManager();
                 // 通过反射设置移动网络
                 Method method = telephonyManager.getClass().getDeclaredMethod("setDataEnabled", boolean.class);
@@ -114,7 +115,7 @@ public static boolean setMobileDataEnabled(final boolean isOpen) {
      * 判断是否连接了网络
      * @return {@code true} yes, {@code false} no
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static boolean isConnect() {
         try {
             // 获取手机所有连接管理对象 ( 包括对 wi-fi,net 等连接的管理 )
@@ -148,7 +149,7 @@ public static boolean isConnect() {
      * 获取连接的网络类型
      * @return -1 = 等于未知, 1 = Wifi, 2 = 移动网络
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static int getConnectType() {
         try {
             // 获取手机所有连接管理对象 ( 包括对 wi-fi,net 等连接的管理 )
@@ -192,7 +193,7 @@ public static int getConnectType() {
      * 判断是否连接 Wifi( 连接上、连接中 )
      * @return {@code true} yes, {@code false} no
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static boolean isConnWifi() {
         return (getConnectType() == 1);
     }
@@ -201,7 +202,7 @@ public static boolean isConnWifi() {
      * 判断是否连接移动网络 ( 连接上、连接中 )
      * @return {@code true} yes, {@code false} no
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static boolean isConnMobileData() {
         return (getConnectType() == 2);
     }
@@ -227,7 +228,7 @@ public enum NetworkType {
      * @return {@code true} 可用, {@code false} 不可用
      */
     @Deprecated
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static boolean isAvailable() {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
             NetworkInfo info = getActiveNetworkInfo();
@@ -272,7 +273,7 @@ public static boolean isAvailableByPing(String ip) {
      * @return {@link NetworkInfo}
      */
     @Deprecated
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static NetworkInfo getActiveNetworkInfo() {
         try {
             return AppUtils.getConnectivityManager().getActiveNetworkInfo();
@@ -286,7 +287,7 @@ public static NetworkInfo getActiveNetworkInfo() {
      * 获取活动网络
      * @return {@link Network}
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static Network getActiveNetwork() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             try {
@@ -305,8 +306,8 @@ public static Network getActiveNetwork() {
      * @return {@code true} yes, {@code false} no
      */
     @RequiresPermission(allOf = {
-            android.Manifest.permission.ACCESS_NETWORK_STATE,
-            android.Manifest.permission.READ_PHONE_STATE
+            Manifest.permission.ACCESS_NETWORK_STATE,
+            Manifest.permission.READ_PHONE_STATE
     })
     public static boolean is4G() {
         return getNetworkType() == NetworkType.NETWORK_4G;
@@ -331,7 +332,7 @@ public static boolean getWifiEnabled() {
      * 判断 Wifi 数据是否可用
      * @return {@code true} yes, {@code false} no
      */
-    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
+    @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
     public static boolean isWifiAvailable() {
         return getWifiEnabled() && isAvailable();
     }
@@ -357,8 +358,8 @@ public static String getNetworkOperatorName() {
      * @return {@link NetworkType}
      */
     @RequiresPermission(allOf = {
-            android.Manifest.permission.ACCESS_NETWORK_STATE,
-            android.Manifest.permission.READ_PHONE_STATE
+            Manifest.permission.ACCESS_NETWORK_STATE,
+            Manifest.permission.READ_PHONE_STATE
     })
     public static NetworkType getNetworkType() {
         // 默认网络类型
@@ -603,6 +604,7 @@ public static String getIPAddress(final boolean useIPv4) {
      * 根据 Wifi 获取网络 IP 地址
      * @return 网络 IP 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     public static String getIpAddressByWifi() {
         try {
             @SuppressLint("WifiManagerLeak")
@@ -618,6 +620,7 @@ public static String getIpAddressByWifi() {
      * 根据 Wifi 获取网关 IP 地址
      * @return 网关 IP 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     public static String getGatewayByWifi() {
         try {
             @SuppressLint("WifiManagerLeak")
@@ -633,6 +636,7 @@ public static String getGatewayByWifi() {
      * 根据 Wifi 获取子网掩码 IP 地址
      * @return 子网掩码 IP 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     public static String getNetMaskByWifi() {
         try {
             @SuppressLint("WifiManagerLeak")
@@ -648,6 +652,7 @@ public static String getNetMaskByWifi() {
      * 根据 Wifi 获取服务端 IP 地址
      * @return 服务端 IP 地址
      */
+    @RequiresPermission(Manifest.permission.ACCESS_WIFI_STATE)
     public static String getServerAddressByWifi() {
         try {
             @SuppressLint("WifiManagerLeak")

diff --git a/lib/DevApp/src/main/java/dev/utils/app/PhoneUtils.java b/lib/DevApp/src/main/java/dev/utils/app/PhoneUtils.java
@@ -1,5 +1,6 @@
 package dev.utils.app;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -195,7 +196,7 @@ public static int checkSimCountry() {
      * 获取 MEID 码
      * @return MEID 码
      */
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getMEID() {
         return getMEID(-1);
     }
@@ -206,7 +207,7 @@ public static String getMEID() {
      * @return MEID 码
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getMEID(final int slotIndex) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             try {
@@ -223,7 +224,7 @@ public static String getMEID(final int slotIndex) {
      * 获取 IMEI 码
      * @return IMEI 码
      */
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getIMEI() {
         return getIMEI(-1);
     }
@@ -243,7 +244,7 @@ public static String getIMEI() {
      * @return IMEI 码
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getIMEI(final int slotIndex) {
         try {
             TelephonyManager telephonyManager = AppUtils.getTelephonyManager();
@@ -281,7 +282,7 @@ public static String getIMEI(final int slotIndex) {
      * @return IMSI 码
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getIMSI() {
         try {
             return AppUtils.getTelephonyManager().getSubscriberId();
@@ -321,7 +322,7 @@ public static String getSimOperator() {
      * 通过 IMSI 获取中国运营商简称
      * @return 中国运营商简称
      */
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getChinaOperatorByIMSI() {
         return getChinaOperatorByIMSI(getIMSI());
     }
@@ -393,7 +394,7 @@ public static int getPhoneType() {
      * 获取设备 id
      * @return 设备 id
      */
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getDeviceId() {
         return getDeviceId(-1);
     }
@@ -404,7 +405,7 @@ public static String getDeviceId() {
      * @return 设备 id
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getDeviceId(final int slotIndex) {
         try {
             TelephonyManager telephonyManager = AppUtils.getTelephonyManager();
@@ -441,7 +442,7 @@ public static String getAndroidId() {
      * @return 设备序列号
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getSerialNumber() {
         try {
             return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? Build.getSerial() : Build.SERIAL;
@@ -456,7 +457,7 @@ public static String getSerialNumber() {
      * @return SIM 卡序列号
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getSimSerialNumber() {
         try {
             return AppUtils.getTelephonyManager().getSimSerialNumber();
@@ -471,7 +472,7 @@ public static String getSimSerialNumber() {
      * @return 设备唯一 UUID
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getUUID() {
         String deviceId     = StringUtils.getString(getDeviceId());
         String androidId    = StringUtils.getString(getAndroidId());
@@ -503,7 +504,7 @@ public static String getUUID() {
      * @return 手机状态信息
      */
     @SuppressLint("MissingPermission")
-    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
+    @RequiresPermission(Manifest.permission.READ_PHONE_STATE)
     public static String getPhoneStatus() {
         try {
             TelephonyManager telephonyManager = AppUtils.getTelephonyManager();

diff --git a/lib/DevApp/src/main/java/dev/utils/app/VibrationUtils.java b/lib/DevApp/src/main/java/dev/utils/app/VibrationUtils.java
@@ -1,5 +1,6 @@
 package dev.utils.app;
 
+import android.Manifest;
 import android.os.Vibrator;
 
 import androidx.annotation.RequiresPermission;
@@ -27,7 +28,7 @@ private VibrationUtils() {
      * @param milliseconds 震动时长 ( 毫秒 )
      * @return {@code true} success, {@code false} fail
      */
-    @RequiresPermission(android.Manifest.permission.VIBRATE)
+    @RequiresPermission(Manifest.permission.VIBRATE)
     public static boolean vibrate(final long milliseconds) {
         try {
             Vibrator vibrator = AppUtils.getVibrator();
@@ -46,7 +47,7 @@ public static boolean vibrate(final long milliseconds) {
      *                -1 表示只震动一次, 非 -1 表示从 pattern 数组指定下标开始重复震动
      * @return {@code true} success, {@code false} fail
      */
-    @RequiresPermission(android.Manifest.permission.VIBRATE)
+    @RequiresPermission(Manifest.permission.VIBRATE)
     public static boolean vibrate(
             final long[] pattern,
             final int repeat
@@ -66,7 +67,7 @@ public static boolean vibrate(
      * 取消震动
      * @return {@code true} success, {@code false} fail
      */
-    @RequiresPermission(android.Manifest.permission.VIBRATE)
+    @RequiresPermission(Manifest.permission.VIBRATE)
     public static boolean cancel() {
         try {
             AppUtils.getVibrator().cancel();