|
@@ -51,7 +51,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
|
|
|
private BasicDeviceAdapter basicDeviceAdapter;
|
|
|
private List<BasicDeviceAdapter.ItemBean> itemBeanList = new ArrayList<>();
|
|
|
// 输出流缓冲区
|
|
|
- private StringBuffer outStringBuffer;
|
|
|
+ private StringBuffer outStringBuffer = new StringBuffer("");
|
|
|
|
|
|
static {
|
|
|
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
|
|
@@ -156,6 +156,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
|
|
|
String address = data.getExtras().getString(BluetoothChatService.EXTRA_DEVICE_ADDRESS);
|
|
|
// 尝试连接到设备
|
|
|
chatService.connect(bluetoothAdapter.getRemoteDevice(address));
|
|
|
+ // 初始化文本
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -167,19 +168,24 @@ public class BasicDeviceActivity extends AppCompatActivity {
|
|
|
startActivityForResult(new Intent(BasicDeviceActivity.this, ScanDeviceActivity.class), 0);
|
|
|
break;
|
|
|
case R.id.opUp:
|
|
|
- sendDataToDevice("UD\r\nUU\r\n", false);
|
|
|
+ sendDataToDevice("UD\r\n", false);
|
|
|
+ sendDataToDevice("UU\r\n", false);
|
|
|
break;
|
|
|
case R.id.opLeft:
|
|
|
- sendDataToDevice("LD\r\nLU\r\n", false);
|
|
|
+ sendDataToDevice("LD\r\n", false);
|
|
|
+ sendDataToDevice("LU\r\n", false);
|
|
|
break;
|
|
|
case R.id.opCenter:
|
|
|
- sendDataToDevice("SD\r\nSU\r\n", false);
|
|
|
+ sendDataToDevice("SD\r\n", false);
|
|
|
+ sendDataToDevice("SU\r\n", false);
|
|
|
break;
|
|
|
case R.id.opRight:
|
|
|
- sendDataToDevice("RD\r\nRU\r\n", false);
|
|
|
+ sendDataToDevice("RD\r\n", false);
|
|
|
+ sendDataToDevice("RU\r\n", false);
|
|
|
break;
|
|
|
case R.id.opDown:
|
|
|
- sendDataToDevice("DD\r\nDU\n", false);
|
|
|
+ sendDataToDevice("DD\r\n", false);
|
|
|
+ sendDataToDevice("DU\r\n", false);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -255,7 +261,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
if (null != readMessage) {
|
|
|
- System.err.println("/" + readMessage);
|
|
|
+ System.err.println("===" + readMessage);
|
|
|
Pattern p = Pattern.compile("\\{.*?\\}");
|
|
|
Matcher m = p.matcher(readMessage);
|
|
|
// 判断正则表达式是否匹配到
|