tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:

Browse Source 
fix:netfixes
update:
This commit is contained in:
Godfather
2022-04-06 18:11:55 +08:00
parent 683f31087f
commit f2cc0aea30
20 changed files with 1003 additions and 1395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

475
app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java
View File

@@ -10,24 +10,17 @@ import android.util.Log;
import com.alibaba.fastjson.JSONObject;
import com.aoleyun.sn.BuildConfig;
import com.aoleyun.sn.base.BaseApplication;
import com.aoleyun.sn.bean.AppUpdateInfo;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.DefaultApp;
import com.aoleyun.sn.bean.ForceDownloadBean;
import com.aoleyun.sn.bean.ForceDownloadData;
import com.aoleyun.sn.bean.LogoImg;
import com.aoleyun.sn.bean.NetAndLaunchBean;
import com.aoleyun.sn.bean.PoweroffBean;
import com.aoleyun.sn.bean.StudentsInfo;
import com.aoleyun.sn.bean.WiFiAlias;
import com.aoleyun.sn.comm.CommonConfig;
import com.aoleyun.sn.comm.JGYActions;
import com.aoleyun.sn.comm.PackageNames;
import com.aoleyun.sn.manager.ConnectManager;
import com.aoleyun.sn.disklrucache.CacheHelper;
import com.aoleyun.sn.network.NetInterfaceManager;
import com.aoleyun.sn.utils.ApkUtils;
import com.aoleyun.sn.utils.ForegroundAppUtil;
import com.aoleyun.sn.utils.JGYUtils;
import com.aoleyun.sn.utils.SPUtils;
import com.aoleyun.sn.utils.TimeUtils;
@@ -35,28 +28,23 @@ import com.aoleyun.sn.utils.ToastUtil;
import com.aoleyun.sn.utils.URLUtils;
import com.aoleyun.sn.utils.Utils;
import com.aoleyun.sn.utils.WiFiUtils;
import com.arialyy.aria.core.Aria;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Function5;
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.BehaviorSubject;
import okhttp3.ResponseBody;
@@ -74,6 +62,7 @@ public class MainSPresenter implements MainSContact.Presenter {
private Context mContext;
private ContentResolver crv;
private MMKV mMMKV = MMKV.defaultMMKV();
private CacheHelper cacheHelper;
private final String DEFAULT_INFO = "暂无信息";
private final int OK = 200;
@@ -90,7 +79,8 @@ public class MainSPresenter implements MainSContact.Presenter {
public MainSPresenter(Context context) {
this.mContext = context;
crv = mContext.getContentResolver();
this.crv = mContext.getContentResolver();
this.cacheHelper = new CacheHelper(mContext);
Log.e(TAG, "MainSPresenter: " + context.getClass());
}
@@ -111,22 +101,7 @@ public class MainSPresenter implements MainSContact.Presenter {
public void getLockedState(String key) {
Log.e(TAG, "getLockedState: " + key);
NetInterfaceManager.getInstance()
.getLockedState(lifecycle, new NetInterfaceManager.ObserverCallback() {
@Override
public void onSubscribe(Disposable d) {
Log.e("getLockedState", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse response) {
Log.e("getLockedState", "onNext: ");
}
@Override
public void onError(Throwable e) {
Log.e("getLockedState", "onError: " + e.getMessage());
}
.getLockedState(getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("getLockedState", "onComplete: ");
@@ -139,25 +114,14 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void setPushTags() {
NetInterfaceManager.getInstance().setPushTags(lifecycle, new NetInterfaceManager.ObserverCallback() {
@Override
public void onSubscribe(Disposable d) {
Log.e("setPushTags", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse response) {
Log.e("setPushTags", "onNext: ");
}
@Override
public void onError(Throwable e) {
Log.e("setPushTags", "onError: " + e.getMessage());
}
NetInterfaceManager.getInstance().setPushTags(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("setPushTags", "onComplete: ");
Set tagSets = mMMKV.decodeStringSet(CommonConfig.DEVICES_TAG);
Log.e("setPushTags", "onComplete: tagSets =" + tagSets);
String tags = cacheHelper.getAsString(CommonConfig.DEVICES_TAG);
Log.e("setPushTags", "onComplete: tags = " + tags);
mView.setTagsFinish(tagSets == null || tagSets.size() < 2);
}
});
}
@@ -196,6 +160,11 @@ public class MainSPresenter implements MainSContact.Presenter {
public void setStudentsInfo(StudentsInfo studentsInfo) {
mView.setStudesInfo();
}
@Override
public void onComplete() {
mView.setStudesInfo();
}
});
}
@@ -205,22 +174,7 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void sendMACAddress() {
NetInterfaceManager.getInstance().sendMACAddress(lifecycle, new NetInterfaceManager.ObserverCallback() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseResponse response) {
}
@Override
public void onError(Throwable e) {
}
NetInterfaceManager.getInstance().sendMACAddress(getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
mView.sendMACFinish();
@@ -234,22 +188,7 @@ public class MainSPresenter implements MainSContact.Presenter {
mView.updateDeviceInfoFinish();
return;
}
NetInterfaceManager.getInstance().updateDeviceInfo(new NetInterfaceManager.ObserverCallback() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseResponse response) {
}
@Override
public void onError(Throwable e) {
}
NetInterfaceManager.getInstance().updateDeviceInfo(new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
mView.updateDeviceInfoFinish();
@@ -262,22 +201,7 @@ public class MainSPresenter implements MainSContact.Presenter {
*/
@Override
public void sendInstalled() {
NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.ObserverCallback() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseResponse response) {
}
@Override
public void onError(Throwable e) {
}
NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
mView.sendInstalledFinish();
@@ -292,127 +216,22 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void checkAoleyunUpdate() {
long lastCheckAllUpdateTime = mMMKV.decodeLong(CommonConfig.LAST_CHECK_ALL_UPDATE_TIME, 0);
if (System.currentTimeMillis() - lastCheckAllUpdateTime < 60 * 60 * 1000) {
Log.e(TAG, "checkAoleyunUpdate: " + lastCheckAllUpdateTime);
String jsonString = mMMKV.decodeString(CommonConfig.ALL_APP_UPDATE, "");
if (TextUtils.isEmpty(jsonString)) {
return;
}
Gson gson = new Gson();
Type listType = new TypeToken<List<AppUpdateInfo>>() {
}.getType();
List<AppUpdateInfo> appUpdateInfos = gson.fromJson(jsonString, listType);
for (AppUpdateInfo info : appUpdateInfos) {
JsonObject jsonObject = parseString(new Gson().toJson(info)).getAsJsonObject();
JGYUtils.getInstance().installAPK(jsonObject);
}
return;
}
Observable<BaseResponse<AppUpdateInfo>> infoUpdateObservable = NetInterfaceManager.getInstance()
.getUpdateApi().getUpdate(BuildConfig.APPLICATION_ID, JGYUtils.getInstance().checkAppPlatform());
Observable<BaseResponse<AppUpdateInfo>> storeUpdateObservable = NetInterfaceManager.getInstance()
.getUpdateApi().getUpdate(PackageNames.APPSTORE, JGYUtils.getInstance().checkAppPlatform());
Observable<BaseResponse<AppUpdateInfo>> desktopUpdateObservable = NetInterfaceManager.getInstance()
.getUpdateApi().getUpdate(PackageNames.DESKTOP, JGYUtils.getInstance().checkAppPlatform());
Observable<BaseResponse<AppUpdateInfo>> notifyUpdateObservable = NetInterfaceManager.getInstance()
.getUpdateApi().getUpdate(PackageNames.NOTIFICATIONS, JGYUtils.getInstance().checkAppPlatform());
Observable<BaseResponse<AppUpdateInfo>> browserUpdateObservable = NetInterfaceManager.getInstance()
.getUpdateApi().getUpdate(PackageNames.BROWSER, JGYUtils.getInstance().checkAppPlatform());
Observable.zip(infoUpdateObservable, storeUpdateObservable, desktopUpdateObservable, notifyUpdateObservable, browserUpdateObservable,
new Function5<BaseResponse<AppUpdateInfo>, BaseResponse<AppUpdateInfo>, BaseResponse<AppUpdateInfo>, BaseResponse<AppUpdateInfo>, BaseResponse<AppUpdateInfo>, List<AppUpdateInfo>>() {
@Override
public List<AppUpdateInfo> apply(BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse, BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse2, BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse3, BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse4, BaseResponse<AppUpdateInfo> appUpdateInfoBaseResponse5) throws Throwable {
List<AppUpdateInfo> appUpdateInfos = new ArrayList<>();
if (appUpdateInfoBaseResponse.code == OK) {
appUpdateInfos.add(appUpdateInfoBaseResponse.data);
}
if (appUpdateInfoBaseResponse2.code == OK) {
appUpdateInfos.add(appUpdateInfoBaseResponse2.data);
}
if (appUpdateInfoBaseResponse3.code == OK) {
appUpdateInfos.add(appUpdateInfoBaseResponse3.data);
}
if (appUpdateInfoBaseResponse4.code == OK) {
appUpdateInfos.add(appUpdateInfoBaseResponse4.data);
}
if (appUpdateInfoBaseResponse5.code == OK) {
appUpdateInfos.add(appUpdateInfoBaseResponse5.data);
}
return appUpdateInfos;
}
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<List<AppUpdateInfo>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("checkAoleyunUpdate", "onSubscribe: ");
}
@Override
public void onNext(@NonNull List<AppUpdateInfo> appUpdateInfos) {
mMMKV.encode(CommonConfig.LAST_CHECK_ALL_UPDATE_TIME, System.currentTimeMillis());
String jsonString = new Gson().toJson(appUpdateInfos);
Log.e("checkAoleyunUpdate", "onNext: " + jsonString);
mMMKV.encode(CommonConfig.ALL_APP_UPDATE, jsonString);
for (AppUpdateInfo info : appUpdateInfos) {
JsonObject jsonObject = parseString(new Gson().toJson(info)).getAsJsonObject();
JGYUtils.getInstance().installAPK(jsonObject);
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("checkAoleyunUpdate", "onError: " + e.getMessage());
}
NetInterfaceManager.getInstance()
.checkAoleyunUpdate(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("checkAoleyunUpdate", "onComplete: ");
mView.checkAoleyunUpdateFinish();
}
});
}
/**
* 获取灰度测试更新
*/
@Override
public void checkTestUpdate() {
NetInterfaceManager.getInstance()
.getTestUpdateObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<ForceDownloadData>>>() {
@Override
public void onSubscribe(Disposable d) {
Log.e("checkTestUpdate", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse<List<ForceDownloadData>> listBaseResponse) {
Log.e("checkTestUpdate", "onNext: " + listBaseResponse.data);
if (listBaseResponse.code == OK) {
List<ForceDownloadData> APPlist = listBaseResponse.data;
JGYUtils.getInstance().installTestAPK(APPlist);
} else {
Log.e("checkTestUpdate", "onNext: " + listBaseResponse.msg);
}
}
@Override
public void onError(Throwable e) {
Log.e("checkTestUpdate", "onError: " + e.getMessage());
onComplete();
}
.checkTestUpdate(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("checkTestUpdate", "onComplete: ");
mView.checkTestUpdateFinish();
}
});
@@ -421,51 +240,9 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void getForceDownload() {
NetInterfaceManager.getInstance()
.getForceDownloadObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<ForceDownloadBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getForceDownload", "onSubscribe: ");
}
@Override
public void onNext(@NonNull ForceDownloadBean forceDownloadBean) {
Log.e("getForceDownload", "onNext: ");
switch (forceDownloadBean.getCode()) {
case OK:
Log.e("getForceDownload", "isDownloading=" + BaseApplication.getInstance().isDownloading());
BaseApplication.getInstance().checkIsDownloading();
if (!BaseApplication.getInstance().isDownloading()) {
Type type = new TypeToken<List<ForceDownloadData>>() {
}.getType();
Gson gson = new Gson();
List<ForceDownloadData> forceDownloadData = gson.fromJson(gson.toJson(forceDownloadBean.getData()), type);
JGYUtils.getInstance().forceDownload(forceDownloadData);
} else {
Aria.download(this).resumeAllTask();
}
break;
case -200:
boolean qch_force_app = Settings.System.putString(mContext.getContentResolver(), "qch_force_app", "invalid");
Log.e("getForceDownload", "qch_force_app:" + qch_force_app);
break;
default:
Log.e("getForceDownload", forceDownloadBean.getMsg());
break;
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getForceDownload", "onError: " + e.getMessage());
onComplete();
}
.getForceDownload(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("getForceDownload", "onComplete: ");
mView.getForceDownloadFinish();
}
});
@@ -478,53 +255,9 @@ public class MainSPresenter implements MainSContact.Presenter {
return;
}
NetInterfaceManager.getInstance()
.getDesktopObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<ResponseBody>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("getDefaultDesktop", "onSubscribe: ");
}
@Override
public void onNext(@NonNull ResponseBody responseBody) {
try {
JSONObject jsonObject = JSONObject.parseObject(responseBody.string());
Log.e("getDefaultDesktop", "onNext: " + jsonObject.toString());
int code = jsonObject.getInteger("code");
if (code == OK) {
JSONObject data = jsonObject.getJSONObject("data");
JGYUtils.getInstance().installDesktop(data);
} else {
Log.e("getDefaultDesktop", "onNext: " + "删除定制桌面");
String whiteList = Settings.System.getString(mContext.getContentResolver(), JGYActions.ACTION_JGY_SHORTCUTLIST);
if (!TextUtils.isEmpty(whiteList)) {
if (!whiteList.contains(ApkUtils.desktopAPP.get(0))) {
ApkUtils.UninstallAPP(mContext, ApkUtils.desktopAPP.get(0));
Log.e("getDefaultDesktop", "skip: " + ApkUtils.desktopAPP.get(0));
}
if (!whiteList.contains(ApkUtils.desktopAPP.get(1))) {
ApkUtils.UninstallAPP(mContext, ApkUtils.desktopAPP.get(1));
Log.e("getDefaultDesktop", "skip: " + ApkUtils.desktopAPP.get(1));
}
}
}
} catch (IOException e) {
e.printStackTrace();
Log.e("getDefaultDesktop", "onNext: IOException: " + e.getMessage());
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getDefaultDesktop", "onError: " + e.getMessage());
onComplete();
}
.getDefaultDesktop(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("getDefaultDesktop", "onComplete: ");
NetInterfaceManager.getInstance().getAllAppList();
mView.getDefaultDesktopFinish();
}
@@ -538,44 +271,9 @@ public class MainSPresenter implements MainSContact.Presenter {
return;
}
NetInterfaceManager.getInstance()
.getLogoImgObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<LogoImg>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.e("setLogoImg", "onSubscribe: ");
}
@Override
public void onNext(@NonNull BaseResponse<LogoImg> logoImgBaseResponse) {
Log.e("setLogoImg", "onNext: " + logoImgBaseResponse.data);
if (logoImgBaseResponse.code == OK) {
LogoImg logoImg = logoImgBaseResponse.data;
String file_url = logoImg.getFile_url();
String file_md5 = logoImg.getFile_md5();
String batch = logoImg.getBatch();
if (TextUtils.isEmpty(file_url)) {
Log.e("setLogoImg", "onNext: file_url is empty");
} else {
JGYUtils.getInstance().checkBootFile(file_url, file_md5);
}
} else {
Log.e("setLogoImg", "onNext: delete");
JGYUtils.getInstance().removeBootanimation();
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("setLogoImg", "onError: " + e.getMessage());
onComplete();
}
.setLogoImg(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("setLogoImg", "onComplete: ");
mView.setLogoImgFinish();
}
});
@@ -588,43 +286,10 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void getDeveloper() {
NetInterfaceManager.getInstance()
.getDeveloperControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(Disposable d) {
Log.e("getDeveloper", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse baseResponse) {
if (baseResponse.code == OK) {
JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(baseResponse.data)).getAsJsonObject();
int is_developer = jsonObject.get("is_developer").getAsInt();
Log.e("getDeveloper", "onNext: " + is_developer);
//后台1是0否 底层0是1否
JGYUtils.getInstance().setDeveloperOptions(is_developer == 0 ? 1 : 0);
} else {
JGYUtils.getInstance().setDeveloperOptions(1);
}
}
@Override
public void onError(Throwable e) {
Log.e("getDeveloper", "onError: " + e.getMessage());
if (!BuildConfig.DEBUG) {
int oldStatus = Settings.System.getInt(mContext.getContentResolver(), "qch_Developeroptions", 1);
Log.e("getDeveloper", "oldStatus: " + oldStatus);
JGYUtils.getInstance().setDeveloperOptions(oldStatus);
}
onComplete();
}
.getDeveloper(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
mView.getDeveloperFinish();
Log.e("getDeveloper", "onComplete: ");
}
});
}
@@ -641,7 +306,7 @@ public class MainSPresenter implements MainSContact.Presenter {
public void getAppLimit() {
NetInterfaceManager.getInstance()
.getAppLimitObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -694,7 +359,7 @@ public class MainSPresenter implements MainSContact.Presenter {
.getROMApp(NetInterfaceManager.HTTP_KEY, customVersion)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(Disposable d) {
@@ -769,7 +434,7 @@ public class MainSPresenter implements MainSContact.Presenter {
NetInterfaceManager.getInstance()
.getDesktopIconObservable()
.observeOn(Schedulers.io())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -833,7 +498,7 @@ public class MainSPresenter implements MainSContact.Presenter {
.getAppAutoStartUpdateAndNetObservable()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<NetAndLaunchBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -870,7 +535,7 @@ public class MainSPresenter implements MainSContact.Presenter {
NetInterfaceManager.getInstance()
.getAppIDControlObservable()
.observeOn(Schedulers.io())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<ResponseBody>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -938,7 +603,7 @@ public class MainSPresenter implements MainSContact.Presenter {
NetInterfaceManager.getInstance()
.getSystemSettingObservable()
.observeOn(Schedulers.io())
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<ResponseBody>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -996,7 +661,7 @@ public class MainSPresenter implements MainSContact.Presenter {
public void getDefaultApp() {
NetInterfaceManager.getInstance()
.getDefaultAppApi()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<DefaultApp>>() {
@Override
public void onSubscribe(Disposable d) {
@@ -1040,41 +705,10 @@ public class MainSPresenter implements MainSContact.Presenter {
return;
}
NetInterfaceManager.getInstance()
.getTopAppControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(Disposable d) {
Log.e("setTopApp", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse response) {
Log.e("setTopApp", "onNext: " + response.data);
if (response.code == OK) {
JsonObject jsonObject = JsonParser.parseString(new Gson().toJson(response.data)).getAsJsonObject();
String app_package = jsonObject.get("app_package").getAsString();
ForegroundAppUtil.setTopAppClass(mContext, app_package);
SPUtils.put(mContext, ForegroundAppUtil.TOPAPP_KEY, app_package);
ForegroundAppUtil.openTopApp(mContext);
} else {
ForegroundAppUtil.setTopAppClass(mContext, "");
SPUtils.put(mContext, ForegroundAppUtil.TOPAPP_KEY, "");
}
}
@Override
public void onError(Throwable e) {
Log.e("setTopApp", "onError: " + e.getMessage());
onComplete();
}
.getTopApp(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("setTopApp", "onComplete: ");
mView.setTopAppFinish();
ToastUtil.betaShow("获取管控结束");
}
});
}
@@ -1082,36 +716,9 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void getPoweroffTime() {
NetInterfaceManager.getInstance()
.getPoweroffTimeControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<PoweroffBean>>>() {
@Override
public void onSubscribe(Disposable d) {
Log.e("getPoweroffTime", "onSubscribe: ");
}
@Override
public void onNext(BaseResponse<List<PoweroffBean>> listBaseResponse) {
Log.e("getPoweroffTime", "onNext: " + listBaseResponse);
if (listBaseResponse.code == OK) {
List<PoweroffBean> poweroffBeanList = listBaseResponse.data;
String poweroffTime = new Gson().toJson(poweroffBeanList);
mMMKV.encode("poweroffTime", poweroffTime);
} else {
mMMKV.encode("PoweroffTime", "");
}
}
@Override
public void onError(Throwable e) {
Log.e("getPoweroffTime", "onError: " + e.getLocalizedMessage());
onComplete();
}
.getPoweroffTime(true, getLifecycle(), new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("getPoweroffTime", "onComplete: ");
mView.setPoweroffTime();
}
});
@@ -1125,7 +732,7 @@ public class MainSPresenter implements MainSContact.Presenter {
}
NetInterfaceManager.getInstance()
.getSnTimeObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@@ -1176,7 +783,7 @@ public class MainSPresenter implements MainSContact.Presenter {
public void getEBagCode() {
NetInterfaceManager.getInstance()
.getEBagCodeControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse>() {
@Override
public void onSubscribe(Disposable d) {
@@ -1214,7 +821,7 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override
public void getWiFiPasswd() {
NetInterfaceManager.getInstance().getWiFiControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<List<WiFiAlias>>>() {
@Override
public void onSubscribe(Disposable d) {

41
app/src/main/java/com/aoleyun/sn/service/main/MainService.java
View File

@@ -18,6 +18,8 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Debug;
import android.os.Handler;
import android.os.IBinder;
import android.provider.Settings;
import android.text.TextUtils;
@@ -101,6 +103,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
@Override
public void onConnected(NetworkUtils.NetworkType networkType) {
Debug.waitForDebugger();
ToastUtil.betaShow("网络已连接");
String WiFiAlias = Utils.getWifiAlias(this);
Log.e("OnNetworkStatusChanged", "onConnected: " + WiFiAlias);
@@ -135,28 +138,12 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
super.onPostExecute(aLong);
AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
am.setTime(aLong);
tPushInit();
NetInterfaceManager.getInstance().setPushTags(lifecycleSubject, new NetInterfaceManager.ObserverCallback() {
Handler.getMain().postDelayed(new Runnable() {
@Override
public void onSubscribe(Disposable d) {
Log.e("TimeTask", "onSubscribe: ");
public void run() {
tPushInit();
}
@Override
public void onNext(BaseResponse response) {
Log.e("TimeTask", "onNext: ");
}
@Override
public void onError(Throwable e) {
Log.e("TimeTask", "onError: " + e.getMessage());
}
@Override
public void onComplete() {
Log.e("TimeTask", "onComplete: ");
}
});
}, 10000);
Log.e(TAG, "getTimeFromNtpServer: " + aLong);
}
}
@@ -188,6 +175,12 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
Log.e("TPush", "注册失败，错误码：" + errCode + ",错误信息：" + msg);
}
});
NetInterfaceManager.getInstance().setPushTags(false, lifecycleSubject, new NetInterfaceManager.onCompleteCallback() {
@Override
public void onComplete() {
Log.e("TimeTask", "onComplete: ");
}
});
}
private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
@@ -387,9 +380,13 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.e(TAG, "onStartCommand: ");
JGYUtils.getInstance().wakeUpAppstore();
if (!checkAoleyunApp()) {
mPresenter.checkAoleyunUpdate();
if (mMMKV.decodeInt(CommonConfig.DEVICES_FRIST_START, 1) == 0) {
if (!checkAoleyunApp()) {
Log.e(TAG, "onStartCommand: " + "checkAoleyunApp");
mPresenter.checkAoleyunUpdate();
}
}
return START_STICKY;
}