version:

update:2021.03.30
fix:更换包名，安装应用时只执行最后一次请求，开机动画测试
add:

app/build.gradle

@@ -204,24 +204,26 @@ dependencies {
     implementation 'com.jakewharton:butterknife:10.1.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
     implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
-    implementation 'com.alibaba:fastjson:1.2.70'
+    implementation "org.java-websocket:Java-WebSocket:1.4.1"
-    implementation 'com.lzy.net:okgo:2.1.4'
-    implementation 'com.lzy.net:okrx:0.1.2'
-//    implementation 'com.lzy.net:okserver:1.1.3'
     implementation 'com.squareup.okhttp3:okhttp:4.6.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+//    implementation "com.uber.autodispose:autodispose:1.3.0"
+//    implementation "com.uber.autodispose:autodispose-android-archcomponents:1.3.0"
     implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.zxing:core:3.3.0'
     implementation 'cn.jiguang.sdk:jpush:3.8.6'  // 此处以JPush 3.5.6 版本为例。
     implementation 'cn.jiguang.sdk:jcore:2.6.0'  // 此处以JCore 2.2.8 版本为例。
+    implementation 'com.alibaba:fastjson:1.2.70'
+    implementation 'com.lzy.net:okgo:2.1.4'
+    implementation 'com.lzy.net:okrx:0.1.2'
+//    implementation 'com.lzy.net:okserver:1.1.3'
     implementation 'com.blankj:utilcode:1.23.7'
     implementation 'com.arialyy.aria:core:3.8.15'
     annotationProcessor 'com.arialyy.aria:compiler:3.8.15'
-    implementation "org.java-websocket:Java-WebSocket:1.4.1"
-    implementation 'com.google.zxing:core:3.3.0'
     implementation 'com.amap.api:location:5.1.0'
     //高德地图定位
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.mjsheng.myappstore"
+    package="com.jiaoguanyi.appstore"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -24,6 +24,7 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.SHUTDOWN" />
 
     <!-- 静默安装权限 -->
     <uses-permission
@@ -81,7 +82,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
     <application
-        android:name=".base.BaseApplication"
+        android:name="com.jiaoguanyi.appstore.base.BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -89,8 +90,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <activity android:name=".activity.TopActivity" />
+        <activity android:name="com.jiaoguanyi.appstore.activity.TopActivity" />
-        <activity android:name=".activity.HomeActivity">
+        <activity android:name="com.jiaoguanyi.appstore.activity.SplashActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -99,7 +100,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.MainActivity"
+            android:name="com.jiaoguanyi.appstore.activity.MainActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTop">
             <!--            <intent-filter>-->
@@ -109,16 +110,16 @@
             <!--            </intent-filter>-->
         </activity>
         <activity
-            android:name=".activity.OldActivity"
+            android:name="com.jiaoguanyi.appstore.activity.OldActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTop" />
         <!--        <service android:name=".server.MyDownloadService" />-->
-        <service android:name=".server.GuardService" />
+        <service android:name="com.jiaoguanyi.appstore.server.GuardService" />
         <service
-            android:name=".server.StepService"
+            android:name="com.jiaoguanyi.appstore.server.StepService"
             android:exported="true" />
         <service
-            android:name=".server.MainService"
+            android:name="com.jiaoguanyi.appstore.server.MainService"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -137,7 +138,7 @@
         <!--        </service>-->
 
         <receiver
-            android:name=".receiver.NewAppReceiver"
+            android:name="com.jiaoguanyi.appstore.receiver.NewAppReceiver"
             android:enabled="true"
             android:exported="true"
             android:permission="com.example.broadcast.permission">
@@ -150,11 +151,11 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".utils.InstallResultReceiver"
+            android:name="com.jiaoguanyi.appstore.utils.InstallResultReceiver"
             android:enabled="true"
             android:exported="true" />
         <receiver
-            android:name=".receiver.BootReceiver"
+            android:name="com.jiaoguanyi.appstore.receiver.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -196,7 +197,7 @@
         <!-- </intent-filter> -->
         <!-- </receiver> -->
         <receiver
-            android:name=".receiver.MyJPushReceiver"
+            android:name="com.jiaoguanyi.appstore.receiver.MyJPushReceiver"
             android:enabled="true">
             <intent-filter>
 
@@ -337,7 +338,7 @@
         <!-- Since JCore2.0.0 Required SDK核心功能 -->
         <!-- 这个Service要继承JCommonService -->
         <service
-            android:name=".jpush.PushService"
+            android:name="com.jiaoguanyi.appstore.jpush.PushService"
             android:process=":pushcore">
             <intent-filter>
                 <action android:name="cn.jiguang.user.service.action" />
@@ -345,7 +346,7 @@
         </service>
         <!-- User defined.  For test only  用户自定义的广播接收器 -->
         <receiver
-            android:name=".jpush.MyReceiver"
+            android:name="com.jiaoguanyi.appstore.jpush.MyReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -363,7 +364,7 @@
             </intent-filter>
         </receiver>
         <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调 -->
-        <receiver android:name=".jpush.MyJPushMessageReceiver">
+        <receiver android:name="com.jiaoguanyi.appstore.jpush.MyJPushMessageReceiver">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
 

app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl

@@ -1,5 +1,5 @@
 // KeepAliveConnection.aidl
-package com.mjsheng.myappstore;
+package com.jiaoguanyi.appstore;
 
 // Declare any non-default types here with import statements
 

app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.activity;
+package com.jiaoguanyi.appstore.activity;
 
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -16,16 +16,16 @@ import android.widget.TextView;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.gson.JsonObject;
-import com.mjsheng.myappstore.BuildConfig;
+import com.jiaoguanyi.appstore.BuildConfig;
-import com.mjsheng.myappstore.R;
+import com.jiaoguanyi.appstore.R;
-import com.mjsheng.myappstore.base.BaseActivity;
+import com.jiaoguanyi.appstore.base.BaseActivity;
-import com.mjsheng.myappstore.utils.ApkUtils;
+import com.jiaoguanyi.appstore.utils.ApkUtils;
-import com.mjsheng.myappstore.utils.ExampleUtil;
+import com.jiaoguanyi.appstore.utils.ExampleUtil;
-import com.mjsheng.myappstore.utils.JGYUtils;
+import com.jiaoguanyi.appstore.utils.JGYUtils;
-import com.mjsheng.myappstore.utils.SaveListUtils;
+import com.jiaoguanyi.appstore.utils.SaveListUtils;
-import com.mjsheng.myappstore.utils.SysSettingUtils;
+import com.jiaoguanyi.appstore.utils.SysSettingUtils;
-import com.mjsheng.myappstore.utils.ToastUtil;
+import com.jiaoguanyi.appstore.utils.ToastUtil;
-import com.mjsheng.myappstore.utils.Utils;
+import com.jiaoguanyi.appstore.utils.Utils;
 
 import java.util.concurrent.TimeUnit;
 
@@ -38,6 +38,7 @@ import io.reactivex.Observer;
 import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
 
 public class MainActivity extends BaseActivity implements MainContact.MainView {
     @BindView(R.id.imageView)
@@ -242,7 +243,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
             showDialog(jsonObject);
         } else {
             Observable.timer(5000, TimeUnit.MILLISECONDS)
-                    .observeOn(rx.android.schedulers.AndroidSchedulers.mainThread())
+                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(aLong -> ToastUtil.show("已经是最新版本"));
         }
     }
@@ -337,9 +338,6 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
 
     }
 
-
-
-
     @Override
     protected void onStop() {
         super.onStop();
@@ -375,7 +373,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
         }
     }
 
-    private void setStoreUpdateListener(View view){
+    private void setStoreUpdateListener(View view) {
         ObservableOnSubscribe<View> mObservableOnSubscribe = new ObservableOnSubscribe<View>() {
             @Override
             public void subscribe(@NonNull ObservableEmitter<View> emitter) throws Exception {

app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java

@@ -1,10 +1,10 @@
-package com.mjsheng.myappstore.activity;
+package com.jiaoguanyi.appstore.activity;
 
 import android.view.View;
 
 import com.google.gson.JsonObject;
-import com.mjsheng.myappstore.base.BasePresenter;
+import com.jiaoguanyi.appstore.base.BasePresenter;
-import com.mjsheng.myappstore.base.BaseView;
+import com.jiaoguanyi.appstore.base.BaseView;
 
 public class MainContact {
     public interface MainView extends BaseView {

app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java

@@ -1,7 +1,6 @@
-package com.mjsheng.myappstore.activity;
+package com.jiaoguanyi.appstore.activity;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -19,27 +18,26 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.mjsheng.myappstore.BuildConfig;
+import com.jiaoguanyi.appstore.BuildConfig;
-import com.mjsheng.myappstore.base.BaseApplication;
+import com.jiaoguanyi.appstore.base.BaseApplication;
-import com.mjsheng.myappstore.bean.Appground;
+import com.jiaoguanyi.appstore.bean.Appground;
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.Batch;
+import com.jiaoguanyi.appstore.bean.Batch;
-import com.mjsheng.myappstore.bean.BrowserBookmarks;
+import com.jiaoguanyi.appstore.bean.BrowserBookmarks;
-import com.mjsheng.myappstore.bean.BrowserData;
+import com.jiaoguanyi.appstore.bean.BrowserData;
-import com.mjsheng.myappstore.bean.ForceDownloadBean;
+import com.jiaoguanyi.appstore.bean.ForceDownloadBean;
-import com.mjsheng.myappstore.bean.NetAndLaunchBean;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchBean;
-import com.mjsheng.myappstore.bean.StudentsInfo;
+import com.jiaoguanyi.appstore.bean.StudentsInfo;
-import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
+import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper;
-import com.mjsheng.myappstore.manager.NetInterfaceManager;
+import com.jiaoguanyi.appstore.manager.NetInterfaceManager;
-import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi;
+import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi;
-import com.mjsheng.myappstore.server.MainService;
+import com.jiaoguanyi.appstore.server.MainService;
-import com.mjsheng.myappstore.utils.ApkUtils;
+import com.jiaoguanyi.appstore.utils.ApkUtils;
-import com.mjsheng.myappstore.utils.JGYUtils;
+import com.jiaoguanyi.appstore.utils.JGYUtils;
-import com.mjsheng.myappstore.utils.SPUtils;
+import com.jiaoguanyi.appstore.utils.SPUtils;
-import com.mjsheng.myappstore.utils.SysSettingUtils;
+import com.jiaoguanyi.appstore.utils.SysSettingUtils;
-import com.mjsheng.myappstore.utils.TimeUtils;
+import com.jiaoguanyi.appstore.utils.TimeUtils;
-import com.mjsheng.myappstore.utils.ToastUtil;
+import com.jiaoguanyi.appstore.utils.Utils;
-import com.mjsheng.myappstore.utils.Utils;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -47,12 +45,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import cn.jpush.android.api.JPushInterface;
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
@@ -60,8 +54,8 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET;
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence;
 
 public class MainPresenter implements MainContact.Presenter {
     private static final String TAG = MainPresenter.class.getSimpleName();
@@ -404,7 +398,6 @@ public class MainPresenter implements MainContact.Presenter {
     public void setJpushTags() {
         NetInterfaceManager.getInstance()
                 .getJpushTagsObservable()
-                .observeOn(Schedulers.io())
                 .subscribe(new Observer<BaseResponse>() {
                     @Override
                     public void onSubscribe(@NonNull Disposable d) {
@@ -885,10 +878,10 @@ public class MainPresenter implements MainContact.Presenter {
                     @Override
                     public void onNext(@NonNull BaseResponse response) {
                         Log.e("getDesktopIcon", "onNext: ");
-                        String data = response.data.toString();
                         ApkUtils.showAllAPP(mContext);
-                        Log.e("getDesktopIcon", "data: " + data);
                         if (response.code == 200) {
+                            String data = response.data.toString();
+                            Log.e("getDesktopIcon", "data: " + data);
                             if (!TextUtils.isEmpty(data)) {
                                 List<String> newList = Arrays.asList(data.split(","));//新的list
                                 PackageManager pm = mContext.getPackageManager();
@@ -1102,10 +1095,9 @@ public class MainPresenter implements MainContact.Presenter {
                         Log.e("getScreenLockState", "onNext: ");
                         if (response.code == 200) {
                             String bodyString = response.data.toString();
-                            JsonObject jsonObject = JsonParser.parseString(bodyString).getAsJsonObject();
+                            JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject();
-                            JsonObject data = jsonObject.getAsJsonObject(response.data.toString());
+                            int is_screen_lock = jsonObject.get("is_screen_lock").getAsInt();
-                            int is_screen_lock = data.get("is_screen_lock").getAsInt();
+                            String name = jsonObject.get("name").getAsString();
-                            String name = data.get("name").getAsString();
                             mView.setScreenLockStateFinished(is_screen_lock == 1, name);
                         } else {
                             mView.setScreenLockStateFinished(false, "");

app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.activity;
+package com.jiaoguanyi.appstore.activity;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -36,33 +36,33 @@ import com.blankj.utilcode.util.EncryptUtils;
 import com.blankj.utilcode.util.PathUtils;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
-import com.mjsheng.myappstore.BuildConfig;
+import com.jiaoguanyi.appstore.BuildConfig;
-import com.mjsheng.myappstore.R;
+import com.jiaoguanyi.appstore.R;
-import com.mjsheng.myappstore.base.BaseApplication;
+import com.jiaoguanyi.appstore.base.BaseApplication;
-import com.mjsheng.myappstore.bean.ForceDownloadBean;
+import com.jiaoguanyi.appstore.bean.ForceDownloadBean;
-import com.mjsheng.myappstore.bean.ForceDownloadData;
+import com.jiaoguanyi.appstore.bean.ForceDownloadData;
-import com.mjsheng.myappstore.bean.LzyResponse;
+import com.jiaoguanyi.appstore.bean.LzyResponse;
-import com.mjsheng.myappstore.bean.NetAndLaunchBean;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchBean;
-import com.mjsheng.myappstore.bean.NetAndLaunchData;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchData;
-import com.mjsheng.myappstore.bean.StudentsInfo;
+import com.jiaoguanyi.appstore.bean.StudentsInfo;
-import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
+import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper;
-import com.mjsheng.myappstore.manager.NetInterfaceManager;
+import com.jiaoguanyi.appstore.manager.NetInterfaceManager;
-import com.mjsheng.myappstore.network.HTTPInterface;
+import com.jiaoguanyi.appstore.network.HTTPInterface;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
-import com.mjsheng.myappstore.network.api.AppLimitApi;
+import com.jiaoguanyi.appstore.network.api.AppLimitApi;
-import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi;
+import com.jiaoguanyi.appstore.network.api.DeselectBrowserIDApi;
-import com.mjsheng.myappstore.network.api.DeselectIDApi;
+import com.jiaoguanyi.appstore.network.api.DeselectIDApi;
-import com.mjsheng.myappstore.network.api.ForceDownloadApi;
+import com.jiaoguanyi.appstore.network.api.ForceDownloadApi;
-import com.mjsheng.myappstore.network.api.NetAndLaunchApi;
+import com.jiaoguanyi.appstore.network.api.NetAndLaunchApi;
-import com.mjsheng.myappstore.network.api.SystemSettingApi;
+import com.jiaoguanyi.appstore.network.api.SystemSettingApi;
-import com.mjsheng.myappstore.utils.ApkUtils;
+import com.jiaoguanyi.appstore.utils.ApkUtils;
-import com.mjsheng.myappstore.utils.ExampleUtil;
+import com.jiaoguanyi.appstore.utils.ExampleUtil;
-import com.mjsheng.myappstore.utils.JGYUtils;
+import com.jiaoguanyi.appstore.utils.JGYUtils;
-import com.mjsheng.myappstore.utils.SPUtils;
+import com.jiaoguanyi.appstore.utils.SPUtils;
-import com.mjsheng.myappstore.utils.SaveListUtils;
+import com.jiaoguanyi.appstore.utils.SaveListUtils;
-import com.mjsheng.myappstore.utils.SysSettingUtils;
+import com.jiaoguanyi.appstore.utils.SysSettingUtils;
-import com.mjsheng.myappstore.utils.ToastUtil;
+import com.jiaoguanyi.appstore.utils.ToastUtil;
-import com.mjsheng.myappstore.utils.Utils;
+import com.jiaoguanyi.appstore.utils.Utils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -85,9 +85,9 @@ import okhttp3.ResponseBody;
 import rx.Observable;
 import rx.functions.Action1;
 
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET;
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.TagAliasBean;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.TagAliasBean;
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence;
 
 public class OldActivity extends AppCompatActivity {
     private static final String TAG = OldActivity.class.getSimpleName();

app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java

@@ -0,0 +1,67 @@
+package com.jiaoguanyi.appstore.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.util.Log;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.jiaoguanyi.appstore.BuildConfig;
+import com.jiaoguanyi.appstore.R;
+import com.jiaoguanyi.appstore.utils.Utils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+
+public class SplashActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_home);
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                startActivity(new Intent(SplashActivity.this, MainActivity.class));
+                finish();
+            }
+        }, 2000);
+
+        if (BuildConfig.DEBUG) {
+            DebugTest();
+        }
+    }
+
+    private void DebugTest() {
+        Utils.getHardware(this);
+
+        File file = new File(Environment.getExternalStorageDirectory() + File.separator + "bootanimation.zip");
+        String path0 = "/data/local/qchmedia/bootanimation.zip";
+        if (file.exists()) {
+            File file1 = new File(path0);
+            if (!file1.exists()) {
+                file.mkdirs();
+                try {
+                    file.createNewFile();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    Log.e("bootanimation", e.getMessage());
+                }
+            }
+            Log.e("bootanimation", "SD卡路径存在");
+            try {
+                Path path = Paths.get(file.getAbsolutePath());
+                Files.copy(path, new FileOutputStream(path0));
+            } catch (Exception e) {
+                Log.e("bootanimation", e.getMessage());
+            }
+        }
+    }
+}

app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java

@@ -1,11 +1,11 @@
-package com.mjsheng.myappstore.activity;
+package com.jiaoguanyi.appstore.activity;
 
 import android.content.Intent;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.KeyEvent;
 
-import com.mjsheng.myappstore.R;
+import com.jiaoguanyi.appstore.R;
 
 public class TopActivity extends AppCompatActivity {
 

app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.base;
+package com.jiaoguanyi.appstore.base;
 
 import android.os.Bundle;
 

app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.base;
+package com.jiaoguanyi.appstore.base;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,24 +28,24 @@ import com.lzy.okgo.cache.CacheEntity;
 import com.lzy.okgo.cache.CacheMode;
 import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.cookie.store.PersistentCookieStore;
-import com.mjsheng.myappstore.BuildConfig;
+import com.jiaoguanyi.appstore.BuildConfig;
-import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
+import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper;
-import com.mjsheng.myappstore.manager.AmapManager;
+import com.jiaoguanyi.appstore.manager.AmapManager;
-import com.mjsheng.myappstore.manager.NetInterfaceManager;
+import com.jiaoguanyi.appstore.manager.NetInterfaceManager;
-import com.mjsheng.myappstore.network.HTTPInterface;
+import com.jiaoguanyi.appstore.network.HTTPInterface;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
-import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.GetLockStateApi;
-import com.mjsheng.myappstore.receiver.NewAppReceiver;
+import com.jiaoguanyi.appstore.receiver.NewAppReceiver;
-import com.mjsheng.myappstore.server.GuardService;
+import com.jiaoguanyi.appstore.server.GuardService;
-import com.mjsheng.myappstore.server.MainService;
+import com.jiaoguanyi.appstore.server.MainService;
-import com.mjsheng.myappstore.server.StepService;
+import com.jiaoguanyi.appstore.server.StepService;
-import com.mjsheng.myappstore.statistics.AppInformation;
+import com.jiaoguanyi.appstore.statistics.AppInformation;
-import com.mjsheng.myappstore.statistics.StatisticsInfo;
+import com.jiaoguanyi.appstore.statistics.StatisticsInfo;
-import com.mjsheng.myappstore.utils.JGYUtils;
+import com.jiaoguanyi.appstore.utils.JGYUtils;
-import com.mjsheng.myappstore.utils.NetworkUtils;
+import com.jiaoguanyi.appstore.utils.NetworkUtils;
-import com.mjsheng.myappstore.utils.SystemUtils;
+import com.jiaoguanyi.appstore.utils.SystemUtils;
-import com.mjsheng.myappstore.utils.ToastUtil;
+import com.jiaoguanyi.appstore.utils.ToastUtil;
-import com.mjsheng.myappstore.utils.Utils;
+import com.jiaoguanyi.appstore.utils.Utils;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -74,7 +74,7 @@ import rx.functions.Action1;
  */
 
 //public class MyApplication extends MultiDexApplication implements Thread.UncaughtExceptionHandler {
-public class BaseApplication extends MultiDexApplication {
+public class BaseApplication extends MultiDexApplication{
     private final String TAG = BaseApplication.class.getSimpleName();
 
     public static Context context;
@@ -621,7 +621,7 @@ public class BaseApplication extends MultiDexApplication {
                 data.put("data", appinfo);
             }
         } catch (Exception e) {
-            Log.e("fht", e.getMessage());
+            Log.e("sendAppUsedTime", e.getMessage());
         }
         OkGo.post(URLAddress.SEND_USEDTIME)
                 .params("sn", Utils.getSerial())
@@ -639,7 +639,7 @@ public class BaseApplication extends MultiDexApplication {
                     @Override
                     public void onError(Call call, Response response, Exception e) {
                         super.onError(call, response, e);
-                        Log.e("fht", e.getMessage());
+                        Log.e("sendAppUsedTime", e.getMessage());
                     }
                 });
 

app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.base;
+package com.jiaoguanyi.appstore.base;
 
 import androidx.annotation.NonNull;
 

app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java

@@ -0,0 +1,4 @@
+package com.jiaoguanyi.appstore.base;
+
+public interface BaseView {
+}

app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -11,9 +11,9 @@ import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.util.Log;
 
-import com.mjsheng.myappstore.database.DBHelper;
+import com.jiaoguanyi.appstore.database.DBHelper;
-import com.mjsheng.myappstore.database.DBSqlBuilder;
+import com.jiaoguanyi.appstore.database.DBSqlBuilder;
-import com.mjsheng.myappstore.utils.Utils;
+import com.jiaoguanyi.appstore.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import android.graphics.drawable.Drawable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * Created by Administrator on 2017/1/10.

app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import androidx.annotation.NonNull;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java

@@ -1,6 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
-
-import java.util.List;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;

app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java

@@ -1,6 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
-
-import java.util.List;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import com.google.gson.stream.JsonReader;
 import com.lzy.okgo.callback.AbsCallback;

app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import android.graphics.drawable.Drawable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java

@@ -1,6 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
-
-import java.util.List;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * Created by Administrator on 2016/10/9.

app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 public class SearchBean {
 	private String category;

app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.bean;
+package com.jiaoguanyi.appstore.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.comm;
+package com.jiaoguanyi.appstore.comm;
 
 
 public class CommonDatas {

app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.database;
+package com.jiaoguanyi.appstore.database;
 
 import android.content.ContentValues;
 import android.content.Context;

app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.database;
+package com.jiaoguanyi.appstore.database;
 
 public class DBSqlBuilder {
 

app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;

app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.util.Log;
 

app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java

@@ -1,8 +1,8 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.content.Context;
 
-import com.mjsheng.myappstore.base.BaseApplication;
+import com.jiaoguanyi.appstore.base.BaseApplication;
 
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushMessage;

app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.mjsheng.myappstore.activity.MainActivity;
+import com.jiaoguanyi.appstore.activity.MainActivity;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import cn.jpush.android.service.JCommonService;
 

app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush;
+package com.jiaoguanyi.appstore.jpush;
 
 import android.content.Context;
 import android.os.Handler;

app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java

@@ -1,8 +1,8 @@
-package com.mjsheng.myappstore.jpush.invalid;
+package com.jiaoguanyi.appstore.jpush.invalid;
 
 import android.app.Application;
 
-import com.mjsheng.myappstore.jpush.Logger;
+import com.jiaoguanyi.appstore.jpush.Logger;
 
 import cn.jpush.android.api.JPushInterface;
 

app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush.invalid;
+package com.jiaoguanyi.appstore.jpush.invalid;
 
 
 //public class MainActivity extends InstrumentedActivity implements OnClickListener{

app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush.invalid;
+package com.jiaoguanyi.appstore.jpush.invalid;
 
 //public class PushSetActivity extends InstrumentedActivity implements OnClickListener {
 //    private static final String TAG = "JIGUANG-Example";

app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush.invalid;
+package com.jiaoguanyi.appstore.jpush.invalid;
 
 //public class SettingActivity extends InstrumentedActivity implements OnClickListener {
 //	TimePicker startTime;

app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.jpush.invalid;
+package com.jiaoguanyi.appstore.jpush.invalid;
 
 import android.app.Activity;
 import android.content.Intent;

app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.log;
+package com.jiaoguanyi.appstore.log;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java

@@ -1,13 +1,10 @@
-package com.mjsheng.myappstore.log;
+package com.jiaoguanyi.appstore.log;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
-import android.os.Process;
-
 
 
 /**

app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.manager;
+package com.jiaoguanyi.appstore.manager;
 
 import android.content.Context;
 import android.util.Log;
@@ -7,7 +7,7 @@ import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
-import com.mjsheng.myappstore.utils.SPUtils;
+import com.jiaoguanyi.appstore.utils.SPUtils;
 
 public class AmapManager {
     private static AmapManager sInstance;

app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.manager;
+package com.jiaoguanyi.appstore.manager;
 
 import android.content.Context;
 import android.util.Log;

app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java

@@ -0,0 +1,367 @@
+package com.jiaoguanyi.appstore.manager;
+
+import android.content.Context;
+import android.os.Environment;
+
+import com.jiaoguanyi.appstore.BuildConfig;
+import com.jiaoguanyi.appstore.bean.Appground;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BrowserBookmarks;
+import com.jiaoguanyi.appstore.bean.BrowserData;
+import com.jiaoguanyi.appstore.bean.ForceDownloadBean;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchBean;
+import com.jiaoguanyi.appstore.bean.StudentsInfo;
+import com.jiaoguanyi.appstore.network.api.AppLimitApi;
+import com.jiaoguanyi.appstore.network.api.BrankPicApi;
+import com.jiaoguanyi.appstore.network.api.CategoryPicApi;
+import com.jiaoguanyi.appstore.network.api.DeselectBrowserIDApi;
+import com.jiaoguanyi.appstore.network.api.DeselectIDApi;
+import com.jiaoguanyi.appstore.network.api.ForceDownloadApi;
+import com.jiaoguanyi.appstore.network.api.NetAndLaunchApi;
+import com.jiaoguanyi.appstore.network.api.ProjectPicApi;
+import com.jiaoguanyi.appstore.network.api.RankAppApi;
+import com.jiaoguanyi.appstore.network.api.SystemSettingApi;
+import com.jiaoguanyi.appstore.network.api.UploadAppInfoApi;
+import com.jiaoguanyi.appstore.network.api.newapi.AppinsideWebApi;
+import com.jiaoguanyi.appstore.network.api.newapi.BrowserBookmarksApi;
+import com.jiaoguanyi.appstore.network.api.newapi.BrowserListApi;
+import com.jiaoguanyi.appstore.network.api.newapi.CheckTestUpdateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.CheckUpdateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.DesktopIconApi;
+import com.jiaoguanyi.appstore.network.api.newapi.DevicesLockedStateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.GetBatchApi;
+import com.jiaoguanyi.appstore.network.api.newapi.GetDesktopApi;
+import com.jiaoguanyi.appstore.network.api.newapi.GetLockStateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.JpushTagsApi;
+import com.jiaoguanyi.appstore.network.api.newapi.MACAddressApi;
+import com.jiaoguanyi.appstore.network.api.newapi.ScreenLockStateApi;
+import com.jiaoguanyi.appstore.network.api.newapi.SnTimeControl;
+import com.jiaoguanyi.appstore.network.api.newapi.StudentsInfosApi;
+import com.jiaoguanyi.appstore.network.api.newapi.TopAppControlApi;
+import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi;
+import com.jiaoguanyi.appstore.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 {
+    private static NetInterfaceManager sInstance;
+    private Context mContext;
+    private static Retrofit mRetrofit;
+
+    public static final String ROOT_URL = BuildConfig.ROOT_URL;
+    public static final String WEBSOCKET_URL = BuildConfig.WebsocketURL;
+    public static final String HTTP_KEY = "YTM3YTAxNTJmMmZmNzkyM2E2YzIwZjlhZTc0NzNmMGI=";
+
+
+    private NetInterfaceManager(Context context) {
+        this.mContext = context;
+        if (null == mRetrofit) {
+            mRetrofit = new Retrofit.Builder()
+                    .client(okHttpClient)
+                    .baseUrl(ROOT_URL)
+                    .addConverterFactory(gsonConverterFactory)
+                    .addCallAdapterFactory(rxJavaCallAdapterFactory)
+                    .build();
+        }
+    }
+
+    public static void init(Context context) {
+        if (sInstance == null) {
+            sInstance = new NetInterfaceManager(context);
+        }
+
+    }
+
+    public static NetInterfaceManager getInstance() {
+        if (sInstance == null) {
+            throw new IllegalStateException("You must be init NetworkManager first");
+        }
+        return sInstance;
+    }
+
+    private static final long cacheSize = 1024 * 1024 * 32;// 缓存文件最大限制大小20M
+    private static String cacheDirectory = Environment.getExternalStorageDirectory() + "/okttpcaches"; // 设置缓存文件路径
+    private static Cache cache = new Cache(new File(cacheDirectory), cacheSize);  //
+    private static final OkHttpClient okHttpClient;
+    private static final int timeOut = 5;
+
+    static {
+        //如果无法生存缓存文件目录，检测权限使用已经加上，检测手机是否把文件读写权限禁止了
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        builder.connectTimeout(timeOut, TimeUnit.SECONDS); // 设置连接超时时间
+        builder.writeTimeout(timeOut, TimeUnit.SECONDS);// 设置写入超时时间
+        builder.readTimeout(timeOut, TimeUnit.SECONDS);// 设置读取数据超时时间
+        builder.retryOnConnectionFailure(true);// 设置进行连接失败重试
+        builder.cache(cache);// 设置缓存
+        okHttpClient = builder.build();
+    }
+
+    private static CallAdapter.Factory rxJavaCallAdapterFactory = RxJava2CallAdapterFactory.create();
+    private static Converter.Factory gsonConverterFactory = GsonConverterFactory.create();
+
+    /**
+     * 通过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.getAndroid7MAC(),
+                        JPushInterface.getRegistrationID(mContext),
+                        Utils.getProperty("ro.custom.build.version", "获取失败"),
+                        BuildConfig.VERSION_NAME,
+                        Utils.getAPPVersionName(mContext)
+                )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * 获取极光推送的tag
+     *
+     * @return
+     */
+    public Observable<BaseResponse> getJpushTagsObservable() {
+        return mRetrofit
+                .create(JpushTagsApi.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<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> getTestUpdateObservable() {
+        return mRetrofit
+                .create(CheckTestUpdateApi.class)
+                .getTestUpdate(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    public Observable<BaseResponse> getSnTimeObservable() {
+        return mRetrofit
+                .create(SnTimeControl.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<BaseResponse> 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());
+    }
+
+
+    /*
+     *
+     * API
+     *
+     * */
+    public static UploadAppInfoApi getUploadAppInfoApi() {
+        return mRetrofit.create(UploadAppInfoApi.class);
+    }
+
+    public static DeselectIDApi getDeselectIDApi() {
+        return mRetrofit.create(DeselectIDApi.class);
+    }
+
+    public static DeselectBrowserIDApi getDeselectBrowserIDApi() {
+        return mRetrofit.create(DeselectBrowserIDApi.class);
+    }
+
+    public static RankAppApi getRankAppApi() {
+        return mRetrofit.create(RankAppApi.class);
+    }
+
+    public static CategoryPicApi getCategoryPicApi() {
+        return mRetrofit.create(CategoryPicApi.class);
+    }
+
+    public static ProjectPicApi getProjectPicApi() {
+        return mRetrofit.create(ProjectPicApi.class);
+    }
+
+    public static BrankPicApi getBrankPicApi() {
+        return mRetrofit.create(BrankPicApi.class);
+    }
+
+    public static AppLimitApi getAppLimitApi() {
+        return mRetrofit.create(AppLimitApi.class);
+
+    }
+
+    public static SystemSettingApi getSystemSettingApi() {
+        return mRetrofit.create(SystemSettingApi.class);
+    }
+
+
+    public static NetAndLaunchApi getNetAndLaunchApi() {
+        return mRetrofit.create(NetAndLaunchApi.class);
+    }
+
+    public static ForceDownloadApi getForceDownloadApi() {
+        return mRetrofit.create(ForceDownloadApi.class);
+    }
+
+    public static GetLockStateApi getLockState() {
+        return mRetrofit.create(GetLockStateApi.class);
+    }
+
+    public static UpdateDeviceInfoApi getUpdateDeviceInfo() {
+        return mRetrofit.create(UpdateDeviceInfoApi.class);
+    }
+
+    public static GetBatchApi getBatchApi() {
+        return mRetrofit.create(GetBatchApi.class);
+    }
+
+    public static SnTimeControl getSnTimeControlApi() {
+        return mRetrofit.create(SnTimeControl.class);
+    }
+
+    public static TopAppControlApi getTopAppControlApi() {
+        return mRetrofit.create(TopAppControlApi.class);
+    }
+
+
+    public CheckUpdateApi getUpdateApi() {
+        return mRetrofit
+                .create(CheckUpdateApi.class);
+    }
+
+}

app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network;
+package com.jiaoguanyi.appstore.network;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -18,23 +18,23 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
-import com.mjsheng.myappstore.base.BaseApplication;
+import com.jiaoguanyi.appstore.base.BaseApplication;
-import com.mjsheng.myappstore.bean.Appground;
+import com.jiaoguanyi.appstore.bean.Appground;
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.NetAndLaunchBean;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchBean;
-import com.mjsheng.myappstore.bean.NetAndLaunchData;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchData;
-import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper;
+import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper;
-import com.mjsheng.myappstore.manager.NetInterfaceManager;
+import com.jiaoguanyi.appstore.manager.NetInterfaceManager;
-import com.mjsheng.myappstore.network.api.newapi.SnTimeControl;
+import com.jiaoguanyi.appstore.network.api.newapi.SnTimeControl;
-import com.mjsheng.myappstore.network.api.newapi.TopAppControlApi;
+import com.jiaoguanyi.appstore.network.api.newapi.TopAppControlApi;
-import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi;
+import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi;
-import com.mjsheng.myappstore.server.MainService;
+import com.jiaoguanyi.appstore.server.MainService;
-import com.mjsheng.myappstore.utils.ApkUtils;
+import com.jiaoguanyi.appstore.utils.ApkUtils;
-import com.mjsheng.myappstore.utils.ForegroundAppUtil;
+import com.jiaoguanyi.appstore.utils.ForegroundAppUtil;
-import com.mjsheng.myappstore.utils.Logger;
+import com.jiaoguanyi.appstore.utils.Logger;
-import com.mjsheng.myappstore.utils.SPUtils;
+import com.jiaoguanyi.appstore.utils.SPUtils;
-import com.mjsheng.myappstore.utils.TimeUtils;
+import com.jiaoguanyi.appstore.utils.TimeUtils;
-import com.mjsheng.myappstore.utils.Utils;
+import com.jiaoguanyi.appstore.utils.Utils;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -50,8 +50,8 @@ import okhttp3.Call;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET;
-import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence;
+import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence;
 
 public class HTTPInterface {
 //    //获取我的设备接口
@@ -373,7 +373,7 @@ public class HTTPInterface {
                     @Override
                     public void onError(Call call, Response response, Exception e) {
                         super.onError(call, response, e);
-                        Log.e("fht", e.getMessage());
+                        Log.e("setJpushTags", e.getMessage());
                     }
                 });
     }
@@ -395,7 +395,7 @@ public class HTTPInterface {
                     @Override
                     public void onError(Call call, Response response, Exception e) {
                         super.onError(call, response, e);
-                        Log.e("fht", e.getMessage() + "???");
+                        Log.e("cleanJpushAlias", e.getMessage() + "???");
                     }
                 });
     }
@@ -801,6 +801,7 @@ public class HTTPInterface {
         jsonObject.put("address", address);
         jsonObject.put("longitude", longitude);
         jsonObject.put("latitude", latitude);
+        String add = jsonObject.toJSONString();
         UpdateDeviceInfoApi updateDeviceInfo = NetInterfaceManager.getUpdateDeviceInfo();
         updateDeviceInfo.updateDeviceInfo(
                 Utils.getSerial(),

app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java

@@ -1,6 +1,6 @@
-package com.mjsheng.myappstore.network;
+package com.jiaoguanyi.appstore.network;
 
-import com.mjsheng.myappstore.manager.NetInterfaceManager;
+import com.jiaoguanyi.appstore.manager.NetInterfaceManager;
 
 /**
  * @author Administrator

app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java

@@ -1,6 +1,6 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.CommonPicBean;
+import com.jiaoguanyi.appstore.bean.CommonPicBean;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java

@@ -1,9 +1,8 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.CategoryPicBean;
+import com.jiaoguanyi.appstore.bean.CategoryPicBean;
 
 import io.reactivex.Observable;
-import okhttp3.ResponseBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;

app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java

@@ -1,9 +1,8 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.ForceDownloadBean;
+import com.jiaoguanyi.appstore.bean.ForceDownloadBean;
 
 import io.reactivex.Observable;
-import okhttp3.ResponseBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;

app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java

@@ -1,9 +1,8 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.NetAndLaunchBean;
+import com.jiaoguanyi.appstore.bean.NetAndLaunchBean;
 
 import io.reactivex.Observable;
-import okhttp3.ResponseBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;

app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java

@@ -1,7 +1,6 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.CommonPicBean;
+import com.jiaoguanyi.appstore.bean.CommonPicBean;
-import com.mjsheng.myappstore.bean.ProjectPicBean;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java

@@ -1,9 +1,8 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
-import com.mjsheng.myappstore.bean.AppInfoBean;
+import com.jiaoguanyi.appstore.bean.AppInfoBean;
 
 import io.reactivex.Observable;
-import okhttp3.ResponseBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;

app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java

@@ -1,6 +1,4 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
-
-import com.mjsheng.myappstore.bean.CommonPicBean;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java

@@ -1,14 +1,10 @@
-package com.mjsheng.myappstore.network.api;
+package com.jiaoguanyi.appstore.network.api;
 
 import io.reactivex.Observable;
-import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.Multipart;
 import retrofit2.http.POST;
-import retrofit2.http.Part;
-import retrofit2.http.Path;
 
 /**
  * 作者 mjsheng

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java

@@ -1,9 +1,9 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
 
-import com.mjsheng.myappstore.bean.Appground;
+import com.jiaoguanyi.appstore.bean.Appground;
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import java.util.List;
 

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java

@@ -1,8 +1,8 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.BrowserBookmarks;
+import com.jiaoguanyi.appstore.bean.BrowserBookmarks;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java

@@ -1,8 +1,8 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.BrowserData;
+import com.jiaoguanyi.appstore.bean.BrowserData;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java

@@ -1,8 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.BrowserBookmarks;
+import com.jiaoguanyi.appstore.network.URLAddress;
-import com.mjsheng.myappstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java

@@ -1,9 +1,4 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
-
-import com.mjsheng.myappstore.bean.Batch;
-import com.mjsheng.myappstore.bean.LzyResponse;
-
-import java.util.List;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java

@@ -1,8 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.StudentsInfo;
+import com.jiaoguanyi.appstore.network.URLAddress;
-import com.mjsheng.myappstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java

@@ -1,8 +1,8 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.bean.StudentsInfo;
+import com.jiaoguanyi.appstore.bean.StudentsInfo;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java

@@ -1,7 +1,7 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
-import com.mjsheng.myappstore.bean.BaseResponse;
+import com.jiaoguanyi.appstore.bean.BaseResponse;
-import com.mjsheng.myappstore.network.URLAddress;
+import com.jiaoguanyi.appstore.network.URLAddress;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java

@@ -1,4 +1,4 @@
-package com.mjsheng.myappstore.network.api.newapi;
+package com.jiaoguanyi.appstore.network.api.newapi;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;

app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java

@@ -1,14 +1,14 @@
-package com.mjsheng.myappstore.receiver;
+package com.jiaoguanyi.appstore.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.mjsheng.myappstore.network.HTTPInterface;
+import com.jiaoguanyi.appstore.network.HTTPInterface;
-import com.mjsheng.myappstore.server.GuardService;
+import com.jiaoguanyi.appstore.server.GuardService;
-import com.mjsheng.myappstore.server.MainService;
+import com.jiaoguanyi.appstore.server.MainService;
-import com.mjsheng.myappstore.server.StepService;
+import com.jiaoguanyi.appstore.server.StepService;
 
 public class BootReceiver extends BroadcastReceiver {
     private String TAG = BootReceiver.class.getSimpleName();
@@ -21,7 +21,7 @@ public class BootReceiver extends BroadcastReceiver {
             HTTPInterface.updateDeviceInfo(context);
             startService(context);
         } else if (
-                intent.getAction().equals("android.intent.action.BroadcastReceiver")
+                intent.getAction().equals(BOOT_COMPLETED)
                         || intent.getAction().equals(Intent.ACTION_BATTERY_CHANGED)
                         || intent.getAction().equals(Intent.ACTION_BATTERY_LOW)
                         || intent.getAction().equals(Intent.ACTION_BATTERY_OKAY)
@@ -48,15 +48,15 @@ public class BootReceiver extends BroadcastReceiver {
         ) {
             //除了USER_PRESENT应该都收不到
 //            Log.e("fht", "BootReceiver MSG:" + intent.getAction());
-//            startService(context);
+            startService(context);
         }
 
 
     }
 
     private void startService(Context context) {
+        context.startService(new Intent(context, MainService.class));
         context.startService(new Intent(context, StepService.class));
         context.startService(new Intent(context, GuardService.class));
-        context.startService(new Intent(context, MainService.class));
     }
 }