version:1.0

update:2021-10-16 18:50:25 fix:增减检查弹窗，修复第一次启动不能自动下载 add:切换到奥乐云平台
2021-10-16 18:51:47 +08:00
parent 3018660216
commit a4c68f0b37
58 changed files with 1028 additions and 194 deletions
--- a/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java
+++ b/app/src/main/java/com/aoleyun/sn/network/HTTPInterface.java
@@ -6,8 +6,6 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
 import android.provider.Settings;
 import android.text.TextUtils;

@@ -34,18 +32,15 @@ import com.aoleyun.sn.bean.Appground;
 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.NetAndLaunchBean;
 import com.aoleyun.sn.jpush.TagAliasOperatorHelper;
-import com.aoleyun.sn.manager.NetInterfaceManager;
 import com.aoleyun.sn.network.api.newapi.SnTimeControlApi;
 import com.aoleyun.sn.network.api.newapi.TopAppControlApi;
 import com.aoleyun.sn.network.api.newapi.UpdateDeviceInfoApi;
 import com.aoleyun.sn.service.MainService;
 import com.aoleyun.sn.utils.ApkUtils;
 import com.aoleyun.sn.utils.ForegroundAppUtil;
-import com.aoleyun.sn.utils.Logger;
 import com.aoleyun.sn.utils.SPUtils;
 import com.aoleyun.sn.utils.TimeUtils;
 import com.aoleyun.sn.utils.Utils;
-import com.trello.rxlifecycle2.android.ActivityEvent;

 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -59,8 +54,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.Call;
-import okhttp3.Response;
 import okhttp3.ResponseBody;

 import static com.aoleyun.sn.jpush.TagAliasOperatorHelper.ACTION_SET;
--- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
@@ -0,0 +1,398 @@
+package com.aoleyun.sn.network;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+
+import com.aoleyun.sn.BuildConfig;
+import com.aoleyun.sn.bean.Appground;
+import com.aoleyun.sn.bean.BaseResponse;
+import com.aoleyun.sn.bean.BrowserBookmarks;
+import com.aoleyun.sn.bean.BrowserData;
+import com.aoleyun.sn.bean.DefaultApp;
+import com.aoleyun.sn.bean.ForceDownloadBean;
+import com.aoleyun.sn.bean.ForceDownloadData;
+import com.aoleyun.sn.bean.LogoImg;
+import com.aoleyun.sn.bean.NetAndLaunchBean;
+import com.aoleyun.sn.bean.StudentsInfo;
+import com.aoleyun.sn.network.api.AppLimitApi;
+import com.aoleyun.sn.network.api.DeselectIDApi;
+import com.aoleyun.sn.network.api.ForceDownloadApi;
+import com.aoleyun.sn.network.api.NetAndLaunchApi;
+import com.aoleyun.sn.network.api.SystemSettingApi;
+import com.aoleyun.sn.network.api.UploadAppInfoApi;
+import com.aoleyun.sn.network.api.newapi.AppinsideWebApi;
+import com.aoleyun.sn.network.api.newapi.BrowserBookmarksApi;
+import com.aoleyun.sn.network.api.newapi.BrowserListApi;
+import com.aoleyun.sn.network.api.newapi.CheckTestUpdateApi;
+import com.aoleyun.sn.network.api.newapi.CheckUpdateApi;
+import com.aoleyun.sn.network.api.newapi.CustomROMAppApi;
+import com.aoleyun.sn.network.api.newapi.DefaultAppApi;
+import com.aoleyun.sn.network.api.newapi.DesktopIconApi;
+import com.aoleyun.sn.network.api.newapi.DevicesLockedStateApi;
+import com.aoleyun.sn.network.api.newapi.GetAllAppApi;
+import com.aoleyun.sn.network.api.newapi.GetAppLogApi;
+import com.aoleyun.sn.network.api.newapi.GetBatchApi;
+import com.aoleyun.sn.network.api.newapi.GetDesktopApi;
+import com.aoleyun.sn.network.api.newapi.GetDeveloperApi;
+import com.aoleyun.sn.network.api.newapi.GetEBagCodeApi;
+import com.aoleyun.sn.network.api.newapi.GetLockStateApi;
+import com.aoleyun.sn.network.api.newapi.GetJpushTagsApi;
+import com.aoleyun.sn.network.api.newapi.LogoImgApi;
+import com.aoleyun.sn.network.api.newapi.MACAddressApi;
+import com.aoleyun.sn.network.api.newapi.NewAppinsideWebApi;
+import com.aoleyun.sn.network.api.newapi.ScreenLockStateApi;
+import com.aoleyun.sn.network.api.newapi.SendDownloadInfoApi;
+import com.aoleyun.sn.network.api.newapi.SendDownloadTimesApi;
+import com.aoleyun.sn.network.api.newapi.SendScreenshotApi;
+import com.aoleyun.sn.network.api.newapi.SnTimeControlApi;
+import com.aoleyun.sn.network.api.newapi.StudentsInfosApi;
+import com.aoleyun.sn.network.api.newapi.TopAppControlApi;
+import com.aoleyun.sn.network.api.newapi.UpdateDeviceInfoApi;
+import com.aoleyun.sn.utils.Utils;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import cn.jpush.android.api.JPushInterface;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import okhttp3.ResponseBody;
+import retrofit2.CallAdapter;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class NetInterfaceManager {
+    @SuppressLint("StaticFieldLeak")
+    private static NetInterfaceManager INSTANCE;
+    private Context mContext;
+    private Retrofit mRetrofit;
+    private OkHttpClient okHttpClient;
+
+    //超时时间
+    private static int timeOut = 5;
+    // 缓存文件最大限制大小20M
+    private static long cacheSize = 1024 * 1024 * 64;
+
+    public static final String HTTP_KEY = "YTM3YTAxNTJmMmZmNzkyM2E2YzIwZjlhZTc0NzNmMGI=";
+
+    private NetInterfaceManager(Context context) {
+        this.mContext = context;
+        if (okHttpClient == null) {
+            //如果无法生存缓存文件目录，检测权限使用已经加上，检测手机是否把文件读写权限禁止了
+            OkHttpClient.Builder builder = new OkHttpClient.Builder();
+            builder.connectTimeout(timeOut, TimeUnit.SECONDS); // 设置连接超时时间
+            builder.writeTimeout(timeOut, TimeUnit.SECONDS);// 设置写入超时时间
+            builder.readTimeout(timeOut, TimeUnit.SECONDS);// 设置读取数据超时时间
+            builder.retryOnConnectionFailure(true);// 设置进行连接失败重试
+            // 设置缓存文件路径
+            String cacheDirectory = mContext.getExternalCacheDir().getAbsolutePath() + "/OkHttpCache";
+            Cache cache = new Cache(new File(cacheDirectory), cacheSize);
+            builder.cache(cache);// 设置缓存
+            okHttpClient = builder.build();
+        }
+
+        if (mRetrofit == null) {
+            mRetrofit = new Retrofit.Builder()
+                    .client(okHttpClient)
+                    .baseUrl(BuildConfig.ROOT_URL)
+                    .addConverterFactory(GsonConverterFactory.create())
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                    .build();
+        }
+    }
+
+    public static void init(Context context) {
+        if (INSTANCE == null) {
+            INSTANCE = new NetInterfaceManager(context);
+        }
+    }
+
+    public static NetInterfaceManager getInstance() {
+        if (INSTANCE == null) {
+            throw new IllegalStateException("You must be init NetworkManager first");
+        }
+        return INSTANCE;
+    }
+
+    public OkHttpClient getOkHttpClient() {
+        return okHttpClient;
+    }
+
+    /**
+     * 通过sn获取设备的信息
+     *
+     * @return
+     */
+    public Observable<BaseResponse<StudentsInfo>> getStudesInfoObservable() {
+        return mRetrofit.create(StudentsInfosApi.class)
+                .getStudentsInfo(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * 获取设备锁状态
+     *
+     * @return
+     */
+    public Observable<BaseResponse> getDevicesLockedStateObservable() {
+        return mRetrofit.create(DevicesLockedStateApi.class)
+                .getLockedState(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * 发送设备mac地址
+     *
+     * @return
+     */
+    public Observable<BaseResponse> sendMACAddressObservable() {
+        return mRetrofit.create(MACAddressApi.class)
+                .sendMACaddress(Utils.getSerial(),
+                        Utils.getAndroid10MAC(mContext),
+                        JPushInterface.getRegistrationID(mContext),
+                        Utils.getCustomVersion(),
+                        BuildConfig.VERSION_NAME,
+                        Utils.getAPPVersionName(mContext),
+                        Utils.getAndroid7MAC()
+                )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * 获取极光推送的tag
+     *
+     * @return
+     */
+    public Observable<BaseResponse> getJpushTagsObservable() {
+        return mRetrofit.create(GetJpushTagsApi.class)
+                .getJpushTags(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<BrowserData>> getBrowserListSettingObservable() {
+        return mRetrofit.create(BrowserListApi.class)
+                .getBrowserList(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<BrowserBookmarks>> getBrowserBookmarksObservable() {
+        return mRetrofit.create(BrowserBookmarksApi.class)
+                .getBrowserBookmarks(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getDesktopIconObservable() {
+        return mRetrofit.create(DesktopIconApi.class)
+                .getDesktopIcon(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<NetAndLaunchBean> getAppAutoStartUpdateAndNetObservable() {
+        return mRetrofit.create(NetAndLaunchApi.class)
+                .getNetAndLaunchApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ResponseBody> getAppIDControlObservable() {
+        return mRetrofit.create(DeselectIDApi.class)
+                .getDeselectIDApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<List<Appground>>> getAppinsideWebObservable() {
+        return mRetrofit.create(AppinsideWebApi.class)
+                .getAppinsideWeb(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getNewAppinsideWebObservable() {
+        return mRetrofit.create(NewAppinsideWebApi.class)
+                .getAppinsideWeb(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ResponseBody> getSystemSettingObservable() {
+        return mRetrofit.create(SystemSettingApi.class)
+                .getSystemSettingApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ResponseBody> getAppLimitObservable() {
+        return mRetrofit.create(AppLimitApi.class)
+                .getAppLimitApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ForceDownloadBean> getForceDownloadObservable() {
+        return mRetrofit.create(ForceDownloadApi.class)
+                .getForceDownloadApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<List<ForceDownloadData>>> getTestUpdateObservable() {
+        return mRetrofit.create(CheckTestUpdateApi.class)
+                .getTestUpdate(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getSnTimeObservable() {
+        return mRetrofit.create(SnTimeControlApi.class)
+                .getSnTimeControl(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getScreenLockObservable() {
+        return mRetrofit.create(ScreenLockStateApi.class)
+                .getScreenLockState(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ResponseBody> getDesktopObservable() {
+        return mRetrofit.create(GetDesktopApi.class)
+                .getDesktop(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<ResponseBody> getBatchObservable() {
+        return mRetrofit.create(GetBatchApi.class)
+                .getBatch(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<LogoImg>> getLogoImgObservable() {
+        return mRetrofit.create(LogoImgApi.class)
+                .getLogoImg(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getTopAppControl() {
+        return mRetrofit.create(TopAppControlApi.class)
+                .getSnAppControl(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getDeveloperControl() {
+        return mRetrofit.create(GetDeveloperApi.class)
+                .getDeveloperState(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getEBagCodeControl() {
+        return mRetrofit.create(GetEBagCodeApi.class)
+                .getEBagCode(NetInterfaceManager.HTTP_KEY, Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse<DefaultApp>> getDefaultAppApi() {
+        return mRetrofit.create(DefaultAppApi.class)
+                .getDefaultApp(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /*
+     *
+     * API
+     *
+     * */
+    public UploadAppInfoApi getUploadAppInfoApi() {
+        return mRetrofit.create(UploadAppInfoApi.class);
+    }
+
+    public DeselectIDApi getDeselectIDApi() {
+        return mRetrofit.create(DeselectIDApi.class);
+    }
+
+    public AppLimitApi getAppLimitApi() {
+        return mRetrofit.create(AppLimitApi.class);
+    }
+
+    public SystemSettingApi getSystemSettingApi() {
+        return mRetrofit.create(SystemSettingApi.class);
+    }
+
+    public NetAndLaunchApi getNetAndLaunchApi() {
+        return mRetrofit.create(NetAndLaunchApi.class);
+    }
+
+    public ForceDownloadApi getForceDownloadApi() {
+        return mRetrofit.create(ForceDownloadApi.class);
+    }
+
+    public GetLockStateApi getLockState() {
+        return mRetrofit.create(GetLockStateApi.class);
+    }
+
+    public UpdateDeviceInfoApi getUpdateDeviceInfo() {
+        return mRetrofit.create(UpdateDeviceInfoApi.class);
+    }
+
+    public GetBatchApi getBatchApi() {
+        return mRetrofit.create(GetBatchApi.class);
+    }
+
+    public SnTimeControlApi getSnTimeControlApi() {
+        return mRetrofit.create(SnTimeControlApi.class);
+    }
+
+    public TopAppControlApi getTopAppControlApi() {
+        return mRetrofit.create(TopAppControlApi.class);
+    }
+
+    public CheckUpdateApi getUpdateApi() {
+        return mRetrofit.create(CheckUpdateApi.class);
+    }
+
+    public CustomROMAppApi getCustomROMAppApi() {
+        return mRetrofit.create(CustomROMAppApi.class);
+    }
+
+    public GetAllAppApi GetAllAppApi() {
+        return mRetrofit.create(GetAllAppApi.class);
+    }
+
+    public GetAppLogApi getAppLogApi() {
+        return mRetrofit.create(GetAppLogApi.class);
+    }
+
+    public SendDownloadTimesApi getSendTimesApi() {
+        return mRetrofit.create(SendDownloadTimesApi.class);
+    }
+
+    public SendDownloadInfoApi getSendInfoApi() {
+        return mRetrofit.create(SendDownloadInfoApi.class);
+    }
+
+    public SendScreenshotApi getScreenshotApi() {
+        return mRetrofit.create(SendScreenshotApi.class);
+    }
+}
--- a/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java
+++ b/app/src/main/java/com/aoleyun/sn/network/UrlAddress.java
@@ -7,7 +7,7 @@ import rxhttp.wrapper.annotation.DefaultDomain;
 /**
 * @author Administrator
 */
-public class URLAddress {
+public class UrlAddress {
    //根网址
    @DefaultDomain
    public static final String HTTP_TAG_HEAD_NEW = BuildConfig.ROOT_URL;
--- a/app/src/main/java/com/aoleyun/sn/network/api/AppLimitApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/AppLimitApi.java
@@ -1,6 +1,6 @@
 package com.aoleyun.sn.network.api;

-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface AppLimitApi {
    @FormUrlEncoded
-    @POST(URLAddress.SET_WHITE_PACKAGE_LIST)
+    @POST(UrlAddress.SET_WHITE_PACKAGE_LIST)
    Observable<ResponseBody> getAppLimitApi(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/ForceDownloadApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/ForceDownloadApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api;

 import com.aoleyun.sn.bean.ForceDownloadBean;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface ForceDownloadApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_FORCE_INSTALL_LIST)
+    @POST(UrlAddress.GET_FORCE_INSTALL_LIST)
    Observable<ForceDownloadBean> getForceDownloadApi(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/NetAndLaunchApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/NetAndLaunchApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api;

 import com.aoleyun.sn.bean.NetAndLaunchBean;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface NetAndLaunchApi {
    @FormUrlEncoded
-    @POST(URLAddress.NET_AND_LAUNCH_API)
+    @POST(UrlAddress.NET_AND_LAUNCH_API)
    Observable<NetAndLaunchBean> getNetAndLaunchApi(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/AppinsideWebApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/AppinsideWebApi.java
@@ -3,7 +3,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.Appground;
 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import java.util.List;

@@ -14,7 +14,7 @@ import retrofit2.http.POST;

 public interface AppinsideWebApi {
    @FormUrlEncoded
-    @POST(URLAddress.SET_APPINSIDEWEB)
+    @POST(UrlAddress.SET_APPINSIDEWEB)
    Observable<BaseResponse<List<Appground>>> getAppinsideWeb(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/BrowserBookmarksApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/BrowserBookmarksApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.BrowserBookmarks;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -11,7 +11,7 @@ import retrofit2.http.POST;

 public interface BrowserBookmarksApi {
    @FormUrlEncoded
-    @POST(URLAddress.SET_HOMEPAG_TAG)
+    @POST(UrlAddress.SET_HOMEPAG_TAG)
    Observable<BaseResponse<BrowserBookmarks>> getBrowserBookmarks(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/BrowserListApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/BrowserListApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.BrowserData;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -11,7 +11,7 @@ import retrofit2.http.POST;

 public interface BrowserListApi {
    @FormUrlEncoded
-    @POST(URLAddress.SET_BROWSER_LIST)
+    @POST(UrlAddress.SET_BROWSER_LIST)
    Observable<BaseResponse<BrowserData>> getBrowserList(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/CheckTestUpdateApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/CheckTestUpdateApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.ForceDownloadData;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import java.util.List;

@@ -11,7 +11,7 @@ import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface CheckTestUpdateApi {
-    @GET(URLAddress.GET_SN_APP_TEST)
+    @GET(UrlAddress.GET_SN_APP_TEST)
    Observable<BaseResponse<List<ForceDownloadData>>> getTestUpdate(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/CheckUpdateApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/CheckUpdateApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface CheckUpdateApi {
    @FormUrlEncoded
-    @POST(URLAddress.CHECK_UPDATE)
+    @POST(UrlAddress.CHECK_UPDATE)
    //1MTK平台  2展锐平台
    Observable<BaseResponse> getUpdate(
            @Field("package") String packages,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/CustomROMAppApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/CustomROMAppApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface CustomROMAppApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_ROM_APP)
+    @POST(UrlAddress.GET_ROM_APP)
    Observable<BaseResponse> getROMApp(
            @Field("key") String key,
            @Field("version_number") String version_number
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/DefaultAppApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/DefaultAppApi.java
@@ -2,14 +2,14 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.DefaultApp;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface DefaultAppApi {
-    @GET(URLAddress.GET_DEFAULT_APP)
+    @GET(UrlAddress.GET_DEFAULT_APP)
    Observable<BaseResponse<DefaultApp>> getDefaultApp(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/DesktopIconApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/DesktopIconApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface DesktopIconApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_HIDE_DESKTOPICON)
+    @POST(UrlAddress.GET_HIDE_DESKTOPICON)
    Observable<BaseResponse> getDesktopIcon(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/DevicesLockedStateApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/DevicesLockedStateApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface DevicesLockedStateApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_DEVICES_LOCKED)
+    @POST(UrlAddress.GET_DEVICES_LOCKED)
    Observable<BaseResponse> getLockedState(
            @Field("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetAllAppApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetAllAppApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.AppListInfo;
 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import java.util.List;

@@ -13,7 +13,7 @@ import retrofit2.http.POST;

 public interface GetAllAppApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_ALL_APP)
+    @POST(UrlAddress.GET_ALL_APP)
    Observable<BaseResponse<List<AppListInfo>>> getAllAppList(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetAppLogApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetAppLogApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface GetAppLogApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_APP_LOG)
+    @POST(UrlAddress.GET_APP_LOG)
    Observable<BaseResponse> getAppLog(
            @Field("sn") String sn,
            @Field("random") String random,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetDesktopApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetDesktopApi.java
@@ -1,6 +1,6 @@
 package com.aoleyun.sn.network.api.newapi;

-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
@@ -8,7 +8,7 @@ import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface GetDesktopApi {
-    @GET(URLAddress.GET_DESKTOP)
+    @GET(UrlAddress.GET_DESKTOP)
    Observable<ResponseBody> getDesktop(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetDeveloperApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetDeveloperApi.java
@@ -1,14 +1,14 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface GetDeveloperApi {
-    @GET(URLAddress.GET_DEVELOPER)
+    @GET(UrlAddress.GET_DEVELOPER)
    Observable<BaseResponse> getDeveloperState(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetEBagCodeApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetEBagCodeApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface GetEBagCodeApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_EBAG_CODE)
+    @POST(UrlAddress.GET_EBAG_CODE)
    Observable<BaseResponse> getEBagCode(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetJpushTagsApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/GetJpushTagsApi.java
@@ -1,14 +1,14 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface GetJpushTagsApi {
-    @GET(URLAddress.GET_DEVICES_TAGS)
+    @GET(UrlAddress.GET_DEVICES_TAGS)
    Observable<BaseResponse> getJpushTags(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/LogoImgApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/LogoImgApi.java
@@ -2,14 +2,14 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.LogoImg;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface LogoImgApi {
-    @GET(URLAddress.GET_LOGO_IMG)
+    @GET(UrlAddress.GET_LOGO_IMG)
    Observable<BaseResponse<LogoImg>> getLogoImg(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/MACAddressApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/MACAddressApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface MACAddressApi {
    @FormUrlEncoded
-    @POST(URLAddress.SEND_DEVICES)
+    @POST(UrlAddress.SEND_DEVICES)
    Observable<BaseResponse> sendMACaddress(
            @Field("sn") String sn,
            @Field("mac") String mac,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/NewAppinsideWebApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/NewAppinsideWebApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;


 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -11,7 +11,7 @@ import retrofit2.http.POST;

 public interface NewAppinsideWebApi {
    @FormUrlEncoded
-    @POST(URLAddress.SET_APPINSIDEWEB)
+    @POST(UrlAddress.SET_APPINSIDEWEB)
    Observable<BaseResponse> getAppinsideWeb(
            @Field("key") String key,
            @Field("sn") String sn
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/ScreenLockStateApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/ScreenLockStateApi.java
@@ -1,14 +1,14 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface ScreenLockStateApi {
-    @GET(URLAddress.GET_LOCK_SCREEN_STATE)
+    @GET(UrlAddress.GET_LOCK_SCREEN_STATE)
    Observable<BaseResponse> getScreenLockState(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendDownloadInfoApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendDownloadInfoApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface SendDownloadInfoApi {
    @FormUrlEncoded
-    @POST(URLAddress.SEND_DOWNLOAD_FILE_INFO)
+    @POST(UrlAddress.SEND_DOWNLOAD_FILE_INFO)
    Observable<BaseResponse> sendDownloadTimes(
            @Field("key") String key,
            @Field("sn") String sn,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendDownloadTimesApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendDownloadTimesApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -10,7 +10,7 @@ import retrofit2.http.POST;

 public interface SendDownloadTimesApi {
    @FormUrlEncoded
-    @POST(URLAddress.SEND_DOWNLOAD_TIMES)
+    @POST(UrlAddress.SEND_DOWNLOAD_TIMES)
    Observable<BaseResponse> sendDownloadTimes(
            @Field("key") String key,
            @Field("sn") String sn,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendScreenshotApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/SendScreenshotApi.java
@@ -1,7 +1,7 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
@@ -12,7 +12,7 @@ import retrofit2.http.Part;

 public interface SendScreenshotApi {
    @Multipart
-    @POST(URLAddress.SEND_SCREENSHOT)
+    @POST(UrlAddress.SEND_SCREENSHOT)
    Observable<BaseResponse> sendScreenshot(
            @Field("sn") String sn,
            @Field("createtime") long createtime,
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/SnTimeControlApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/SnTimeControlApi.java
@@ -1,14 +1,14 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface SnTimeControlApi {
-    @GET(URLAddress.GET_SN_TIME_CONTROL)
+    @GET(UrlAddress.GET_SN_TIME_CONTROL)
    Observable<BaseResponse> getSnTimeControl(
            @Query("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/StudentsInfosApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/StudentsInfosApi.java
@@ -2,7 +2,7 @@ package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.StudentsInfo;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -11,7 +11,7 @@ import retrofit2.http.POST;

 public interface StudentsInfosApi {
    @FormUrlEncoded
-    @POST(URLAddress.GET_STUDENTS_INFO)
+    @POST(UrlAddress.GET_STUDENTS_INFO)
    Observable<BaseResponse<StudentsInfo>> getStudentsInfo(
            @Field("sn") String sn
    );
--- a/app/src/main/java/com/aoleyun/sn/network/api/newapi/TopAppControlApi.java
+++ b/app/src/main/java/com/aoleyun/sn/network/api/newapi/TopAppControlApi.java
@@ -1,14 +1,14 @@
 package com.aoleyun.sn.network.api.newapi;

 import com.aoleyun.sn.bean.BaseResponse;
-import com.aoleyun.sn.network.URLAddress;
+import com.aoleyun.sn.network.UrlAddress;

 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Query;

 public interface TopAppControlApi {
-    @GET(URLAddress.GET_TOP_APP_CONTROL)
+    @GET(UrlAddress.GET_TOP_APP_CONTROL)
    Observable<BaseResponse> getSnAppControl(
            @Query("sn") String sn
    );