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

version:

Browse Source 
fix:
update:优化类名，准备修复闹钟问题
This commit is contained in:
tongtongstudio
2024-08-24 16:56:05 +08:00
parent 261016b9bd
commit 251b6a3329
51 changed files with 1059 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/xxpatx/os/network/NetInterfaceManager.java
View File

@@ -11,7 +11,6 @@ import com.tencent.mmkv.MMKV;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.trello.rxlifecycle4.android.FragmentEvent;
import com.uiui.video.bean.VideoInfo;
import com.xxpatx.os.BuildConfig;
import com.xxpatx.os.alarm.AlarmClockData;
import com.xxpatx.os.alarm.AlarmUtils;
@@ -23,7 +22,6 @@ import com.xxpatx.os.bean.AppInfo;
import com.xxpatx.os.bean.ArticleList;
import com.xxpatx.os.bean.BaiduMapGeoBean;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.bean.CategoryBean;
import com.xxpatx.os.bean.Contact;
import com.xxpatx.os.bean.DemandBean;
import com.xxpatx.os.bean.ExpressData;
@@ -55,7 +53,6 @@ import com.xxpatx.os.network.api.uiui.AppUpdate;
import com.xxpatx.os.network.api.uiui.AppUsageRecordApi;
import com.xxpatx.os.network.api.uiui.ArticleCategorysListApi;
import com.xxpatx.os.network.api.uiui.ArticleListApi;
import com.xxpatx.os.network.api.uiui.CategorysApi;
import com.xxpatx.os.network.api.uiui.DemandListApi;
import com.xxpatx.os.network.api.uiui.GetAdminSnSettingApi;
import com.xxpatx.os.network.api.uiui.GetMailList;
@@ -64,7 +61,6 @@ import com.xxpatx.os.network.api.uiui.GoodsListApi;
import com.xxpatx.os.network.api.uiui.GoodsTypeApi;
import com.xxpatx.os.network.api.uiui.GoodsTypeListApi;
import com.xxpatx.os.network.api.uiui.HealthCodeApi;
import com.xxpatx.os.network.api.uiui.KnowledgeVideoListApi;
import com.xxpatx.os.network.api.uiui.SnIsActivationApi;
import com.xxpatx.os.network.api.uiui.contact.MailListAddApi;
import com.xxpatx.os.network.api.uiui.contact.MailListDeleteApi;
@@ -82,7 +78,6 @@ import com.xxpatx.os.network.api.uiui.app.RunNewApp;
import com.xxpatx.os.network.api.uiui.contact.MailListEditApi;
import com.xxpatx.os.network.api.uiui.desktop.GetDesktopApi;
import com.xxpatx.os.network.api.uiui.desktop.UpdateDesktopApi;
import com.xxpatx.os.network.api.uiui.liven.LivenVideoListApi;
import com.xxpatx.os.network.api.uiui.order.AllOrderApi;
import com.xxpatx.os.network.api.uiui.order.OrderExpressApi;
import com.xxpatx.os.network.api.uiui.order.OrderIndexApi;
@@ -101,7 +96,6 @@ import com.xxpatx.os.utils.Utils;
import java.io.File;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -402,13 +396,6 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<CategoryBean>>> getCategorysObservable() {
return mRetrofit.create(CategorysApi.class)
.getArticleCategorys(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArticleList>> getArticleListObservable() {
return mRetrofit.create(ArticleListApi.class)
.getArticleList(Utils.getSerial())
@@ -458,7 +445,7 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getMailListDeleteObservable(String id) {
public Observable<BaseResponse> getMailListDeleteObservable(int id) {
return mRetrofit.create(MailListDeleteApi.class)
.deleteMailList(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
@@ -528,20 +515,6 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArrayList<VideoInfo>>> getLivenVideoListObservable() {
return mRetrofit.create(LivenVideoListApi.class)
.getLivenVideoList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArrayList<VideoInfo>>> getKnowledgeVideoListObservable() {
return mRetrofit.create(KnowledgeVideoListApi.class)
.getKnowledgeVideoList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<RegionInfo>>> getRegionListObservable(String id) {
return mRetrofit.create(RegionListApi.class)
.getRegionList(id)

10
app/src/main/java/com/xxpatx/os/network/UrlAddress.java
View File

@@ -117,16 +117,6 @@ public class UrlAddress {
/*获取闹钟*/
public static final String GET_ALARM_CLOCK = "getAlarmClock";
/**
* 养生视频分类
*/
/*养生视频列表*/
public static final String GET_LIVEN_VIDEO_LIST = "livenVideo/getLivenVideoList";
/*知识视频列表*/
public static final String GET_KNOWLEDGE_VIDEO_LIST = "knowledgeVideo/getKnowledgeVideoList";
/*养生资讯分类*/
public static final String ARTICLE_CATEGORYS = "article/categorys";
/**
* 商品购买
*/

18
app/src/main/java/com/xxpatx/os/network/api/uiui/CategorysApi.java
View File

@@ -1,18 +0,0 @@
package com.xxpatx.os.network.api.uiui;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.bean.CategoryBean;
import com.xxpatx.os.network.UrlAddress;
import java.util.List;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface CategorysApi {
@GET(UrlAddress.ARTICLE_CATEGORYS)
Observable<BaseResponse<List<CategoryBean>>> getArticleCategorys(
@Query("sn") String sn
);
}

18
app/src/main/java/com/xxpatx/os/network/api/uiui/KnowledgeVideoListApi.java
View File

@@ -1,18 +0,0 @@
package com.xxpatx.os.network.api.uiui;
import com.uiui.video.bean.VideoInfo;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.network.UrlAddress;
import java.util.ArrayList;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface KnowledgeVideoListApi {
@GET(UrlAddress.GET_KNOWLEDGE_VIDEO_LIST)
Observable<BaseResponse<ArrayList<VideoInfo>>> getKnowledgeVideoList(
@Query("sn") String sn
);
}

2
app/src/main/java/com/xxpatx/os/network/api/uiui/contact/MailListDeleteApi.java
View File

@@ -13,6 +13,6 @@ public interface MailListDeleteApi {
@POST(UrlAddress.MAIL_LIST_DELETE)
Observable<BaseResponse> deleteMailList(
@Field("sn") String sn,
@Field("id") String id
@Field("id") int id
);
}

18
app/src/main/java/com/xxpatx/os/network/api/uiui/liven/LivenVideoListApi.java
View File

@@ -1,18 +0,0 @@
package com.xxpatx.os.network.api.uiui.liven;
import com.uiui.video.bean.VideoInfo;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.network.UrlAddress;
import java.util.ArrayList;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface LivenVideoListApi {
@GET(UrlAddress.GET_LIVEN_VIDEO_LIST)
Observable<BaseResponse<ArrayList<VideoInfo>>> getLivenVideoList(
@Query("sn") String sn
);
}