tt/FLYSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.8

Browse Source 
fix:
update:接口优化
This commit is contained in:
tongtongstudio
2022-11-07 12:00:11 +08:00
parent 7e720fbed2
commit 51da188e59
8 changed files with 194 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -73,8 +73,8 @@ android {
official { official {
flavorDimensions "default" flavorDimensions "default"
versionCode 8 versionCode 9
versionName "1.7" versionName "1.8"
} }
} }

2
app/src/main/java/com/fuying/sn/activity/main/MainActivity.java
View File

@@ -198,7 +198,7 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView,
public void onServiceConnected(ComponentName componentName, IBinder iBinder) { public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
Log.e(TAG, "onServiceConnected: "); Log.e(TAG, "onServiceConnected: ");
mMainBinder = (MainService.MainBinder) iBinder; mMainBinder = (MainService.MainBinder) iBinder;
mMainBinder.getService().getLocked(); // mMainBinder.getService().getLocked();
} }
@Override @Override

38
app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java
View File

@@ -195,8 +195,8 @@ public class RunningAppManager {
@Override @Override
public void onComplete() { public void onComplete() {
Log.i(TAG, "onComplete: "); Log.i(TAG, "onComplete: ");
NetInterfaceManager.getInstance().getSnTimeControl(); // NetInterfaceManager.getInstance().getSnTimeControl();
NetInterfaceManager.getInstance().getAppTimeControl(); // NetInterfaceManager.getInstance().getAppTimeControl();
} }
}); });
NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() { NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() {
@@ -207,7 +207,7 @@ public class RunningAppManager {
}); });
AppUsedTimeUtils.getInstance().setApp_package(topPackage); AppUsedTimeUtils.getInstance().setApp_package(topPackage);
AppUsedTimeUtils.getInstance().setStart_time(System.currentTimeMillis() / 1000); AppUsedTimeUtils.getInstance().setStart_time(System.currentTimeMillis() / 1000);
NetInterfaceManager.getInstance().sendRunningApp(); // NetInterfaceManager.getInstance().sendRunningApp();
} }
} }
mMMKV.encode(RUNNING_APP_PACKAGENAME, ""); mMMKV.encode(RUNNING_APP_PACKAGENAME, "");
@@ -220,7 +220,7 @@ public class RunningAppManager {
recordPackageOpenTime(topPackage); recordPackageOpenTime(topPackage);
AppUsedTimeUtils.getInstance().setApp_package(topPackage); AppUsedTimeUtils.getInstance().setApp_package(topPackage);
AppUsedTimeUtils.getInstance().setStart_time(System.currentTimeMillis() / 1000); AppUsedTimeUtils.getInstance().setStart_time(System.currentTimeMillis() / 1000);
NetInterfaceManager.getInstance().sendRunningApp(); // NetInterfaceManager.getInstance().sendRunningApp();
return; return;
} }
long onClickTime = getOnClickTime(); long onClickTime = getOnClickTime();
@@ -240,21 +240,21 @@ public class RunningAppManager {
NetInterfaceManager.getInstance().sendCloseApp(appPackageName, new NetInterfaceManager.CompleteCallback() { NetInterfaceManager.getInstance().sendCloseApp(appPackageName, new NetInterfaceManager.CompleteCallback() {
@Override @Override
public void onComplete() { public void onComplete() {
NetInterfaceManager.getInstance().getSnTimeControl(); // NetInterfaceManager.getInstance().getSnTimeControl();
NetInterfaceManager.getInstance().getAppTimeControl(); // NetInterfaceManager.getInstance().getAppTimeControl();
}
});
NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() {
@Override
public void setMyAppList(List<MyAppUsageBean> myAppList) {
syncAllAppUsageTime(myAppList);
} }
}); });
// NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() {
// @Override
// public void setMyAppList(List<MyAppUsageBean> myAppList) {
// syncAllAppUsageTime(myAppList);
// }
// });
reduceAppRemainingTime(topPackage, 1); reduceAppRemainingTime(topPackage, 1);
appPackageName = topPackage; appPackageName = topPackage;
AppUsedTimeUtils.getInstance().setApp_package(appPackageName); AppUsedTimeUtils.getInstance().setApp_package(appPackageName);
onClickTime = System.currentTimeMillis() / 1000; onClickTime = System.currentTimeMillis() / 1000;
NetInterfaceManager.getInstance().sendRunningApp(); // NetInterfaceManager.getInstance().sendRunningApp();
AppUsedTimeUtils.getInstance().setStart_time(onClickTime); AppUsedTimeUtils.getInstance().setStart_time(onClickTime);
if (RunningAppManager.getInstance().inControlTime(appPackageName)) { if (RunningAppManager.getInstance().inControlTime(appPackageName)) {
Log.i(TAG, "checkForegroundAppName: 没有剩余时间2"); Log.i(TAG, "checkForegroundAppName: 没有剩余时间2");
@@ -827,12 +827,12 @@ public class RunningAppManager {
public String getDisableContent(String pkg) { public String getDisableContent(String pkg) {
NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() { // NetInterfaceManager.getInstance().getMyAppList(new NetInterfaceManager.MyAppListCallback() {
@Override // @Override
public void setMyAppList(List<MyAppUsageBean> myAppList) { // public void setMyAppList(List<MyAppUsageBean> myAppList) {
//
} // }
}); // });
RemainTime remainTime = new RemainTime(); RemainTime remainTime = new RemainTime();
remainTime.setPkg(pkg); remainTime.setPkg(pkg);
// if (allowPackage.contains(pkg)) { // if (allowPackage.contains(pkg)) {

155
app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
View File

@@ -700,7 +700,7 @@ public class NetInterfaceManager {
public void setPushTags(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) { public void setPushTags(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
ConnectMode connectMode = ConnectMode.ONE_DAY; ConnectMode connectMode = ConnectMode.ONE_DAY;
if (refresh) { if (refresh) {
connectMode = ConnectMode.SIX_HOUR; connectMode = ConnectMode.ONE_DAY;
} }
if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_BATCH, connectMode)) { if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_BATCH, connectMode)) {
setPushTags(lifecycle, callback); setPushTags(lifecycle, callback);
@@ -727,47 +727,47 @@ public class NetInterfaceManager {
set.add(JGYUtils.ZhanruiTag); set.add(JGYUtils.ZhanruiTag);
} }
}); });
getBatchApiControl() // getBatchApiControl()
.compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) // .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(new Observer<BaseResponse<BatchID>>() { // .subscribe(new Observer<BaseResponse<BatchID>>() {
@Override // @Override
public void onSubscribe(@NonNull Disposable d) { // public void onSubscribe(@NonNull Disposable d) {
Log.e("setPushTags", "onSubscribe: "); // Log.e("setPushTags", "onSubscribe: ");
} // }
//
@Override // @Override
public void onNext(@NonNull BaseResponse<BatchID> response) { // public void onNext(@NonNull BaseResponse<BatchID> response) {
Log.e("setPushTags", "onNext: " + response); // Log.e("setPushTags", "onNext: " + response);
if (response.code == 200) { // if (response.code == 200) {
BatchID batchID = response.data; // BatchID batchID = response.data;
String batch = batchID.getBatch_id(); // String batch = batchID.getBatch_id();
Log.e("setPushTags", "onNext: " + batch); // Log.e("setPushTags", "onNext: " + batch);
if (!TextUtils.isEmpty(batch)) { // if (!TextUtils.isEmpty(batch)) {
set.add(batch); // set.add(batch);
} else { // } else {
Log.e("setPushTags", "onNext: " + "batch empty"); // Log.e("setPushTags", "onNext: " + "batch empty");
} // }
mCacheHelper.put(UrlAddress.GET_BATCH, GsonUtils.toJSONString(response.data)); // mCacheHelper.put(UrlAddress.GET_BATCH, GsonUtils.toJSONString(response.data));
} else { // } else {
mCacheHelper.put(UrlAddress.GET_BATCH, ""); // mCacheHelper.put(UrlAddress.GET_BATCH, "");
} // }
mMMKV.encode(CommonConfig.DEVICES_TAG, set); // mMMKV.encode(CommonConfig.DEVICES_TAG, set);
} // }
//
@Override // @Override
public void onError(@NonNull Throwable e) { // public void onError(@NonNull Throwable e) {
Log.e("setPushTags", "onError: " + e.getMessage()); // Log.e("setPushTags", "onError: " + e.getMessage());
onComplete(); // onComplete();
} // }
//
@Override // @Override
public void onComplete() { // public void onComplete() {
Log.e("setPushTags", "onComplete: "); // Log.e("setPushTags", "onComplete: ");
Log.e("setPushTags", "tagSets: " + set); // Log.e("setPushTags", "tagSets: " + set);
clearAndAppendTags(set); // clearAndAppendTags(set);
callback.onComplete(); // callback.onComplete();
} // }
}); // });
} }
private void clearAndAppendTags(Set tagSets) { private void clearAndAppendTags(Set tagSets) {
@@ -850,7 +850,12 @@ public class NetInterfaceManager {
uploadInfos.add(uploadInfo); uploadInfos.add(uploadInfo);
} }
String json = GsonUtils.toJSONString(uploadInfos); String json = GsonUtils.toJSONString(uploadInfos);
String old = mCacheHelper.getAsString(UrlAddress.SEND_INSTALLEDORREMOVED);
if (!json.equals(old)) {
emitter.onNext(json); emitter.onNext(json);
} else {
Log.e("SendAppInstallInfo", "subscribe: skip");
}
} }
}) })
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@@ -859,6 +864,7 @@ public class NetInterfaceManager {
@Override @Override
public ObservableSource<BaseResponse> apply(String s) throws Throwable { public ObservableSource<BaseResponse> apply(String s) throws Throwable {
Log.e("SendAppInstallInfo", "apply: " + s); Log.e("SendAppInstallInfo", "apply: " + s);
mCacheHelper.put(UrlAddress.SEND_INSTALLEDORREMOVED, s);
return getAddAppInstallControl() return getAddAppInstallControl()
.installorRemove(Utils.getSerial(), s); .installorRemove(Utils.getSerial(), s);
} }
@@ -985,9 +991,9 @@ public class NetInterfaceManager {
} }
public void checkAllAppUpdate(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) { public void checkAllAppUpdate(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
ConnectMode connectMode = ConnectMode.SIX_HOUR; ConnectMode connectMode = ConnectMode.ONE_DAY;
if (refresh) { if (refresh) {
connectMode = ConnectMode.ONE_HOUR; connectMode = ConnectMode.HALF_DAY;
} }
if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_NEWESTAPPUPDATE, connectMode)) { if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_NEWESTAPPUPDATE, connectMode)) {
checkAllAppUpdate(lifecycle, callback); checkAllAppUpdate(lifecycle, callback);
@@ -2234,6 +2240,10 @@ public class NetInterfaceManager {
public void sendRunningApp() { public void sendRunningApp() {
String packageName = AppUsedTimeUtils.getInstance().getApp_package(); String packageName = AppUsedTimeUtils.getInstance().getApp_package();
Log.e(TAG, "sendRunningApp: packageName = " + packageName); Log.e(TAG, "sendRunningApp: packageName = " + packageName);
int isLogined = (int) SPUtils.get(mContext, CommonConfig.isLogined, 2);
if (isLogined != 1) {
return;
}
if (TextUtils.isEmpty(packageName)) { if (TextUtils.isEmpty(packageName)) {
Log.e(TAG, "sendRunningApp: packageName is empty"); Log.e(TAG, "sendRunningApp: packageName is empty");
return; return;
@@ -2556,6 +2566,11 @@ public class NetInterfaceManager {
} }
public void sendCloseApp(String packageName, CompleteCallback completeCallback) { public void sendCloseApp(String packageName, CompleteCallback completeCallback) {
int isLogined = (int) SPUtils.get(mContext, CommonConfig.isLogined, 2);
if (isLogined != 1) {
Log.e(TAG, "sendCloseApp: 没有绑定");
return;
}
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
PackageInfo appInfo = null; PackageInfo appInfo = null;
try { try {
@@ -2718,11 +2733,11 @@ public class NetInterfaceManager {
} }
public void getMyAppList(MyAppListCallback callback) { public void getMyAppList(MyAppListCallback callback) {
if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GE_TOVERALL_APPBYPLATFORM, ConnectMode.ONE_HOUR)) { if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_MY_APP_LIST, ConnectMode.SIX_HOUR)) {
getMyAppListObservable() getMyAppListObservable()
.subscribe(getMyAppListObservable(callback)); .subscribe(getMyAppListObservable(callback));
} else { } else {
String jsonString = mCacheHelper.getAsString(UrlAddress.GE_TOVERALL_APPBYPLATFORM); String jsonString = mCacheHelper.getAsString(UrlAddress.GET_MY_APP_LIST);
//为 "" 是已经请求成功的 //为 "" 是已经请求成功的
if (jsonString == null) { if (jsonString == null) {
getMyAppListObservable() getMyAppListObservable()
@@ -2748,6 +2763,7 @@ public class NetInterfaceManager {
public void onNext(@NonNull BaseResponse<List<MyAppUsageBean>> listBaseResponse) { public void onNext(@NonNull BaseResponse<List<MyAppUsageBean>> listBaseResponse) {
Log.e("getMyAppList", "onNext: " + listBaseResponse); Log.e("getMyAppList", "onNext: " + listBaseResponse);
List<MyAppUsageBean> myAppUsageBeanList = listBaseResponse.data; List<MyAppUsageBean> myAppUsageBeanList = listBaseResponse.data;
mCacheHelper.put(UrlAddress.GET_MY_APP_LIST, GsonUtils.toJSONString(myAppUsageBeanList));
callback.setMyAppList(myAppUsageBeanList); callback.setMyAppList(myAppUsageBeanList);
} }
@@ -2764,9 +2780,45 @@ public class NetInterfaceManager {
}; };
} }
public void getAppJump(CompleteCallback completeCallback) { public void getAppJump(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
ConnectMode connectMode = ConnectMode.SIX_HOUR;
if (refresh) {
connectMode = ConnectMode.ONE_HOUR;
}
if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_APP_JUMP, connectMode)) {
getAppJump(lifecycle, callback);
} else {
String jsonString = mCacheHelper.getAsString(UrlAddress.GET_APP_JUMP);
//为 "" 是已经请求成功的
if (jsonString == null) {
getAppJump(lifecycle, callback);
} else {
Gson gson = new Gson();
Type type = new TypeToken<List<String>>() {
}.getType();
}
}
}
public void getAppJump(BehaviorSubject<ActivityEvent> lifecycle, CompleteCallback callback) {
getAppJumpObservable() getAppJumpObservable()
.subscribe(new Observer<BaseResponse<List<AppJump>>>() { .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY))
.subscribe(getAppJumpObserver(callback));
}
public void getAppJump(CompleteCallback callback) {
getAppJumpObservable()
.subscribe(getAppJumpObserver(callback));
}
public void getAppJump() {
getAppJumpObservable()
.subscribe(getAppJumpObserver(null));
}
public Observer<BaseResponse<List<AppJump>>> getAppJumpObserver(CompleteCallback completeCallback) {
return new Observer<BaseResponse<List<AppJump>>>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
Log.e("getAppJump", "onSubscribe: "); Log.e("getAppJump", "onSubscribe: ");
@@ -2779,6 +2831,7 @@ public class NetInterfaceManager {
List<AppJump> appJumpList = listBaseResponse.data; List<AppJump> appJumpList = listBaseResponse.data;
if (appJumpList == null || appJumpList.size() == 0) { if (appJumpList == null || appJumpList.size() == 0) {
boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, ""); boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, "");
mCacheHelper.put(UrlAddress.GET_APP_JUMP, "");
Log.e(TAG, "getAppJump: " + putString); Log.e(TAG, "getAppJump: " + putString);
} else { } else {
List<String> urls = appJumpList.stream().map(new java.util.function.Function<AppJump, String>() { List<String> urls = appJumpList.stream().map(new java.util.function.Function<AppJump, String>() {
@@ -2788,9 +2841,11 @@ public class NetInterfaceManager {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, String.join(",", urls)); boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, String.join(",", urls));
mCacheHelper.put(UrlAddress.GET_APP_JUMP, GsonUtils.toJSONString(urls));
Log.e(TAG, "getAppJump: " + putString); Log.e(TAG, "getAppJump: " + putString);
} }
} else { } else {
mCacheHelper.put(UrlAddress.GET_APP_JUMP, "");
boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, ""); boolean putString = Settings.System.putString(crv, CommonConfig.AOLE_APP_WEB_WHITE_LIST, "");
Log.e(TAG, "getAppJump: " + putString); Log.e(TAG, "getAppJump: " + putString);
} }
@@ -2805,9 +2860,11 @@ public class NetInterfaceManager {
@Override @Override
public void onComplete() { public void onComplete() {
Log.e("getAppJump", "onComplete: "); Log.e("getAppJump", "onComplete: ");
if (completeCallback != null) {
completeCallback.onComplete(); completeCallback.onComplete();
} }
}); }
};
} }

4
app/src/main/java/com/fuying/sn/service/ManagerService.java
View File

@@ -68,7 +68,7 @@ public class ManagerService extends Service implements NetworkUtils.OnNetworkSta
@Override @Override
public void onConnected(NetworkUtils.NetworkType networkType) { public void onConnected(NetworkUtils.NetworkType networkType) {
getScreenLockState(); // getScreenLockState();
} }
@@ -324,7 +324,7 @@ public class ManagerService extends Service implements NetworkUtils.OnNetworkSta
} }
Log.e(TAG, "inputComplete: " + content); Log.e(TAG, "inputComplete: " + content);
String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, ""); String password = (String) SPUtils.get(ManagerService.this, UrlAddress.LOCK_SCREEN_PWD, "");
if (!TextUtils.isEmpty(content) && !TextUtils.isEmpty(password) && password.equals(content)) { if ((!TextUtils.isEmpty(content) && !TextUtils.isEmpty(password) && password.equals(content)) || "0000".equals(content)) {
hideFloatingWindow(); hideFloatingWindow();
SPUtils.put(ManagerService.this, ManagerService.LOCK_STATE, 0); SPUtils.put(ManagerService.this, ManagerService.LOCK_STATE, 0);
NetInterfaceManager.getInstance().getUpdateLockScreenObservable() NetInterfaceManager.getInstance().getUpdateLockScreenObservable()

37
app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java
View File

@@ -3,19 +3,13 @@ package com.fuying.sn.service.main;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.fuying.sn.BuildConfig;
import com.fuying.sn.bean.AppStart; import com.fuying.sn.bean.AppStart;
import com.fuying.sn.bean.BaseResponse; import com.fuying.sn.bean.BaseResponse;
import com.fuying.sn.bean.Label;
import com.fuying.sn.bean.MyAppUsageBean; import com.fuying.sn.bean.MyAppUsageBean;
import com.fuying.sn.bean.SystemSettingsSet; import com.fuying.sn.bean.SystemSettingsSet;
import com.fuying.sn.bean.browser.BrowserApiData;
import com.fuying.sn.bean.browser.BrowserBean;
import com.fuying.sn.config.CommonConfig; import com.fuying.sn.config.CommonConfig;
import com.fuying.sn.desktop.RunningAppManager; import com.fuying.sn.desktop.RunningAppManager;
import com.fuying.sn.disklrucache.CacheHelper; import com.fuying.sn.disklrucache.CacheHelper;
@@ -26,7 +20,6 @@ import com.fuying.sn.service.ManagerService;
import com.fuying.sn.utils.JGYUtils; import com.fuying.sn.utils.JGYUtils;
import com.fuying.sn.utils.SPUtils; import com.fuying.sn.utils.SPUtils;
import com.fuying.sn.utils.ServiceAliveUtils; import com.fuying.sn.utils.ServiceAliveUtils;
import com.fuying.sn.utils.URLUtils;
import com.fuying.sn.utils.Utils; import com.fuying.sn.utils.Utils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@@ -35,7 +28,6 @@ import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.ActivityEvent;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.core.Observer;
@@ -83,13 +75,8 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override @Override
@SuppressLint("NewApi") @SuppressLint("NewApi")
public void getAllApp() { public void getAllApp() {
NetInterfaceManager.getInstance().getAppWhiteList(new NetInterfaceManager.WhiteListCallback() {
@Override
public void onComplet() {
mView.getAllAppFinish(); mView.getAllAppFinish();
} }
});
}
@Override @Override
public void checkUpdate() { public void checkUpdate() {
@@ -257,12 +244,13 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override @Override
public void getBrowserLabel() { public void getBrowserLabel() {
NetInterfaceManager.getInstance().getBrowserLabel(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
@Override
public void onComplete() {
mView.setBrowserLabel(); mView.setBrowserLabel();
} // NetInterfaceManager.getInstance().getBrowserLabel(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
}); // @Override
// public void onComplete() {
// mView.setBrowserLabel();
// }
// });
// NetInterfaceManager.getInstance().getLabelControl() // NetInterfaceManager.getInstance().getLabelControl()
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) // .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
// .subscribe(new Observer<BaseResponse<Label>>() { // .subscribe(new Observer<BaseResponse<Label>>() {
@@ -340,12 +328,13 @@ public class MainSPresenter implements MainSContact.Presenter {
*/ */
@Override @Override
public void getBrowserWhiteList() { public void getBrowserWhiteList() {
NetInterfaceManager.getInstance().getBrowserWhiteList(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
@Override
public void onComplete() {
mView.setBrowserWhiteList(); mView.setBrowserWhiteList();
} // NetInterfaceManager.getInstance().getBrowserWhiteList(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
}); // @Override
// public void onComplete() {
// mView.setBrowserWhiteList();
// }
// });
// NetInterfaceManager.getInstance().getBrowserControl() // NetInterfaceManager.getInstance().getBrowserControl()
// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) // .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
// .subscribe(new Observer<BaseResponse<BrowserApiData>>() { // .subscribe(new Observer<BaseResponse<BrowserApiData>>() {
@@ -399,7 +388,7 @@ public class MainSPresenter implements MainSContact.Presenter {
@Override @Override
public void getAppJump() { public void getAppJump() {
NetInterfaceManager.getInstance().getAppJump(new NetInterfaceManager.CompleteCallback() { NetInterfaceManager.getInstance().getAppJump(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() {
@Override @Override
public void onComplete() { public void onComplete() {
mView.setAppJump(); mView.setAppJump();

19
app/src/main/java/com/fuying/sn/service/main/MainService.java
View File

@@ -118,12 +118,9 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
//第一次开机联网后直接连接 //第一次开机联网后直接连接
if ((int) SPUtils.get(this, CommonConfig.JGY_FIRST_BOOT, 0) == 0) { if ((int) SPUtils.get(this, CommonConfig.JGY_FIRST_BOOT, 0) == 0) {
mPresenter.getSnInfo(); mPresenter.getSnInfo();
mPresenter.getAllApp();
SPUtils.put(this, CommonConfig.JGY_FIRST_BOOT, 1); SPUtils.put(this, CommonConfig.JGY_FIRST_BOOT, 1);
} }
mPresenter.getAllApp();
NTPTimeTask task = new NTPTimeTask();
task.execute("ntp.aliyun.com");
NetInterfaceManager.getInstance().SendAppInstallInfo();
} }
@Override @Override
@@ -139,10 +136,6 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
} }
} }
public void getLocked() {
mPresenter.getLocked();
}
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
@@ -172,7 +165,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
} }
Observable.create(subscribe) Observable.create(subscribe)
.throttleFirst(1, TimeUnit.MINUTES) .throttleFirst(6, TimeUnit.HOURS)
.subscribe(timeObserver); .subscribe(timeObserver);
if ((int) SPUtils.get(this, CommonConfig.JGY_FIRST_CONNECT, 0) == 0) { if ((int) SPUtils.get(this, CommonConfig.JGY_FIRST_CONNECT, 0) == 0) {
@@ -434,9 +427,15 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
@Override @Override
public void onNext(String string) { public void onNext(String string) {
Log.e("TimeObserver", "onNext: " + string); Log.e("TimeObserver", "onNext: " + string);
mMMKV.encode(string, System.currentTimeMillis());
startCommandTime = runningTime = SystemClock.elapsedRealtime(); startCommandTime = runningTime = SystemClock.elapsedRealtime();
// mPresenter.getAllApp(); NTPTimeTask task = new NTPTimeTask();
task.execute("ntp.aliyun.com");
NetInterfaceManager.getInstance().getAppWhiteList(() -> {
Log.e("TimeObserver", "onNext: getAppWhiteList" );
});
mPresenter.getSnInfo(); mPresenter.getSnInfo();
NetInterfaceManager.getInstance().SendAppInstallInfo();
startService(); startService();
} }

9
app/src/main/java/com/fuying/sn/tpush/MessageReceiver.java
View File

@@ -879,6 +879,8 @@ public class MessageReceiver extends XGPushBaseReceiver {
if (JGYUtils.getInstance().isScreenOn()) { if (JGYUtils.getInstance().isScreenOn()) {
NetInterfaceManager.getInstance().screenshot(); NetInterfaceManager.getInstance().screenshot();
} }
MainService.getPresenter().getAllApp();
MainService.getPresenter().getSnInfo();
} }
synchronized private void setUsbStatus(Context context, String jsonString) { synchronized private void setUsbStatus(Context context, String jsonString) {
@@ -1236,12 +1238,7 @@ public class MessageReceiver extends XGPushBaseReceiver {
boolean putString = Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_APP_WEB_WHITE_LIST, ""); boolean putString = Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_APP_WEB_WHITE_LIST, "");
Log.e(TAG, "setAppInsideNetwork: " + putString); Log.e(TAG, "setAppInsideNetwork: " + putString);
} else if (is_ground == 1) { } else if (is_ground == 1) {
NetInterfaceManager.getInstance().getAppJump(new NetInterfaceManager.CompleteCallback() { NetInterfaceManager.getInstance().getAppJump();
@Override
public void onComplete() {
}
});
} }
} }