bauseweinfr74630/mMDT5_GreenWatch
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adaptation of the receive logic

Browse Source
This commit is contained in:
Christian Tinz 2023-06-23 17:46:50 +02:00
parent f1f90952d2
commit fb873406f9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java
View File

@ -51,11 +51,6 @@ public class WiFiCommunication {
if (mDeviceRepository == null) { if (mDeviceRepository == null) {
this.mDeviceRepository = deviceRepository; this.mDeviceRepository = deviceRepository;
} }
}
public void setRecievedSting(String rxString) {
this.rxString = rxString;
//mDeviceRepository.getNewReceivedMessage(this.rxString);
} }
public void setNewMessage(String newMessage, boolean isNewMessage){ public void setNewMessage(String newMessage, boolean isNewMessage){
@ -124,7 +119,7 @@ public class WiFiCommunication {
rxString = new String(packet.getData(), 0, packet.getLength()); rxString = new String(packet.getData(), 0, packet.getLength());
if(!previousRxString.equals(rxString)){ if(!previousRxString.equals(rxString)){
setRecievedSting(rxString); mDeviceRepository.getNewReceivedMessage(rxString);
} }
previousRxString = rxString; previousRxString = rxString;

9
app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
View File

@ -1,6 +1,8 @@
package com.example.greenwatch.repositories; package com.example.greenwatch.repositories;
import android.os.Looper;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.example.greenwatch.models.Device; import com.example.greenwatch.models.Device;
@ -273,7 +275,12 @@ public class DeviceRepository {
private void setMutableLiveDataDeviceList() { private void setMutableLiveDataDeviceList() {
List<Device> list = new ArrayList<>(connectedDevicesList.values()); List<Device> list = new ArrayList<>(connectedDevicesList.values());
deviceList.setValue(list); if (Looper.myLooper() == Looper.getMainLooper()){
deviceList.setValue(list);
}
else {
deviceList.postValue(list);
}
} }
private void setMutableLiveDataAlarmHistoryList() { private void setMutableLiveDataAlarmHistoryList() {