version:

update:2021.03.16 fix: add: migrate to androidx
2021-03-16 15:49:25 +08:00
parent 5a943fc34f
commit b9563baf1e
30 changed files with 72 additions and 120 deletions
--- a/app/src/main/java/com/mjsheng/myappstore/MyApplication.java
+++ b/app/src/main/java/com/mjsheng/myappstore/MyApplication.java
@@ -7,17 +7,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 import android.text.TextUtils;
 import android.util.Log;

@@ -64,9 +60,7 @@ import org.lzh.framework.updatepluginlib.base.UpdateParser;
 import org.lzh.framework.updatepluginlib.model.CheckEntity;

 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -81,7 +75,6 @@ import java.util.logging.Level;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.JPushMessage;
 import io.reactivex.Observer;
-import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
--- a/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java
+++ b/app/src/main/java/com/mjsheng/myappstore/Statistics/AppInformation.java
@@ -7,7 +7,7 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;


 public class AppInformation {
--- a/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java
+++ b/app/src/main/java/com/mjsheng/myappstore/Statistics/StatisticsInfo.java
@@ -6,7 +6,7 @@ import android.app.usage.UsageStats;
 import android.app.usage.UsageStatsManager;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;

 import java.util.ArrayList;
 import java.util.Calendar;
--- a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java
+++ b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java
@@ -3,7 +3,7 @@ package com.mjsheng.myappstore.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;

 import com.mjsheng.myappstore.R;

--- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
+++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java
@@ -22,8 +22,9 @@ import android.os.PersistableBundle;
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -69,7 +70,6 @@ import com.mjsheng.myappstore.network.api.DeselectIDApi;
 import com.mjsheng.myappstore.network.api.ForceDownloadApi;
 import com.mjsheng.myappstore.network.api.NetAndLaunchApi;
 import com.mjsheng.myappstore.network.api.SystemSettingApi;
-import com.mjsheng.myappstore.server.InitJpushServer;
 import com.mjsheng.myappstore.server.MyDownloadService;
 import com.mjsheng.myappstore.utils.ApkUtils;
 import com.mjsheng.myappstore.utils.Configure;
--- a/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java
+++ b/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java
@@ -1,7 +1,7 @@
 package com.mjsheng.myappstore.activity;

 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.KeyEvent;

--- a/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java
+++ b/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java
@@ -1,6 +1,6 @@
 package com.mjsheng.myappstore.bean;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;


 import java.io.Serializable;
--- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
+++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java
@@ -10,7 +10,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.Log;

--- a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java
+++ b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java
@@ -19,9 +19,8 @@ import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.format.Formatter;
 import android.util.Log;

@@ -34,10 +33,8 @@ import com.arialyy.aria.core.task.DownloadTask;
 import com.blankj.utilcode.util.LogUtils;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
-import com.mjsheng.myappstore.BuildConfig;
 import com.mjsheng.myappstore.KeepAliveConnection;
 import com.mjsheng.myappstore.MyApplication;
-import com.mjsheng.myappstore.activity.MainActivity;
 import com.mjsheng.myappstore.utils.ApkUtils;
 import com.mjsheng.myappstore.utils.Configure;
 import com.mjsheng.myappstore.utils.SPUtils;
--- a/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java
+++ b/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java
@@ -10,7 +10,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;

 import com.lzy.okgo.OkGo;
--- a/app/src/main/java/com/mjsheng/myappstore/server/StepService.java
+++ b/app/src/main/java/com/mjsheng/myappstore/server/StepService.java
@@ -15,26 +15,18 @@ import android.content.ServiceConnection;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;

 import com.blankj.utilcode.util.LogUtils;
-import com.lzy.okserver.download.DownloadInfo;
 import com.mjsheng.myappstore.KeepAliveConnection;
-import com.mjsheng.myappstore.MyApplication;
-import com.mjsheng.myappstore.bean.AppDateInfo;
-import com.mjsheng.myappstore.bean.FileData;
 import com.mjsheng.myappstore.network.Network;
-import com.mjsheng.myappstore.utils.ApkUtils;
 import com.mjsheng.myappstore.utils.ServiceAliveUtils;
 import com.mjsheng.myappstore.utils.Utils;

 import org.java_websocket.handshake.ServerHandshake;

 import java.net.URI;
-import java.nio.file.Path;
-
-import okhttp3.internal.Util;

 /**
 * 主进程 双进程通讯
--- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
@@ -17,8 +17,8 @@ import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -34,9 +34,6 @@ import com.mjsheng.myappstore.R;
 import com.mjsheng.myappstore.bean.UploadAppInfo;
 import com.mjsheng.myappstore.network.Network;
 import com.mjsheng.myappstore.network.api.UploadAppInfoApi;
-import com.mjsheng.myappstore.server.InitJpushServer;
-
-import org.w3c.dom.Text;

 import java.io.BufferedReader;
 import java.io.DataOutputStream;
--- a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java
@@ -5,12 +5,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInstaller;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;

-
-import static android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION;
-
 public class InstallResultReceiver extends BroadcastReceiver {
    private static final String TAG = "InstallResultReceiver";

--- a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java
@@ -1,45 +1,18 @@
 package com.mjsheng.myappstore.utils;

 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.util.Log;
-import android.view.View;
-import android.widget.Toast;

 import com.blankj.utilcode.util.SPStaticUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.mjsheng.myappstore.R;
 import com.mjsheng.myappstore.comm.CommonDatas;
-import com.mjsheng.myappstore.utils.update.ToastTool;

-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import rx.Observable;
-import rx.Observer;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;

 public class SaveListUtils {
    private static List<String> downLoadList = new ArrayList<>();
--- a/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java
@@ -1,7 +1,7 @@
 package com.mjsheng.myappstore.utils;

 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;

 /**
--- a/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java
@@ -2,7 +2,7 @@ package com.mjsheng.myappstore.utils;

 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;


--- a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java
@@ -30,10 +30,9 @@ import android.net.wifi.WifiManager;
 import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Environment;
-import android.os.PowerManager;
 import android.os.StatFs;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.text.format.Formatter;
--- a/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/update/NotificationDownloadCreator.java
@@ -3,10 +3,9 @@ package com.mjsheng.myappstore.utils.update;
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.support.v4.app.NotificationCompat;

-import com.mjsheng.myappstore.R;
+import androidx.core.app.NotificationCompat;
+
 import com.mjsheng.myappstore.comm.CommonDatas;

 import org.lzh.framework.updatepluginlib.base.DownloadCallback;