version:2.9

fix:优化接口，增加检测其他应用 update:
2022-03-01 10:34:46 +08:00
parent 97bc5d6a75
commit ee731661fc
55 changed files with 1165 additions and 1342 deletions
--- a/app/src/main/java/com/aoleyun/sn/service/GuardService.java
+++ b/app/src/main/java/com/aoleyun/sn/service/GuardService.java
@@ -28,10 +28,8 @@ import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.comm.CommonConfig;
 import com.aoleyun.sn.comm.PackageNames;
 import com.aoleyun.sn.manager.AmapManager;
-import com.aoleyun.sn.network.HTTPInterface;
 import com.aoleyun.sn.network.NetInterfaceManager;
-import com.aoleyun.sn.network.api.newapi.GetLockStateApi;
-import com.aoleyun.sn.network.api.newapi.SendScreenStatusApi;
+import com.aoleyun.sn.network.api.SendScreenStatusApi;
 import com.aoleyun.sn.receiver.BootReceiver;
 import com.aoleyun.sn.receiver.NewAppReceiver;
 import com.aoleyun.sn.rlog.LogDBManager;
@@ -339,6 +337,11 @@ public class GuardService extends Service {
                });
    }

+    /**
+     * @param status
+     * @param time
+     * 和锁屏状态无关，记录设备使用时长的
+     */
    private void getLockState(String status, String time) {
        if (JGYUtils.isOfficialVersion()) {
            return;
@@ -558,6 +561,7 @@ public class GuardService extends Service {
    @Download.onTaskFail
    void taskFail(DownloadTask task, Exception e) {
        try {
+            Aria.download(this).resumeAllTask();
            final String filepath = task.getFilePath();
            final String packageName = task.getExtendField();
            JSONObject jsonObject = JSON.parseObject(task.getExtendField());
--- a/app/src/main/java/com/aoleyun/sn/service/main/MainSContact.java
+++ b/app/src/main/java/com/aoleyun/sn/service/main/MainSContact.java
@@ -1,174 +1,169 @@
 package com.aoleyun.sn.service.main;

-import android.view.View;
-
 import com.aoleyun.sn.base.BasePresenter;
 import com.aoleyun.sn.base.BaseView;
-import com.google.gson.JsonObject;

 public class MainSContact {
    public interface Presenter extends BasePresenter<MainView> {
-        //获取学生信息
-        void getStudesInfo();
-        //获取设备锁定状态
+
+        /*分支1*/
+        /*获取设备锁定状态*/
        void getLockedState(String key);
-        //是否第一次联网
-        void getFirstConnect();
-        //关闭所有功能
-        void setDisableSetting();
-        //发送mac地址
-        void sendMACAddress();
-        //更新设备信息
-        void updateDeviceInfo();
-        //获取时间管控
-        void getSnTimeControl();
-        //获取电子书包激活码
-        void getEBagCode();
-        //设置极光推送别名
-        void setJpushAlias();
-        //设置极光推送平台标签
-        void setJpushPlatformTags(int platform);
-        //获取应用市场更新
-        void checkStoreUpdate();
-        //获取设备信息更新
-        void checkInfoUpdate();
-        //获取桌面升级
-        void checkDesktopUpdate();
-        //获取通知升级
-        void checkNotifyUpdate();
-        //获取浏览器升级
-        void checkBrowserUpdate();
-        //手动获取设备信息更新
-        void buttonCheckUpdate(View view);
-        //获取测试应用更新
-        void checkTestUpdate();
-        //开始
-        //设置极光推送标签
+        /*设置极光推送标签*/
        void setPushTags();
-        //获取开发者选项
-        void getDeveloper();
-        //获取设备后台设置
-        void getSystemSettingbegin();
-        //获取可被写入的安装包名
-        void getAppLimit();
-        //获取设备批次
-        void getDeviceBatch(String packageList);
-        //获取强制下载apk
+        /*获取设备批次*/
+        void getDeviceBatch();
+
+
+        /*分支2 基本信息*/
+        /*是否第一次联网*/
+        void getFirstConnect();
+        /*获取学生信息*/
+        void getStudesInfo();
+
+        /*分支3 上传信息*/
+        /*发送mac地址*/
+        void sendMACAddress();
+        /*更新设备信息*/
+        void updateDeviceInfo();
+        /*上传安装的应用列表*/
+        void sendInstalled();
+
+        /*分支4 获取应用*/
+        /*获取设备信息更新*/
+        void checkInfoUpdate();
+        /*获取应用市场更新*/
+        void checkStoreUpdate();
+        /*获取桌面升级*/
+        void checkDesktopUpdate();
+        /*获取通知升级*/
+        void checkNotifyUpdate();
+        /*获取浏览器升级*/
+        void checkBrowserUpdate();
+        /*获取测试应用更新*/
+        void checkTestUpdate();
+        /*获取强制下载apk*/
        void getForceDownload();
-        //获取浏览器上网管控设置
-        void getBrowserList();
-        //获取浏览器书签设置管控
-        void getBrowserBookmarks(String whitelist);
-        //设置白名单的url
-        void getBrowserWhiteList();
-        //获取应用图标桌面可见性管控
-        void getDesktopIcon();
-        //获取应用自启升级和网络权限管理
-        void getAppAutoStartUpdateAndNet();
-        //获取第三方应用子页面ID连网限制
-        void getAppIDControl();
-        //获取第三方应用内部网页跳转屏蔽
-        void setAppinsideWeb();
-        //获取系统其他管控设置
-        void setSystemSetting();
-        //获取系统默认程序设置
-        void getDefaultApp();
-        //获取自定义版本内置app
-        void getROMApp();
-        //设置开机动画
-        void setLogoImg();
-        //应用霸屏
-        void setTopApp();
-        //获取桌面
+        /*获取桌面*/
        void getDefaultDesktop();
-        //获取关机时间
+        /*设置开机动画*/
+        void setLogoImg();
+
+        /*分支5 获取管控*/
+        /*获取开发者选项*/
+        void getDeveloper();
+        /*获取设备后台设置*/
+        void getSystemSettingBegin();
+        /*获取可被写入的安装包名*/
+        void getAppLimit();
+        /*获取自定义内置app*/
+        void getROMApp();
+        /*获取浏览器书签设置管控*/
+        void getBrowserBookmarks();
+        /*设置白名单的url 单独*/
+        void getBrowserWhiteList();
+        /*获取应用图标桌面可见性管控*/
+        void getDesktopIcon();
+        /*获取应用自启升级和网络权限管理*/
+        void getAppAutoStartUpdateAndNet();
+        /*获取第三方应用子页面ID连网限制*/
+        void getAppIDControl();
+        /*获取第三方应用内部网页跳转屏蔽*/
+        void setAppinsideWeb();
+        /*获取系统其他管控设置*/
+        void setSystemSetting();
+        /*获取系统默认程序设置*/
+        void getDefaultApp();
+        /*应用霸屏*/
+        void setTopApp();
+        /*获取关机时间*/
        void getPoweroffTime();
-        //获取wifi密码
+        /*获取时间管控*/
+        void getSnTimeControl();
+        /*获取电子书包激活码*/
+        void getEBagCode();
+        /*获取wifi密码*/
        void getWiFiPasswd();
-        /*
-         * MainService
-         * */
-        //获取屏幕锁状态
+        /*获取屏幕锁状态*/
        void getScreenLockState();
    }

    public interface MainView extends BaseView {
-        //获取设备锁定状态
-        void setLockedState(boolean loocked);
-        //是否第一次联网
-        void setFirstConnect(boolean state);
-        //发送mac地址
-        void sendMACFinish();
-        //更新设备信息
-        void updateDeviceInfoFinish();
-        //获取时间管控
-        void getSnTimeControlFinish();
-        //获取电子书包激活码
-        void getEBagCodeFinish();
-        //设置极光推送别名
-        void setAliasFinish();
-        //设置极光推送平台标签
-        void setJpushPlatformTagsFinish();
-        //获取应用市场更新
-        void checkStoreUpdateFinish();
-        //获取设备信息更新
-        void checkInfoUpdateFinish();
-        //获取桌面升级
-        void checkDesktopUpdateFinish();
-        //获取通知升级
-        void checkNotifyUpdateFinish();
-        //获取浏览器升级
-        void checkBrowserUpdateFinish();
-        //手动获取设备信息更新
-        void buttonCheckUpdateFinish(boolean update, JsonObject jsonObject);
-        //获取测试应用更新
-        void checkTestUpdateFinish();
-        //开始
-        //设置极光推送标签
-        void setTagsFinish(boolean noTag);
-        //获取开发者选项结束
-        void getDeveloperFinish();
-        //设置设备后台设置
-        void getSystemSettingbegin();
-        //获取可被写入的安装包名结束
-        void getAppLimitFinish(String packageList);
-        //获取设备批次结束
-        void getDeviceBatchFinish();
-        //获取强制下载apk结束
-        void getForceDownloadFinish();
-        //获取浏览器上网管控设置结束
-        void getBrowserListFinish(String whitelist);
-        //获取浏览器书签设置管控结束
-        void getBrowserBookmarksFinish();
-        //获取应用图标桌面可见性管控结束
-        void getDesktopIconFinish();
-        //获取应用自启升级和网络权限管理结束
-        void getAppAutoStartUpdateAndNetFinish();
-        //获取第三方应用子页面ID连网限制结束
-        void getAppIDControlFinish();
-        //获取第三方应用内部网页跳转屏蔽结束
-        void setAppinsideWebFinish();
-        //获取系统其他管控设置结束
-        void setSystemSettingFinish();
-        //获取系统默认程序设置
-        void setDefaultAppFinish();
-        //获取自定义版本内置app
-        void getROMAppFinish();

-        //设置开机动画
-        void setLogoImgFinish();
-        //获取应用霸屏结束
-        void setTopAppFinish();
-        //获取桌面结束
+        /*获取设备锁定状态*/
+        void setLockedState(boolean loocked);
+        /*设置极光推送标签*/
+        void setTagsFinish(boolean noTag);
+        /*获取设备批次结束*/
+        void getDeviceBatchFinish();
+
+
+        /*是否第一次联网*/
+        void setFirstConnect(boolean state);
+        /*获取学生信息*/
+        void setStudesInfo();
+
+        /*发送mac地址*/
+        void sendMACFinish();
+        /*更新设备信息*/
+        void updateDeviceInfoFinish();
+        /*上传安装的应用列表*/
+        void sendInstalledFinish();
+
+        /*获取设备信息更新*/
+        void checkInfoUpdateFinish();
+        /*获取应用市场更新*/
+        void checkStoreUpdateFinish();
+        /*获取桌面升级*/
+        void checkDesktopUpdateFinish();
+        /*获取通知升级*/
+        void checkNotifyUpdateFinish();
+        /*获取浏览器升级*/
+        void checkBrowserUpdateFinish();
+        /*获取测试应用更新*/
+        void checkTestUpdateFinish();
+        /*获取强制下载apk结束*/
+        void getForceDownloadFinish();
+        /*获取桌面结束*/
        void getDefaultDesktopFinish();
-        //获取关机时间
+        /*设置开机动画*/
+        void setLogoImgFinish();
+
+        /*获取开发者选项结束*/
+        void getDeveloperFinish();
+        /*设置设备后台设置*/
+        void setSystemSetting();
+        /*获取可被写入的安装包名结束*/
+        void getAppLimitFinish();
+        /*获取自定义内置app*/
+        void getROMAppFinish();
+        /*获取浏览器书签设置管控结束*/
+        void getBrowserBookmarksFinish();
+        /*设置白名单的url 单独*/
+        void setBrowserWhiteList();
+        /*获取应用图标桌面可见性管控结束*/
+        void getDesktopIconFinish();
+        /*获取应用自启升级和网络权限管理结束*/
+        void getAppAutoStartUpdateAndNetFinish();
+        /*获取第三方应用子页面ID连网限制结束*/
+        void getAppIDControlFinish();
+        /*获取第三方应用内部网页跳转屏蔽结束*/
+        void setAppinsideWebFinish();
+        /*获取系统其他管控设置结束*/
+        void setSystemSettingFinish();
+        /*获取系统默认程序设置*/
+        void setDefaultAppFinish();
+        /*获取应用霸屏结束*/
+        void setTopAppFinish();
+        /*获取关机时间*/
        void setPoweroffTime();
-        //获取wifi密码结束
+        /*获取时间管控*/
+        void getSnTimeControlFinish();
+        /*获取电子书包激活码*/
+        void getEBagCodeFinish();
+        /*获取wifi密码结束*/
        void setWiFiPasswd();
-        /*
-        * MainService
-        * */
-        //设置屏幕锁状态结束
+        /*设置屏幕锁状态结束*/
        void setScreenLockStateFinish(boolean locked, String tips);
    }
 }
--- a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java
+++ b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java
--- a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java
+++ b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java
@@ -5,11 +5,9 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.Service;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.net.ConnectivityManager;
@@ -18,7 +16,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.IBinder;
-import android.os.SystemClock;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
@@ -37,14 +34,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.aoleyun.sn.BuildConfig;
 import com.aoleyun.sn.R;
 import com.aoleyun.sn.activity.main.MainAPresenter;
-import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.PoweroffBean;
 import com.aoleyun.sn.comm.CommonConfig;
 import com.aoleyun.sn.comm.JGYActions;
 import com.aoleyun.sn.comm.PackageNames;
 import com.aoleyun.sn.manager.ConnectManager;
 import com.aoleyun.sn.network.NetInterfaceManager;
-import com.aoleyun.sn.receiver.BootReceiver;
 import com.aoleyun.sn.rlog.LogDBManager;
 import com.aoleyun.sn.utils.ApkUtils;
 import com.aoleyun.sn.utils.ForegroundAppUtil;
@@ -57,7 +52,6 @@ import com.aoleyun.sn.utils.ToastUtil;
 import com.aoleyun.sn.utils.Utils;
 import com.blankj.utilcode.util.NetworkUtils;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.LifecycleProvider;
@@ -87,7 +81,6 @@ public class MainService extends Service implements MainSContact.MainView, Netwo

    @SuppressLint("StaticFieldLeak")
    public static MainSPresenter mPresenter;
-    public static boolean netWorkIsRunning = false;
    private MMKV mMMKV = MMKV.defaultMMKV();

    @Override
@@ -109,6 +102,9 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
                start.onstar(WiFiAlias);
            }
        }
+        if (!checkAoleyunApp()){
+            mPresenter.checkInfoUpdate();
+        }
    }

    private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
@@ -198,7 +194,6 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        }
    }

-
    private interface Start {
        void onstar(String key);
    }
@@ -215,25 +210,24 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    private Observer<String> timeObserver = new Observer<String>() {
        @Override
        public void onSubscribe(Disposable d) {
-
+            Log.e("timeObserver", "onSubscribe: ");
        }

        @Override
        public void onNext(String string) {
            connectKey = string;
-            Log.e("TimeObserver", "onNext: " + string);
-            mPresenter.getFirstConnect();
+            Log.e("timeObserver", "onNext: " + string);
            mPresenter.getLockedState(string);
        }

        @Override
        public void onError(Throwable e) {
-
+            Log.e("timeObserver", "onError: " + e.getMessage());
        }

        @Override
        public void onComplete() {
-
+            Log.e("timeObserver", "onComplete: ");
        }
    };

@@ -254,6 +248,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        mPresenter = new MainSPresenter(this);
        mPresenter.attachView(this);
        mPresenter.setLifecycle(lifecycleSubject);
+
        Observable.create(subscribe)
                .throttleFirst(1, TimeUnit.MINUTES)
                .subscribe(timeObserver);
@@ -263,24 +258,23 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        if ((int) SPUtils.get(this, CommonConfig.JGY_FIRST_CONNECT, 0) == 0) {
            // TODO: 2021/5/26 待底层修改，临时解决办法
            Log.e(TAG, "onCreate: " + "Disable All Settings");
-            mPresenter.setDisableSetting();
+            SysSettingUtils.setDisableSetting(this);
+            start.onstar(ConnectManager.REBOOT_LAST_ONNECT_TIME);
        }
        int oldVersionCode = (int) SPUtils.get(this, CommonConfig.SN_VERSIONCODE, 0);
        if (oldVersionCode < BuildConfig.VERSION_CODE) {
            Log.e(TAG, "onCreate: " + "upgrade successful");
        } else {
 //            if (ConnectManager.getInstance().isRebootFistConnect()) {
-                start.onstar(ConnectManager.REBOOT_LAST_ONNECT_TIME);
+            start.onstar(ConnectManager.REBOOT_LAST_ONNECT_TIME);
 //            }
        }
        SPUtils.put(this, CommonConfig.SN_VERSIONCODE, BuildConfig.VERSION_CODE);
        registerReceivers();
        NetworkUtils.registerNetworkStatusChangedListener(this);
        addShortcut();
-//        cleanLauncherCache();
        timeChangedStart.onstar(System.currentTimeMillis());
        setStatusbar();
-        //发送设备mac地址和信息
        setFloatingWindow(this);
        createNotificationChannel();
        sendSimpleNotification();
@@ -289,6 +283,9 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
        JGYUtils.getInstance().wakeUpAppstore();
+        if (!checkAoleyunApp()){
+            mPresenter.checkInfoUpdate();
+        }
        return START_STICKY;
    }

@@ -301,6 +298,18 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        mPresenter.detachView();
    }

+    private boolean checkAoleyunApp() {
+        if (!ApkUtils.isAvailable(this, PackageNames.APPSTORE)) return false;
+        if (!ApkUtils.isAvailable(this, PackageNames.DESKTOP)) return false;
+        if (!ApkUtils.isAvailable(this, PackageNames.NOTIFICATIONS)) return false;
+        if (!ApkUtils.isAvailable(this, PackageNames.BROWSER)) return false;
+        return true;
+    }
+
+    private static final String CHANNEL_ID = "CHANNEL_ID";
+    private static final String channel_name = "系统通知";
+    private static final String channel_description = "我的设备系统通知";
+
    private void createNotificationChannel() {
        // Create the NotificationChannel, but only on API 26+ because
        // the NotificationChannel class is new and not in the support library
@@ -317,10 +326,6 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        }
    }

-    private static final String CHANNEL_ID = "CHANNEL_ID";
-    private static final String channel_name = "系统通知";
-    private static final String channel_description = "我的设备系统通知";
-
    private void sendSimpleNotification() {
        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, "CHANNEL_ID")
                .setSmallIcon(R.mipmap.ic_launcher)
@@ -337,7 +342,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    }

    private void addShortcut() {
-        ApkUtils.addShortcut(MainService.this);
+        ApkUtils.addShortcut(this);
    }

    private void setStatusbar() {
@@ -571,8 +576,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    }

    private void checkShutdownTime() {
-        MMKV mmkv = MMKV.defaultMMKV();
-        String poweroffTime = mmkv.decodeString("poweroffTime", "");
+        String poweroffTime = mMMKV.decodeString("poweroffTime", "");
        Log.e("checkShutdownTime", "poweroffTime: " + poweroffTime);
        Gson gson = new Gson();
        Type listType = new TypeToken<List<PoweroffBean>>() {
@@ -597,7 +601,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    private static final String UPLOAD_LOG_TIME = "23:00:00";

    private void checkUploadLogTime() {
-        int is_log_type = (int) SPUtils.get(MainService.this, CommonConfig.UPLOAD_LOG_TYPE, 0);
+        int is_log_type = (int) SPUtils.get(this, CommonConfig.UPLOAD_LOG_TYPE, 0);
        if (is_log_type == 0) {
            Log.e(TAG, "checkUploadLogTime: " + "is_log_type = " + is_log_type);
        } else {
@@ -614,7 +618,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    synchronized private void setFloatingWindow(Context context) {
        ForegroundAppUtil.openTopApp(context);
        long nowTime = System.currentTimeMillis();
-        TimeUtils.ContralTime contralTime = TimeUtils.getDefaltContralTime(MainService.this);
+        TimeUtils.ContralTime contralTime = TimeUtils.getDefaltContralTime(this);
        Log.e(TAG, "setFloatingWindow: " + contralTime);
        Log.e(TAG, "setFloatingWindow: screenlocked: " + screenlocked);
        if (null != contralTime) {
@@ -700,57 +704,38 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
            Log.e(TAG, "installApkByPackage: " + "packageName: " + pkg + " not in whitelist");
        } else {
            Log.e(TAG, "installApkByPackage: " + "packageName: " + pkg);
-            ApkUtils.installApp(MainService.this, filePath);
+            ApkUtils.installApp(this, filePath);
        }
    }

    @Override
    public void setLockedState(boolean loocked) {
-        Log.e(TAG, "netWorkIsRunning: " + netWorkIsRunning);
-        //发送设备mac地址和信息
-        mPresenter.sendMACAddress();
-        //设置极光推送别名
-        mPresenter.setJpushAlias();
-        //设置极光推送标签
-        mPresenter.setPushTags();
        if (loocked) {
            ToastUtil.betaShow("设备已上锁");
-            //上传APP信息
-            NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.ObserverCallback() {
-                @Override
-                public void onSubscribe(Disposable d) {
-
-                }
-
-                @Override
-                public void onNext(BaseResponse response) {
-
-                }
-
-                @Override
-                public void onError(Throwable e) {
-
-                }
-
-                @Override
-                public void onComplete() {
-
-                }
-            });
-
+            mPresenter.setPushTags();
+            mPresenter.getDeveloper();
            SaveListUtils.getList();
-            if (netWorkIsRunning) {
-                //如果正在执行，不执行
-//                return;
-            }
-            netWorkIsRunning = true;
        } else {
            ToastUtil.betaShow("设备已解锁");
-            netWorkIsRunning = false;
            SysSettingUtils.setEnableSetting(this);
        }
    }

+    @Override
+    public void setTagsFinish(boolean noTag) {
+        if (noTag) {
+            //没有批次就没有管控
+            Log.e(TAG, "setTagsFinish: " + "not set tag");
+        } else {
+            mPresenter.getDeviceBatch();
+        }
+    }
+
+    @Override
+    public void getDeviceBatchFinish() {
+        mPresenter.getFirstConnect();
+    }
+
    /**
     * 首次使用默认关闭所有功能
     *
@@ -760,12 +745,22 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
    public void setFirstConnect(boolean state) {
        Log.e(TAG, "isFirstConnect: " + "end request: " + state);
        if (state) {
-            mPresenter.setDisableSetting();
+            Log.e(TAG, "setDisableSetting: ");
+            //设置系统管控
+            SysSettingUtils.setDisableSetting(this);
        } else {

        }
+        mPresenter.getStudesInfo();
    }

+    @Override
+    public void setStudesInfo() {
+        Log.e(TAG, "setStudesInfo: " + "基本信息获取完毕");
+        mPresenter.sendMACAddress();
+    }
+
+
    @Override
    public void sendMACFinish() {
        mPresenter.updateDeviceInfo();
@@ -773,36 +768,23 @@ public class MainService extends Service implements MainSContact.MainView, Netwo

    @Override
    public void updateDeviceInfoFinish() {
-        mPresenter.getSnTimeControl();
+        mPresenter.sendInstalled();
    }

    @Override
-    public void getSnTimeControlFinish() {
-        mPresenter.getEBagCode();
+    public void sendInstalledFinish() {
+        Log.e(TAG, "sendInstalledFinish: ");
+        mPresenter.checkInfoUpdate();
    }

-    @Override
-    public void getEBagCodeFinish() {
-
-    }

    @Override
-    public void setAliasFinish() {
+    public void checkInfoUpdateFinish() {
        mPresenter.checkStoreUpdate();
    }

-    @Override
-    public void setJpushPlatformTagsFinish() {
-
-    }
-
    @Override
    public void checkStoreUpdateFinish() {
-        mPresenter.checkInfoUpdate();
-    }
-
-    @Override
-    public void checkInfoUpdateFinish() {
        mPresenter.checkDesktopUpdate();
    }

@@ -821,61 +803,54 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
        mPresenter.checkTestUpdate();
    }

-    @Override
-    public void buttonCheckUpdateFinish(boolean update, JsonObject jsonObject) {
-
-    }
-
    @Override
    public void checkTestUpdateFinish() {
-
-    }
-
-    @Override
-    public void setTagsFinish(boolean noTag) {
-        if (noTag) {
-            Log.e(TAG, "setTagsFinished: " + "not set tag");
-            netWorkIsRunning = false;
-            Log.e(TAG, "SettingFinished: " + (SystemClock.elapsedRealtime()) + " ms");
-        } else {
-            mPresenter.getSystemSettingbegin();
-        }
-        mPresenter.getDeveloper();
-    }
-
-    @Override
-    public void getDeveloperFinish() {
-        Log.e(TAG, "getDeveloperFinished: ");
-    }
-
-    @Override
-    public void getSystemSettingbegin() {
-        mPresenter.getAppLimit();
-    }
-
-    @Override
-    public void getAppLimitFinish(String packageList) {
-        mPresenter.getDeviceBatch(packageList);
-    }
-
-    @Override
-    public void getDeviceBatchFinish() {
        mPresenter.getForceDownload();
    }

    @Override
    public void getForceDownloadFinish() {
-        mPresenter.getBrowserList();
+        mPresenter.getDefaultDesktop();
    }

    @Override
-    public void getBrowserListFinish(String whitelist) {
-        mPresenter.getBrowserBookmarks(whitelist);
+    public void getDefaultDesktopFinish() {
+        mPresenter.setLogoImg();
+    }
+
+    @Override
+    public void setLogoImgFinish() {
+        Log.e(TAG, "setLogoImgFinish: ");
+    }
+
+
+    @Override
+    public void getDeveloperFinish() {
+        mPresenter.getSystemSettingBegin();
+    }
+
+    @Override
+    public void setSystemSetting() {
+        mPresenter.getAppLimit();
+    }
+
+    @Override
+    public void getAppLimitFinish() {
+        mPresenter.getROMApp();
+    }
+
+    @Override
+    public void getROMAppFinish() {
+        mPresenter.getBrowserBookmarks();
    }

    @Override
    public void getBrowserBookmarksFinish() {
        mPresenter.getBrowserWhiteList();
+    }
+
+    @Override
+    public void setBrowserWhiteList() {
        mPresenter.getDesktopIcon();
    }

@@ -906,39 +881,33 @@ public class MainService extends Service implements MainSContact.MainView, Netwo

    @Override
    public void setDefaultAppFinish() {
-        mPresenter.getROMApp();
-    }
-
-    @Override
-    public void getROMAppFinish() {
-        mPresenter.setLogoImg();
-    }
-
-    @Override
-    public void setLogoImgFinish() {
        mPresenter.setTopApp();
    }

    @Override
    public void setTopAppFinish() {
-        mPresenter.getDefaultDesktop();
-    }
-
-    @Override
-    public void getDefaultDesktopFinish() {
        mPresenter.getPoweroffTime();
    }

    @Override
    public void setPoweroffTime() {
+        mPresenter.getSnTimeControl();
+    }
+
+    @Override
+    public void getSnTimeControlFinish() {
+        mPresenter.getEBagCode();
+    }
+
+    @Override
+    public void getEBagCodeFinish() {
        mPresenter.getWiFiPasswd();
    }

    @Override
    public void setWiFiPasswd() {
-        MMKV.defaultMMKV().encode(MainAPresenter.GET_SETTING_FINISH_TIME, System.currentTimeMillis());
-        netWorkIsRunning = false;
-        Log.e(TAG, "SettingFinished: " + (SystemClock.elapsedRealtime()) + " ms");
+        mMMKV.encode(MainAPresenter.GET_SETTING_FINISH_TIME, System.currentTimeMillis());
+        mPresenter.getScreenLockState();
    }

    @Override
@@ -948,15 +917,17 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
                showFloatingWindow(tips);
            }
            screenlocked = true;
-            SPUtils.put(MainService.this, "is_screen_lock", true);
-            SPUtils.put(MainService.this, "screen_tips", tips);
+            SPUtils.put(this, "is_screen_lock", true);
+            SPUtils.put(this, "screen_tips", tips);
        } else {
            if (!timelocked) {
                hideFloatingWindow();
            }
            screenlocked = false;
-            SPUtils.put(MainService.this, "is_screen_lock", false);
-            SPUtils.put(MainService.this, "screen_tips", "");
+            SPUtils.put(this, "is_screen_lock", false);
+            SPUtils.put(this, "screen_tips", "");
        }
    }
+
+
 }