|
@@ -1207,11 +1207,7 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
private List<SerialPortManager> mPortList = new ArrayList<>();
|
|
|
private void toConnectPort(String name){
|
|
|
- for (SerialPortManager port:mPortList) {
|
|
|
- if (port.serialHelper.getPort().equals(name)){
|
|
|
- port.open();
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (mPortList.size()==0){
|
|
|
SerialPortManager serialPortManager = new SerialPortManager();
|
|
|
serialPortManager.init(MainActivity.this, name, 9600, new SerialPortManager.SerialCallBack() {
|
|
|
@Override
|
|
@@ -1241,7 +1237,43 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
}
|
|
|
});
|
|
|
+ }else {
|
|
|
+ for (SerialPortManager port:mPortList) {
|
|
|
+ if (port.serialHelper.getPort().equals(name)){
|
|
|
+ port.open();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ SerialPortManager serialPortManager = new SerialPortManager();
|
|
|
+ serialPortManager.init(MainActivity.this, name, 9600, new SerialPortManager.SerialCallBack() {
|
|
|
+ @Override
|
|
|
+ public void dataCallBack(String data) {
|
|
|
+ Log.e("--------->","------->data1="+data);
|
|
|
+ mWebView.loadUrl("javascript:responsePortData('"+data+"')");
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void openCallBack(int code) {
|
|
|
+ Log.e("--------->","------->toConnectPort code="+code);
|
|
|
+ runOnUiThread(new Runnable() {
|
|
|
+ @Override
|
|
|
+ public void run() {
|
|
|
+ mWebView.loadUrl("javascript:responsePortCode('"+name+","+code+"')");
|
|
|
+ if (code == 1){
|
|
|
+ mPortList.add(serialPortManager);
|
|
|
+ }else {
|
|
|
+ Toast.makeText(MainActivity.this, "串口未打开", Toast.LENGTH_SHORT).show();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void closeCallBack(int code) {
|
|
|
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|