merge
This commit is contained in:
@@ -2,8 +2,8 @@ package com.mogo.telematic;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.nsd.NsdServiceInfo;
|
||||
import android.util.Log;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.telematic.client.NettyTcpClient;
|
||||
import com.mogo.telematic.client.NsdClient;
|
||||
import com.mogo.telematic.client.listener.MessageStateListener;
|
||||
@@ -43,7 +43,7 @@ public class NSDNettyManager {
|
||||
return sInstance;
|
||||
}
|
||||
|
||||
private NettyServerListener mDefaultServerListener = new NettyServerListener() {
|
||||
private final NettyServerListener mDefaultServerListener = new NettyServerListener() {
|
||||
|
||||
@Override
|
||||
public void onMessageResponseServer(Object msg, Channel channel) {
|
||||
@@ -129,7 +129,7 @@ public class NSDNettyManager {
|
||||
/**
|
||||
* 服务器端注册一个可供NSD探测到的网络 Ip 地址,便于给展示叫号机连接此socket
|
||||
*/
|
||||
private Runnable mNsdServerRunnable = new Runnable() {
|
||||
private final Runnable mNsdServerRunnable = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (mNsdServer == null) {
|
||||
@@ -140,7 +140,7 @@ public class NSDNettyManager {
|
||||
mNsdServer.setRegisterState(new NSDServer.IRegisterState() {
|
||||
@Override
|
||||
public void onServiceRegistered(NsdServiceInfo serviceInfo) {
|
||||
Log.i(TAG, "已注册服务onServiceRegistered: " + serviceInfo.toString());
|
||||
Logger.i(TAG, "已注册服务onServiceRegistered: " + serviceInfo.toString());
|
||||
//已经注册可停止该服务
|
||||
// nsdServer.stopNSDServer();
|
||||
}
|
||||
@@ -188,7 +188,7 @@ public class NSDNettyManager {
|
||||
public void onServerFound(NsdServiceInfo info, int port) {
|
||||
if (info != null) {
|
||||
String hostAddress = info.getHost().getHostAddress();
|
||||
Log.d(TAG, "NSD查询到指定服务器信息ip为:" + hostAddress + ",port为:" + port);
|
||||
Logger.d(TAG, "NSD查询到指定服务器信息ip为:" + hostAddress + ",port为:" + port);
|
||||
//获取到指定的地址,进行Netty的连接
|
||||
connectNettyServer(hostAddress, port, uuid, listener);
|
||||
|
||||
@@ -209,9 +209,9 @@ public class NSDNettyManager {
|
||||
}
|
||||
|
||||
private void connectNettyServer(String serverAddress, int port, String sign, NettyClientListener listener) {
|
||||
Log.d(TAG, "connectNettyServer");
|
||||
Logger.d(TAG, "connectNettyServer");
|
||||
if (serverAddress == null || serverAddress.length() == 0) {
|
||||
Log.e(TAG, "Netty Server的ip不能为空!");
|
||||
Logger.e(TAG, "Netty Server的ip不能为空!");
|
||||
return;
|
||||
}
|
||||
if (mNettyTcpClient == null) {
|
||||
|
||||
Reference in New Issue
Block a user