version:
fix: update:精简api接口,增加新接口地址
This commit is contained in:
@@ -251,6 +251,7 @@ public class NetInterfaceManager {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Observable
|
* Observable
|
||||||
@@ -265,7 +266,7 @@ public class NetInterfaceManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Observable<BaseResponse<SystemSettingsSet>> getSettingControl() {
|
public Observable<BaseResponse<SystemSettingsSet>> getSettingControl() {
|
||||||
return mRetrofit.create(SettingsApi.class)
|
return getSettingsApi()
|
||||||
.getSetting(Utils.getSerial())
|
.getSetting(Utils.getSerial())
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
.observeOn(AndroidSchedulers.mainThread());
|
||||||
@@ -328,19 +329,12 @@ public class NetInterfaceManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Observable<BaseResponse<AppletQRCode>> getQRCodeApiControl() {
|
public Observable<BaseResponse<AppletQRCode>> getQRCodeApiControl() {
|
||||||
return mRetrofit.create(FileApi.class)
|
return getFileApi()
|
||||||
.getQRCodeApi()
|
.getQRCodeApi()
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
.observeOn(AndroidSchedulers.mainThread());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Observable<BaseResponse> getAppInsideControl() {
|
|
||||||
return getSettingsApi()
|
|
||||||
.getAppInside(Utils.getSerial())
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
|
||||||
}
|
|
||||||
|
|
||||||
public Observable<BaseResponse> getGetGuideControl() {
|
public Observable<BaseResponse> getGetGuideControl() {
|
||||||
return getFileApi()
|
return getFileApi()
|
||||||
.getGuidePic(2)
|
.getGuidePic(2)
|
||||||
@@ -348,6 +342,13 @@ public class NetInterfaceManager {
|
|||||||
.observeOn(AndroidSchedulers.mainThread());
|
.observeOn(AndroidSchedulers.mainThread());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Observable<BaseResponse> getAppInsideControl() {
|
||||||
|
return getSettingsApi()
|
||||||
|
.getAppInside(Utils.getSerial())
|
||||||
|
.subscribeOn(Schedulers.io())
|
||||||
|
.observeOn(AndroidSchedulers.mainThread());
|
||||||
|
}
|
||||||
|
|
||||||
public Observable<BaseResponse<BatchID>> getBatchApiControl() {
|
public Observable<BaseResponse<BatchID>> getBatchApiControl() {
|
||||||
return getSnApi()
|
return getSnApi()
|
||||||
.getBatch(Utils.getSerial())
|
.getBatch(Utils.getSerial())
|
||||||
@@ -413,7 +414,7 @@ public class NetInterfaceManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Observable<BaseResponse<BlacklistBean>> getBlacklistObservable() {
|
public Observable<BaseResponse<BlacklistBean>> getBlacklistObservable() {
|
||||||
return mRetrofit.create(CommonApi.class)
|
return getCommonApi()
|
||||||
.getBlacklist()
|
.getBlacklist()
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread());
|
.observeOn(AndroidSchedulers.mainThread());
|
||||||
|
|||||||
@@ -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.bean.BaseResponse;
|
||||||
import com.fuying.sn.network.UrlAddress;
|
import com.fuying.sn.network.UrlAddress;
|
||||||
@@ -17,5 +17,4 @@ public interface ControlApi {
|
|||||||
Observable<BaseResponse> getAppTimeControl(
|
Observable<BaseResponse> getAppTimeControl(
|
||||||
@Query("sn") String sn
|
@Query("sn") String sn
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -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.bean.BaseResponse;
|
||||||
import com.fuying.sn.network.UrlAddress;
|
import com.fuying.sn.network.UrlAddress;
|
||||||
@@ -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.bean.BaseResponse;
|
||||||
import com.fuying.sn.network.UrlAddress;
|
import com.fuying.sn.network.UrlAddress;
|
||||||
Reference in New Issue
Block a user