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

version:6.3

Browse Source 
fix:
update:优化管控页面
This commit is contained in:
tongtongstudio
2022-11-17 09:36:01 +08:00
parent 2ae033b3f5
commit b87c2e99b9
11 changed files with 105 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java
View File

@@ -134,7 +134,7 @@ public class CustomPresenter implements CustomContact.Presenter {
@Override
public void getAlarmClock() {
NetInterfaceManager.getInstance().getAlarmClock(new NetInterfaceManager.AlarmClockCallback() {
NetInterfaceManager.getInstance().getAlarmClockFragment(lifecycle, new NetInterfaceManager.AlarmClockCallback() {
@Override
public void setAlarmClock(List<AlarmClockData> alarmClockList) {
AlarmClockData alarmClockData = AlarmUtils.getInstance().getRecentAlarmClock();

7
app/src/main/java/com/uiui/aios/manager/AmapManager.java
View File

@@ -8,6 +8,7 @@ import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.blankj.utilcode.util.SPUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV;
@@ -97,7 +98,7 @@ public class AmapManager {
public AMapLocation getNowAMapLocation() {
if (nowAMapLocation == null) {
String aMapLocationjson = mMMKV.decodeString(AMAPLOCATION_JSON_KEY, "");
String aMapLocationjson = SPUtils.getInstance().getString(AMAPLOCATION_JSON_KEY, "");
Type type = new TypeToken<AMapLocation>() {
}.getType();
AMapLocation aMapLocation = new Gson().fromJson(aMapLocationjson, type);
@@ -116,12 +117,12 @@ public class AmapManager {
Log.d(TAG, "onLocationChanged: " + aMapLocation.toStr());
if (aMapLocation.getErrorCode() == 0) {
nowAMapLocation = aMapLocation;
mMMKV.encode(AMAPLOCATION_JSON_KEY, aMapLocation.toStr());
SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, aMapLocation.toStr());
mMMKV.encode(LONGITUDE_KEY, String.valueOf(aMapLocation.getLongitude()));
mMMKV.encode(LATITUDE_KEY, String.valueOf(aMapLocation.getLatitude()));
mMMKV.encode(ADDRESS_KEY, aMapLocation.getAddress());
} else {
mMMKV.encode(AMAPLOCATION_JSON_KEY, "");
SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, "");
}
aMapLocationListener.onLocationChanged(aMapLocation);
}

6
app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
View File

@@ -725,6 +725,12 @@ public class NetInterfaceManager {
.subscribe(getAlarmClockObserver(callback));
}
public void getAlarmClockFragment(BehaviorSubject<FragmentEvent> lifecycle, AlarmClockCallback callback) {
getAlarmClockObservable()
.compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
.subscribe(getAlarmClockObserver(callback));
}
public void getAlarmClock(AlarmClockCallback callback) {
getAlarmClockObservable()
.subscribe(getAlarmClockObserver(callback));