[工控机监控] 注释掉司机端服务和乘客端连接
This commit is contained in:
@@ -93,6 +93,6 @@ dependencies {
|
|||||||
// implementation project(':core:mogo-core-utils')
|
// implementation project(':core:mogo-core-utils')
|
||||||
implementation 'org.greenrobot:eventbus:3.2.0'
|
implementation 'org.greenrobot:eventbus:3.2.0'
|
||||||
implementation 'com.android.support:multidex:1.0.3'
|
implementation 'com.android.support:multidex:1.0.3'
|
||||||
implementation 'com.mogo.cloud:telematic:1.3.59'
|
// implementation 'com.mogo.cloud:telematic:1.3.59'//注释掉司机端 乘客端
|
||||||
implementation 'com.jcraft:jsch:0.1.55'
|
implementation 'com.jcraft:jsch:0.1.55'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
package com.zhidao.adas.client.ui;
|
package com.zhidao.adas.client.ui;
|
||||||
|
|
||||||
import static com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA;
|
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@@ -1084,6 +1082,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
|
|||||||
if (BuildConfig.IS_CLIENT) {
|
if (BuildConfig.IS_CLIENT) {
|
||||||
/*—————————————作为乘客端———————————*/
|
/*—————————————作为乘客端———————————*/
|
||||||
options = new AdasOptions.Builder().setClient(true).build();
|
options = new AdasOptions.Builder().setClient(true).build();
|
||||||
|
/*乘客端启动 注释掉
|
||||||
NSDNettyManager.getInstance().searchAndConnectServer(this, "1234", new NettyClientListener<MogoProtocolMsg>() {
|
NSDNettyManager.getInstance().searchAndConnectServer(this, "1234", new NettyClientListener<MogoProtocolMsg>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -1103,7 +1102,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
|
|||||||
getHandler().sendEmptyMessage(WHAT_DRIVER_IP);
|
getHandler().sendEmptyMessage(WHAT_DRIVER_IP);
|
||||||
onUpdateConnectStateView();
|
onUpdateConnectStateView();
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
} else {
|
} else {
|
||||||
/*—————————————作为司机端———————————*/
|
/*—————————————作为司机端———————————*/
|
||||||
int mode = Constants.getIpcConnectionMode(this);
|
int mode = Constants.getIpcConnectionMode(this);
|
||||||
@@ -1126,6 +1125,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*司机端启动 注释掉
|
||||||
NSDNettyManager.getInstance().startNSDNettyServerWithSN(this, new NettyServerListener<MogoProtocolMsg>() {
|
NSDNettyManager.getInstance().startNSDNettyServerWithSN(this, new NettyServerListener<MogoProtocolMsg>() {
|
||||||
@Override
|
@Override
|
||||||
public void onMessageResponseServer(MogoProtocolMsg msg, Channel channel) {
|
public void onMessageResponseServer(MogoProtocolMsg msg, Channel channel) {
|
||||||
@@ -1152,10 +1152,11 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
|
|||||||
public void onChannelDisConnect(Channel channel) {
|
public void onChannelDisConnect(Channel channel) {
|
||||||
Log.i(TAG, "onChannelDisConnect channel=" + channel.id());
|
Log.i(TAG, "onChannelDisConnect channel=" + channel.id());
|
||||||
}
|
}
|
||||||
}, "1234567");
|
}, "1234567");*/
|
||||||
}
|
}
|
||||||
AdasManager.getInstance().create(options, this);
|
AdasManager.getInstance().create(options, this);
|
||||||
AdasManager.getInstance().setOnAdasListener(this);
|
AdasManager.getInstance().setOnAdasListener(this);
|
||||||
|
/*两端数据转发 注释掉
|
||||||
AdasManager.getInstance().setOnMultiDeviceListener(new OnMultiDeviceListener() {
|
AdasManager.getInstance().setOnMultiDeviceListener(new OnMultiDeviceListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onForwardingDriverIPCMessage(byte[] bytes) {
|
public void onForwardingDriverIPCMessage(byte[] bytes) {
|
||||||
@@ -1173,7 +1174,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
|
|||||||
.sendMogoProtocolMsgToServer(new MogoProtocolMsg(NORMAL_DATA, bytes.length, bytes), null);
|
.sendMogoProtocolMsgToServer(new MogoProtocolMsg(NORMAL_DATA, bytes.length, bytes), null);
|
||||||
Log.i(TAG, "乘客屏发送数据=" + ByteUtil.byteArrToHex(bytes));
|
Log.i(TAG, "乘客屏发送数据=" + ByteUtil.byteArrToHex(bytes));
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user