diff --git a/app/build.gradle b/app/build.gradle index fce79cc..bcc5cc2 100644 --- a/app/build.gradle +++ b/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 'com.lzy.net:okgo:2.1.4' - implementation 'com.lzy.net:okrx:0.1.2' -// implementation 'com.lzy.net:okserver:1.1.3' + implementation "org.java-websocket:Java-WebSocket:1.4.1" 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' //高德地图定位 } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bdb6033..d513373 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -24,6 +24,7 @@ + - - + + @@ -99,7 +100,7 @@ @@ -109,16 +110,16 @@ - + @@ -137,7 +138,7 @@ @@ -150,11 +151,11 @@ @@ -196,7 +197,7 @@ @@ -337,7 +338,7 @@ @@ -345,7 +346,7 @@ @@ -363,7 +364,7 @@ - + diff --git a/app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl b/app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl similarity index 79% rename from app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl rename to app/src/main/aidl/com/jiaoguanyi/appstore/KeepAliveConnection.aidl index b9a3571..52cc242 100644 --- a/app/src/main/aidl/com/mjsheng/myappstore/KeepAliveConnection.aidl +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/activity/MainActivity.java index 0d7bfa5..1acce1f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/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.mjsheng.myappstore.R; -import com.mjsheng.myappstore.base.BaseActivity; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.ExampleUtil; -import com.mjsheng.myappstore.utils.JGYUtils; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.ToastUtil; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.base.BaseActivity; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.ExampleUtil; +import com.jiaoguanyi.appstore.utils.JGYUtils; +import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.ToastUtil; +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 mObservableOnSubscribe = new ObservableOnSubscribe() { @Override public void subscribe(@NonNull ObservableEmitter emitter) throws Exception { diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java rename to app/src/main/java/com/jiaoguanyi/appstore/activity/MainContact.java index 283a9bc..56d59dd 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainContact.java +++ b/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.mjsheng.myappstore.base.BaseView; +import com.jiaoguanyi.appstore.base.BasePresenter; +import com.jiaoguanyi.appstore.base.BaseView; public class MainContact { public interface MainView extends BaseView { diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java rename to app/src/main/java/com/jiaoguanyi/appstore/activity/MainPresenter.java index e11271a..404f52c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainPresenter.java +++ b/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.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.bean.Appground; -import com.mjsheng.myappstore.bean.BaseResponse; -import com.mjsheng.myappstore.bean.Batch; -import com.mjsheng.myappstore.bean.BrowserBookmarks; -import com.mjsheng.myappstore.bean.BrowserData; -import com.mjsheng.myappstore.bean.ForceDownloadBean; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; -import com.mjsheng.myappstore.server.MainService; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.JGYUtils; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.TimeUtils; -import com.mjsheng.myappstore.utils.ToastUtil; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.bean.Appground; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.Batch; +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.jpush.TagAliasOperatorHelper; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi; +import com.jiaoguanyi.appstore.server.MainService; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.JGYUtils; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.TimeUtils; +import com.jiaoguanyi.appstore.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.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; +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() { @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 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 data = jsonObject.getAsJsonObject(response.data.toString()); - int is_screen_lock = data.get("is_screen_lock").getAsInt(); - String name = data.get("name").getAsString(); + JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject(); + int is_screen_lock = jsonObject.get("is_screen_lock").getAsInt(); + String name = jsonObject.get("name").getAsString(); mView.setScreenLockStateFinished(is_screen_lock == 1, name); } else { mView.setScreenLockStateFinished(false, ""); diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/activity/OldActivity.java index f3ac49d..bbcb723 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/OldActivity.java +++ b/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.mjsheng.myappstore.R; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.bean.ForceDownloadBean; -import com.mjsheng.myappstore.bean.ForceDownloadData; -import com.mjsheng.myappstore.bean.LzyResponse; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.NetAndLaunchData; -import com.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.HTTPInterface; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.network.api.AppLimitApi; -import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; -import com.mjsheng.myappstore.network.api.DeselectIDApi; -import com.mjsheng.myappstore.network.api.ForceDownloadApi; -import com.mjsheng.myappstore.network.api.NetAndLaunchApi; -import com.mjsheng.myappstore.network.api.SystemSettingApi; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.ExampleUtil; -import com.mjsheng.myappstore.utils.JGYUtils; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.ToastUtil; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.bean.ForceDownloadBean; +import com.jiaoguanyi.appstore.bean.ForceDownloadData; +import com.jiaoguanyi.appstore.bean.LzyResponse; +import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; +import com.jiaoguanyi.appstore.bean.NetAndLaunchData; +import com.jiaoguanyi.appstore.bean.StudentsInfo; +import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.network.URLAddress; +import com.jiaoguanyi.appstore.network.api.AppLimitApi; +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.SystemSettingApi; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.ExampleUtil; +import com.jiaoguanyi.appstore.utils.JGYUtils; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.ToastUtil; +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.mjsheng.myappstore.jpush.TagAliasOperatorHelper.TagAliasBean; -import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.TagAliasBean; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; public class OldActivity extends AppCompatActivity { private static final String TAG = OldActivity.class.getSimpleName(); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/SplashActivity.java new file mode 100644 index 0000000..f7f55c4 --- /dev/null +++ b/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()); + } + } + } +} diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java similarity index 90% rename from app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/activity/TopActivity.java index 4455689..7df9d3e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/TopActivity.java +++ b/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 { diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/base/BaseActivity.java index 819fb84..5059471 100644 --- a/app/src/main/java/com/mjsheng/myappstore/base/BaseActivity.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java b/app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java rename to app/src/main/java/com/jiaoguanyi/appstore/base/BaseApplication.java index b731df1..3b5ea5b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/base/BaseApplication.java +++ b/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.mjsheng.myappstore.jpush.TagAliasOperatorHelper; -import com.mjsheng.myappstore.manager.AmapManager; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.HTTPInterface; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; -import com.mjsheng.myappstore.receiver.NewAppReceiver; -import com.mjsheng.myappstore.server.GuardService; -import com.mjsheng.myappstore.server.MainService; -import com.mjsheng.myappstore.server.StepService; -import com.mjsheng.myappstore.statistics.AppInformation; -import com.mjsheng.myappstore.statistics.StatisticsInfo; -import com.mjsheng.myappstore.utils.JGYUtils; -import com.mjsheng.myappstore.utils.NetworkUtils; -import com.mjsheng.myappstore.utils.SystemUtils; -import com.mjsheng.myappstore.utils.ToastUtil; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; +import com.jiaoguanyi.appstore.manager.AmapManager; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.network.URLAddress; +import com.jiaoguanyi.appstore.network.api.newapi.GetLockStateApi; +import com.jiaoguanyi.appstore.receiver.NewAppReceiver; +import com.jiaoguanyi.appstore.server.GuardService; +import com.jiaoguanyi.appstore.server.MainService; +import com.jiaoguanyi.appstore.server.StepService; +import com.jiaoguanyi.appstore.statistics.AppInformation; +import com.jiaoguanyi.appstore.statistics.StatisticsInfo; +import com.jiaoguanyi.appstore.utils.JGYUtils; +import com.jiaoguanyi.appstore.utils.NetworkUtils; +import com.jiaoguanyi.appstore.utils.SystemUtils; +import com.jiaoguanyi.appstore.utils.ToastUtil; +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()); } }); diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java b/app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java similarity index 80% rename from app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java rename to app/src/main/java/com/jiaoguanyi/appstore/base/BasePresenter.java index ba9ab2e..e785404 100644 --- a/app/src/main/java/com/mjsheng/myappstore/base/BasePresenter.java +++ b/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; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java b/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java new file mode 100644 index 0000000..df9a404 --- /dev/null +++ b/app/src/main/java/com/jiaoguanyi/appstore/base/BaseView.java @@ -0,0 +1,4 @@ +package com.jiaoguanyi.appstore.base; + +public interface BaseView { +} diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppData.java index e7c861d..0441ea3 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppData.java +++ b/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.mjsheng.myappstore.database.DBSqlBuilder; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.database.DBHelper; +import com.jiaoguanyi.appstore.database.DBSqlBuilder; +import com.jiaoguanyi.appstore.utils.Utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppDateInfo.java index b42925b..2ae323e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppDateInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppDownloadInfo.java index 5fd8ded..37fc722 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppDownloadInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfo.java index c4e978e..5f5081e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppInfoBean.java index 7fb91fb..8c31762 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppInfoBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/AppUpdateInfo.java index 6bb9974..24c2b50 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/AppUpdateInfo.java +++ b/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. diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/Appground.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/bean/Appground.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/Appground.java index dac91a3..bc3080f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/Appground.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/BaseResponse.java index 701fd74..0112909 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/BaseResponse.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/Batch.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java similarity index 93% rename from app/src/main/java/com/mjsheng/myappstore/bean/Batch.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/Batch.java index 83cd92d..c4033ed 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/Batch.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java similarity index 93% rename from app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserBookmarks.java index 3842aa4..68c2f60 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/BrowserBookmarks.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java similarity index 92% rename from app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/BrowserData.java index ea4018b..a472c9c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/BrowserData.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryInfo.java index b59decb..a52b96f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/CategoryInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/CategoryPicBean.java index 7140ce6..077887e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/CategoryPicBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicBean.java index 0d3f470..707de39 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java index 4cc2978..dc8c828 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/CommonPicData.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/bean/CommonPicData.java @@ -1,6 +1,4 @@ -package com.mjsheng.myappstore.bean; - -import java.util.List; +package com.jiaoguanyi.appstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/Convert.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/bean/Convert.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/Convert.java index bd80ac4..d85b4ec 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/Convert.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/FileData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java similarity index 93% rename from app/src/main/java/com/mjsheng/myappstore/bean/FileData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/FileData.java index 60c73bd..d6c1642 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/FileData.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadBean.java index 47f853e..353a46d 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java index 3e362cb..c576d50 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/ForceDownloadData.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/bean/ForceDownloadData.java @@ -1,6 +1,4 @@ -package com.mjsheng.myappstore.bean; - -import java.util.List; +package com.jiaoguanyi.appstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/JsonCallback.java index b416a21..9953d82 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/JsonCallback.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/LocalAppInfo.java index 3182da2..455f6e1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/LocalAppInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java similarity index 85% rename from app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/LzyResponse.java index cf6f5ae..b13b086 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/LzyResponse.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchBean.java index f16b588..eaadeb4 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java index a3b41b1..add1145 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/NetAndLaunchData.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/bean/NetAndLaunchData.java @@ -1,6 +1,4 @@ -package com.mjsheng.myappstore.bean; - -import java.util.List; +package com.jiaoguanyi.appstore.bean; /** * 作者 mjsheng diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectDateInfo.java index 6ffb562..ff7da4c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/ProjectDateInfo.java +++ b/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. diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/ProjectPicBean.java index 2d72c0b..64da206 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/ProjectPicBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java similarity index 90% rename from app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/SearchBean.java index 1b0741f..ae78039 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/SearchBean.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/SimpleResponse.java index 460f234..f04da50 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/SimpleResponse.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/StudentsInfo.java index 6b25918..aea0fdc 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/StudentsInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java similarity index 90% rename from app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSetBean.java index bd6bc2f..55ba09d 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSetBean.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingBean.java index f5c5d06..afbb9f6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingBean.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/SystemSettingData.java index f8559be..d919a32 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/SystemSettingData.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java similarity index 92% rename from app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/TimeControl.java index 436d1e4..add1bf3 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/TimeControl.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/UploadAppInfo.java index 396b6e2..572f9d9 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/UploadAppInfo.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/bean/UserInfo.java index 5f8abf8..74615e7 100644 --- a/app/src/main/java/com/mjsheng/myappstore/bean/UserInfo.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java b/app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java similarity index 92% rename from app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java rename to app/src/main/java/com/jiaoguanyi/appstore/comm/CommonDatas.java index 6adaefd..26e42cb 100644 --- a/app/src/main/java/com/mjsheng/myappstore/comm/CommonDatas.java +++ b/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 { diff --git a/app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java b/app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java rename to app/src/main/java/com/jiaoguanyi/appstore/database/DBHelper.java index 7e9135f..33435be 100644 --- a/app/src/main/java/com/mjsheng/myappstore/database/DBHelper.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java b/app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java rename to app/src/main/java/com/jiaoguanyi/appstore/database/DBSqlBuilder.java index 33141eb..6348be4 100644 --- a/app/src/main/java/com/mjsheng/myappstore/database/DBSqlBuilder.java +++ b/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 { diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/ExampleUtil.java index 9dd9c70..a45f669 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/ExampleUtil.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/LocalBroadcastManager.java index 5465f66..fb577b0 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/LocalBroadcastManager.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/Logger.java index 010114d..ce446ed 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/Logger.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/MyJPushMessageReceiver.java index 34974c6..44a0308 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/MyJPushMessageReceiver.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/MyReceiver.java index 7db837e..ec57385 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/MyReceiver.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java similarity index 72% rename from app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/PushService.java index 1a5109b..be6807c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/PushService.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/TagAliasOperatorHelper.java index bbf7b03..26c8a26 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/TagAliasOperatorHelper.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java similarity index 87% rename from app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/ExampleApplication.java index e0fd46a..ee307e8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/ExampleApplication.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/MainActivity.java index 4d10459..d9bffd8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/MainActivity.java +++ b/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{ diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/PushSetActivity.java index 97c3131..00065ce 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/PushSetActivity.java +++ b/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"; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/SettingActivity.java index 4f131e6..102981b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/SettingActivity.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java b/app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java rename to app/src/main/java/com/jiaoguanyi/appstore/jpush/invalid/TestActivity.java index b426b95..bd4d83f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/jpush/invalid/TestActivity.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/log/LogReceiver.java index 9d64828..567bfee 100644 --- a/app/src/main/java/com/mjsheng/myappstore/log/LogReceiver.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java b/app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java rename to app/src/main/java/com/jiaoguanyi/appstore/log/ReceiverHandler.java index e088632..23bf4a9 100644 --- a/app/src/main/java/com/mjsheng/myappstore/log/ReceiverHandler.java +++ b/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; - /** diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java b/app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java rename to app/src/main/java/com/jiaoguanyi/appstore/manager/AmapManager.java index 9ccf0b2..84c2c30 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/AmapManager.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java b/app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java rename to app/src/main/java/com/jiaoguanyi/appstore/manager/FileManager.java index c23f8cd..f2f6764 100644 --- a/app/src/main/java/com/mjsheng/myappstore/manager/FileManager.java +++ b/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; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java b/app/src/main/java/com/jiaoguanyi/appstore/manager/NetInterfaceManager.java new file mode 100644 index 0000000..16f1b90 --- /dev/null +++ b/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> getStudesInfoObservable() { + return mRetrofit + .create(StudentsInfosApi.class) + .getStudentsInfo(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + /** + * 获取设备锁状态 + * + * @return + */ + public Observable getDevicesLockedStateObservable() { + return mRetrofit + .create(DevicesLockedStateApi.class) + .getLockedState(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + /** + * 发送设备mac地址 + * + * @return + */ + public Observable 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 getJpushTagsObservable() { + return mRetrofit + .create(JpushTagsApi.class) + .getJpushTags(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + + public Observable> getBrowserListSettingObservable() { + return mRetrofit + .create(BrowserListApi.class) + .getBrowserList(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable> getBrowserBookmarksObservable() { + return mRetrofit + .create(BrowserBookmarksApi.class) + .getBrowserBookmarks(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getDesktopIconObservable() { + return mRetrofit + .create(DesktopIconApi.class) + .getDesktopIcon(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getAppAutoStartUpdateAndNetObservable() { + return mRetrofit + .create(NetAndLaunchApi.class) + .getNetAndLaunchApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getAppIDControlObservable() { + return mRetrofit + .create(DeselectIDApi.class) + .getDeselectIDApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable>> getAppinsideWebObservable() { + return mRetrofit + .create(AppinsideWebApi.class) + .getAppinsideWeb(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getSystemSettingObservable() { + return mRetrofit + .create(SystemSettingApi.class) + .getSystemSettingApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getAppLimitObservable() { + return mRetrofit + .create(AppLimitApi.class) + .getAppLimitApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getForceDownloadObservable() { + return mRetrofit + .create(ForceDownloadApi.class) + .getForceDownloadApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + + public Observable getTestUpdateObservable() { + return mRetrofit + .create(CheckTestUpdateApi.class) + .getTestUpdate(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getSnTimeObservable() { + return mRetrofit + .create(SnTimeControl.class) + .getSnTimeControl(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getScreenLockObservable() { + return mRetrofit + .create(ScreenLockStateApi.class) + .getScreenLockState(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable getDesktopObservable() { + return mRetrofit + .create(GetDesktopApi.class) + .getDesktop(Utils.getSerial()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + + public Observable 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); + } + +} diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/HTTPInterface.java index 226b162..233f62b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java +++ b/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.mjsheng.myappstore.bean.Appground; -import com.mjsheng.myappstore.bean.BaseResponse; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.NetAndLaunchData; -import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.api.newapi.SnTimeControl; -import com.mjsheng.myappstore.network.api.newapi.TopAppControlApi; -import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; -import com.mjsheng.myappstore.server.MainService; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.ForegroundAppUtil; -import com.mjsheng.myappstore.utils.Logger; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.TimeUtils; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.bean.Appground; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; +import com.jiaoguanyi.appstore.bean.NetAndLaunchData; +import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.api.newapi.SnTimeControl; +import com.jiaoguanyi.appstore.network.api.newapi.TopAppControlApi; +import com.jiaoguanyi.appstore.network.api.newapi.UpdateDeviceInfoApi; +import com.jiaoguanyi.appstore.server.MainService; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; +import com.jiaoguanyi.appstore.utils.Logger; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.TimeUtils; +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.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; +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(), diff --git a/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java b/app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/URLAddress.java index 04d910c..789d353 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/URLAddress.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/AppLimitApi.java index 5cbcd7c..40ae7b6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/AppLimitApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java similarity index 82% rename from app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/BrankPicApi.java index ca26fe0..62aa545 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/BrankPicApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java similarity index 79% rename from app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/CategoryPicApi.java index b46fe48..5e1845c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/CategoryPicApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectBrowserIDApi.java index 0aa10de..ff4904e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectBrowserIDApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/DeselectIDApi.java index 1ae69cf..bac0957 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/DeselectIDApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java similarity index 77% rename from app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/ForceDownloadApi.java index 3e81028..6022a04 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/ForceDownloadApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java similarity index 77% rename from app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/NetAndLaunchApi.java index 4db925d..4a9686e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/NetAndLaunchApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java similarity index 76% rename from app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/ProjectPicApi.java index ec86c95..31a77a2 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/ProjectPicApi.java +++ b/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.mjsheng.myappstore.bean.ProjectPicBean; +import com.jiaoguanyi.appstore.bean.CommonPicBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java similarity index 77% rename from app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/RankAppApi.java index fd24822..3a15195 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/RankAppApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java similarity index 91% rename from app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/SystemSettingApi.java index 029d14f..0096c55 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/SystemSettingApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java similarity index 83% rename from app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java index f27c3fb..6a7e502 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/UpdateApi.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/network/api/UpdateApi.java @@ -1,6 +1,4 @@ -package com.mjsheng.myappstore.network.api; - -import com.mjsheng.myappstore.bean.CommonPicBean; +package com.jiaoguanyi.appstore.network.api; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java similarity index 75% rename from app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/UploadAppInfoApi.java index eb53fd8..ef84ddc 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/UploadAppInfoApi.java +++ b/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 diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java similarity index 66% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/AppinsideWebApi.java index 485e0f0..ea1606d 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/AppinsideWebApi.java +++ b/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.mjsheng.myappstore.bean.BaseResponse; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.Appground; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import java.util.List; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java similarity index 64% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserBookmarksApi.java index 6477ef8..5a20768 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserBookmarksApi.java +++ b/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.mjsheng.myappstore.bean.BrowserBookmarks; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.BrowserBookmarks; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java similarity index 64% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/BrowserListApi.java index 7422995..b4b8635 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/BrowserListApi.java +++ b/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.mjsheng.myappstore.bean.BrowserData; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.BrowserData; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java similarity index 62% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckTestUpdateApi.java index 70e02cb..a32b791 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckTestUpdateApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java similarity index 67% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/CheckUpdateApi.java index 9804246..58e87f6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/CheckUpdateApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java similarity index 63% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DesktopIconApi.java index ee9fb24..d1c0c42 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DesktopIconApi.java +++ b/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.mjsheng.myappstore.bean.BrowserBookmarks; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java similarity index 67% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/DevicesLockedStateApi.java index af09dee..7836608 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/DevicesLockedStateApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java similarity index 65% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java index b864dd7..2cf1886 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetBatchApi.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetBatchApi.java @@ -1,9 +1,4 @@ -package com.mjsheng.myappstore.network.api.newapi; - -import com.mjsheng.myappstore.bean.Batch; -import com.mjsheng.myappstore.bean.LzyResponse; - -import java.util.List; +package com.jiaoguanyi.appstore.network.api.newapi; import io.reactivex.Observable; import okhttp3.ResponseBody; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java similarity index 61% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetDesktopApi.java index a44d708..00bc407 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetDesktopApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java similarity index 89% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/GetLockStateApi.java index c88704f..e49629e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/GetLockStateApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java similarity index 61% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/JpushTagsApi.java index 6ca5a72..3a2cc53 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/JpushTagsApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java similarity index 74% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/MACAddressApi.java index 42155b2..20a4d38 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/MACAddressApi.java +++ b/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.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java similarity index 63% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/ScreenLockStateApi.java index 11d3589..e5c8428 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/ScreenLockStateApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java similarity index 62% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/SnTimeControl.java index a51106d..d48153b 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/SnTimeControl.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java similarity index 61% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/StudentsInfosApi.java index ddd0c41..bc01670 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/StudentsInfosApi.java +++ b/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.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.StudentsInfo; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java similarity index 62% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/TopAppControlApi.java index 6bca241..879acd6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/TopAppControlApi.java +++ b/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.mjsheng.myappstore.network.URLAddress; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.network.URLAddress; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java b/app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java similarity index 90% rename from app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java rename to app/src/main/java/com/jiaoguanyi/appstore/network/api/newapi/UpdateDeviceInfoApi.java index 9543f03..9dd5c32 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/api/newapi/UpdateDeviceInfoApi.java +++ b/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; diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java similarity index 89% rename from app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/receiver/BootReceiver.java index 33598b8..c7b4f08 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/BootReceiver.java +++ b/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.mjsheng.myappstore.server.GuardService; -import com.mjsheng.myappstore.server.MainService; -import com.mjsheng.myappstore.server.StepService; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.server.GuardService; +import com.jiaoguanyi.appstore.server.MainService; +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)); } } diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java index dc49710..26246b9 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/receiver/MyJPushReceiver.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.receiver; +package com.jiaoguanyi.appstore.receiver; import android.app.ActivityManager; import android.bluetooth.BluetoothAdapter; @@ -23,22 +23,22 @@ import com.amap.api.location.AMapLocationListener; import com.blankj.utilcode.util.PathUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.comm.CommonDatas; -import com.mjsheng.myappstore.manager.AmapManager; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.HTTPInterface; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.server.MainService; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.CmdUtil; -import com.mjsheng.myappstore.utils.ForegroundAppUtil; -import com.mjsheng.myappstore.utils.MySQLData; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.ServiceAliveUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.manager.AmapManager; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.network.URLAddress; +import com.jiaoguanyi.appstore.server.MainService; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.CmdUtil; +import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; +import com.jiaoguanyi.appstore.utils.MySQLData; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -268,7 +268,6 @@ public class MyJPushReceiver extends BroadcastReceiver { setAPPinsideWebsite(extras); break; case DISABLE_APPUPDATE: - Log.e("fht", extras); setDisableUpdateList(extras); break; case HIDE_DESKTOP_ICON: @@ -982,6 +981,7 @@ public class MyJPushReceiver extends BroadcastReceiver { } private void setDisableUpdateList(String s) { + Log.e("setDisableUpdateList", s); try { JSONObject jsonObject = new JSONObject(s); String ban = jsonObject.getString("ban"); diff --git a/app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java new file mode 100644 index 0000000..d0f0605 --- /dev/null +++ b/app/src/main/java/com/jiaoguanyi/appstore/receiver/NewAppReceiver.java @@ -0,0 +1,131 @@ +package com.jiaoguanyi.appstore.receiver; + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.Build; +import android.provider.Settings; +import android.text.TextUtils; +import android.util.Log; + +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.SaveListUtils; + +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.ObservableEmitter; +import io.reactivex.ObservableOnSubscribe; +import io.reactivex.Observer; +import io.reactivex.annotations.NonNull; +import io.reactivex.disposables.Disposable; + +public class NewAppReceiver extends BroadcastReceiver { + private static final String TAG = NewAppReceiver.class.getSimpleName(); + private static final String APPSTORE = "com.jiaoguanyi.store"; + private static NewAppListener newAppListener; + private static Context mContext; + + static { + sendAppInfo(); + } + + @Override + public void onReceive(Context context, Intent intent) { + mContext = context; + String action = intent.getAction(); + Log.e(TAG, "onReceive: " + "action = " + action); + String state = ""; + if (TextUtils.isEmpty(action)) { + Log.e(TAG, "onReceive: " + "action is empty "); + return; + } + String packageName = intent.getDataString().replace("package:", ""); + switch (action) { + case Intent.ACTION_PACKAGE_ADDED: + state = "安装了"; + break; + case Intent.ACTION_PACKAGE_REPLACED: + state = "重装了"; + break; + case Intent.ACTION_PACKAGE_REMOVED: + state = "卸载了"; + break; + default: + state = "未知"; + break; + } + Log.e(TAG, "sendAppInfo: " + state + packageName); + String result = Settings.System.getString(context.getContentResolver(), "qch_app_forbid"); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (!APPSTORE.equals(packageName) || !BuildConfig.APPLICATION_ID.equals(packageName)) { + ApkUtils.addShortcut(context, result); + ApkUtils.RemoveTask(context, packageName); + } + Intent bootIntent = new Intent(BootReceiver.BOOT_COMPLETED); + bootIntent.setComponent(new ComponentName("com.jiaoguanyi.store", "com.jiaoguanyi.store.receiver.BootReceiver")); + context.sendBroadcast(bootIntent); + //启动教官壹 + } + newAppListener.setNewAppListener(packageName); + //接收卸载广播 +// if (action.equals(Intent.ACTION_PACKAGE_REMOVED)) { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { +// if (!"com.jiaoguanyi.store".equals(packageName) || !"com.jiaoguanyi.appstore".equals(packageName)) { +// ApkUtils.addShortcut(context, result); +// } +// Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); +// intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); +// context.sendBroadcast(intent1); +// } +// } + } + + + public interface NewAppListener { + void setNewAppListener(String packageName); + } + + private static void sendAppInfo() { + Observable.create(new ObservableOnSubscribe() { + @Override + public void subscribe(@NonNull ObservableEmitter emitter) throws Exception { + newAppListener = new NewAppListener() { + @Override + public void setNewAppListener(String packageName) { + emitter.onNext(packageName); + } + }; + } + }) + .throttleLast(5, TimeUnit.SECONDS) + //这句很关键，这是RxJava中的操作符，在规定时间内观察者不在接收被观察者发送的事件 + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull String s) { + Log.e(TAG, "sendAppInfo: onNext: " + s); + SaveListUtils.getDownLoadList().remove(s); + ApkUtils.getAppInfo(mContext); + HTTPInterface.getNetAndLaunchSetting(mContext); + } + + @Override + public void onError(@NonNull Throwable e) { + + } + + @Override + public void onComplete() { + Log.e(TAG, "onComplete: "); + } + }); + } +} diff --git a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java b/app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/server/GuardService.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java index 0b5ca14..ef71dc5 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/GuardService.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; /** * 作者 mjsheng @@ -33,15 +33,15 @@ import com.arialyy.aria.core.download.DownloadEntity; import com.arialyy.aria.core.task.DownloadTask; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.mjsheng.myappstore.KeepAliveConnection; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.ServiceAliveUtils; -import com.mjsheng.myappstore.utils.ToastUtil; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.KeepAliveConnection; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.URLAddress; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; +import com.jiaoguanyi.appstore.utils.ToastUtil; +import com.jiaoguanyi.appstore.utils.Utils; import java.io.File; import java.io.FileOutputStream; @@ -159,13 +159,9 @@ public class GuardService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { - - Aria.init(this); Aria.get(this).getDownloadConfig().setMaxTaskNum(1); - Aria.download(this).register(); - // startForeground(1, new Notification()); // 绑定建立链接 bindService(new Intent(this, StepService.class), mServiceConnection, Context.BIND_IMPORTANT); @@ -180,8 +176,6 @@ public class GuardService extends Service { } } - - private NetworkChangedRecceiver mNetworkChangedRecceiver; public void registerNetworkReceiver() { @@ -361,9 +355,6 @@ public class GuardService extends Service { } catch (Exception e) { Log.e("aria", "taskFail"); } - } - - } diff --git a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java b/app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java index 9206395..f47988a 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/InitJpushServer.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; import android.annotation.SuppressLint; import android.app.Service; @@ -32,36 +32,36 @@ import com.arialyy.aria.core.Aria; import com.blankj.utilcode.util.PathUtils; import com.lzy.okgo.OkGo; import com.lzy.okgo.callback.StringCallback; -import com.mjsheng.myappstore.BuildConfig; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.R; -import com.mjsheng.myappstore.bean.Batch; -import com.mjsheng.myappstore.bean.ForceDownloadBean; -import com.mjsheng.myappstore.bean.ForceDownloadData; -import com.mjsheng.myappstore.bean.LzyResponse; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.NetAndLaunchData; -import com.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.comm.CommonDatas; -import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.HTTPInterface; -import com.mjsheng.myappstore.network.api.AppLimitApi; -import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; -import com.mjsheng.myappstore.network.api.DeselectIDApi; -import com.mjsheng.myappstore.network.api.ForceDownloadApi; -import com.mjsheng.myappstore.network.api.NetAndLaunchApi; -import com.mjsheng.myappstore.network.api.SystemSettingApi; -import com.mjsheng.myappstore.network.api.newapi.GetBatchApi; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.utils.ForegroundAppUtil; -import com.mjsheng.myappstore.utils.MySQLData; -import com.mjsheng.myappstore.utils.SPUtils; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.TimeUtils; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.bean.Batch; +import com.jiaoguanyi.appstore.bean.ForceDownloadBean; +import com.jiaoguanyi.appstore.bean.ForceDownloadData; +import com.jiaoguanyi.appstore.bean.LzyResponse; +import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; +import com.jiaoguanyi.appstore.bean.NetAndLaunchData; +import com.jiaoguanyi.appstore.bean.StudentsInfo; +import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.HTTPInterface; +import com.jiaoguanyi.appstore.network.api.AppLimitApi; +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.SystemSettingApi; +import com.jiaoguanyi.appstore.network.api.newapi.GetBatchApi; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.network.URLAddress; +import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; +import com.jiaoguanyi.appstore.utils.MySQLData; +import com.jiaoguanyi.appstore.utils.SPUtils; +import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.TimeUtils; +import com.jiaoguanyi.appstore.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -85,8 +85,8 @@ import okhttp3.ResponseBody; import rx.Observable; import rx.functions.Action1; -import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.ACTION_SET; -import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.ACTION_SET; +import static com.jiaoguanyi.appstore.jpush.TagAliasOperatorHelper.sequence; /** * 作者 mjsheng diff --git a/app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java b/app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java index 0957f74..b0739ac 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/JWebSocketClient.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/JWebSocketClient.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; import android.util.Log; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/MainService.java b/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/server/MainService.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java index c06daf2..b84e16e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/MainService.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/MainService.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; import android.annotation.SuppressLint; import android.app.Service; @@ -22,15 +22,15 @@ import android.widget.Button; import android.widget.TextView; import com.google.gson.JsonObject; -import com.mjsheng.myappstore.R; -import com.mjsheng.myappstore.activity.MainActivity; -import com.mjsheng.myappstore.activity.MainContact; -import com.mjsheng.myappstore.activity.MainPresenter; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.ForegroundAppUtil; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.SysSettingUtils; -import com.mjsheng.myappstore.utils.TimeUtils; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.activity.MainActivity; +import com.jiaoguanyi.appstore.activity.MainContact; +import com.jiaoguanyi.appstore.activity.MainPresenter; +import com.jiaoguanyi.appstore.utils.ApkUtils; +import com.jiaoguanyi.appstore.utils.ForegroundAppUtil; +import com.jiaoguanyi.appstore.utils.SaveListUtils; +import com.jiaoguanyi.appstore.utils.SysSettingUtils; +import com.jiaoguanyi.appstore.utils.TimeUtils; public class MainService extends Service implements MainContact.MainView { private MainPresenter mPresenter; @@ -73,14 +73,13 @@ public class MainService extends Service implements MainContact.MainView { //一分钟内防止多次调用 } else { startCommandTime = SystemClock.elapsedRealtime(); - if (MainActivity.isForeground){ + if (MainActivity.isForeground) { mPresenter.getFirstConnect(); timeMillis = System.currentTimeMillis(); mPresenter.getLockedState(); - Log.e(TAG, "onStartCommand: "+(SystemClock.elapsedRealtime() - startCommandTime)); - }else { + Log.e(TAG, "onStartCommand: " + (SystemClock.elapsedRealtime() - startCommandTime)); + } else { Log.e(TAG, "onStartCommand: isForeground: " + MainActivity.isForeground); - } } return START_STICKY; @@ -184,6 +183,7 @@ public class MainService extends Service implements MainContact.MainView { } } + public class LockScreenReceiver extends BroadcastReceiver { public static final String action_lock = "LockScreenReceiver_lockscreen"; public static final String action_unlock = "LockScreenReceiver_unlockscreen"; @@ -375,7 +375,7 @@ public class MainService extends Service implements MainContact.MainView { @Override public void getAppLimitFinished(String packageList) { - mPresenter.getDeviceBatch(packageList); + mPresenter.getDeviceBatch(packageList); } @Override @@ -445,5 +445,4 @@ public class MainService extends Service implements MainContact.MainView { } - } diff --git a/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java b/app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java index 189c90e..1dd6639 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/MyDownloadService.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/MyDownloadService.java @@ -1,5 +1,5 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/StepService.java b/app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/server/StepService.java rename to app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java index 4c03678..a520849 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/StepService.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/server/StepService.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.server; +package com.jiaoguanyi.appstore.server; /** * 作者 mjsheng @@ -19,10 +19,10 @@ import android.util.Log; import androidx.annotation.Nullable; -import com.mjsheng.myappstore.KeepAliveConnection; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.utils.ServiceAliveUtils; -import com.mjsheng.myappstore.utils.Utils; +import com.jiaoguanyi.appstore.KeepAliveConnection; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.utils.ServiceAliveUtils; +import com.jiaoguanyi.appstore.utils.Utils; import org.java_websocket.handshake.ServerHandshake; diff --git a/app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java b/app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java rename to app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java index 3741b90..71114b1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/statistics/AppInformation.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/statistics/AppInformation.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.statistics; +package com.jiaoguanyi.appstore.statistics; import android.app.usage.UsageStats; import android.content.Context; diff --git a/app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java b/app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java rename to app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java index 11cadf8..84f92b2 100644 --- a/app/src/main/java/com/mjsheng/myappstore/statistics/StatisticsInfo.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/statistics/StatisticsInfo.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.statistics; +package com.jiaoguanyi.appstore.statistics; import android.annotation.TargetApi; import android.app.usage.UsageEvents; @@ -13,7 +13,7 @@ import java.util.Calendar; import java.util.HashMap; import java.util.List; -import static com.mjsheng.myappstore.statistics.AppInformation.bootTime; +import static com.jiaoguanyi.appstore.statistics.AppInformation.bootTime; public class StatisticsInfo { diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java index c26d97a..18c0b3c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ApkUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.app.ActivityManager; import android.app.PendingIntent; @@ -31,12 +31,11 @@ import com.alibaba.fastjson.JSONObject; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.download.DownloadEntity; import com.google.gson.Gson; -import com.mjsheng.myappstore.BuildConfig; -import com.mjsheng.myappstore.R; -import com.mjsheng.myappstore.bean.UploadAppInfo; -import com.mjsheng.myappstore.manager.NetInterfaceManager; -import com.mjsheng.myappstore.network.URLAddress; -import com.mjsheng.myappstore.network.api.UploadAppInfoApi; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.bean.UploadAppInfo; +import com.jiaoguanyi.appstore.manager.NetInterfaceManager; +import com.jiaoguanyi.appstore.network.api.UploadAppInfoApi; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java index 0656ae0..80c1948 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/AppsManagerUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/AppsManagerUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; import android.content.Intent; @@ -8,8 +8,8 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; -import com.mjsheng.myappstore.bean.AppUpdateInfo; -import com.mjsheng.myappstore.bean.LocalAppInfo; +import com.jiaoguanyi.appstore.bean.AppUpdateInfo; +import com.jiaoguanyi.appstore.bean.LocalAppInfo; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java new file mode 100644 index 0000000..9065817 --- /dev/null +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/BootUtils.java @@ -0,0 +1,7 @@ +package com.jiaoguanyi.appstore.utils; + +public class BootUtils { + public static void main() { + + } +} diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java index 66d5a57..9c8f098 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/CmdUtil.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/CmdUtil.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java index 2d6e022..86e6f38 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ExampleUtil.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ExampleUtil.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java index 4e05883..4dbd5b1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ForegroundAppUtil.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.app.ActivityManager; import android.app.usage.UsageStats; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java index 3d74484..130ee3e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/InstallResultReceiver.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/InstallResultReceiver.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java index 5a12fde..32f72f6 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/JGYUtils.java @@ -1,18 +1,15 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.annotation.SuppressLint; -import android.app.Activity; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.BatteryManager; import android.os.Build; -import android.os.Bundle; import android.os.PowerManager; import android.provider.Settings; import android.text.TextUtils; @@ -20,15 +17,14 @@ import android.util.Log; import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; -import com.mjsheng.myappstore.BuildConfig; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.bean.Appground; -import com.mjsheng.myappstore.bean.BaseResponse; -import com.mjsheng.myappstore.bean.ForceDownloadData; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.NetAndLaunchData; -import com.mjsheng.myappstore.comm.CommonDatas; -import com.mjsheng.myappstore.server.InitJpushServer; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.bean.Appground; +import com.jiaoguanyi.appstore.bean.BaseResponse; +import com.jiaoguanyi.appstore.bean.ForceDownloadData; +import com.jiaoguanyi.appstore.bean.NetAndLaunchBean; +import com.jiaoguanyi.appstore.bean.NetAndLaunchData; +import com.jiaoguanyi.appstore.comm.CommonDatas; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Logger.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java similarity index 90% rename from app/src/main/java/com/mjsheng/myappstore/utils/Logger.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java index 2236640..eae8bf0 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Logger.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/Logger.java @@ -1,8 +1,8 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.util.Log; -import com.mjsheng.myappstore.BuildConfig; +import com.jiaoguanyi.appstore.BuildConfig; /** * Created by efan on 2017/4/13. diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java index 7e307d3..3c641f5 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/MySQLData.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/MySQLData.java @@ -1,13 +1,13 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import com.mjsheng.myappstore.comm.CommonDatas; -import com.mjsheng.myappstore.database.DBHelper; -import com.mjsheng.myappstore.database.DBSqlBuilder; +import com.jiaoguanyi.appstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.database.DBHelper; +import com.jiaoguanyi.appstore.database.DBSqlBuilder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java index 00b8ae0..9a259b0 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/NetworkUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java index b4f8ae7..6ea6bf1 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SPUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/SPUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; import android.content.SharedPreferences; @@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable; import android.util.Base64; import android.widget.ImageView; -import com.mjsheng.myappstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.comm.CommonDatas; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java index cab82ac..e31b174 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/SaveListUtils.java @@ -1,14 +1,13 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; import android.provider.Settings; -import androidx.core.content.FileProvider; import android.util.Log; import com.blankj.utilcode.util.SPStaticUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.mjsheng.myappstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.comm.CommonDatas; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java similarity index 95% rename from app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java index 8a2535f..e0fe12f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ServiceAliveUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java similarity index 96% rename from app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java index aee971c..bb9dbbe 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SpacesItemDecoration.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/SpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.graphics.Rect; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java similarity index 99% rename from app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java index 772ce61..a0d5c48 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SysSettingUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/SysSettingUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.bluetooth.BluetoothAdapter; import android.content.Context; @@ -11,7 +11,7 @@ import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.mjsheng.myappstore.BuildConfig; +import com.jiaoguanyi.appstore.BuildConfig; public class SysSettingUtils { diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java similarity index 94% rename from app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java index 457c293..1931723 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/SystemUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java similarity index 98% rename from app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java index 265e1d5..2aaac42 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/TimeUtils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.content.Context; import android.content.Intent; @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import android.text.TextUtils; -import com.mjsheng.myappstore.server.MainService; +import com.jiaoguanyi.appstore.server.MainService; import java.text.DateFormat; import java.text.ParseException; diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java index 233996e..1eabe68 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/ToastUtil.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/ToastUtil.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -8,7 +8,7 @@ import android.os.Looper; import android.util.Log; import android.widget.Toast; -import com.mjsheng.myappstore.BuildConfig; +import com.jiaoguanyi.appstore.BuildConfig; /** diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java similarity index 97% rename from app/src/main/java/com/mjsheng/myappstore/utils/Utils.java rename to app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java index ffe3496..05544fb 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Utils.java +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/Utils.java @@ -1,4 +1,4 @@ -package com.mjsheng.myappstore.utils; +package com.jiaoguanyi.appstore.utils; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -57,10 +57,10 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import com.mjsheng.myappstore.BuildConfig; -import com.mjsheng.myappstore.R; -import com.mjsheng.myappstore.base.BaseApplication; -import com.mjsheng.myappstore.comm.CommonDatas; +import com.jiaoguanyi.appstore.BuildConfig; +import com.jiaoguanyi.appstore.R; +import com.jiaoguanyi.appstore.base.BaseApplication; +import com.jiaoguanyi.appstore.comm.CommonDatas; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -1263,14 +1263,16 @@ public class Utils { jsonObject.put("firmware_version", firmware_version); jsonObject.put("rom", rom); jsonObject.put("screen_rate", screen_rate); - return jsonObject.toJSONString(); + String jsonString = jsonObject.toJSONString(); + return jsonString; } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) public static String getHardware(Context context) { int electric = getBattery(context); int charging = getIsCharging(context); - String memory = Formatter.formatFileSize(context, getAvailMemory(context)) + "\t 已用" + "/" + "共" + Formatter.formatFileSize(context, getTotalMemory(context)); + String memory = Formatter.formatFileSize(context, getFreeMemory(context)) + "\t 已用" + "/" + "共" + Formatter.formatFileSize(context, getTotalMemory(context)); + Log.e("getHardware", "Memory: " + memory); String storage = getRemnantSize(context) + "/" + getDataTotalSize(context); int CPU = getNumCores(); JSONObject jsonObject = new JSONObject(); @@ -1279,7 +1281,8 @@ public class Utils { jsonObject.put("memory", memory); jsonObject.put("storage", storage); jsonObject.put("CPU", CPU + "核"); - return jsonObject.toJSONString(); + String jsonString = jsonObject.toJSONString(); + return jsonString; } private static int getNumCores() { @@ -1359,22 +1362,47 @@ public class Utils { */ public static long getAvailMemory(Context context) { // 获取android当前可用内存大小 - ActivityManager activityManager = (ActivityManager) context - .getSystemService(Context.ACTIVITY_SERVICE); + ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); activityManager.getMemoryInfo(memoryInfo); // 当前系统可用内存 ,将获得的内存大小规格化 - return memoryInfo.availMem; } /** - * 描述：总内存. - * + * @param context + * @return 可用的内存大小 + */ + public static long getFreeMemory(Context context) { + ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); + activityManager.getMemoryInfo(memoryInfo); + long freeMem = memoryInfo.totalMem - memoryInfo.availMem; + Log.e("getHardware", "getFreeMemory: " + freeMem); + return freeMem; + } + + + /** * @param context * @return */ public static long getTotalMemory(Context context) { + ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); + activityManager.getMemoryInfo(memoryInfo); + Log.e("getHardware", "getFreeMemory: " + memoryInfo.totalMem); + return memoryInfo.totalMem; + } + + + /** + * 描述：总内存. + * https://blog.csdn.net/a357339414/article/details/52057507 + * + * @return + */ + public static long getTotalMemory() { // 系统内存信息文件 String file = "/proc/meminfo"; String memInfo; @@ -1398,6 +1426,7 @@ public class Utils { } // Byte转位KB或MB return memory * 1024; +// return memory * 1000; } public static String formatFileSize(long fileS) { diff --git a/app/src/main/java/com/jiaoguanyi/appstore/utils/XApkUtils.java b/app/src/main/java/com/jiaoguanyi/appstore/utils/XApkUtils.java new file mode 100644 index 0000000..43ede84 --- /dev/null +++ b/app/src/main/java/com/jiaoguanyi/appstore/utils/XApkUtils.java @@ -0,0 +1,4 @@ +package com.jiaoguanyi.appstore.utils; + +public class XApkUtils { +} diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java deleted file mode 100644 index 1efded1..0000000 --- a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.mjsheng.myappstore.activity; - -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import androidx.appcompat.app.AppCompatActivity; - -import com.mjsheng.myappstore.R; - -public class HomeActivity 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(HomeActivity.this, MainActivity.class)); - finish(); - } - }, 3000); - } - -} diff --git a/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java b/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java deleted file mode 100644 index 0d85d1e..0000000 --- a/app/src/main/java/com/mjsheng/myappstore/base/BaseView.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.mjsheng.myappstore.base; - -public interface BaseView { -} diff --git a/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java b/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java deleted file mode 100644 index 691bcb3..0000000 --- a/app/src/main/java/com/mjsheng/myappstore/manager/NetInterfaceManager.java +++ /dev/null @@ -1,532 +0,0 @@ -package com.mjsheng.myappstore.manager; - -import android.content.Context; -import android.os.Environment; - -import com.mjsheng.myappstore.BuildConfig; -import com.mjsheng.myappstore.bean.Appground; -import com.mjsheng.myappstore.bean.BaseResponse; -import com.mjsheng.myappstore.bean.BrowserBookmarks; -import com.mjsheng.myappstore.bean.BrowserData; -import com.mjsheng.myappstore.bean.ForceDownloadBean; -import com.mjsheng.myappstore.bean.NetAndLaunchBean; -import com.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.network.api.AppLimitApi; -import com.mjsheng.myappstore.network.api.BrankPicApi; -import com.mjsheng.myappstore.network.api.CategoryPicApi; -import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; -import com.mjsheng.myappstore.network.api.DeselectIDApi; -import com.mjsheng.myappstore.network.api.ForceDownloadApi; -import com.mjsheng.myappstore.network.api.NetAndLaunchApi; -import com.mjsheng.myappstore.network.api.ProjectPicApi; -import com.mjsheng.myappstore.network.api.RankAppApi; -import com.mjsheng.myappstore.network.api.SystemSettingApi; -import com.mjsheng.myappstore.network.api.UploadAppInfoApi; -import com.mjsheng.myappstore.network.api.newapi.AppinsideWebApi; -import com.mjsheng.myappstore.network.api.newapi.BrowserBookmarksApi; -import com.mjsheng.myappstore.network.api.newapi.BrowserListApi; -import com.mjsheng.myappstore.network.api.newapi.CheckTestUpdateApi; -import com.mjsheng.myappstore.network.api.newapi.CheckUpdateApi; -import com.mjsheng.myappstore.network.api.newapi.DesktopIconApi; -import com.mjsheng.myappstore.network.api.newapi.DevicesLockedStateApi; -import com.mjsheng.myappstore.network.api.newapi.GetBatchApi; -import com.mjsheng.myappstore.network.api.newapi.GetDesktopApi; -import com.mjsheng.myappstore.network.api.newapi.GetLockStateApi; -import com.mjsheng.myappstore.network.api.newapi.JpushTagsApi; -import com.mjsheng.myappstore.network.api.newapi.MACAddressApi; -import com.mjsheng.myappstore.network.api.newapi.ScreenLockStateApi; -import com.mjsheng.myappstore.network.api.newapi.SnTimeControl; -import com.mjsheng.myappstore.network.api.newapi.StudentsInfosApi; -import com.mjsheng.myappstore.network.api.newapi.TopAppControlApi; -import com.mjsheng.myappstore.network.api.newapi.UpdateDeviceInfoApi; -import com.mjsheng.myappstore.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; - 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; - } - - 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> getStudesInfoObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(StudentsInfosApi.class) - .getStudentsInfo(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - /** - * 获取设备锁状态 - * - * @return - */ - public Observable getDevicesLockedStateObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(DevicesLockedStateApi.class) - .getLockedState(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - /** - * 发送设备mac地址 - * - * @return - */ - public Observable sendMACAddressObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .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 getJpushTagsObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(JpushTagsApi.class) - .getJpushTags(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - - public Observable> getBrowserListSettingObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(BrowserListApi.class) - .getBrowserList(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable> getBrowserBookmarksObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(BrowserBookmarksApi.class) - .getBrowserBookmarks(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getDesktopIconObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(DesktopIconApi.class) - .getDesktopIcon(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getAppAutoStartUpdateAndNetObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(NetAndLaunchApi.class) - .getNetAndLaunchApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getAppIDControlObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(DeselectIDApi.class) - .getDeselectIDApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable>> getAppinsideWebObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(AppinsideWebApi.class) - .getAppinsideWeb(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getSystemSettingObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(SystemSettingApi.class) - .getSystemSettingApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getAppLimitObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(AppLimitApi.class) - .getAppLimitApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getForceDownloadObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(ForceDownloadApi.class) - .getForceDownloadApi(NetInterfaceManager.HTTP_KEY, Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - - public Observable getTestUpdateObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(CheckTestUpdateApi.class) - .getTestUpdate(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getSnTimeObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(SnTimeControl.class) - .getSnTimeControl(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - public Observable getScreenLockObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(ScreenLockStateApi.class) - .getScreenLockState(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - public Observable getDesktopObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(GetDesktopApi.class) - .getDesktop(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - public Observable getBatchObservable() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(GetBatchApi.class) - .getBatch(Utils.getSerial()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - - - - /* - * - * API - * - * */ - public static UploadAppInfoApi getUploadAppInfoApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(UploadAppInfoApi.class); - } - - public static DeselectIDApi getDeselectIDApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(DeselectIDApi.class); - } - - public static DeselectBrowserIDApi getDeselectBrowserIDApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(DeselectBrowserIDApi.class); - } - - public static RankAppApi getRankAppApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(RankAppApi.class); - } - - public static CategoryPicApi getCategoryPicApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(CategoryPicApi.class); - } - - public static ProjectPicApi getProjectPicApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(ProjectPicApi.class); - } - - public static BrankPicApi getBrankPicApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(BrankPicApi.class); - } - - public static AppLimitApi getAppLimitApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(AppLimitApi.class); - - } - - public static SystemSettingApi getSystemSettingApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(SystemSettingApi.class); - } - - - - public static NetAndLaunchApi getNetAndLaunchApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(NetAndLaunchApi.class); - } - - public static ForceDownloadApi getForceDownloadApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(ForceDownloadApi.class); - } - - public static GetLockStateApi getLockState() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(GetLockStateApi.class); - } - - public static UpdateDeviceInfoApi getUpdateDeviceInfo() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(UpdateDeviceInfoApi.class); - } - - public static GetBatchApi getBatchApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(GetBatchApi.class); - } - - public static SnTimeControl getSnTimeControlApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(SnTimeControl.class); - } - - public static TopAppControlApi getTopAppControlApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build().create(TopAppControlApi.class); - } - - - public CheckUpdateApi getUpdateApi() { - return new Retrofit.Builder() - .client(okHttpClient) - .baseUrl(ROOT_URL) - .addConverterFactory(gsonConverterFactory) - .addCallAdapterFactory(rxJavaCallAdapterFactory) - .build() - .create(CheckUpdateApi.class); - } - -} diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java deleted file mode 100644 index 509dc54..0000000 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/NewAppReceiver.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.mjsheng.myappstore.receiver; - -import android.content.BroadcastReceiver; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.os.Build; -import android.provider.Settings; -import android.util.Log; - -import com.mjsheng.myappstore.bean.AppData; -import com.mjsheng.myappstore.network.HTTPInterface; -import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.SaveListUtils; -import com.mjsheng.myappstore.utils.Utils; - -public class NewAppReceiver extends BroadcastReceiver { - - private static final String TAG = "--NewAppReceiver--"; - private String action = null; - - @Override - public void onReceive(Context context, Intent intent) { - action = intent.getAction(); - Log.e("onReceive", action); - //接收安装广播 - if (action.equals(Intent.ACTION_PACKAGE_ADDED) || action.equals(Intent.ACTION_PACKAGE_REPLACED)) { - - Intent allIntent = new Intent(); - allIntent.setAction(Utils.DOWNLOAD_ALLTASK_ACTION); - context.sendBroadcast(allIntent); - String packageName = intent.getDataString().replace("package:", ""); - String result = Settings.System.getString(context.getContentResolver(), "qch_app_forbid"); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - if (!packageName.equals("com.jiaoguanyi.store") || !packageName.equals("com.jiaoguanyi.appstore")) { -// ApkUtils.getStartActivityName(context, packageName); - ApkUtils.addShortcut(context, result); - ApkUtils.RemoveTask(context,packageName); - } - Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); - intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); - context.sendBroadcast(intent1); - } - -// MyApplication.getInstance().removeDate(packageName); - Log.e(TAG, "安装了:" + packageName + "包名的程序"); - Log.e("fht", "安装了:" + packageName + "包名的程序"); -// OkGo.post(Configure.HTTP_TAG_DOWNLOAD_URL) -// .params("key", Configure.HTTP_KEY) -// .params("sn", Utils.getSerial()) -// .params("package", packageName) -// .tag(this) -// .execute(new StringCallback() { -// @Override -// public void onSuccess(String s, Call call, Response response) { -// -// } -// }); - SaveListUtils.getDownLoadList().remove(packageName);//移除下载列表 -// ToastTool.show("安装成功"); - if (!packageName.equals(Utils.YOUNGSYSTEM_APP_TONGBU) && !packageName.equals(context.getPackageName())) { - updateUserApp(context, packageName); - } - // 下载管理服务 删除对应任务 - Intent msgIntent = new Intent(Utils.DOWNLOAD_DELETE_PACKAGENAME_ACTION); - msgIntent.putExtra("packageName", packageName); - context.sendBroadcast(msgIntent); - - Intent intent1 = new Intent(); - if (action.equals(Intent.ACTION_PACKAGE_ADDED)) { - intent1.setAction(Utils.ACTION_PACKAGE_ADDED); - } else { - intent1.setAction(Utils.ACTION_PACKAGE_REPLACED); - } - intent1.putExtra("packageName", packageName); - context.sendBroadcast(intent1); - ApkUtils.getAppInfo(context); - } - //接收卸载广播 - if (action.equals(Intent.ACTION_PACKAGE_REMOVED)) { - String packageName = intent.getDataString().replace("package:", ""); - Log.e(TAG, "卸载了:" + packageName + "包名的程序"); - - if (!packageName.equals(Utils.YOUNGSYSTEM_APP_TONGBU) && !packageName.equals(context.getPackageName())) { - deletedateUserApp(context, packageName); - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - String result = Settings.System.getString(context.getContentResolver(), "qch_app_forbid"); - if (!packageName.equals("com.jiaoguanyi.store") || !packageName.equals("com.jiaoguanyi.appstore")) { -// ApkUtils.getStartActivityName(context, packageName); - ApkUtils.addShortcut(context, result); - } - Intent intent1 = new Intent(BootReceiver.BOOT_COMPLETED); - intent1.setComponent(new ComponentName("com.jiaoguanyi.store", "com.mjsheng.myappstore.receiver.BootReceiver")); - context.sendBroadcast(intent1); - } - Intent intent1 = new Intent(); - intent1.setAction(Utils.ACTION_PACKAGE_REMOVED); - intent1.putExtra("packageName", packageName); - context.sendBroadcast(intent1); - ApkUtils.getAppInfo(context); - } -// MyApplication.getInstance().getWhitePackageList(); - HTTPInterface.getNetAndLaunchSetting(context); - - } - - - private void deletedateUserApp(Context context, String packageName) { - String category = AppData.getConfigApp(context, packageName); - if (category != null && category.toString() != "") { - AppData.deleteAppsByAppKey(context, packageName); - // 子界面下载回调 提示更新UI - Intent intent = new Intent(); - intent.setAction(Utils.DOWNLOADAPP_CALLBACK); - intent.putExtra("data", category); - context.sendBroadcast(intent); - } - } - - private void updateUserApp(Context context, String packageName) { - String[] category = AppData.getDownloadApp(context, packageName); - if (category != null && category.toString() != "") { - AppData.updateConfigApp(context, category[0], category[1], packageName); - AppData.deleteDownloadApp(context, packageName); - // 子界面下载回调 提示更新UI - Intent intent = new Intent(); - intent.setAction(Utils.DOWNLOADAPP_CALLBACK); - intent.putExtra("data", category[0]); - context.sendBroadcast(intent); - } - } - -// private void getAppInfo(Context context) { -// ArrayList appList = new ArrayList(); //用来存储获取的应用信息数据 -// List packages = context.getPackageManager().getInstalledPackages(0); -// -// for (int i = 0; i < packages.size(); i++) { -// PackageInfo packageInfo = packages.get(i); -// if (ApkUtils.systemapp.contains(packageInfo.packageName)) { -// continue; -// } -// -// UploadAppInfo uploadAppInfo = new UploadAppInfo(); -// uploadAppInfo.setApp_name(packageInfo.applicationInfo.loadLabel(context.getPackageManager()).toString()); -// uploadAppInfo.setPackage_name(packageInfo.packageName); -// uploadAppInfo.setId(i); -// String firstInstallTime = Utils.transferLongToDate(packageInfo.firstInstallTime); -// uploadAppInfo.setInstall_time(firstInstallTime); -// uploadAppInfo.setVersionCode(String.valueOf(packageInfo.versionCode)); -// -// if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1) { -// } else { -// appList.add(uploadAppInfo); -// } -// -// -// } -// -//// Log.e("mjsheng", "UploadAppInfo========" + appList.toString()); -// -// Gson gson = new Gson(); -// String jsonString = gson.toJson(appList); -//// Log.e("mjsheng", "json========" + jsonString); -// -// UploadAppInfoApi uploadAppInfoApi = Network.getUploadAppInfoApi(); -// uploadAppInfoApi.getUploadAppInfoApi(Configure.HTTP_KEY, Utils.getSerial(), jsonString) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(new Observer() { -// @Override -// public void onSubscribe(Disposable d) { -// -// } -// -// @Override -// public void onNext(ResponseBody responseBody) { -// try { -// Log.e("mjhseng", "上传的结果" + responseBody.string()); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// -// @Override -// public void onError(Throwable e) { -// Log.e("mjsheng", "UploadAppInfoApi=onError:"); -// } -// -// @Override -// public void onComplete() { -// -// } -// }); -// } - -} diff --git a/app/src/main/res/layout-land/activity_home.xml b/app/src/main/res/layout-land/activity_home.xml index 5c26bed..09b8d31 100644 --- a/app/src/main/res/layout-land/activity_home.xml +++ b/app/src/main/res/layout-land/activity_home.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.mjsheng.myappstore.activity.HomeActivity"> + tools:context="com.jiaoguanyi.appstore.activity.SplashActivity"> + tools:context="com.jiaoguanyi.appstore.activity.TopActivity"> + tools:context="com.jiaoguanyi.appstore.activity.SplashActivity"> + tools:context="com.jiaoguanyi.appstore.activity.TopActivity">