From fe8ff166e285b3fdd117a5f75d288bc068bb92d3 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期四, 28 十一月 2019 17:09:43 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/com/socket/CommSockClientThread.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/CommSockClientThread.java b/platforms/android/app/src/main/java/com/socket/CommSockClientThread.java
index 32151ea..adbd033 100644
--- a/platforms/android/app/src/main/java/com/socket/CommSockClientThread.java
+++ b/platforms/android/app/src/main/java/com/socket/CommSockClientThread.java
@@ -44,6 +44,7 @@
private boolean thread_run_flag = true;
private Gson gson = new Gson();
private ServiceModel remodel = new ServiceModel();
+ byte[] rx_buf_t = new byte[1024];
private CommSockClientThread(){
this.concentratorState = new Concentrator_State();
@@ -150,17 +151,14 @@
InputStream in = this.socket.getInputStream();
OutputStream out = this.socket.getOutputStream();
//----------------- clear rx buff for tcp resend packet ----------------//
- byte[] rx_buf_t = new byte[1024];
+
//----------------------------------------------------------------------//
bytebuffer_for_socket_RX.order(ByteOrder.BIG_ENDIAN);
bytebuffer_for_socket_RX.clear();
//--------------------- socket write -----------------------------------//
//--------------------- socket write -----------------------------------//
- boolean aes_en = true;
byte[] plain_tx_t = datasource;
- byte[] cipher_tx_t = new byte[plain_tx_t.length];
- Date d1 = new Date();
//=====================================================================//
/*
for(int n=0; n<3; n++) {
@@ -217,11 +215,6 @@
bytebuffer_for_socket_RX.flip();
-// Date d2 = new Date();
-// long comm_tms = (d2.getTime() - d1.getTime());
-// if(comm_tms < 200) {
-// Thread.sleep(200 - comm_tms);
-// }
/*
System.out.println(this.getName()
+ " dev_id: " + m_StatAndParam.dev_id
--
Gitblit v1.9.1