|
@@ -262,7 +262,7 @@ public class MainActivity extends BaseActivity {
|
|
|
connectLight.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View v) {
|
|
|
- toConnectLight();
|
|
|
+ toConnectLight(UserCache.getSerialName());
|
|
|
}
|
|
|
});
|
|
|
turnOnLight.setOnClickListener(new View.OnClickListener() {
|
|
@@ -321,6 +321,7 @@ public class MainActivity extends BaseActivity {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ Log.e("------->","-------->"+UserCache.getSerialName());
|
|
|
}
|
|
|
|
|
|
private AndroidInterface aIn;
|
|
@@ -417,9 +418,9 @@ public class MainActivity extends BaseActivity {
|
|
|
}
|
|
|
|
|
|
@JavascriptInterface
|
|
|
- public void connectLight() {
|
|
|
+ public void connectLight(String name) {
|
|
|
Log.e(TAG, "connectLight");
|
|
|
- toConnectLight();
|
|
|
+ toConnectLight(name);
|
|
|
}
|
|
|
|
|
|
@JavascriptInterface
|
|
@@ -1141,10 +1142,10 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
private SerialPortManager serialPortManager;
|
|
|
|
|
|
- private void toConnectLight(){
|
|
|
+ private void toConnectLight(String name){
|
|
|
if (serialPortManager == null){
|
|
|
serialPortManager = new SerialPortManager();
|
|
|
- serialPortManager.init(MainActivity.this, UserCache.getSerialName(), UserCache.getSerialRate(), new SerialPortManager.SerialCallBack() {
|
|
|
+ serialPortManager.init(MainActivity.this, name, UserCache.getSerialRate(), new SerialPortManager.SerialCallBack() {
|
|
|
@Override
|
|
|
public void dataCallBack(String data) {
|
|
|
Log.e("--------->","------->data="+data);
|