|
@@ -445,6 +445,21 @@ public class MainActivity extends BaseActivity {
|
|
Log.e(TAG, "getPort");
|
|
Log.e(TAG, "getPort");
|
|
mWebView.loadUrl("javascript:getPort('" + UserCache.getSerialPortName() + "')");
|
|
mWebView.loadUrl("javascript:getPort('" + UserCache.getSerialPortName() + "')");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @JavascriptInterface
|
|
|
|
+ public void connectPort(String name) {
|
|
|
|
+ Log.e(TAG, "connectPort");
|
|
|
|
+ toConnectPort(name);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @JavascriptInterface
|
|
|
|
+ public void disConnectPort() {
|
|
|
|
+ Log.e(TAG, "disConnectPort");
|
|
|
|
+ if (serialPortManager2!=null){
|
|
|
|
+ serialPortManager2.close();
|
|
|
|
+ serialPortManager2 = null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
private void toCloseCamera() {
|
|
private void toCloseCamera() {
|
|
@@ -1183,6 +1198,43 @@ public class MainActivity extends BaseActivity {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private SerialPortManager serialPortManager2;
|
|
|
|
+
|
|
|
|
+ private void toConnectPort(String name){
|
|
|
|
+ if (serialPortManager2 == null){
|
|
|
|
+ serialPortManager2 = new SerialPortManager();
|
|
|
|
+ serialPortManager2.init(MainActivity.this, name, UserCache.getSerialRate(), new SerialPortManager.SerialCallBack() {
|
|
|
|
+ @Override
|
|
|
|
+ public void dataCallBack(String data) {
|
|
|
|
+ Log.e("--------->","------->data="+data);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void openCallBack(int code) {
|
|
|
|
+ Log.e("--------->","------->toConnectPort code="+code);
|
|
|
|
+ runOnUiThread(new Runnable() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ mWebView.loadUrl("javascript:responsePortCode('"+code+"')");
|
|
|
|
+ if (code == 1){
|
|
|
|
+
|
|
|
|
+ }else {
|
|
|
|
+ Toast.makeText(MainActivity.this, "串口未打开", Toast.LENGTH_SHORT).show();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void closeCallBack(int code) {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }else {
|
|
|
|
+ serialPortManager2.open();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
protected void onDestroy() {
|
|
protected void onDestroy() {
|
|
super.onDestroy();
|
|
super.onDestroy();
|