tt/Aria
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配 androidX

Browse Source
This commit is contained in:
laoyuyu
2019-07-30 21:26:19 +08:00
parent 43915ad204
commit ac43c9b93b
107 changed files with 234 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AppFrame/build.gradle
View File

@@ -10,7 +10,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -25,11 +25,11 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
api "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
api 'androidx.appcompat:appcompat:1.0.2'
api 'com.google.code.gson:gson:2.8.2'
api 'io.reactivex:rxandroid:1.2.0'
api 'io.reactivex:rxjava:1.1.5'
@@ -39,10 +39,10 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.2.0'
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.1'
api "android.arch.lifecycle:runtime:${rootProject.ext.lifecycleVersion}"
api "android.arch.lifecycle:extensions:${rootProject.ext.lifecycleVersion}"
annotationProcessor "android.arch.lifecycle:compiler:${rootProject.ext.lifecycleVersion}"
api 'androidx.lifecycle:lifecycle-runtime:2.0.0'
api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
}

5
AppFrame/src/main/java/com/arialyy/frame/base/BaseDialog.java
View File

@@ -6,13 +6,10 @@ import android.animation.AnimatorSet;
import android.animation.IntEvaluator;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.app.Dialog;
import android.databinding.ViewDataBinding;
import androidx.databinding.ViewDataBinding;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.BounceInterpolator;

2
AppFrame/src/main/java/com/arialyy/frame/base/BaseFragment.java
View File

@@ -1,6 +1,6 @@
package com.arialyy.frame.base;
import android.databinding.ViewDataBinding;
import androidx.databinding.ViewDataBinding;
import com.arialyy.frame.core.AbsFragment;
/**

2
AppFrame/src/main/java/com/arialyy/frame/base/BaseViewModule.java
View File

@@ -1,6 +1,6 @@
package com.arialyy.frame.base;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import com.arialyy.frame.base.net.NetManager;
import com.arialyy.frame.util.StringUtil;

7
AppFrame/src/main/java/com/arialyy/frame/cache/AbsCache.java vendored
View File

@@ -1,18 +1,15 @@
package com.arialyy.frame.cache;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v4.util.LruCache;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.collection.LruCache;
import com.arialyy.frame.util.AndroidUtils;
import com.arialyy.frame.util.AppUtils;
import com.arialyy.frame.util.FileUtil;
import com.arialyy.frame.util.StreamUtil;
import com.arialyy.frame.util.StringUtil;
import com.arialyy.frame.util.show.FL;
import com.arialyy.frame.util.show.L;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;

4
AppFrame/src/main/java/com/arialyy/frame/cache/CacheUtil.java vendored
View File

@@ -2,12 +2,10 @@ package com.arialyy.frame.cache;
import android.content.Context;
import android.graphics.Bitmap;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.arialyy.frame.util.DrawableUtil;
import com.arialyy.frame.util.show.L;
import com.google.gson.Gson;
import java.io.UnsupportedEncodingException;
/**

9
AppFrame/src/main/java/com/arialyy/frame/core/AbsActivity.java
View File

@@ -1,14 +1,13 @@
package com.arialyy.frame.core;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.temp.AbsTempView;

5
AppFrame/src/main/java/com/arialyy/frame/core/AbsAlertDialog.java
View File

@@ -3,9 +3,8 @@ package com.arialyy.frame.core;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.util.StringUtil;

3
AppFrame/src/main/java/com/arialyy/frame/core/AbsDialog.java
View File

@@ -2,9 +2,8 @@ package com.arialyy.frame.core;
import android.app.Dialog;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.Window;
import androidx.annotation.NonNull;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.util.StringUtil;

16
AppFrame/src/main/java/com/arialyy/frame/core/AbsDialogFragment.java
View File

@@ -2,23 +2,21 @@ package com.arialyy.frame.core;
import android.app.Activity;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.fragment.app.DialogFragment;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.util.StringUtil;
import com.lyy.frame.R;
/**
* Created by lyy on 2015/11/4.
* DialogFragment
@@ -69,7 +67,7 @@ public abstract class AbsDialogFragment<VB extends ViewDataBinding> extends Dial
}
}
public <T extends View> T findViewById(@IdRes int id){
public <T extends View> T findViewById(@IdRes int id) {
return mRootView.findViewById(id);
}

16
AppFrame/src/main/java/com/arialyy/frame/core/AbsFragment.java
View File

@@ -2,22 +2,21 @@ package com.arialyy.frame.core;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentContainer;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentContainer;
import androidx.viewpager.widget.ViewPager;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.temp.AbsTempView;
@@ -26,7 +25,6 @@ import com.arialyy.frame.temp.TempView;
import com.arialyy.frame.util.ReflectionUtil;
import com.arialyy.frame.util.StringUtil;
import com.arialyy.frame.util.show.L;
import java.lang.reflect.Field;
/**

2
AppFrame/src/main/java/com/arialyy/frame/core/AbsPopupWindow.java
View File

@@ -4,11 +4,11 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.PopupWindow;
import androidx.annotation.NonNull;
import com.arialyy.frame.module.AbsModule;
import com.arialyy.frame.module.IOCProxy;
import com.arialyy.frame.util.StringUtil;

2
AppFrame/src/main/java/com/arialyy/frame/core/BindingFactory.java
View File

@@ -1,6 +1,6 @@
package com.arialyy.frame.core;
import android.databinding.ViewDataBinding;
import androidx.databinding.ViewDataBinding;
import java.util.HashMap;
import java.util.Map;

3
AppFrame/src/main/java/com/arialyy/frame/core/PermissionHelp.java
View File

@@ -4,8 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.arialyy.frame.permission.OnPermissionCallback;
import com.arialyy.frame.permission.PermissionManager;
import com.arialyy.frame.util.AndroidVersionUtil;

7
AppFrame/src/main/java/com/arialyy/frame/http/HttpUtil.java
View File

@@ -3,15 +3,12 @@ package com.arialyy.frame.http;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.arialyy.frame.cache.CacheUtil;
import com.arialyy.frame.http.inf.IResponse;
import com.arialyy.frame.util.show.L;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -25,14 +22,12 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
/**

2
AppFrame/src/main/java/com/arialyy/frame/http/inf/IRequest.java
View File

@@ -1,6 +1,6 @@
package com.arialyy.frame.http.inf;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* 网络请求类

11
AppFrame/src/main/java/com/arialyy/frame/module/AbsModule.java
View File

@@ -1,23 +1,14 @@
package com.arialyy.frame.module;
import android.content.Context;
import android.databinding.ViewDataBinding;
import android.text.TextUtils;
import android.util.SparseIntArray;
import android.view.View;
import androidx.databinding.ViewDataBinding;
import com.arialyy.frame.core.AbsActivity;
import com.arialyy.frame.core.BindingFactory;
import com.arialyy.frame.module.inf.ModuleListener;
import com.arialyy.frame.util.ObjUtil;
import com.arialyy.frame.util.StringUtil;
import com.arialyy.frame.util.show.L;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
* Created by AriaLyy on 2015/2/3.
* 抽象的module

4
AppFrame/src/main/java/com/arialyy/frame/permission/PermissionManager.java
View File

@@ -4,11 +4,9 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.os.Build;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.util.SparseArray;
import com.arialyy.frame.util.show.L;
import androidx.fragment.app.Fragment;
import java.util.Arrays;
import java.util.List;

4
AppFrame/src/main/java/com/arialyy/frame/permission/PermissionUtil.java
View File

@@ -7,13 +7,11 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import androidx.fragment.app.Fragment;
import com.arialyy.frame.util.AndroidVersionUtil;
import com.arialyy.frame.util.show.L;
import com.arialyy.frame.util.show.T;
import java.util.ArrayList;
import java.util.List;

3
AppFrame/src/main/java/com/arialyy/frame/temp/AbsTempView.java
View File

@@ -1,12 +1,11 @@
package com.arialyy.frame.temp;
import android.content.Context;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import com.arialyy.frame.util.StringUtil;
import com.arialyy.frame.util.show.L;

4
AppFrame/src/main/java/com/arialyy/frame/util/AESEncryption.java
View File

@@ -1,11 +1,9 @@
package com.arialyy.frame.util;
import android.annotation.SuppressLint;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.io.File;
import java.security.SecureRandom;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;

4
AppFrame/src/main/java/com/arialyy/frame/util/AndroidUtils.java
View File

@@ -17,8 +17,8 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.StatFs;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.content.FileProvider;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
import android.view.WindowManager;

6
AppFrame/src/main/java/com/arialyy/frame/util/FileUtil.java
View File

@@ -6,12 +6,10 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
import android.media.MediaMetadataRetriever;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.arialyy.frame.util.show.FL;
import com.arialyy.frame.util.show.L;
import java.io.BufferedInputStream;
@@ -31,8 +29,6 @@ import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
import java.util.Formatter;
import java.util.Locale;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;