全面升级代码到androidX以获得更好的兼容性和可以使用android最新的特性
This commit is contained in:
@@ -7,8 +7,6 @@ android {
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 59
|
||||
versionName "5.5.4"
|
||||
ndk {
|
||||
abiFilters 'armeabi','arm64-v8a'
|
||||
}
|
||||
@@ -25,8 +23,8 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
testCompile 'junit:junit:4.12'
|
||||
compile 'com.android.support:appcompat-v7:26.1.0'
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
testImplementation 'junit:junit:4.12'
|
||||
api 'androidx.appcompat:appcompat:1.0.0'
|
||||
}
|
||||
|
||||
|
||||
@@ -6,9 +6,8 @@ import android.content.ContextWrapper;
|
||||
import android.content.SharedPreferences;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.view.ContextThemeWrapper;
|
||||
import android.text.TextUtils;
|
||||
import android.view.ContextThemeWrapper;
|
||||
|
||||
import java.util.Formatter;
|
||||
import java.util.Locale;
|
||||
@@ -66,22 +65,6 @@ public class JCUtils {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get AppCompatActivity from context
|
||||
*
|
||||
* @param context
|
||||
* @return AppCompatActivity if it's not null
|
||||
*/
|
||||
public static AppCompatActivity getAppCompActivity(Context context) {
|
||||
if (context == null) return null;
|
||||
if (context instanceof AppCompatActivity) {
|
||||
return (AppCompatActivity) context;
|
||||
} else if (context instanceof ContextThemeWrapper) {
|
||||
return getAppCompActivity(((ContextThemeWrapper) context).getBaseContext());
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static int dip2px(Context context, float dpValue) {
|
||||
final float scale = context.getResources().getDisplayMetrics().density;
|
||||
return (int) (dpValue * scale + 0.5f);
|
||||
|
||||
@@ -9,8 +9,6 @@ import android.hardware.SensorManager;
|
||||
import android.media.AudioManager;
|
||||
import android.media.MediaPlayer;
|
||||
import android.os.Handler;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.app.ActionBar;
|
||||
import android.text.TextUtils;
|
||||
import android.util.AttributeSet;
|
||||
import android.util.Log;
|
||||
|
||||
Reference in New Issue
Block a user