Skip to content

Commit 9513cb3

Browse files
author
Ttt
committed
1.修改部分无用 context 传参
2.发布 1.2.5 Former-commit-id: c13a1f7
1 parent 48ae77c commit 9513cb3

File tree

10 files changed

+45
-63
lines changed

10 files changed

+45
-63
lines changed

‎DevLibUtils/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.android.library'
22

3-
def dev_utils_version = "1.2.4";
3+
def dev_utils_version = "1.2.5";
44

55
android {
66
compileSdkVersion 28

‎DevLibUtils/src/main/java/dev/utils/app/AppUtils.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -614,17 +614,16 @@ public static boolean isAppInstalled(@NonNull final String packageName) {
614614

615615
/**
616616
* 判断是否安装指定包名的 App
617-
* @param context
618617
* @param packageName 包路径
619618
* @return
620619
*/
621620
@SuppressWarnings("unused")
622-
public static boolean isInstalledApp(Context context, String packageName) {
621+
public static boolean isInstalledApp(String packageName) {
623622
if (packageName == null || "".equals(packageName)) {
624623
return false;
625624
}
626625
try {
627-
ApplicationInfo info = context.getPackageManager().getApplicationInfo(packageName, PackageManager.GET_UNINSTALLED_PACKAGES);
626+
ApplicationInfo info = DevUtils.getContext().getPackageManager().getApplicationInfo(packageName, PackageManager.GET_UNINSTALLED_PACKAGES);
628627
return true;
629628
} catch (Exception e) {
630629
LogPrintUtils.eTag(TAG, e, "isInstalledApp");
@@ -1002,18 +1001,17 @@ private static String bytes2HexString(final byte[] bytes) {
10021001

10031002
/**
10041003
* 启动本地应用打开PDF
1005-
* @param context
10061004
* @param filePath 文件路径
10071005
*/
1008-
public static boolean openPDFFile(Context context, String filePath) {
1006+
public static boolean openPDFFile(String filePath) {
10091007
try {
10101008
File file = new File(filePath);
10111009
if (file.exists()) {
10121010
Uri path = Uri.fromFile(file);
10131011
Intent intent = new Intent(Intent.ACTION_VIEW);
10141012
intent.setDataAndType(path, "application/pdf");
1015-
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
1016-
context.startActivity(intent);
1013+
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
1014+
DevUtils.getContext().startActivity(intent);
10171015
return true;
10181016
}
10191017
} catch (Exception e) {
@@ -1024,10 +1022,9 @@ public static boolean openPDFFile(Context context, String filePath) {
10241022

10251023
/**
10261024
* 启动本地应用打开PDF
1027-
* @param context
10281025
* @param filePath 文件路径
10291026
*/
1030-
public static boolean openWordFile(Context context, String filePath) {
1027+
public static boolean openWordFile(String filePath) {
10311028
try {
10321029
File file = new File(filePath);
10331030
if (file.exists()) {
@@ -1036,7 +1033,7 @@ public static boolean openWordFile(Context context, String filePath) {
10361033
intent.addCategory("android.intent.category.DEFAULT");
10371034
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
10381035
intent.setDataAndType(path, "application/msword");
1039-
context.startActivity(intent);
1036+
DevUtils.getContext().startActivity(intent);
10401037
return true;
10411038
}
10421039
} catch (Exception e) {
@@ -1047,10 +1044,9 @@ public static boolean openWordFile(Context context, String filePath) {
10471044

10481045
/**
10491046
* 调用WPS打开office文档
1050-
* @param context
10511047
* @param filePath 文件路径
10521048
*/
1053-
public static boolean openOfficeByWPS(Context context, String filePath) {
1049+
public static boolean openOfficeByWPS(String filePath) {
10541050
try {
10551051
// 检查是否安装WPS
10561052
String wpsPackageEng = "cn.wps.moffice_eng";// 普通版与英文版一样
@@ -1064,7 +1060,7 @@ public static boolean openOfficeByWPS(Context context, String filePath) {
10641060

10651061
Uri uri = Uri.fromFile(new File(filePath));
10661062
intent.setData(uri);
1067-
context.startActivity(intent);
1063+
DevUtils.getContext().startActivity(intent);
10681064
return true;
10691065
} catch (Exception e) {
10701066
LogPrintUtils.eTag(TAG, e, "openOfficeByWPS");

‎DevLibUtils/src/main/java/dev/utils/app/LocationUtils.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.utils.app;
22

33
import android.annotation.SuppressLint;
4-
import android.content.Context;
54
import android.content.Intent;
65
import android.location.Address;
76
import android.location.Criteria;
@@ -45,17 +44,16 @@ private LocationUtils() {
4544
/**
4645
* 获取位置, 需要先判断是否开启了定位
4746
* <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
48-
* @param context
4947
* @param listener
5048
* @param time 间隔时间
5149
* @param distance 间隔距离
5250
* @return {@code Location}
5351
*/
5452
@SuppressLint("MissingPermission")
55-
public static Location getLocation(Context context, LocationListener listener, long time, float distance) {
53+
public static Location getLocation(LocationListener listener, long time, float distance) {
5654
Location location = null;
5755
try {
58-
mLocationManager = (LocationManager) context.getSystemService(LOCATION_SERVICE);
56+
mLocationManager = (LocationManager) DevUtils.getContext().getSystemService(LOCATION_SERVICE);
5957
if (isLocationEnabled()) {
6058
mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, time, distance, listener);
6159
if (mLocationManager != null) {

‎DevLibUtils/src/main/java/dev/utils/app/MemoryUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@ public static ActivityManager.MemoryInfo getMemoryInfo() {
9797

9898
/**
9999
* 打印内存信息
100-
* @param context
101100
* @return
102101
*/
103102
@RequiresApi(Build.VERSION_CODES.CUPCAKE)
104-
public static ActivityManager.MemoryInfo printMemoryInfo(Context context) {
103+
public static ActivityManager.MemoryInfo printMemoryInfo() {
105104
ActivityManager.MemoryInfo mi = getMemoryInfo();
106105
StringBuilder sBuilder = new StringBuilder();
107106
sBuilder.append("_______ Memory : ");

‎DevLibUtils/src/main/java/dev/utils/app/PhoneUtils.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,9 @@ public String printInfo() {
691691

692692
/**
693693
* 获取 MTK 神机的双卡 IMSI、IMSI 信息
694-
* @param context
695694
* @return
696695
*/
697-
public static TeleInfo getMtkTeleInfo(Context context) {
696+
public static TeleInfo getMtkTeleInfo() {
698697
TeleInfo teleInfo = new TeleInfo();
699698
try {
700699
Class<?> phone = Class.forName("com.android.internal.telephony.Phone");
@@ -707,7 +706,7 @@ public static TeleInfo getMtkTeleInfo(Context context) {
707706
fields2.setAccessible(true);
708707
int simId_2 = (Integer) fields2.get(null);
709708

710-
TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
709+
TelephonyManager tm = (TelephonyManager) DevUtils.getContext().getSystemService(Context.TELEPHONY_SERVICE);
711710
Method getSubscriberIdGemini = TelephonyManager.class.getDeclaredMethod("getSubscriberIdGemini", int.class);
712711
String imsi_1 = (String) getSubscriberIdGemini.invoke(tm, simId_1);
713712
String imsi_2 = (String) getSubscriberIdGemini.invoke(tm, simId_2);
@@ -734,14 +733,13 @@ public static TeleInfo getMtkTeleInfo(Context context) {
734733

735734
/**
736735
* 获取 MTK 神机的双卡 IMSI、IMSI 信息
737-
* @param context
738736
* @return
739737
*/
740738
@RequiresPermission(Manifest.permission.READ_PHONE_STATE)
741-
public static TeleInfo getMtkTeleInfo2(Context context) {
739+
public static TeleInfo getMtkTeleInfo2() {
742740
TeleInfo teleInfo = new TeleInfo();
743741
try {
744-
TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
742+
TelephonyManager tm = (TelephonyManager) DevUtils.getContext().getSystemService(Context.TELEPHONY_SERVICE);
745743
Class<?> phone = Class.forName("com.android.internal.telephony.Phone");
746744
Field fields1 = phone.getField("GEMINI_SIM_1");
747745
fields1.setAccessible(true);
@@ -776,15 +774,14 @@ public static TeleInfo getMtkTeleInfo2(Context context) {
776774

777775
/**
778776
* 获取 高通 神机的双卡 IMSI、IMSI 信息
779-
* @param context
780777
* @return
781778
*/
782-
public static TeleInfo getQualcommTeleInfo(Context context) {
779+
public static TeleInfo getQualcommTeleInfo() {
783780
TeleInfo teleInfo = new TeleInfo();
784781
try {
785-
TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
782+
TelephonyManager tm = (TelephonyManager) DevUtils.getContext().getSystemService(Context.TELEPHONY_SERVICE);
786783
Class<?> simTMclass = Class.forName("android.telephony.MSimTelephonyManager");
787-
Object sim = context.getSystemService("phone_msim");
784+
Object sim = DevUtils.getContext().getSystemService("phone_msim");
788785
int simId_1 = 0;
789786
int simId_2 = 1;
790787

‎DevLibUtils/src/main/java/dev/utils/app/VibrationUtils.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.os.Vibrator;
55
import android.support.annotation.RequiresPermission;
66

7+
import dev.DevUtils;
78
import dev.utils.LogPrintUtils;
89

910
/**
@@ -20,13 +21,12 @@ private VibrationUtils() {
2021

2122
/**
2223
* 震动
23-
* @param context
2424
* @param milliseconds 震动时长
2525
*/
2626
@RequiresPermission(android.Manifest.permission.VIBRATE)
27-
public static void vibrate(final Context context, final long milliseconds) {
27+
public static void vibrate(final long milliseconds) {
2828
try {
29-
Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
29+
Vibrator vibrator = (Vibrator) DevUtils.getContext().getSystemService(Context.VIBRATOR_SERVICE);
3030
vibrator.vibrate(milliseconds);
3131
} catch (Exception e){
3232
LogPrintUtils.eTag(TAG, e, "vibrate");
@@ -35,14 +35,13 @@ public static void vibrate(final Context context, final long milliseconds) {
3535

3636
/**
3737
* 指定手机以pattern模式震动
38-
* @param context
3938
* @param pattern new long[]{400,800,1200,1600}，就是指定在 400ms、800ms、1200ms、1600ms 这些时间点交替启动、关闭手机震动器
4039
* @param repeat 指定pattern数组的索引，指定pattern数组中从repeat索引开始的震动进行循环。-1表示只震动一次，非-1表示从 pattern的指定下标开始重复震动。
4140
*/
4241
@RequiresPermission(android.Manifest.permission.VIBRATE)
43-
public static void vibrate(final Context context, final long[] pattern, final int repeat) {
42+
public static void vibrate(final long[] pattern, final int repeat) {
4443
try {
45-
Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
44+
Vibrator vibrator = (Vibrator) DevUtils.getContext().getSystemService(Context.VIBRATOR_SERVICE);
4645
vibrator.vibrate(pattern, repeat);
4746
} catch (Exception e){
4847
LogPrintUtils.eTag(TAG, e, "vibrate");
@@ -51,12 +50,11 @@ public static void vibrate(final Context context, final long[] pattern, final in
5150

5251
/**
5352
* 取消震动
54-
* @param context
5553
*/
5654
@RequiresPermission(android.Manifest.permission.VIBRATE)
57-
public static void cancel(final Context context) {
55+
public static void cancel() {
5856
try {
59-
((Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE)).cancel();
57+
((Vibrator) DevUtils.getContext().getSystemService(Context.VIBRATOR_SERVICE)).cancel();
6058
} catch (Exception e){
6159
LogPrintUtils.eTag(TAG, e, "cancel");
6260
}

‎DevLibUtils/src/main/java/dev/utils/app/assist/BeepVibrateAssist.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public final class BeepVibrateAssist implements Closeable {
2222
// 日志TAG
2323
private static final String TAG = BeepVibrateAssist.class.getSimpleName();
2424
// Context
25-
private final Context context;
25+
private final Context mContext;
2626
// 播放资源对象
2727
private MediaPlayer mediaPlayer = null;
2828
// 是否需要震动
@@ -35,7 +35,7 @@ public final class BeepVibrateAssist implements Closeable {
3535
* @param context
3636
*/
3737
public BeepVibrateAssist(Context context) {
38-
this.context = context;
38+
this.mContext = context;
3939
}
4040

4141
/**
@@ -44,7 +44,7 @@ public BeepVibrateAssist(Context context) {
4444
* @param rawId
4545
*/
4646
public BeepVibrateAssist(Context context, @RawRes int rawId) {
47-
this.context = context;
47+
this.mContext = context;
4848
this.mediaPlayer = buildMediaPlayer(context, rawId);
4949
}
5050

@@ -54,7 +54,7 @@ public BeepVibrateAssist(Context context, @RawRes int rawId) {
5454
* @param path 只支持本地资源
5555
*/
5656
public BeepVibrateAssist(Context context, String path) {
57-
this.context = context;
57+
this.mContext = context;
5858
this.mediaPlayer = buildMediaPlayer(path);
5959
}
6060

@@ -69,7 +69,7 @@ private boolean shouldBeep() {
6969
if (shouldPlayBeep) {
7070
try {
7171
// RINGER_MODE_NORMAL(普通)、RINGER_MODE_SILENT(静音)、RINGER_MODE_VIBRATE(震动)
72-
AudioManager audioService = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
72+
AudioManager audioService = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
7373
if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
7474
shouldPlayBeep = false; // 进入只有属于, 静音、震动，才不播放
7575
}
@@ -88,7 +88,7 @@ private synchronized void update() {
8888
// The volume on STREAM_SYSTEM is not adjustable, and users found it too loud,
8989
// so we now play on the music stream.
9090
try {
91-
((Activity) context).setVolumeControlStream(AudioManager.STREAM_MUSIC);
91+
((Activity) mContext).setVolumeControlStream(AudioManager.STREAM_MUSIC);
9292
} catch (Exception e){
9393
LogPrintUtils.eTag(TAG, e, "update");
9494
}
@@ -162,7 +162,7 @@ public synchronized void playBeepSoundAndVibrate() {
162162
// 判断是否允许震动
163163
if (vibrate) {
164164
try {
165-
Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
165+
Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
166166
vibrator.vibrate(vibrateDuration);
167167
} catch (Exception e){
168168
}

‎DevLibUtils/src/main/java/dev/utils/app/image/BitmapUtils.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.utils.app.image;
22

33
import android.content.Context;
4-
import android.content.res.Resources;
54
import android.graphics.Bitmap;
65
import android.graphics.BitmapFactory;
76
import android.graphics.Canvas;
@@ -115,8 +114,7 @@ public static Drawable getDrawable(Context context, @DrawableRes int id) {
115114
* @return
116115
*/
117116
public static Bitmap getBitmapFromResources(Context context, int resId) {
118-
Resources res = context.getResources();
119-
return BitmapFactory.decodeResource(res, resId);
117+
return BitmapFactory.decodeResource(context.getResources(), resId);
120118
}
121119

122120
/**
@@ -126,8 +124,7 @@ public static Bitmap getBitmapFromResources(Context context, int resId) {
126124
* @return
127125
*/
128126
public static Drawable getDrawableFromResources(Context context, int resId) {
129-
Resources res = context.getResources();
130-
return res.getDrawable(resId);
127+
return context.getResources().getDrawable(resId);
131128
}
132129

133130
/**

‎DevLibUtils/src/main/java/dev/utils/app/wifi/WifiUtils.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,11 @@ public static String getSSID(WifiInfo wifiInfo){
188188

189189
/**
190190
* 通过 Context 获取当前连接的ssid
191-
* @param context
192191
*/
193-
public static String getSSID(Context context){
192+
public static String getSSID(){
194193
try {
195194
// 初始化WifiManager对象
196-
WifiManager mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
195+
WifiManager mWifiManager = (WifiManager) DevUtils.getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
197196
// 获取当前连接的wifi
198197
WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
199198
// 获取wifi - SSID
@@ -360,19 +359,18 @@ public static boolean isConnNull(String ssid){
360359

361360
/**
362361
* 判断是否连接上Wifi(非连接中)
363-
* @param context
364362
* @return 返回ssid
365363
*/
366364
@RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
367-
public static String isConnectAphot(Context context){
365+
public static String isConnectAphot(){
368366
try {
369367
// 连接管理
370-
ConnectivityManager cManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
368+
ConnectivityManager cManager = (ConnectivityManager) DevUtils.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
371369
// 连接状态
372370
NetworkInfo.State nState = cManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState();
373371
if((nState == NetworkInfo.State.CONNECTED)){
374372
// 获取连接的ssid
375-
return getSSID(context);
373+
return getSSID();
376374
}
377375
} catch (Exception e) {
378376
LogPrintUtils.eTag(TAG, e, "isConnectAphot");
@@ -468,14 +466,13 @@ public WifiConfiguration isExsits(int networkId){
468466
// ================= 配置操作 =================
469467
/**
470468
* 删除指定的 Wifi(SSID) 配置信息
471-
* @param context
472469
* @param ssid
473470
* @return 删除结果
474471
*/
475-
public static boolean delWifiConfig(Context context, String ssid){
472+
public static boolean delWifiConfig(String ssid){
476473
try {
477474
// 初始化WifiManager对象
478-
WifiManager mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
475+
WifiManager mWifiManager = (WifiManager) DevUtils.getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
479476
// 获取wifi 连接过的配置信息
480477
List<WifiConfiguration> listWifiConfigs = mWifiManager.getConfiguredNetworks();
481478
// 防止为null

0 commit comments

Comments
 (0)