MTing 3 weeks ago
parent
commit
c0e113acba
  1. 3
      app/src/main/java/com/ouxuan/oxface/DebugActivity.java
  2. 6
      app/src/main/java/com/ouxuan/oxface/device/Ox485.java

3
app/src/main/java/com/ouxuan/oxface/DebugActivity.java

@ -250,6 +250,7 @@ public class DebugActivity extends Activity {
// 485人数测试按钮 // 485人数测试按钮
Button btnTest485PeopleNum = findViewById(R.id.btnTest485PeopleNum); Button btnTest485PeopleNum = findViewById(R.id.btnTest485PeopleNum);
btnTest485PeopleNum.setVisibility(View.GONE); // 暂时隐藏
btnTest485PeopleNum.setOnClickListener(new View.OnClickListener() { btnTest485PeopleNum.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -295,6 +296,7 @@ public class DebugActivity extends Activity {
// 485完整诊断按钮 // 485完整诊断按钮
Button btn485FullDiagnosis = findViewById(R.id.btn485FullDiagnosis); Button btn485FullDiagnosis = findViewById(R.id.btn485FullDiagnosis);
btn485FullDiagnosis.setVisibility(View.GONE); // 暂时隐藏
btn485FullDiagnosis.setOnClickListener(new View.OnClickListener() { btn485FullDiagnosis.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -304,6 +306,7 @@ public class DebugActivity extends Activity {
// 485快速测试按钮 // 485快速测试按钮
Button btn485QuickTest = findViewById(R.id.btn485QuickTest); Button btn485QuickTest = findViewById(R.id.btn485QuickTest);
btn485QuickTest.setVisibility(View.GONE); // 暂时隐藏
btn485QuickTest.setOnClickListener(new View.OnClickListener() { btn485QuickTest.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

6
app/src/main/java/com/ouxuan/oxface/device/Ox485.java

@ -104,9 +104,11 @@ public class Ox485 {
if (deviceType == 5) { if (deviceType == 5) {
// 第6批设备使用ttyS6 // 第6批设备使用ttyS6
DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS6"; DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS6";
} else {
// 其他设备包括第7批使用ttyS4
} else if(deviceType == 6){
// 第7批使用ttyS4
DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS4"; DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS4";
}else{
DEFAULT_SERIAL_PORT_PATH = "/dev/ttyS6";
} }
String logMessage = "已根据设备类型(" + deviceType + ")切换485串口路径: " + oldPath + " -> " + DEFAULT_SERIAL_PORT_PATH; String logMessage = "已根据设备类型(" + deviceType + ")切换485串口路径: " + oldPath + " -> " + DEFAULT_SERIAL_PORT_PATH;

Loading…
Cancel
Save