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

version:

Browse Source 
fix:
update:优化离线添加闹钟，优化离线添加联系人，dock栏自定义图标
This commit is contained in:
tongtongstudio
2024-08-27 15:10:55 +08:00
parent 251b6a3329
commit 7f134d6328
40 changed files with 1328 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,20 +61,21 @@ 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.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;
import com.xxpatx.os.network.api.uiui.RegionListCall;
import com.xxpatx.os.network.api.uiui.ServeApi;
import com.xxpatx.os.network.api.uiui.SnIsActivationApi;
import com.xxpatx.os.network.api.uiui.UpdateAppIconApi;
import com.xxpatx.os.network.api.uiui.UserInfoControl;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockAddApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockGetApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockDeleteApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockEditApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockQueryApi;
import com.xxpatx.os.network.api.uiui.alarmclock.AlarmClockUpdateApi;
import com.xxpatx.os.network.api.uiui.app.RunNewApp;
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.contact.MailListEditApi;
import com.xxpatx.os.network.api.uiui.desktop.GetDesktopApi;
import com.xxpatx.os.network.api.uiui.desktop.UpdateDesktopApi;
@@ -90,7 +91,6 @@ import com.xxpatx.os.network.api.uiui.sn.SettingApi;
import com.xxpatx.os.network.api.uiui.sn.SnInfoApi;
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;
@@ -362,7 +362,7 @@ public class NetInterfaceManager {
}
public Observable<BaseResponse> getUpdateAlarmObservable(int id) {
return mRetrofit.create(UpdateAlarmClockApi.class)
return mRetrofit.create(AlarmClockUpdateApi.class)
.updateAlarm(Utils.getSerial(), id)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
@@ -466,7 +466,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable() {
return mRetrofit
.create(AlarmClockApi.class)
.create(AlarmClockGetApi.class)
.getAlarmClock(Utils.getSerial(), 0)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
@@ -474,7 +474,7 @@ public class NetInterfaceManager {
public Observable<BaseResponse<List<AlarmClockData>>> getAlarmClockObservable(int type) {
return mRetrofit
.create(AlarmClockApi.class)
.create(AlarmClockGetApi.class)
.getAlarmClock(Utils.getSerial(), type)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
@@ -1020,41 +1020,9 @@ public class NetInterfaceManager {
public interface AlarmClockCallback {
void setAlarmClock(List<AlarmClockData> alarmClockList);
void setAlarmClockEmpty();
void onError();
void onError(String msg);
}
public void getAlarmClock(boolean refresh, BehaviorSubject<ActivityEvent> lifecycle, AlarmClockCallback callback) {
// ConnectMode connectMode = ConnectMode.DEFAULT;
// if (refresh) {
// connectMode = ConnectMode.DEFAULT;
// }
// if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_ALARM_CLOCK, connectMode)) {
getAlarmClock(lifecycle, callback);
// } else {
// getAlarmClockCache(lifecycle, callback);
// }
}
// public void getAlarmClockCache(BehaviorSubject<ActivityEvent> lifecycle, AlarmClockCallback callback) {
// String jsonString = mCacheHelper.getAsString(UrlAddress.GET_ALARM_CLOCK);
// //为 "" 是已经请求成功的
// if (jsonString == null) {
// getAlarmClock(lifecycle, callback);
// } else {
// Gson gson = new Gson();
// Type type = new TypeToken<List<AlarmClockData>>() {
// }.getType();
// List<AlarmClockData> list = gson.fromJson(jsonString, type);
// if (list == null || list.size() == 0) {
// callback.setAlarmClockEmpty();
// } else {
// callback.setAlarmClock(list);
// }
// }
// }
public void getAlarmClockFragment(BehaviorSubject<FragmentEvent> lifecycle, AlarmClockCallback callback) {
getAlarmClockObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
@@ -1092,31 +1060,30 @@ public class NetInterfaceManager {
if (alarmClockData != null && alarmClockData.size() != 0) {
AlarmUtils.getInstance().setAlarmClockData(alarmClockData);
mMMKV.encode(UrlAddress.GET_ALARM_CLOCK, GsonUtils.toJSONString(alarmClockData));
// if (callback != null) {
// callback.setAlarmClock(alarmClockData);
// }
} else {
AlarmUtils.getInstance().deleteAllAlarmClock();
AlarmUtils.getInstance().setAlarmClockData(null);
mMMKV.encode(UrlAddress.GET_ALARM_CLOCK, "");
// if (callback != null) {
// callback.setAlarmClockEmpty();
// }
if (callback != null) {
callback.onError(listBaseResponse.msg);
}
}
} else {
AlarmUtils.getInstance().deleteAllAlarmClock();
AlarmUtils.getInstance().setAlarmClockData(null);
mMMKV.encode(UrlAddress.GET_ALARM_CLOCK, "");
// if (callback != null) {
// callback.setAlarmClockEmpty();
// }
if (callback != null) {
callback.onError(listBaseResponse.msg);
}
}
}
@Override
public void onError(@NonNull Throwable e) {
Log.e("getAlarmClockObserver", "onError: " + e.getMessage());
if (callback != null) callback.onError();
if (callback != null) {
callback.onError("请检查网络连接");
}
onComplete();
}
@@ -1124,8 +1091,10 @@ public class NetInterfaceManager {
public void onComplete() {
Log.e("getAlarmClockObserver", "onComplete: ");
List<AlarmClockData> list = AlarmUtils.getInstance().getOldData();
Log.e("getAlarmClockObserver", "onComplete: list = " + list);
if (list == null || list.size() == 0) {
if (callback != null) callback.setAlarmClockEmpty();
if (callback != null) callback.setAlarmClock(null);
} else {
List<AlarmClockData> filter = list.stream().filter(alarmClockData -> !alarmClockData.isDeleted()).collect(Collectors.toList());
if (callback != null) callback.setAlarmClock(filter);

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

@@ -23,8 +23,6 @@ public class UrlAddress {
*/
/*获取设备是否激活*/
public static final String GET_SN_IS_ACTIVATION = "sn/getSnIsActivation";
/*爱心提醒通知成功接口*/
public static final String UPDATE_ALARM_CLOCK = "updateAlarmClock";
/*上传截屏图片*/
public static final String SEND_SCREENSHOT = "sn/uploadScreenshot";
/*获取系统设置其它管控*/
@@ -106,16 +104,18 @@ public class UrlAddress {
/**
* 闹钟
*/
/*获取闹钟*/
public static final String GET_ALARM_CLOCK = "getAlarmClock";
/*爱心提醒通知成功*/
public static final String ALARM_CLOCK_UPDATE = "updateAlarmClock";
/*编号查询闹钟*/
public static final String ALARM_CLOCK_BY_ID = "AlarmClock/alarmClockById";
/*添加闹钟*/
public static final String ALARM_CLOCK_ADD = "AlarmClock/alarmClockAdd";
/*编辑闹钟*/
public static final String ALARM_CLOCK_EDIT = "AlarmClock/alarmClockEdit";
/*编号查询闹钟*/
public static final String ALARM_CLOCK_BY_ID = "AlarmClock/alarmClockById";
/*删除闹钟*/
public static final String ALARM_CLOCK_DELETE = "AlarmClock/alarmClockDelete";
/*获取闹钟*/
public static final String GET_ALARM_CLOCK = "getAlarmClock";
/**
* 商品购买

2
app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockApi.java → app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockGetApi.java
View File

@@ -10,7 +10,7 @@ import io.reactivex.rxjava3.core.Observable;
import retrofit2.http.GET;
import retrofit2.http.Query;
public interface AlarmClockApi {
public interface AlarmClockGetApi {
@GET(UrlAddress.GET_ALARM_CLOCK)
Observable<BaseResponse<List<AlarmClockData>>> getAlarmClock(
@Query("sn") String sn,

6
app/src/main/java/com/xxpatx/os/network/api/uiui/sn/UpdateAlarmClockApi.java → app/src/main/java/com/xxpatx/os/network/api/uiui/alarmclock/AlarmClockUpdateApi.java
View File

@@ -1,4 +1,4 @@
package com.xxpatx.os.network.api.uiui.sn;
package com.xxpatx.os.network.api.uiui.alarmclock;
import com.xxpatx.os.bean.BaseResponse;
import com.xxpatx.os.network.UrlAddress;
@@ -8,9 +8,9 @@ import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.POST;
public interface UpdateAlarmClockApi {
public interface AlarmClockUpdateApi {
@FormUrlEncoded
@POST(UrlAddress.UPDATE_ALARM_CLOCK)
@POST(UrlAddress.ALARM_CLOCK_UPDATE)
Observable<BaseResponse> updateAlarm(
@Field("sn") String sn,
@Field("id") int id