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

version:

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

1071
app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
View File

File diff suppressed because it is too large Load Diff

3
app/src/main/java/com/aoleyun/sn/network/api/get/GetDesktopApi.java
View File

@@ -1,5 +1,6 @@
package com.aoleyun.sn.network.api.get;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
@@ -9,7 +10,7 @@ import retrofit2.http.Query;
public interface GetDesktopApi {
@GET(UrlAddress.GET_DESKTOP)
Observable<ResponseBody> getDesktop(
Observable<BaseResponse> getDesktop(
@Query("sn") String sn
);
}

3
app/src/main/java/com/aoleyun/sn/network/api/get/GetDeveloperApi.java
View File

@@ -1,6 +1,7 @@
package com.aoleyun.sn.network.api.get;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.DeveloperBean;
import com.aoleyun.sn.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
@@ -9,7 +10,7 @@ import retrofit2.http.Query;
public interface GetDeveloperApi {
@GET(UrlAddress.GET_DEVELOPER)
Observable<BaseResponse> getDeveloperState(
Observable<BaseResponse<DeveloperBean>> getDeveloperState(
@Query("sn") String sn
);
}

3
app/src/main/java/com/aoleyun/sn/network/api/get/GetJpushTagsApi.java
View File

@@ -1,6 +1,7 @@
package com.aoleyun.sn.network.api.get;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.Batch;
import com.aoleyun.sn.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
@@ -9,7 +10,7 @@ import retrofit2.http.Query;
public interface GetJpushTagsApi {
@GET(UrlAddress.GET_DEVICES_TAGS)
Observable<BaseResponse> getJpushTags(
Observable<BaseResponse<Batch>> getJpushTags(
@Query("sn") String sn
);
}

3
app/src/main/java/com/aoleyun/sn/network/api/get/SnTimeControlApi.java
View File

@@ -1,6 +1,7 @@
package com.aoleyun.sn.network.api.get;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.SnTimeControl;
import com.aoleyun.sn.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
@@ -9,7 +10,7 @@ import retrofit2.http.Query;
public interface SnTimeControlApi {
@GET(UrlAddress.GET_SN_TIME_CONTROL)
Observable<BaseResponse> getSnTimeControl(
Observable<BaseResponse<SnTimeControl>> getSnTimeControl(
@Query("sn") String sn
);
}

3
app/src/main/java/com/aoleyun/sn/network/api/get/TopAppControlApi.java
View File

@@ -1,6 +1,7 @@
package com.aoleyun.sn.network.api.get;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.TopApp;
import com.aoleyun.sn.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
@@ -9,7 +10,7 @@ import retrofit2.http.Query;
public interface TopAppControlApi {
@GET(UrlAddress.GET_TOP_APP_CONTROL)
Observable<BaseResponse> getSnAppControl(
Observable<BaseResponse<TopApp>> getSnAppControl(
@Query("sn") String sn
);
}

7
app/src/main/java/com/aoleyun/sn/network/api/post/ForceDownloadApi.java
View File

@@ -1,8 +1,11 @@
package com.aoleyun.sn.network.api.post;
import com.aoleyun.sn.bean.ForceDownloadBean;
import com.aoleyun.sn.bean.BaseResponse;
import com.aoleyun.sn.bean.ForceDownloadData;
import com.aoleyun.sn.network.UrlAddress;
import java.util.List;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
@@ -11,7 +14,7 @@ import retrofit2.http.POST;
public interface ForceDownloadApi {
@FormUrlEncoded
@POST(UrlAddress.GET_FORCE_INSTALL_LIST)
Observable<ForceDownloadBean> getForceDownloadApi(
Observable<BaseResponse<List<ForceDownloadData>>> getForceDownloadApi(
@Field("key") String key,
@Field("sn") String sn
);

19
app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java
View File

@@ -13,6 +13,7 @@ import okhttp3.Interceptor;
import okhttp3.Protocol;
import okhttp3.Request;
import okhttp3.Response;
import okio.Buffer;
public class RepeatRequestInterceptor implements Interceptor {
private static final String TAG = RepeatRequestInterceptor.class.getSimpleName();
@@ -29,7 +30,7 @@ public class RepeatRequestInterceptor implements Interceptor {
long time = System.currentTimeMillis();//请求时间
try {
if (requestIdsMap.size() > 0 && requestIdsMap.containsKey(requestKey)) {
Log.e("REPEAT-REQUEST", "重复请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + request.body());
Log.e("REPEAT-REQUEST", "重复请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + bodyToString(request));
//下面这行写了不会抛出onerror
// chain.call().cancel();
return new Response.Builder()
@@ -38,7 +39,7 @@ public class RepeatRequestInterceptor implements Interceptor {
.build();
}
requestIdsMap.put(requestKey, time);
Log.e("REPEAT-REQUEST", "注册请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + request.body());
Log.e("REPEAT-REQUEST", "注册请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + bodyToString(request));
// RepeatRequestInterceptor.Builder builder = request.newBuilder();
// builder.addHeader("header", jsonObject.toString());
return chain.proceed(request);
@@ -48,8 +49,20 @@ public class RepeatRequestInterceptor implements Interceptor {
} finally {
if (requestIdsMap.containsKey(requestKey) && requestIdsMap.containsValue(time)) {//请求任务完成删除map中的数据
requestIdsMap.remove(requestKey);
Log.e("REPEAT-REQUEST", "移除请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + request.body());
Log.e("REPEAT-REQUEST", "移除请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + bodyToString(request));
}
}
}
private static String bodyToString(final Request request){
try {
final Request copy = request.newBuilder().build();
final Buffer buffer = new Buffer();
copy.body().writeTo(buffer);
return buffer.readUtf8();
} catch ( Exception e) {
return "-";
}
}
}