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

Benutzeroberflaeche #2

Manually merged
Tinzch67102 merged 36 commits from Benutzeroberflaeche into master 2023-06-23 16:21:00 +00:00
Conversation 0 Commits 36 Files Changed 39 +9 -7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb873406f9 - Show all commits

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

@ -51,11 +51,6 @@ public class WiFiCommunication {
if (mDeviceRepository == null) {
this.mDeviceRepository = deviceRepository;
}
}
public void setRecievedSting(String rxString) {
this.rxString = rxString;
//mDeviceRepository.getNewReceivedMessage(this.rxString);
}
public void setNewMessage(String newMessage, boolean isNewMessage){
@ -124,7 +119,7 @@ public class WiFiCommunication {
rxString = new String(packet.getData(), 0, packet.getLength());
if(!previousRxString.equals(rxString)){
setRecievedSting(rxString);
mDeviceRepository.getNewReceivedMessage(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;
import android.os.Looper;
import androidx.lifecycle.MutableLiveData;
import com.example.greenwatch.models.Device;
@ -273,7 +275,12 @@ public class DeviceRepository {
private void setMutableLiveDataDeviceList() {
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() {