kopia lustrzana https://github.com/sh123/codec2_talkie
Refactoring
rodzic
d463c2e767
commit
df999f0e58
|
@ -331,7 +331,7 @@ public class AppWorker extends Thread {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onTransmitPosition(Position position) {
|
protected void onTransmitPosition(Position position) {
|
||||||
_positionItemRepository.insertPositionItem(position.toPositionItem(true));
|
_positionItemRepository.upsertPositionItem(position.toPositionItem(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -109,6 +109,7 @@ public class PositionItem {
|
||||||
|
|
||||||
public static boolean equalTo(PositionItem positionItem1, PositionItem positionItem2) {
|
public static boolean equalTo(PositionItem positionItem1, PositionItem positionItem2) {
|
||||||
return positionItem1.getSrcCallsign().equals(positionItem2.getSrcCallsign()) &
|
return positionItem1.getSrcCallsign().equals(positionItem2.getSrcCallsign()) &
|
||||||
|
positionItem1.getIsTransmit() == positionItem2.getIsTransmit() &&
|
||||||
Math.abs(positionItem1.getLongitude() - positionItem2.getLongitude()) <= MIN_COORDINATE_CHANGE_DELTA &
|
Math.abs(positionItem1.getLongitude() - positionItem2.getLongitude()) <= MIN_COORDINATE_CHANGE_DELTA &
|
||||||
Math.abs(positionItem1.getLatitude() - positionItem2.getLatitude()) <= MIN_COORDINATE_CHANGE_DELTA;
|
Math.abs(positionItem1.getLatitude() - positionItem2.getLatitude()) <= MIN_COORDINATE_CHANGE_DELTA;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,8 +9,8 @@ import androidx.room.Update;
|
||||||
public interface StationItemDao {
|
public interface StationItemDao {
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.IGNORE)
|
@Insert(onConflict = OnConflictStrategy.IGNORE)
|
||||||
void insertStation(StationItem stationItem);
|
void insertStationItem(StationItem stationItem);
|
||||||
|
|
||||||
@Update(onConflict = OnConflictStrategy.IGNORE)
|
@Update(onConflict = OnConflictStrategy.IGNORE)
|
||||||
void updateStation(StationItem stationItem);
|
void updateStationItem(StationItem stationItem);
|
||||||
}
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
package com.radio.codec2talkie.storage.station;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.lifecycle.LiveData;
|
||||||
|
|
||||||
|
import com.radio.codec2talkie.maps.MapActivity;
|
||||||
|
import com.radio.codec2talkie.storage.AppDatabase;
|
||||||
|
import com.radio.codec2talkie.tools.DateTools;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class StationItemRepository {
|
||||||
|
private static final String TAG = StationItemRepository.class.getSimpleName();
|
||||||
|
|
||||||
|
private final StationItemDao _stationItemDao;
|
||||||
|
|
||||||
|
public StationItemRepository(Application application) {
|
||||||
|
AppDatabase appDatabase = AppDatabase.getDatabase(application);
|
||||||
|
_stationItemDao = appDatabase.stationitemDao();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void insertStationItem(StationItem stationItem) {
|
||||||
|
AppDatabase.getDatabaseExecutor().execute(() -> _stationItemDao.insertStationItem(stationItem));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void upsertStationItem(StationItem stationItem) {
|
||||||
|
AppDatabase.getDatabaseExecutor().execute(() -> {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
package com.radio.codec2talkie.storage.station;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.text.format.DateUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.lifecycle.AndroidViewModel;
|
||||||
|
import androidx.lifecycle.LiveData;
|
||||||
|
|
||||||
|
import com.radio.codec2talkie.storage.station.StationItemRepository;
|
||||||
|
import com.radio.codec2talkie.tools.DateTools;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class StationItemViewModel extends AndroidViewModel {
|
||||||
|
|
||||||
|
private final StationItemRepository _stationItemRepository;
|
||||||
|
|
||||||
|
public StationItemViewModel(@NonNull Application application) {
|
||||||
|
super(application);
|
||||||
|
_stationItemRepository = new StationItemRepository(application);
|
||||||
|
}
|
||||||
|
}
|
Ładowanie…
Reference in New Issue