kopia lustrzana https://github.com/N0BOY/FT8CN
TrUSDXRig: Reactivate sound when exit the application
rodzic
aecd8f03c5
commit
ff4db69b61
|
@ -600,7 +600,7 @@ public class MainViewModel extends ViewModel {
|
||||||
}
|
}
|
||||||
baseRig.setControlMode(GeneralVariables.controlMode);
|
baseRig.setControlMode(GeneralVariables.controlMode);
|
||||||
CableConnector connector = new CableConnector(context, port, GeneralVariables.baudRate
|
CableConnector connector = new CableConnector(context, port, GeneralVariables.baudRate
|
||||||
, GeneralVariables.controlMode);
|
, GeneralVariables.controlMode, baseRig);
|
||||||
baseRig.setOnRigStateChanged(onRigStateChanged);
|
baseRig.setOnRigStateChanged(onRigStateChanged);
|
||||||
baseRig.setConnector(connector);
|
baseRig.setConnector(connector);
|
||||||
connector.connect();
|
connector.connect();
|
||||||
|
|
|
@ -4,6 +4,7 @@ import android.content.Context;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.bg7yoz.ft8cn.database.ControlMode;
|
import com.bg7yoz.ft8cn.database.ControlMode;
|
||||||
|
import com.bg7yoz.ft8cn.rigs.BaseRig;
|
||||||
import com.bg7yoz.ft8cn.serialport.util.SerialInputOutputManager;
|
import com.bg7yoz.ft8cn.serialport.util.SerialInputOutputManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,11 +17,13 @@ public class CableConnector extends BaseRigConnector {
|
||||||
private static final String TAG="CableConnector";
|
private static final String TAG="CableConnector";
|
||||||
|
|
||||||
private final CableSerialPort cableSerialPort;
|
private final CableSerialPort cableSerialPort;
|
||||||
|
private final BaseRig cableConnectedRig;
|
||||||
|
|
||||||
|
|
||||||
public CableConnector(Context context,CableSerialPort.SerialPort serialPort, int baudRate
|
public CableConnector(Context context,CableSerialPort.SerialPort serialPort, int baudRate
|
||||||
, int controlMode) {
|
, int controlMode, BaseRig cableConnectedRig) {
|
||||||
super(controlMode);
|
super(controlMode);
|
||||||
|
this.cableConnectedRig = cableConnectedRig;
|
||||||
cableSerialPort= new CableSerialPort(context,serialPort,baudRate,getOnConnectorStateChanged());
|
cableSerialPort= new CableSerialPort(context,serialPort,baudRate,getOnConnectorStateChanged());
|
||||||
cableSerialPort.ioListener=new SerialInputOutputManager.Listener() {
|
cableSerialPort.ioListener=new SerialInputOutputManager.Listener() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -76,6 +79,7 @@ public class CableConnector extends BaseRigConnector {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void disconnect() {
|
public void disconnect() {
|
||||||
|
cableConnectedRig.onDisconnecting();
|
||||||
super.disconnect();
|
super.disconnect();
|
||||||
cableSerialPort.disconnect();
|
cableSerialPort.disconnect();
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,4 +134,7 @@ public abstract class BaseRig {
|
||||||
public boolean supportWaveOverCAT() {
|
public boolean supportWaveOverCAT() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void onDisconnecting() {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -187,6 +187,14 @@ public class TrUSDXRig extends BaseRig {
|
||||||
return getConnector() != null && getControlMode() == ControlMode.CAT;
|
return getConnector() != null && getControlMode() == ControlMode.CAT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDisconnecting() {
|
||||||
|
if (getConnector() != null) {
|
||||||
|
clearBufferData();
|
||||||
|
getConnector().sendData(KenwoodTK90RigConstant.setTrUSDXStreaming(false));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public TrUSDXRig() {
|
public TrUSDXRig() {
|
||||||
new Handler().postDelayed(new Runnable() {
|
new Handler().postDelayed(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
|
|
Ładowanie…
Reference in New Issue