From 18ad75b43754cd19adb37f39497485eebfc897a6 Mon Sep 17 00:00:00 2001
From: xinfengkun <xinfengkun@zhidaoauto.com>
Date: Thu, 7 Apr 2022 17:58:22 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=E7=A7=BB=E9=99=A4=E4=B9=98=E5=AE=A2?=
 =?UTF-8?q?=E7=AB=AFJson=E6=95=B0=E6=8D=AE=E8=BD=AC=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhidao/adas/client/ui/MainActivity.java   | 10 ++++---
 .../zhidao/support/adas/high/AdasChannel.java | 27 +------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
index b92f0896ea..fbfb7d61ae 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
@@ -273,8 +273,11 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
 
         }
         String ip = Constants.getIPCIp(this);
-        if (!TextUtils.isEmpty(ip))
+        if (!TextUtils.isEmpty(ip)) {
             etIp.setText(ip);
+            etIp.setSelection(ip.length());
+        }
+
 //        infoTitleList.add("录音测试");
         //初始化fragment
         manager = getSupportFragmentManager();
@@ -770,14 +773,13 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
             options = new AdasOptions.Builder().setClient(true).build();
             NSDNettyManager.getInstance().searchAndConnectServer(this, "1234", new NettyClientListener<MogoProtocolMsg>() {
 
-
                 @Override
-                public void onMessageResponseClient(MogoProtocolMsg msg, String sign) {
+                public void onMessageResponseClient(MogoProtocolMsg msg, String sign, Channel channel) {
                     AdasManager.getInstance().parseIPCData(msg.getBody());
                 }
 
                 @Override
-                public void onClientStatusConnectChanged(int statusCode, String sign) {
+                public void onClientStatusConnectChanged(int statusCode, String sign, Channel channel) {
                     if (statusCode == ConnectState.STATUS_CONNECT_SUCCESS) {
                         connectStatus = IPC_CONNECTION_STATUS.CONNECTED;
                     } else {
diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
index 764b6c91e5..289021db91 100644
--- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
+++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
@@ -301,14 +301,6 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         } catch (Exception e) {
             e.printStackTrace();
         }
-        // TODO 临时接续Json数据传递添加的Header 0x00表示PB数据   0x01表示Json数据
-        if (!adasOptions.isClient() && onMultiDeviceListener != null) {
-            byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
-            byte[] temp = new byte[bytes.length + 1];
-            System.arraycopy(bytes, 0, temp, 1, bytes.length);
-            temp[0] = 0x01;
-            onMultiDeviceListener.onForwardingIPCMessage(temp);
-        }
     }
 
     /**
@@ -321,19 +313,6 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         if (bytes == null || bytes.length == 0) {
             return;
         }
-        //TODO 临时将Json数据转发并解析 0x00表示PB数据   0x01表示Json数据
-        if (adasOptions.isClient()) {
-            byte header = bytes[0];
-            byte[] temp = new byte[bytes.length - 1];
-            System.arraycopy(bytes, 1, temp, 0, temp.length);
-            bytes = temp;
-            if (header != 0x00) {
-                //Json 解析
-                handlerWSMsg(new String(bytes, StandardCharsets.UTF_8));
-                return;
-            }
-        }
-        //PB解析
         ByteString byteString = ByteString.of(bytes);
         try {
             if (rawUnpack != null) {
@@ -417,11 +396,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
         byte[] bytes1 = bytes.toByteArray();
         parseIPCData(bytes1);
         if (!adasOptions.isClient() && onMultiDeviceListener != null) {
-            // TODO 临时接续Json数据传递添加的Header 0x00表示PB数据   0x01表示Json数据
-            byte[] temp = new byte[bytes1.length + 1];
-            System.arraycopy(bytes1, 0, temp, 1, bytes1.length);
-            temp[0] = 0x00;
-            onMultiDeviceListener.onForwardingIPCMessage(temp);
+            onMultiDeviceListener.onForwardingIPCMessage(bytes1);
         }
     }