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

version:1.1.5

Browse Source 
update:
bugfixes:优化闹钟自动接听
This commit is contained in:
tongtongstudio
2024-08-19 10:30:50 +08:00
parent 9f8057cd33
commit 261016b9bd
103 changed files with 2478 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,9 +15,11 @@ import com.uiui.video.bean.VideoInfo;
import com.xxpatx.os.BuildConfig;
import com.xxpatx.os.alarm.AlarmClockData;
import com.xxpatx.os.alarm.AlarmUtils;
import com.xxpatx.os.bean.ActivationBean;
import com.xxpatx.os.bean.ActivityBean;
import com.xxpatx.os.bean.AddressInfo;
import com.xxpatx.os.bean.AlarmClockId;
import com.xxpatx.os.bean.AppInfo;
import com.xxpatx.os.bean.ArticleList;
import com.xxpatx.os.bean.BaiduMapGeoBean;
import com.xxpatx.os.bean.BaseResponse;
@@ -45,11 +47,11 @@ import com.xxpatx.os.disklrucache.CacheHelper;
import com.xxpatx.os.gson.GsonUtils;
import com.xxpatx.os.manager.ConnectManager;
import com.xxpatx.os.manager.ConnectMode;
import com.xxpatx.os.manager.RemoteManager;
import com.xxpatx.os.network.api.amap.GeocodingApi;
import com.xxpatx.os.network.api.qweather.LookupApi;
import com.xxpatx.os.network.api.uiui.ActivityListApi;
import com.xxpatx.os.network.api.uiui.AddressIndexApi;
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;
@@ -63,6 +65,7 @@ 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;
import com.xxpatx.os.network.api.uiui.RegionListApi;
@@ -94,6 +97,7 @@ import com.xxpatx.os.network.api.uiui.sn.SosRecordApi;
import com.xxpatx.os.network.api.uiui.sn.UpdateAddressApi;
import com.xxpatx.os.network.api.uiui.sn.UpdateAlarmClockApi;
import com.xxpatx.os.network.interceptor.RepeatRequestInterceptor;
import com.xxpatx.os.utils.Utils;
import java.io.File;
import java.lang.reflect.Type;
@@ -323,119 +327,119 @@ public class NetInterfaceManager {
*/
public Observable<BaseResponse<SnInfo>> getSnInfoControl() {
return mRetrofit.create(SnInfoApi.class)
.getSninfo(RemoteManager.getInstance().getSerial())
.getSninfo(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<FamilyAddress>> getFamilyAddressControl() {
return mRetrofit.create(FamilyAddressApi.class)
.getFamilyAddress(RemoteManager.getInstance().getSerial())
.getFamilyAddress(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<UserAvatarInfo>> getUserAvatarInfoControl() {
return mRetrofit.create(UserInfoControl.class)
.getUserAvatarInfo(RemoteManager.getInstance().getSerial())
.getUserAvatarInfo(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getRunningAppObservable(String json) {
return mRetrofit.create(RunNewApp.class)
.sendRunningInfo(RemoteManager.getInstance().getSerial(), json)
.sendRunningInfo(Utils.getSerial(), json)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<SystemSettings>> getsettingControl() {
return mRetrofit.create(SettingApi.class)
.getSetting(RemoteManager.getInstance().getSerial())
.getSetting(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getSOSRecordObservable(String longitude, String latitude, String address) {
return mRetrofit.create(SosRecordApi.class)
.sendSosRecord(RemoteManager.getInstance().getSerial(), longitude, latitude, address)
.sendSosRecord(Utils.getSerial(), longitude, latitude, address)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getUpdateAlarmObservable(int id) {
return mRetrofit.create(UpdateAlarmClockApi.class)
.updateAlarm(RemoteManager.getInstance().getSerial(), id)
.updateAlarm(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getUpdateDesktopObservable(String jsonArray) {
return mRetrofit.create(UpdateDesktopApi.class)
.updateLayout(RemoteManager.getInstance().getSerial(), jsonArray)
.updateLayout(Utils.getSerial(), jsonArray)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<NetDesktopIcon>>> getDesktopLayoutObservable() {
return mRetrofit.create(GetDesktopApi.class)
.getDesktopLayout(RemoteManager.getInstance().getSerial())
.getDesktopLayout(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<GoodsList>> getGoodsListObservable() {
return mRetrofit.create(GoodsListApi.class)
.getGoodsList(RemoteManager.getInstance().getSerial())
.getGoodsList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<GoodsList>> getGoodsListObservable(int type) {
return mRetrofit.create(GoodsTypeListApi.class)
.getGoodsList(RemoteManager.getInstance().getSerial(), type)
.getGoodsList(Utils.getSerial(), type)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<CategoryBean>>> getCategorysObservable() {
return mRetrofit.create(CategorysApi.class)
.getArticleCategorys(RemoteManager.getInstance().getSerial())
.getArticleCategorys(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArticleList>> getArticleListObservable() {
return mRetrofit.create(ArticleListApi.class)
.getArticleList(RemoteManager.getInstance().getSerial())
.getArticleList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArticleList>> getArticleListObservable(int id) {
return mRetrofit.create(ArticleCategorysListApi.class)
.getArticleList(RemoteManager.getInstance().getSerial(), id)
.getArticleList(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<Contact>>> getContactListObservable() {
return mRetrofit.create(GetMailList.class)
.getContact(RemoteManager.getInstance().getSerial())
.getContact(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getAdminSnSettingObservable() {
return mRetrofit.create(GetAdminSnSettingApi.class)
.getAdminSnSetting(RemoteManager.getInstance().getSerial())
.getAdminSnSetting(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getUpdateAppIconObservable(String pkg, String label, int type) {
return mRetrofit.create(UpdateAppIconApi.class)
.appIconUpdate(RemoteManager.getInstance().getSerial(), pkg, type, label)
.appIconUpdate(Utils.getSerial(), pkg, type, label)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -456,7 +460,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse> getMailListDeleteObservable(String id) {
return mRetrofit.create(MailListDeleteApi.class)
.deleteMailList(RemoteManager.getInstance().getSerial(), id)
.deleteMailList(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -476,7 +480,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable() {
return mRetrofit
.create(AlarmClockApi.class)
.getAlarmClock(RemoteManager.getInstance().getSerial(), 0)
.getAlarmClock(Utils.getSerial(), 0)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -484,7 +488,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable(int type) {
return mRetrofit
.create(AlarmClockApi.class)
.getAlarmClock(RemoteManager.getInstance().getSerial(), type)
.getAlarmClock(Utils.getSerial(), type)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -496,6 +500,13 @@ public class NetInterfaceManager {
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<AlarmClockId>> getAlarmClockAddObservable(Map<String, String> params) {
return mRetrofit.create(AlarmClockAddApi.class)
.addAlarmClock(params)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getAlarmClockEditObservable(Map<String, String> params, MultipartBody.Part body) {
return mRetrofit.create(AlarmClockEditApi.class)
.editAlarmClock(params, body)
@@ -505,28 +516,28 @@ public class NetInterfaceManager {
public Observable<BaseResponse<AlarmClockData>> getAlarmClockByIdObservable(int id) {
return mRetrofit.create(AlarmClockQueryApi.class)
.getAlarmClockById(RemoteManager.getInstance().getSerial(), id)
.getAlarmClockById(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> deleteAlarmClockObservable(int id) {
return mRetrofit.create(AlarmClockDeleteApi.class)
.alarmClockDelete(RemoteManager.getInstance().getSerial(), id)
.alarmClockDelete(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArrayList<VideoInfo>>> getLivenVideoListObservable() {
return mRetrofit.create(LivenVideoListApi.class)
.getLivenVideoList(RemoteManager.getInstance().getSerial())
.getLivenVideoList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ArrayList<VideoInfo>>> getKnowledgeVideoListObservable() {
return mRetrofit.create(KnowledgeVideoListApi.class)
.getKnowledgeVideoList(RemoteManager.getInstance().getSerial())
.getKnowledgeVideoList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -540,7 +551,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<ServeBean>> getServeObservable() {
return mRetrofit.create(ServeApi.class)
.getServe(RemoteManager.getInstance().getSerial())
.getServe(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -554,54 +565,68 @@ public class NetInterfaceManager {
public Observable<BaseResponse<WxpayBean>> getOrderPayObservable(String order_sn, String order_id) {
return mRetrofit.create(OrderPayApi.class)
.orderPay(RemoteManager.getInstance().getSerial(), order_sn, order_id, BuildConfig.APPLICATION_ID)
.orderPay(Utils.getSerial(), order_sn, order_id, BuildConfig.APPLICATION_ID)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getOrderPayCheckObservable(String order_sn, String order_id) {
return mRetrofit.create(OrderPayCheckApi.class)
.checkOrder(RemoteManager.getInstance().getSerial(), order_sn, order_id)
.checkOrder(Utils.getSerial(), order_sn, order_id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<OrderIndexData>> getAllOrderObservable() {
return mRetrofit.create(AllOrderApi.class)
.getOrderIndex(RemoteManager.getInstance().getSerial())
.getOrderIndex(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<OrderIndexData>> getOrderIndexObservable(int status) {
return mRetrofit.create(OrderIndexApi.class)
.getOrderIndex(RemoteManager.getInstance().getSerial(), status)
.getOrderIndex(Utils.getSerial(), status)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ExpressData>> getOrderExpressObservable(String order_sn, String order_id) {
return mRetrofit.create(OrderExpressApi.class)
.getOrderExpress(RemoteManager.getInstance().getSerial(), order_sn, order_id)
.getOrderExpress(Utils.getSerial(), order_sn, order_id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<List<AddressInfo>>> getAddressIndexObservable() {
return mRetrofit.create(AddressIndexApi.class)
.getAddressList(RemoteManager.getInstance().getSerial())
.getAddressList(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse> getUpdateAddressObservable(String address, double longitude, double latitude) {
return mRetrofit.create(UpdateAddressApi.class)
.updateAddress(RemoteManager.getInstance().getSerial(), address, longitude, latitude)
.updateAddress(Utils.getSerial(), address, longitude, latitude)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<ActivationBean>> getSnIsActivationObservable() {
return mRetrofit.create(SnIsActivationApi.class)
.getSnIsActivation(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public Observable<BaseResponse<AppInfo>> getUpdateObservable() {
return mRetrofit.create(AppUpdate.class)
.getAppUpdate(BuildConfig.APPLICATION_ID, "0", 1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
public RegionListApi getRegionListApi() {
return mRetrofit.create(RegionListApi.class);
}
@@ -616,7 +641,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<UserId>> getUserIDObservable() {
return mRetrofit.create(GetUserIDApi.class)
.getUserID(RemoteManager.getInstance().getSerial())
.getUserID(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -683,7 +708,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<ActivityBean>>> getActivityListObservable() {
return mRetrofit.create(ActivityListApi.class)
.getActivityList(RemoteManager.getInstance().getSerial(), 1, 1, getUserId())
.getActivityList(Utils.getSerial(), 1, 1, getUserId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -793,7 +818,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<DemandBean>>> getDemandListObservable() {
return mRetrofit.create(DemandListApi.class)
.getDemandList(RemoteManager.getInstance().getSerial(), 1, 1, getUserId())
.getDemandList(Utils.getSerial(), 1, 1, getUserId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
@@ -913,7 +938,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<HealthCode>>> getHealthCodeObservable() {
return mRetrofit.create(HealthCodeApi.class)
.getArticleDetails(RemoteManager.getInstance().getSerial())
.getArticleDetails(Utils.getSerial())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}

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

@@ -21,6 +21,8 @@ public class UrlAddress {
* 新接口
* SN
*/
/*获取设备是否激活*/
public static final String GET_SN_IS_ACTIVATION = "sn/getSnIsActivation";
/*爱心提醒通知成功接口*/
public static final String UPDATE_ALARM_CLOCK = "updateAlarmClock";
/*上传截屏图片*/
@@ -33,7 +35,8 @@ public class UrlAddress {
public static final String UPDATE_ADDRESS = "sn/update-address";
/*获取设备家庭地址*/
public static final String FAMILY_ADDRESS = "sn/family-address";
/*根据包名获取更新*/
public final static String GET_NEWESTAPPUPDATE = "app/newestAppUpdate";
/*获取抢购列表*/
public static final String GET_GOODS_LIST = "getGoodsList";

18
app/src/main/java/com/xxpatx/os/network/api/uiui/AppUpdate.java Normal file
View File

@@ -0,0 +1,18 @@
package com.xxpatx.os.network.api.uiui;
import com.xxpatx.os.bean.AppInfo;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface AppUpdate {
@GET(UrlAddress.GET_NEWESTAPPUPDATE)
Observable<BaseResponse<AppInfo>> getAppUpdate(
@Query("packageName") String packageName,
@Query("versionCode") String versionCode,
@Query("type") int type
);
}

16
app/src/main/java/com/xxpatx/os/network/api/uiui/SnIsActivationApi.java Normal file
View File

@@ -0,0 +1,16 @@
package com.xxpatx.os.network.api.uiui;
import com.xxpatx.os.bean.ActivationBean;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.network.UrlAddress;
import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface SnIsActivationApi {
@GET(UrlAddress.GET_SN_IS_ACTIVATION)
Observable<BaseResponse<ActivationBean>> getSnIsActivation(
@Query("sn") String sn
);
}

5
app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockAddApi.java
View File

@@ -20,4 +20,9 @@ public interface AlarmClockAddApi {
@QueryMap Map<String, String> params,
@Part MultipartBody.Part body
);
@POST(UrlAddress.ALARM_CLOCK_ADD)
Observable<BaseResponse<AlarmClockId>> addAlarmClock(
@QueryMap Map<String, String> params
);
}