From ae66c33035151674bdd910294d8ea7964d9b3085 Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 3 Mar 2026 17:56:51 +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       | 21 ++++++++++---------
 .../network/{ => api}/newly/ControlApi.java   |  3 +--
 .../{ => api}/newly/DeviceInfoApi.java        |  2 +-
 .../{ => api}/newly/StatisticsApi.java        |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename app/src/main/java/com/fuying/sn/network/{ => api}/newly/ControlApi.java (92%)
 rename app/src/main/java/com/fuying/sn/network/{ => api}/newly/DeviceInfoApi.java (93%)
 rename app/src/main/java/com/fuying/sn/network/{ => api}/newly/StatisticsApi.java (95%)

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 52f1cb9..2d926ff 100644
--- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java
@@ -251,6 +251,7 @@ public class NetInterfaceManager {
 
 
 
+
     /*
      *
      * Observable
@@ -265,7 +266,7 @@ public class NetInterfaceManager {
     }
 
     public Observable<BaseResponse<SystemSettingsSet>> getSettingControl() {
-        return mRetrofit.create(SettingsApi.class)
+        return getSettingsApi()
                 .getSetting(Utils.getSerial())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
@@ -328,19 +329,12 @@ public class NetInterfaceManager {
     }
 
     public Observable<BaseResponse<AppletQRCode>> getQRCodeApiControl() {
-        return mRetrofit.create(FileApi.class)
+        return getFileApi()
                 .getQRCodeApi()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
-    public Observable<BaseResponse> getAppInsideControl() {
-        return getSettingsApi()
-                .getAppInside(Utils.getSerial())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread());
-    }
-
     public Observable<BaseResponse> getGetGuideControl() {
         return getFileApi()
                 .getGuidePic(2)
@@ -348,6 +342,13 @@ public class NetInterfaceManager {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
+    public Observable<BaseResponse> getAppInsideControl() {
+        return getSettingsApi()
+                .getAppInside(Utils.getSerial())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
     public Observable<BaseResponse<BatchID>> getBatchApiControl() {
         return getSnApi()
                 .getBatch(Utils.getSerial())
@@ -413,7 +414,7 @@ public class NetInterfaceManager {
     }
 
     public Observable<BaseResponse<BlacklistBean>> getBlacklistObservable() {
-        return mRetrofit.create(CommonApi.class)
+        return getCommonApi()
                 .getBlacklist()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
diff --git a/app/src/main/java/com/fuying/sn/network/newly/ControlApi.java b/app/src/main/java/com/fuying/sn/network/api/newly/ControlApi.java
similarity index 92%
rename from app/src/main/java/com/fuying/sn/network/newly/ControlApi.java
rename to app/src/main/java/com/fuying/sn/network/api/newly/ControlApi.java
index 0d25c49..0d2ab50 100644
--- a/app/src/main/java/com/fuying/sn/network/newly/ControlApi.java
+++ b/app/src/main/java/com/fuying/sn/network/api/newly/ControlApi.java
@@ -1,4 +1,4 @@
-package com.fuying.sn.network.newly;
+package com.fuying.sn.network.api.newly;
 
 import com.fuying.sn.bean.BaseResponse;
 import com.fuying.sn.network.UrlAddress;
@@ -17,5 +17,4 @@ public interface ControlApi {
     Observable<BaseResponse> 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/api/newly/DeviceInfoApi.java
similarity index 93%
rename from app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java
rename to app/src/main/java/com/fuying/sn/network/api/newly/DeviceInfoApi.java
index f03bbbb..b0989f5 100644
--- a/app/src/main/java/com/fuying/sn/network/newly/DeviceInfoApi.java
+++ b/app/src/main/java/com/fuying/sn/network/api/newly/DeviceInfoApi.java
@@ -1,4 +1,4 @@
-package com.fuying.sn.network.newly;
+package com.fuying.sn.network.api.newly;
 
 import com.fuying.sn.bean.BaseResponse;
 import com.fuying.sn.network.UrlAddress;
diff --git a/app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java b/app/src/main/java/com/fuying/sn/network/api/newly/StatisticsApi.java
similarity index 95%
rename from app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java
rename to app/src/main/java/com/fuying/sn/network/api/newly/StatisticsApi.java
index 194d2a4..bb6eb49 100644
--- a/app/src/main/java/com/fuying/sn/network/newly/StatisticsApi.java
+++ b/app/src/main/java/com/fuying/sn/network/api/newly/StatisticsApi.java
@@ -1,4 +1,4 @@
-package com.fuying.sn.network.newly;
+package com.fuying.sn.network.api.newly;
 
 import com.fuying.sn.bean.BaseResponse;
 import com.fuying.sn.network.UrlAddress;