From de84f7bf112ae9e4ee4336109448af6ae5cd9e7c Mon Sep 17 00:00:00 2001
From: Ttt <13798405957@163.com>
Date: Wed, 30 Sep 2020 09:45:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=20DevUti?=
 =?UTF-8?q?ls.getContext()=20=E8=8E=B7=E5=8F=96=20Resource=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 9198240e8adc7ece17ab7adcce44c5bd073745ad
Former-commit-id: 499f86fd123ac6897ca409f1d0dfe680faa25d3d
---
 lib/DevApp/src/main/java/dev/utils/app/BarUtils.java         | 4 ++--
 lib/DevApp/src/main/java/dev/utils/app/ImageViewUtils.java   | 4 ++--
 lib/DevWidget/src/main/java/dev/widget/ui/ScanShapeView.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/DevApp/src/main/java/dev/utils/app/BarUtils.java b/lib/DevApp/src/main/java/dev/utils/app/BarUtils.java
index da966d3ae7..899390ac30 100644
--- a/lib/DevApp/src/main/java/dev/utils/app/BarUtils.java
+++ b/lib/DevApp/src/main/java/dev/utils/app/BarUtils.java
@@ -500,7 +500,7 @@ ViewGroup.LayoutParams.MATCH_PARENT, getStatusBarHeight()
     public static int getActionBarHeight() {
         TypedValue tv = new TypedValue();
         try {
-            if (DevUtils.getContext().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
+            if (ResourceUtils.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
                 return TypedValue.complexToDimensionPixelSize(tv.data, Resources.getSystem().getDisplayMetrics());
             }
         } catch (Exception e) {
@@ -528,7 +528,7 @@ public static boolean setNotificationBarVisibility(final boolean isVisible) {
         }
         try {
             @SuppressLint("WrongConstant")
-            Object service = DevUtils.getContext().getSystemService("statusbar");
+            Object service = AppUtils.getSystemService("statusbar");
             @SuppressLint("PrivateApi")
             Class<?> statusBarManager = Class.forName("android.app.StatusBarManager");
             Method expand = statusBarManager.getMethod(methodName);
diff --git a/lib/DevApp/src/main/java/dev/utils/app/ImageViewUtils.java b/lib/DevApp/src/main/java/dev/utils/app/ImageViewUtils.java
index d8a859c728..2a3a8cd485 100644
--- a/lib/DevApp/src/main/java/dev/utils/app/ImageViewUtils.java
+++ b/lib/DevApp/src/main/java/dev/utils/app/ImageViewUtils.java
@@ -682,8 +682,8 @@ public static int[] getImageViewSize(final ImageView imageView) {
         int[] imageSize = new int[]{0, 0};
         try {
             if (imageView == null) return imageSize;
-            // =
-            DisplayMetrics displayMetrics = imageView.getContext().getResources().getDisplayMetrics();
+
+            DisplayMetrics displayMetrics = ResourceUtils.getDisplayMetrics(imageView.getContext());
             ViewGroup.LayoutParams layoutParams = imageView.getLayoutParams();
 
             // 获取 ImageView 的实际宽度
diff --git a/lib/DevWidget/src/main/java/dev/widget/ui/ScanShapeView.java b/lib/DevWidget/src/main/java/dev/widget/ui/ScanShapeView.java
index 7f5c839c2a..f5c6ab49bc 100644
--- a/lib/DevWidget/src/main/java/dev/widget/ui/ScanShapeView.java
+++ b/lib/DevWidget/src/main/java/dev/widget/ui/ScanShapeView.java
@@ -1850,7 +1850,7 @@ private void refLineColorToSquare() {
         if (mBitmapToSquare != null && mLineColorToSquare != 0) {
             try {
                 // 转换 Drawable
-                Drawable drawable = new BitmapDrawable(getContext().getResources(), mBitmapToSquare);
+                Drawable drawable = new BitmapDrawable(getResources(), mBitmapToSquare);
                 Drawable tintDrawable = DrawableCompat.wrap(drawable);
                 // 进行着色
                 DrawableCompat.setTint(tintDrawable, mLineColorToSquare);
@@ -1924,7 +1924,7 @@ private void refLineColorToAnnulus() {
         if (mBitmapToAnnulus != null && mLineColorToAnnulus != 0) {
             try {
                 // 转换 Drawable
-                Drawable drawable = new BitmapDrawable(getContext().getResources(), mBitmapToAnnulus);
+                Drawable drawable = new BitmapDrawable(getResources(), mBitmapToAnnulus);
                 Drawable tintDrawable = DrawableCompat.wrap(drawable);
                 // 进行着色
                 DrawableCompat.setTint(tintDrawable, mLineColorToAnnulus);