From 46db355e7955d6ad11a9cf8976e5502127e7bec3 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Tue, 3 Mar 2026 17:52:27 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E7=B2=BE=E7=AE=80api?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sn/network/NetInterfaceManager.java | 209 ++++++++---------- .../com/fuying/sn/network/UrlAddress.java | 57 +++-- .../com/fuying/sn/network/api/APPJump.java | 18 -- .../fuying/sn/network/api/AddAppInstall.java | 18 -- .../com/fuying/sn/network/api/AppApi.java | 60 +++++ .../sn/network/api/AppTimeControlApi.java | 19 -- .../fuying/sn/network/api/BindDevices.java | 17 -- .../fuying/sn/network/api/BlacklistApi.java | 13 -- .../com/fuying/sn/network/api/Browser.java | 16 -- .../fuying/sn/network/api/BrowserLabel.java | 16 -- .../sn/network/api/CloudLessonSettingApi.java | 16 -- ...{AppUsageRecordApi.java => CommonApi.java} | 24 +- .../api/{GetGuideApi.java => FileApi.java} | 8 +- .../fuying/sn/network/api/ForceInstall.java | 18 -- .../fuying/sn/network/api/GetAdminAppApi.java | 18 -- .../sn/network/api/GetAppAndWhiteApi.java | 18 -- .../fuying/sn/network/api/GetBatchApi.java | 17 -- .../network/api/GetControlScreenshotApi.java | 20 -- .../sn/network/api/GetGuideApiTest.java | 14 -- .../sn/network/api/GetLockScreenPwdApi.java | 16 -- .../fuying/sn/network/api/GetSnRunLogApi.java | 16 -- .../sn/network/api/MachineTimeControlApi.java | 16 -- .../fuying/sn/network/api/MyAppListApi.java | 18 -- .../sn/network/api/NewestAppUpdate.java | 18 -- .../network/api/OverallAppByPlatformApi.java | 19 -- .../{GetPublicIPApi.java => PublicIPApi.java} | 2 +- .../com/fuying/sn/network/api/QRCodeApi.java | 13 -- .../fuying/sn/network/api/QueryAllApp.java | 18 -- .../fuying/sn/network/api/QueryAppInside.java | 15 -- .../sn/network/api/QuerySnAppStart.java | 18 -- .../com/fuying/sn/network/api/RunningApp.java | 19 -- .../com/fuying/sn/network/api/ScreenLock.java | 15 -- .../{ScreenState.java => ScreenStateApi.java} | 2 +- .../com/fuying/sn/network/api/Setting.java | 16 -- .../fuying/sn/network/api/SettingsApi.java | 54 +++++ .../java/com/fuying/sn/network/api/SnApi.java | 29 +++ .../com/fuying/sn/network/api/SnBindApi.java | 16 -- .../fuying/sn/network/api/SnControlApi.java | 49 ++++ .../com/fuying/sn/network/api/SnInfoApi.java | 48 ++++ .../{GetUploadLogApi.java => SnLogApi.java} | 12 +- .../com/fuying/sn/network/api/SnTagApi.java | 17 -- .../fuying/sn/network/api/TimeControl.java | 15 -- .../fuying/sn/network/api/UpdateAdminSn.java | 21 -- .../sn/network/api/UpdateLockScreen.java | 17 -- .../sn/network/api/UploadScreenshot.java | 20 -- .../fuying/sn/network/api/UserInfoApi.java | 18 -- .../sn/network/api/UserInfoControl.java | 18 -- .../fuying/sn/network/newly/ControlApi.java | 21 ++ .../sn/network/newly/DeviceInfoApi.java | 22 ++ .../sn/network/newly/StatisticsApi.java | 32 +++ .../java/com/fuying/sn/push/PushManager.java | 4 +- .../com/fuying/sn/service/LogcatService.java | 4 +- .../com/fuying/sn/service/ManagerService.java | 2 +- .../sn/service/main/MainSPresenter.java | 2 +- 54 files changed, 490 insertions(+), 748 deletions(-) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/APPJump.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/AddAppInstall.java create mode 100644 app/src/main/java/com/fuying/sn/network/api/AppApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/AppTimeControlApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/BindDevices.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/BlacklistApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/Browser.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/BrowserLabel.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/CloudLessonSettingApi.java rename app/src/main/java/com/fuying/sn/network/api/{AppUsageRecordApi.java => CommonApi.java} (50%) rename app/src/main/java/com/fuying/sn/network/api/{GetGuideApi.java => FileApi.java} (67%) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/ForceInstall.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetAdminAppApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetAppAndWhiteApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetBatchApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetControlScreenshotApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetGuideApiTest.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetLockScreenPwdApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/GetSnRunLogApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/MachineTimeControlApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/MyAppListApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/NewestAppUpdate.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/OverallAppByPlatformApi.java rename app/src/main/java/com/fuying/sn/network/api/{GetPublicIPApi.java => PublicIPApi.java} (91%) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/QRCodeApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/QueryAllApp.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/QueryAppInside.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/QuerySnAppStart.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/RunningApp.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/ScreenLock.java rename app/src/main/java/com/fuying/sn/network/api/{ScreenState.java => ScreenStateApi.java} (93%) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/Setting.java create mode 100644 app/src/main/java/com/fuying/sn/network/api/SettingsApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/SnBindApi.java create mode 100644 app/src/main/java/com/fuying/sn/network/api/SnControlApi.java create mode 100644 app/src/main/java/com/fuying/sn/network/api/SnInfoApi.java rename app/src/main/java/com/fuying/sn/network/api/{GetUploadLogApi.java => SnLogApi.java} (62%) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/SnTagApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/TimeControl.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/UpdateAdminSn.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/UpdateLockScreen.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/UploadScreenshot.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/UserInfoApi.java delete mode 100644 app/src/main/java/com/fuying/sn/network/api/UserInfoControl.java create mode 100644 app/src/main/java/com/fuying/sn/network/newly/ControlApi.java create mode 100644 app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java create mode 100644 app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java index c0d3f23..52f1cb9 100644 --- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java @@ -53,45 +53,16 @@ import com.fuying.sn.gson.GsonUtils; import com.fuying.sn.manager.ConnectManager; import com.fuying.sn.manager.ConnectMode; import com.fuying.sn.manager.ControlManager; -import com.fuying.sn.network.api.APPJump; -import com.fuying.sn.network.api.AddAppInstall; -import com.fuying.sn.network.api.AppTimeControlApi; -import com.fuying.sn.network.api.AppUsageRecordApi; -import com.fuying.sn.network.api.BindDevices; -import com.fuying.sn.network.api.BlacklistApi; -import com.fuying.sn.network.api.Browser; -import com.fuying.sn.network.api.BrowserLabel; -import com.fuying.sn.network.api.CloudLessonSettingApi; -import com.fuying.sn.network.api.ForceInstall; -import com.fuying.sn.network.api.GetAdminAppApi; -import com.fuying.sn.network.api.GetAppAndWhiteApi; -import com.fuying.sn.network.api.GetBatchApi; -import com.fuying.sn.network.api.GetControlScreenshotApi; -import com.fuying.sn.network.api.GetGuideApi; -import com.fuying.sn.network.api.GetLockScreenPwdApi; -import com.fuying.sn.network.api.GetPublicIPApi; -import com.fuying.sn.network.api.GetSnRunLogApi; -import com.fuying.sn.network.api.GetUploadLogApi; -import com.fuying.sn.network.api.MachineTimeControlApi; -import com.fuying.sn.network.api.MyAppListApi; -import com.fuying.sn.network.api.NewestAppUpdate; -import com.fuying.sn.network.api.OverallAppByPlatformApi; -import com.fuying.sn.network.api.QRCodeApi; -import com.fuying.sn.network.api.QueryAllApp; -import com.fuying.sn.network.api.QueryAppInside; -import com.fuying.sn.network.api.QuerySnAppStart; -import com.fuying.sn.network.api.RunningApp; -import com.fuying.sn.network.api.ScreenLock; -import com.fuying.sn.network.api.ScreenState; -import com.fuying.sn.network.api.Setting; +import com.fuying.sn.network.api.AppApi; +import com.fuying.sn.network.api.CommonApi; +import com.fuying.sn.network.api.FileApi; +import com.fuying.sn.network.api.PublicIPApi; +import com.fuying.sn.network.api.ScreenStateApi; +import com.fuying.sn.network.api.SettingsApi; import com.fuying.sn.network.api.SnApi; -import com.fuying.sn.network.api.SnBindApi; -import com.fuying.sn.network.api.SnTagApi; -import com.fuying.sn.network.api.TimeControl; -import com.fuying.sn.network.api.UpdateAdminSn; -import com.fuying.sn.network.api.UpdateLockScreen; -import com.fuying.sn.network.api.UploadScreenshot; -import com.fuying.sn.network.api.UserInfoControl; +import com.fuying.sn.network.api.SnControlApi; +import com.fuying.sn.network.api.SnInfoApi; +import com.fuying.sn.network.api.SnLogApi; import com.fuying.sn.network.interceptor.RepeatRequestInterceptor; import com.fuying.sn.service.LogcatService; import com.fuying.sn.utils.ApkUtils; @@ -234,10 +205,52 @@ public class NetInterfaceManager { return okHttpClient; } - public GetUploadLogApi getUploadLogApi() { - return mRetrofit.create(GetUploadLogApi.class); + + /* + * + * API + * + * */ + + + public SnApi getSnApi() { + return mRetrofit.create(SnApi.class); } + public SnInfoApi getSnInfoApi() { + return mRetrofit.create(SnInfoApi.class); + } + + public SnControlApi getSnControlApi() { + return mRetrofit.create(SnControlApi.class); + } + + public SnLogApi getSnLogApi() { + return mRetrofit.create(SnLogApi.class); + } + + public AppApi getAppApi() { + return mRetrofit.create(AppApi.class); + } + + public SettingsApi getSettingsApi() { + return mRetrofit.create(SettingsApi.class); + } + + public FileApi getFileApi() { + return mRetrofit.create(FileApi.class); + } + + public CommonApi getCommonApi() { + return mRetrofit.create(CommonApi.class); + } + + public ScreenStateApi setScreen() { + return mRetrofit.create(ScreenStateApi.class); + } + + + /* * * Observable @@ -245,112 +258,112 @@ public class NetInterfaceManager { * */ public Observable> getSnInfoControl() { - return mRetrofit.create(SnApi.class) + return getSnApi() .getsninfo(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getSettingControl() { - return mRetrofit.create(Setting.class) + return mRetrofit.create(SettingsApi.class) .getSetting(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getForceInstallControl() { - return mRetrofit.create(ForceInstall.class) + return getAppApi() .getForceInstall(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getBrowserControl() { - return mRetrofit.create(Browser.class) + return getSettingsApi() .getBrowser(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getLabelControl() { - return mRetrofit.create(BrowserLabel.class) + return getSettingsApi() .getLabel(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getAppStartControl() { - return mRetrofit.create(QuerySnAppStart.class) + return getSnControlApi() .getAppStatu(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getQueryAllAppControl() { - return mRetrofit.create(QueryAllApp.class) + return getAppApi() .getAllApp(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getTimeControlObservable() { - return mRetrofit.create(TimeControl.class) + return getSnControlApi() .getTimeControl(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getUserAvatarInfoControl() { - return mRetrofit.create(UserInfoControl.class) + return getSnApi() .getUserAvatarInfo(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getRunningAppObservable(String json) { - return mRetrofit.create(RunningApp.class) + return getAppApi() .sendAppInfo(Utils.getSerial(), json) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getQRCodeApiControl() { - return mRetrofit.create(QRCodeApi.class) + return mRetrofit.create(FileApi.class) .getQRCodeApi() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getAppInsideControl() { - return mRetrofit.create(QueryAppInside.class) + return getSettingsApi() .getAppInside(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getGetGuideControl() { - return mRetrofit.create(GetGuideApi.class) + return getFileApi() .getGuidePic(2) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getBatchApiControl() { - return mRetrofit.create(GetBatchApi.class) + return getSnApi() .getBatch(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getCloudLessonSettingApiControl() { - return mRetrofit.create(CloudLessonSettingApi.class) + return getSettingsApi() .getCloudLessonSetting(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getUpdateObservable(String packageName) { - return getNewestAppUpdateControl() + return getAppApi() .getAppUpdate(packageName, "0", JgyUtils.getInstance().checkAppPlatform()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); @@ -358,144 +371,98 @@ public class NetInterfaceManager { public Observable>> getOverallAppObservable() { int platformCode = JgyUtils.getInstance().checkAppPlatform(); - return getOverallAppByPlatformControl() + return getAppApi() .getOverallApp(platformCode) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } - /* - * - * API - * - * */ - - public BindDevices getbindDevicesControl() { - return mRetrofit.create(BindDevices.class); - } - - public AddAppInstall getAddAppInstallControl() { - return mRetrofit.create(AddAppInstall.class); - } - - public APPJump getAppJumpControl() { - return mRetrofit.create(APPJump.class); - } - - public UpdateAdminSn getUpdateAdminSnControl() { - return mRetrofit.create(UpdateAdminSn.class); - } - - public NewestAppUpdate getNewestAppUpdateControl() { - return mRetrofit.create(NewestAppUpdate.class); - } - - public OverallAppByPlatformApi getOverallAppByPlatformControl() { - return mRetrofit.create(OverallAppByPlatformApi.class); - } - - public UploadScreenshot getUploadScreenshotControl() { - return mRetrofit.create(UploadScreenshot.class); - } - - public ScreenLock getScreenLockControl() { - return mRetrofit.create(ScreenLock.class); - } - - public ScreenState setScreen() { - return mRetrofit.create(ScreenState.class); - } - - public GetControlScreenshotApi getControlScreenshotApi() { - return mRetrofit.create(GetControlScreenshotApi.class); - } - public Observable>> getAppTimeControlObservable() { - return mRetrofit.create(AppTimeControlApi.class) + return getSettingsApi() .getAppTimeControl(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getMachineTimeControlObservable() { - return mRetrofit.create(MachineTimeControlApi.class) + return getSettingsApi() .getSnTimeControl(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getAppUsageRecordObservable(String pkg, String pkgName, Long open_time, Long close_time) { - return mRetrofit.create(AppUsageRecordApi.class) + return getCommonApi() .sendAppUsageRecord(Utils.getSerial(), pkg, pkgName, open_time, close_time) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getMyAppListObservable() { - return mRetrofit.create(MyAppListApi.class) + return getAppApi() .getMyAppList(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getAppJumpObservable() { - return getAppJumpControl() + return getSnControlApi() .getSNJump(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getBlacklistObservable() { - return mRetrofit.create(BlacklistApi.class) + return mRetrofit.create(CommonApi.class) .getBlacklist() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getAdminAppObservable() { - return mRetrofit.create(GetAdminAppApi.class) + return getCommonApi() .getAdminApp(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getLockScreenPwdObservable() { - return mRetrofit.create(GetLockScreenPwdApi.class) + return getSnControlApi() .getLockScreenPwd(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable getUpdateLockScreenObservable() { - return mRetrofit.create(UpdateLockScreen.class) + return getSnControlApi() .updateLockScreen(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getAppAndWhiteApiObservable() { - return mRetrofit.create(GetAppAndWhiteApi.class) + return getCommonApi() .getAppAndWhite(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getSnBindObservable() { - return mRetrofit.create(SnBindApi.class) + return getSnApi() .getSnBind(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getSnRunLogControl() { - return mRetrofit.create(GetSnRunLogApi.class) + return getSnLogApi() .getSnRunLog(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getSnTag() { - return mRetrofit.create(SnTagApi.class) + return getSnApi() .getTag(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); @@ -528,7 +495,7 @@ public class NetInterfaceManager { .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJava3CallAdapterFactory.create()) .build(); - retrofit.create(GetPublicIPApi.class) + retrofit.create(PublicIPApi.class) .getPublicIP() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -881,7 +848,7 @@ public class NetInterfaceManager { @Override public ObservableSource apply(String s) throws Throwable { Log.e("SendAppInstallInfo", "apply: " + s); - return getAddAppInstallControl() + return getAppApi() .installorRemove(Utils.getSerial(), s); } }).subscribeOn(Schedulers.io()) @@ -967,7 +934,7 @@ public class NetInterfaceManager { public void checkUpdate(String packageName, String versionCode) { Log.e("checkUpdate", "packageName: " + packageName); - getNewestAppUpdateControl() + getAppApi() .getAppUpdate(packageName, versionCode, JgyUtils.getInstance().checkAppPlatform()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -1905,7 +1872,7 @@ public class NetInterfaceManager { Log.e(TAG, "updateAdminInfo: skip"); return; } - getUpdateAdminSnControl().sendAdminSn( + getSnInfoApi().sendAdminSn( Utils.getSerial(), addr, machine, @@ -2319,7 +2286,7 @@ public class NetInterfaceManager { } private Observable getSendFile(String path, MultipartBody.Part body) { - return getControlScreenshotApi() + return getSnInfoApi() .getControlScreenshot(Utils.getSerial(), body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); diff --git a/app/src/main/java/com/fuying/sn/network/UrlAddress.java b/app/src/main/java/com/fuying/sn/network/UrlAddress.java index fa89924..a70ce1b 100644 --- a/app/src/main/java/com/fuying/sn/network/UrlAddress.java +++ b/app/src/main/java/com/fuying/sn/network/UrlAddress.java @@ -4,30 +4,32 @@ public class UrlAddress { /*主页接口*/ static final String ROOT_URL = "http://47.111.23.154/android/"; - /*绑定设备消息*/ - public final static String BIND_DEVICES = "sn/bindSn"; - /*获取设备绑定状态*/ - public final static String GET_SN_BIND = "sn/getSnBind"; /*设备信息接口*/ public static final String SN_INFO = "sn/getSnInfo"; + /*获取设备绑定状态*/ + public final static String GET_SN_BIND = "sn/getSnBind"; /*获取用户头像和信息*/ public static final String GET_USER_AVATAR_INFO = "sn/getUserAvatarInfo"; /*获取批次*/ public static final String GET_BATCH = "sn/getBatch"; /*获取标签*/ public static final String GET_TAG = "sn/get-tag"; + + /*绑定设备消息*/ + public final static String BIND_DEVICES = "sn/bindSn"; /*发送设备基本信息*/ public final static String UPDATE_SN_INFO = "sn/updateAdminSn"; + /*上传屏幕截图*/ + public final static String UPLOAD_SCREEN_SNAPSHOT = "sn/uploadScreenshot"; + /*上传控制面版截图*/ + public static final String UPLOAD_CONTROL_SCREENSHOT = "sn/uploadControlScreenshot"; + /*获取app管控*/ public final static String GET_APP_START = "sn/querySnAppStart"; /*app跳转管控*/ public final static String GET_APP_JUMP = "sn/querySnJump"; /*获取时间管控*/ public final static String GET_TIME_CONTROL = "sn/getTimeControl"; - /*上传屏幕截图*/ - public final static String UPLOAD_SCREEN_SNAPSHOT = "sn/uploadScreenshot"; - /*上传控制面版截图*/ - public static final String UPLOAD_CONTROL_SCREENSHOT = "sn/uploadControlScreenshot"; /*获取屏幕管控*/ public final static String GET_SCREEN_LOCK = "sn/getScreenshot"; /*获取锁屏密码*/ @@ -47,20 +49,21 @@ public class UrlAddress { public static final String UPLOAD_IS_LOG_FILE = "sn/uploadIsLogFile"; - /*获取所有应用时间*/ - public final static String GET_MY_APP_LIST = "app/myAppList"; - /*获取所有全局更新*/ - public final static String GE_TOVERALL_APPBYPLATFORM = "app/overallAppByPlatform"; - /*根据包名获取更新*/ - public final static String GET_NEWEST_APPUPDATE = "app/newestAppUpdate"; - /*获取正在运行的app*/ - public static final String RUN_NEW_APP = "app/runNewApp"; /*获取所有应用*/ public final static String GET_ALL_PACKAGE = "app/queryAllApp"; /*获取强制下载*/ public final static String GET_FORCE_INSTALL = "app/getForceDownload"; + /*获取所有全局更新*/ + public final static String GE_TOVERALL_APPBYPLATFORM = "app/overallAppByPlatform"; + /*根据包名获取更新*/ + public final static String GET_NEWEST_APPUPDATE = "app/newestAppUpdate"; + /*获取所有应用时间*/ + public final static String GET_MY_APP_LIST = "app/myAppList"; + /*获取正在运行的app*/ + public static final String RUN_NEW_APP = "app/runNewApp"; /*发送卸载或者安装信息*/ - public final static String SEND_INSTALLEDORREMOVED = "app/addAppInstall"; + public final static String SEND_APP_INSTALL = "app/addAppInstall"; + /*获取系统设置*/ public final static String GET_SETTINGS = "control/getSetting"; @@ -78,6 +81,26 @@ public class UrlAddress { public final static String GET_SN_TIME_CONTROL = "Control/getSnTimeControl"; + /*2026新接口*/ + /*获取整体管控状态和时长*/ + public final static String SN_TIME_CONTROL = "control/sn-time-control"; + /*获取应用管控状态和时长*/ + public final static String APP_TIME_CONTROL = "control/app-time-control"; + + /*获取设备绑定信息*/ + public final static String DEVICE_INFO = "device/info"; + /*检查设备守护更新*/ + public final static String CHECK_UPDATE = "device/check-update"; + /*使用统计*/ + /*获取整机控制配置*/ + public final static String CONTROL_STATUS = "statistics/control-status"; + /*获取今日剩余时间*/ + public final static String REMAINING_TIME = "statistics/remaining-time"; + /*获取今天本周本月使用应用记录*/ + public final static String APP_USE_TIME = "statistics/app-use-time"; + /*获取应用控制策略列表*/ + public final static String APP_CONTROL_DETAIL = "statistics/app-control-detail"; + /*获取小程序二维码*/ public static final String GET_APPLET_QRCODE = "file/getAppletQrCode"; /*获取操作指南*/ diff --git a/app/src/main/java/com/fuying/sn/network/api/APPJump.java b/app/src/main/java/com/fuying/sn/network/api/APPJump.java deleted file mode 100644 index d61bc4b..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/APPJump.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppJump; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface APPJump { - @GET(UrlAddress.GET_APP_JUMP) - Observable>> getSNJump( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/AddAppInstall.java b/app/src/main/java/com/fuying/sn/network/api/AddAppInstall.java deleted file mode 100644 index 6ea302b..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/AddAppInstall.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface AddAppInstall { - @FormUrlEncoded - @POST(UrlAddress.SEND_INSTALLEDORREMOVED) - Observable installorRemove( - @Field("sn") String sn, - @Field("app") String jsonString - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/AppApi.java b/app/src/main/java/com/fuying/sn/network/api/AppApi.java new file mode 100644 index 0000000..f0258c1 --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/api/AppApi.java @@ -0,0 +1,60 @@ +package com.fuying.sn.network.api; + +import com.fuying.sn.bean.AppInfo; +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.MyAppUsageBean; +import com.fuying.sn.bean.OverallAppBean; +import com.fuying.sn.network.UrlAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.Query; + +public interface AppApi { + @GET(UrlAddress.GET_ALL_PACKAGE) + Observable>> getAllApp( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_FORCE_INSTALL) + Observable>> getForceInstall( + @Query("sn") String sn + ); + + @GET(UrlAddress.GE_TOVERALL_APPBYPLATFORM) + Observable>> getOverallApp( + @Query("platform") int platform + ); + + @GET(UrlAddress.GET_NEWEST_APPUPDATE) + Observable> getAppUpdate( + @Query("packageName") String packageName, + @Query("versionCode") String versionCode, + @Query("type") int type + ); + + @GET(UrlAddress.GET_MY_APP_LIST) + Observable>> getMyAppList( + @Query("sn") String sn + ); + + @FormUrlEncoded + @POST(UrlAddress.RUN_NEW_APP) + Observable sendAppInfo( + @Field("sn") String sn, + @Field("app") String app + ); + + @FormUrlEncoded + @POST(UrlAddress.SEND_APP_INSTALL) + Observable installorRemove( + @Field("sn") String sn, + @Field("app") String jsonString + ); + +} diff --git a/app/src/main/java/com/fuying/sn/network/api/AppTimeControlApi.java b/app/src/main/java/com/fuying/sn/network/api/AppTimeControlApi.java deleted file mode 100644 index f4e75b4..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/AppTimeControlApi.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fuying.sn.network.api; - - -import com.fuying.sn.desktop.AppTimeControl; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface AppTimeControlApi { - @GET(UrlAddress.GET_APP_TIME_CONTROL) - Observable>> getAppTimeControl( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/BindDevices.java b/app/src/main/java/com/fuying/sn/network/api/BindDevices.java deleted file mode 100644 index 9797bf1..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/BindDevices.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface BindDevices { - @GET(UrlAddress.BIND_DEVICES) - Observable getBindDevices( - @Query("sn") String sn, - @Query("id") String id, - @Query("type") int type - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/BlacklistApi.java b/app/src/main/java/com/fuying/sn/network/api/BlacklistApi.java deleted file mode 100644 index 03c9025..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/BlacklistApi.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.BlacklistBean; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; - -public interface BlacklistApi { - @GET(UrlAddress.GLOBAL_BLACKLIST) - Observable> getBlacklist(); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/Browser.java b/app/src/main/java/com/fuying/sn/network/api/Browser.java deleted file mode 100644 index 2d7504e..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/Browser.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.browser.BrowserApiData; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface Browser { - @GET(UrlAddress.SET_BROWSER_URL) - Observable> getBrowser( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/BrowserLabel.java b/app/src/main/java/com/fuying/sn/network/api/BrowserLabel.java deleted file mode 100644 index b0b2a76..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/BrowserLabel.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.Label; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface BrowserLabel { - @GET(UrlAddress.SET_BROWSER_LABEL) - Observable> getLabel( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/CloudLessonSettingApi.java b/app/src/main/java/com/fuying/sn/network/api/CloudLessonSettingApi.java deleted file mode 100644 index ad76ff9..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/CloudLessonSettingApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.CloudLessonSetting; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface CloudLessonSettingApi { - @GET(UrlAddress.GET_CLOUD_LESSON_SETTING) - Observable> getCloudLessonSetting( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/AppUsageRecordApi.java b/app/src/main/java/com/fuying/sn/network/api/CommonApi.java similarity index 50% rename from app/src/main/java/com/fuying/sn/network/api/AppUsageRecordApi.java rename to app/src/main/java/com/fuying/sn/network/api/CommonApi.java index ca67d73..4361b73 100644 --- a/app/src/main/java/com/fuying/sn/network/api/AppUsageRecordApi.java +++ b/app/src/main/java/com/fuying/sn/network/api/CommonApi.java @@ -1,15 +1,34 @@ package com.fuying.sn.network.api; - +import com.fuying.sn.bean.AppAndWhiteBean; +import com.fuying.sn.bean.AppInfo; import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.BlacklistBean; import com.fuying.sn.network.UrlAddress; +import java.util.List; + import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; import retrofit2.http.POST; +import retrofit2.http.Query; + +public interface CommonApi { + @GET(UrlAddress.GLOBAL_BLACKLIST) + Observable> getBlacklist(); + + @GET(UrlAddress.GET_APP_AND_WHITE) + Observable>> getAppAndWhite( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_ADMIN_APP) + Observable>> getAdminApp( + @Query("sn") String sn + ); -public interface AppUsageRecordApi { @FormUrlEncoded @POST(UrlAddress.APP_USAGE_RECORD) Observable sendAppUsageRecord( @@ -19,4 +38,5 @@ public interface AppUsageRecordApi { @Field("open_time") Long open_time, @Field("close_time") Long close_time ); + } diff --git a/app/src/main/java/com/fuying/sn/network/api/GetGuideApi.java b/app/src/main/java/com/fuying/sn/network/api/FileApi.java similarity index 67% rename from app/src/main/java/com/fuying/sn/network/api/GetGuideApi.java rename to app/src/main/java/com/fuying/sn/network/api/FileApi.java index 64360b2..26eb88f 100644 --- a/app/src/main/java/com/fuying/sn/network/api/GetGuideApi.java +++ b/app/src/main/java/com/fuying/sn/network/api/FileApi.java @@ -1,5 +1,6 @@ package com.fuying.sn.network.api; +import com.fuying.sn.bean.AppletQRCode; import com.fuying.sn.bean.BaseResponse; import com.fuying.sn.network.UrlAddress; @@ -7,9 +8,14 @@ import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; import retrofit2.http.Query; -public interface GetGuideApi { +public interface FileApi { + @GET(UrlAddress.GET_APPLET_QRCODE) + Observable> getQRCodeApi(); + @GET(UrlAddress.GET_OPERATION_GUIDE) Observable getGuidePic( @Query("type") int type ); + + } diff --git a/app/src/main/java/com/fuying/sn/network/api/ForceInstall.java b/app/src/main/java/com/fuying/sn/network/api/ForceInstall.java deleted file mode 100644 index 3446c63..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/ForceInstall.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppInfo; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface ForceInstall { - @GET(UrlAddress.GET_FORCE_INSTALL) - Observable>> getForceInstall( - @Query("sn")String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetAdminAppApi.java b/app/src/main/java/com/fuying/sn/network/api/GetAdminAppApi.java deleted file mode 100644 index 523684a..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetAdminAppApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppInfo; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetAdminAppApi { - @GET(UrlAddress.GET_ADMIN_APP) - Observable>> getAdminApp( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetAppAndWhiteApi.java b/app/src/main/java/com/fuying/sn/network/api/GetAppAndWhiteApi.java deleted file mode 100644 index 745b719..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetAppAndWhiteApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppAndWhiteBean; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetAppAndWhiteApi { - @GET(UrlAddress.GET_APP_AND_WHITE) - Observable>> getAppAndWhite( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetBatchApi.java b/app/src/main/java/com/fuying/sn/network/api/GetBatchApi.java deleted file mode 100644 index 6daa337..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetBatchApi.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.BatchID; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetBatchApi { - @GET(UrlAddress.GET_BATCH) - Observable> getBatch( - @Query("sn") String sn - ); - -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetControlScreenshotApi.java b/app/src/main/java/com/fuying/sn/network/api/GetControlScreenshotApi.java deleted file mode 100644 index 51e35d8..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetControlScreenshotApi.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import okhttp3.MultipartBody; -import retrofit2.http.Multipart; -import retrofit2.http.POST; -import retrofit2.http.Part; -import retrofit2.http.Query; - -public interface GetControlScreenshotApi { - @Multipart - @POST(UrlAddress.UPLOAD_CONTROL_SCREENSHOT) - Observable getControlScreenshot( - @Query("sn") String sn, - @Part MultipartBody.Part body - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetGuideApiTest.java b/app/src/main/java/com/fuying/sn/network/api/GetGuideApiTest.java deleted file mode 100644 index 05b131d..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetGuideApiTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetGuideApiTest { - @GET(UrlAddress.GET_OPERATION_GUIDE) - Observable getGuidePic( - @Query("type") int type - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetLockScreenPwdApi.java b/app/src/main/java/com/fuying/sn/network/api/GetLockScreenPwdApi.java deleted file mode 100644 index d10f948..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetLockScreenPwdApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.ScreenPassword; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetLockScreenPwdApi { - @GET(UrlAddress.LOCK_SCREEN_PWD) - Observable> getLockScreenPwd( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetSnRunLogApi.java b/app/src/main/java/com/fuying/sn/network/api/GetSnRunLogApi.java deleted file mode 100644 index 6539318..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/GetSnRunLogApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.SnRunLog; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface GetSnRunLogApi { - @GET(UrlAddress.GET_LOG_ORDER) - Observable> getSnRunLog( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/MachineTimeControlApi.java b/app/src/main/java/com/fuying/sn/network/api/MachineTimeControlApi.java deleted file mode 100644 index 538cc2a..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/MachineTimeControlApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.desktop.MachineControl; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface MachineTimeControlApi { - @GET(UrlAddress.GET_SN_TIME_CONTROL) - Observable> getSnTimeControl( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/MyAppListApi.java b/app/src/main/java/com/fuying/sn/network/api/MyAppListApi.java deleted file mode 100644 index 06c1240..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/MyAppListApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.MyAppUsageBean; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface MyAppListApi { - @GET(UrlAddress.GET_MY_APP_LIST) - Observable>> getMyAppList( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/NewestAppUpdate.java b/app/src/main/java/com/fuying/sn/network/api/NewestAppUpdate.java deleted file mode 100644 index e38a44d..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/NewestAppUpdate.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppInfo; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface NewestAppUpdate { - @GET(UrlAddress.GET_NEWEST_APPUPDATE) - Observable> getAppUpdate( - @Query("packageName") String packageName, - @Query("versionCode") String versionCode, - @Query("type") int type - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/OverallAppByPlatformApi.java b/app/src/main/java/com/fuying/sn/network/api/OverallAppByPlatformApi.java deleted file mode 100644 index cdd6170..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/OverallAppByPlatformApi.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.OverallAppBean; -import com.fuying.sn.network.UrlAddress; - - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface OverallAppByPlatformApi { - @GET(UrlAddress.GE_TOVERALL_APPBYPLATFORM) - Observable>> getOverallApp( - @Query("platform") int platform - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetPublicIPApi.java b/app/src/main/java/com/fuying/sn/network/api/PublicIPApi.java similarity index 91% rename from app/src/main/java/com/fuying/sn/network/api/GetPublicIPApi.java rename to app/src/main/java/com/fuying/sn/network/api/PublicIPApi.java index 1610598..37e9120 100644 --- a/app/src/main/java/com/fuying/sn/network/api/GetPublicIPApi.java +++ b/app/src/main/java/com/fuying/sn/network/api/PublicIPApi.java @@ -14,7 +14,7 @@ import retrofit2.http.GET; * desc : * version: 1.0 */ -public interface GetPublicIPApi { +public interface PublicIPApi { @GET(UrlAddress.SHOUHU_CITYJSON) Observable getPublicIP(); } diff --git a/app/src/main/java/com/fuying/sn/network/api/QRCodeApi.java b/app/src/main/java/com/fuying/sn/network/api/QRCodeApi.java deleted file mode 100644 index a144e34..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/QRCodeApi.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppletQRCode; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; - -public interface QRCodeApi { - @GET(UrlAddress.GET_APPLET_QRCODE) - Observable> getQRCodeApi(); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/QueryAllApp.java b/app/src/main/java/com/fuying/sn/network/api/QueryAllApp.java deleted file mode 100644 index 64d0a88..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/QueryAllApp.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppInfo; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface QueryAllApp { - @GET(UrlAddress.GET_ALL_PACKAGE) - Observable>> getAllApp( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/QueryAppInside.java b/app/src/main/java/com/fuying/sn/network/api/QueryAppInside.java deleted file mode 100644 index 52ab066..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/QueryAppInside.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface QueryAppInside { - @GET(UrlAddress.QUERY_APP_INSIDE) - Observable getAppInside( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/QuerySnAppStart.java b/app/src/main/java/com/fuying/sn/network/api/QuerySnAppStart.java deleted file mode 100644 index 8edd623..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/QuerySnAppStart.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.AppStart; -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import java.util.List; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface QuerySnAppStart { - @GET(UrlAddress.GET_APP_START) - Observable>> getAppStatu( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/RunningApp.java b/app/src/main/java/com/fuying/sn/network/api/RunningApp.java deleted file mode 100644 index 1754f76..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/RunningApp.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fuying.sn.network.api; - - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface RunningApp { - @FormUrlEncoded - @POST(UrlAddress.RUN_NEW_APP) - Observable sendAppInfo( - @Field("sn") String sn, - @Field("app") String app - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/ScreenLock.java b/app/src/main/java/com/fuying/sn/network/api/ScreenLock.java deleted file mode 100644 index 749d1e5..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/ScreenLock.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface ScreenLock { - @GET(UrlAddress.GET_SCREEN_LOCK) - Observable getScreenshot( - @Query("sn")String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/ScreenState.java b/app/src/main/java/com/fuying/sn/network/api/ScreenStateApi.java similarity index 93% rename from app/src/main/java/com/fuying/sn/network/api/ScreenState.java rename to app/src/main/java/com/fuying/sn/network/api/ScreenStateApi.java index 66c7fb7..b3c079f 100644 --- a/app/src/main/java/com/fuying/sn/network/api/ScreenState.java +++ b/app/src/main/java/com/fuying/sn/network/api/ScreenStateApi.java @@ -8,7 +8,7 @@ import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; -public interface ScreenState { +public interface ScreenStateApi { @FormUrlEncoded @POST(BuildConfig.SCREEN_URL) @Deprecated diff --git a/app/src/main/java/com/fuying/sn/network/api/Setting.java b/app/src/main/java/com/fuying/sn/network/api/Setting.java deleted file mode 100644 index 042073a..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/Setting.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.SystemSettingsSet; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface Setting { - @GET(UrlAddress.GET_SETTINGS) - Observable> getSetting( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/SettingsApi.java b/app/src/main/java/com/fuying/sn/network/api/SettingsApi.java new file mode 100644 index 0000000..660579d --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/api/SettingsApi.java @@ -0,0 +1,54 @@ +package com.fuying.sn.network.api; + +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.CloudLessonSetting; +import com.fuying.sn.bean.Label; +import com.fuying.sn.bean.SystemSettingsSet; +import com.fuying.sn.bean.browser.BrowserApiData; +import com.fuying.sn.desktop.AppTimeControl; +import com.fuying.sn.desktop.MachineControl; +import com.fuying.sn.network.UrlAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface SettingsApi { + @GET(UrlAddress.GET_SETTINGS) + Observable> getSetting( + @Query("sn") String sn + ); + + @GET(UrlAddress.SET_BROWSER_URL) + Observable> getBrowser( + @Query("sn") String sn + ); + + @GET(UrlAddress.SET_BROWSER_LABEL) + Observable> getLabel( + @Query("sn") String sn + ); + + @GET(UrlAddress.QUERY_APP_INSIDE) + Observable getAppInside( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_CLOUD_LESSON_SETTING) + Observable> getCloudLessonSetting( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_APP_TIME_CONTROL) + Observable>> getAppTimeControl( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_SN_TIME_CONTROL) + Observable> getSnTimeControl( + @Query("sn") String sn + ); + +} diff --git a/app/src/main/java/com/fuying/sn/network/api/SnApi.java b/app/src/main/java/com/fuying/sn/network/api/SnApi.java index 7b84624..ee6b7ec 100644 --- a/app/src/main/java/com/fuying/sn/network/api/SnApi.java +++ b/app/src/main/java/com/fuying/sn/network/api/SnApi.java @@ -1,11 +1,18 @@ package com.fuying.sn.network.api; import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.BatchID; +import com.fuying.sn.bean.SnBindState; import com.fuying.sn.bean.SnInfo; +import com.fuying.sn.bean.SnTag; +import com.fuying.sn.bean.UserAvatarInfo; import com.fuying.sn.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; +import retrofit2.http.POST; import retrofit2.http.Query; public interface SnApi { @@ -13,4 +20,26 @@ public interface SnApi { Observable> getsninfo( @Query("sn") String sn ); + + @GET(UrlAddress.GET_SN_BIND) + Observable> getSnBind( + @Query("sn") String sn + ); + + @FormUrlEncoded + @POST(UrlAddress.GET_USER_AVATAR_INFO) + Observable> getUserAvatarInfo( + @Field("sn") String sn + ); + + @GET(UrlAddress.GET_BATCH) + Observable> getBatch( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_TAG) + Observable> getTag( + @Query("sn") String sn +// @QueryMap Map params + ); } diff --git a/app/src/main/java/com/fuying/sn/network/api/SnBindApi.java b/app/src/main/java/com/fuying/sn/network/api/SnBindApi.java deleted file mode 100644 index 476d3d2..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/SnBindApi.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.SnBindState; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface SnBindApi { - @GET(UrlAddress.GET_SN_BIND) - Observable> getSnBind( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/SnControlApi.java b/app/src/main/java/com/fuying/sn/network/api/SnControlApi.java new file mode 100644 index 0000000..199fab3 --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/api/SnControlApi.java @@ -0,0 +1,49 @@ +package com.fuying.sn.network.api; + +import com.fuying.sn.bean.AppJump; +import com.fuying.sn.bean.AppStart; +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.ScreenPassword; +import com.fuying.sn.network.UrlAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.Query; + +public interface SnControlApi { + @GET(UrlAddress.GET_APP_START) + Observable>> getAppStatu( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_APP_JUMP) + Observable>> getSNJump( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_TIME_CONTROL) + Observable getTimeControl( + @Query("sn") String sn + ); + + @GET(UrlAddress.GET_SCREEN_LOCK) + Observable getScreenshot( + @Query("sn") String sn + ); + + @GET(UrlAddress.LOCK_SCREEN_PWD) + Observable> getLockScreenPwd( + @Query("sn") String sn + ); + + @FormUrlEncoded + @POST(UrlAddress.UPDATE_LOCK_SCREEN) + Observable updateLockScreen( + @Field("sn") String sn + ); +} diff --git a/app/src/main/java/com/fuying/sn/network/api/SnInfoApi.java b/app/src/main/java/com/fuying/sn/network/api/SnInfoApi.java new file mode 100644 index 0000000..6727387 --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/api/SnInfoApi.java @@ -0,0 +1,48 @@ +package com.fuying.sn.network.api; + +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.network.UrlAddress; + +import io.reactivex.rxjava3.core.Observable; +import okhttp3.MultipartBody; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.Multipart; +import retrofit2.http.POST; +import retrofit2.http.Part; +import retrofit2.http.Query; + +public interface SnInfoApi { + @GET(UrlAddress.BIND_DEVICES) + Observable getBindDevices( + @Query("sn") String sn, + @Query("id") String id, + @Query("type") int type + ); + + @FormUrlEncoded + @POST(UrlAddress.UPDATE_SN_INFO) + Observable sendAdminSn( + @Field("sn") String sn, + @Field("address") String address, + @Field("machine") String machine, + @Field("hardware") String hardware, + @Field("software") String software + ); + + @Multipart + @POST(UrlAddress.UPLOAD_SCREEN_SNAPSHOT) + Observable uploadScreenshot( + @Query("sn") String sn, + @Part MultipartBody.Part file + ); + + @Multipart + @POST(UrlAddress.UPLOAD_CONTROL_SCREENSHOT) + Observable getControlScreenshot( + @Query("sn") String sn, + @Part MultipartBody.Part body + ); + +} diff --git a/app/src/main/java/com/fuying/sn/network/api/GetUploadLogApi.java b/app/src/main/java/com/fuying/sn/network/api/SnLogApi.java similarity index 62% rename from app/src/main/java/com/fuying/sn/network/api/GetUploadLogApi.java rename to app/src/main/java/com/fuying/sn/network/api/SnLogApi.java index 46fb730..1a6e9a1 100644 --- a/app/src/main/java/com/fuying/sn/network/api/GetUploadLogApi.java +++ b/app/src/main/java/com/fuying/sn/network/api/SnLogApi.java @@ -1,21 +1,29 @@ package com.fuying.sn.network.api; import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.bean.SnRunLog; import com.fuying.sn.network.UrlAddress; import java.util.Map; import io.reactivex.rxjava3.core.Observable; import okhttp3.MultipartBody; +import retrofit2.http.GET; import retrofit2.http.Multipart; import retrofit2.http.POST; import retrofit2.http.Part; +import retrofit2.http.Query; import retrofit2.http.QueryMap; -public interface GetUploadLogApi { +public interface SnLogApi { + @GET(UrlAddress.GET_LOG_ORDER) + Observable> getSnRunLog( + @Query("sn") String sn + ); + @Multipart @POST(UrlAddress.UPLOAD_LOG_FILE) - Observable UploadLog( + Observable uploadLog( @QueryMap Map params, @Part MultipartBody.Part body ); diff --git a/app/src/main/java/com/fuying/sn/network/api/SnTagApi.java b/app/src/main/java/com/fuying/sn/network/api/SnTagApi.java deleted file mode 100644 index 1b825ee..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/SnTagApi.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.SnTag; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface SnTagApi { - @GET(UrlAddress.GET_TAG) - Observable> getTag( - @Query("sn") String sn -// @QueryMap Map params - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/TimeControl.java b/app/src/main/java/com/fuying/sn/network/api/TimeControl.java deleted file mode 100644 index 6a77d37..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/TimeControl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface TimeControl { - @GET(UrlAddress.GET_TIME_CONTROL) - Observable getTimeControl( - @Query("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/UpdateAdminSn.java b/app/src/main/java/com/fuying/sn/network/api/UpdateAdminSn.java deleted file mode 100644 index 0457a26..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/UpdateAdminSn.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface UpdateAdminSn { - @FormUrlEncoded - @POST(UrlAddress.UPDATE_SN_INFO) - Observable sendAdminSn( - @Field("sn") String sn, - @Field("address") String address, - @Field("machine") String machine, - @Field("hardware") String hardware, - @Field("software") String software - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/UpdateLockScreen.java b/app/src/main/java/com/fuying/sn/network/api/UpdateLockScreen.java deleted file mode 100644 index 1199210..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/UpdateLockScreen.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface UpdateLockScreen { - @FormUrlEncoded - @POST(UrlAddress.UPDATE_LOCK_SCREEN) - Observable updateLockScreen( - @Field("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/UploadScreenshot.java b/app/src/main/java/com/fuying/sn/network/api/UploadScreenshot.java deleted file mode 100644 index a130692..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/UploadScreenshot.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import okhttp3.MultipartBody; -import retrofit2.http.Multipart; -import retrofit2.http.POST; -import retrofit2.http.Part; -import retrofit2.http.Query; - -public interface UploadScreenshot { - @Multipart - @POST(UrlAddress.UPLOAD_SCREEN_SNAPSHOT) - Observable uploadScreenshot( - @Query("sn") String sn, - @Part MultipartBody.Part file - ) ; -} diff --git a/app/src/main/java/com/fuying/sn/network/api/UserInfoApi.java b/app/src/main/java/com/fuying/sn/network/api/UserInfoApi.java deleted file mode 100644 index 6f119b3..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/UserInfoApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.UserAvatarInfo; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface UserInfoApi { - @FormUrlEncoded - @POST(UrlAddress.GET_USER_AVATAR_INFO) - Observable> getUserAvatarInfo( - @Field("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/api/UserInfoControl.java b/app/src/main/java/com/fuying/sn/network/api/UserInfoControl.java deleted file mode 100644 index d058c94..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/UserInfoControl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.bean.UserAvatarInfo; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface UserInfoControl { - @FormUrlEncoded - @POST(UrlAddress.GET_USER_AVATAR_INFO) - Observable> getUserAvatarInfo( - @Field("sn") String sn - ); -} diff --git a/app/src/main/java/com/fuying/sn/network/newly/ControlApi.java b/app/src/main/java/com/fuying/sn/network/newly/ControlApi.java new file mode 100644 index 0000000..0d25c49 --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/newly/ControlApi.java @@ -0,0 +1,21 @@ +package com.fuying.sn.network.newly; + +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.network.UrlAddress; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface ControlApi { + @GET(UrlAddress.SN_TIME_CONTROL) + Observable getSnTimeControl( + @Query("sn") String sn + ); + + @GET(UrlAddress.APP_TIME_CONTROL) + Observable getAppTimeControl( + @Query("sn") String sn + ); + +} diff --git a/app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java b/app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java new file mode 100644 index 0000000..f03bbbb --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java @@ -0,0 +1,22 @@ +package com.fuying.sn.network.newly; + +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.network.UrlAddress; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface DeviceInfoApi { + @GET(UrlAddress.DEVICE_INFO) + Observable getDeviceInfo( + @Query("sn") String sn + ); + + @GET(UrlAddress.CHECK_UPDATE) + Observable checkUpdate( + @Query("sn") String sn, + @Query("platform") String platform, + @Query("app_package") String app_package + ); +} diff --git a/app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java b/app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java new file mode 100644 index 0000000..194d2a4 --- /dev/null +++ b/app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java @@ -0,0 +1,32 @@ +package com.fuying.sn.network.newly; + +import com.fuying.sn.bean.BaseResponse; +import com.fuying.sn.network.UrlAddress; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface StatisticsApi { + @GET(UrlAddress.CONTROL_STATUS) + Observable getControlStatus( + @Query("sn") String sn + ); + + @GET(UrlAddress.REMAINING_TIME) + Observable getRemainingTime( + @Query("sn") String sn + ); + + @GET(UrlAddress.APP_USE_TIME) + Observable getAppUseTime( + @Query("sn") String sn, + @Query("query_type") int query_type, + @Query("is_all") int is_all + ); + + @GET(UrlAddress.APP_CONTROL_DETAIL) + Observable getAppControlDetail( + @Query("sn") String sn + ); +} diff --git a/app/src/main/java/com/fuying/sn/push/PushManager.java b/app/src/main/java/com/fuying/sn/push/PushManager.java index 62d55ac..481fa79 100644 --- a/app/src/main/java/com/fuying/sn/push/PushManager.java +++ b/app/src/main/java/com/fuying/sn/push/PushManager.java @@ -936,7 +936,7 @@ public class PushManager { synchronized private void bind(final String id, int type) { NetInterfaceManager.getInstance() - .getbindDevicesControl() + .getSnInfoApi() .getBindDevices(Utils.getSerial(), id, type) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -1091,7 +1091,7 @@ public class PushManager { private static Observable getSendFile(String path, MultipartBody.Part body) { return NetInterfaceManager.getInstance() - .getUploadScreenshotControl() + .getSnInfoApi() .uploadScreenshot(Utils.getSerial(), body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); diff --git a/app/src/main/java/com/fuying/sn/service/LogcatService.java b/app/src/main/java/com/fuying/sn/service/LogcatService.java index 1c05f28..61b497f 100644 --- a/app/src/main/java/com/fuying/sn/service/LogcatService.java +++ b/app/src/main/java/com/fuying/sn/service/LogcatService.java @@ -267,8 +267,8 @@ public class LogcatService extends Service { //设置一个file文件 MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), fileBody); - NetInterfaceManager.getInstance().getUploadLogApi() - .UploadLog(params, body) + NetInterfaceManager.getInstance().getSnLogApi() + .uploadLog(params, body) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/app/src/main/java/com/fuying/sn/service/ManagerService.java b/app/src/main/java/com/fuying/sn/service/ManagerService.java index 6454512..9388bd2 100644 --- a/app/src/main/java/com/fuying/sn/service/ManagerService.java +++ b/app/src/main/java/com/fuying/sn/service/ManagerService.java @@ -146,7 +146,7 @@ public class ManagerService extends Service implements NetworkUtils.OnNetworkSta private void getScreenLockState() { NetInterfaceManager.getInstance() - .getScreenLockControl() + .getSnControlApi() .getScreenshot(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java index dd61747..5d947ec 100644 --- a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java @@ -351,7 +351,7 @@ public class MainSPresenter implements MainSContact.Presenter { @Override public void getScreenLock() { NetInterfaceManager.getInstance() - .getScreenLockControl() + .getSnControlApi() .getScreenshot(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread())