Commit fb632659 authored by UIUANG\Zsc's avatar UIUANG\Zsc

qqqqq

parent 8d26c554
......@@ -33,23 +33,26 @@ public class SocketHandler implements Runnable{
int read;
while(-1 != (read = is.read(bytes))) {
if (is.available() == 0) {
String hexString = bytesToHexString(bytes);
// String hexString = bytesToHexString(bytes);
DataPackWrapper parse = instance.parse(bytes, read);
String hexString = bytesToHexString(parse.getInBuffer().array());
instance.setOut(parse);
OutputStream outputStream = null;
try {
outputStream = this.socket.getOutputStream();
String hexString1 = bytesToHexString(parse.getOutBytes());
Log.e("bytes out ", hexString1);
outputStream.write(parse.getOutBytes());
} catch (IOException var17) {
var17.printStackTrace();
}
outputStream.flush();
// List<DataBean> beanList = parse.getBeanList();
List<DataBean> beanList = parse.getBeanList();
// CommandHeader inHeader = parse.getInHeader();
// Log.d("inHeader", inHeader.toString());
// this.listener.pluList(beanList);
this.listener.pluList(beanList);
}
}
} catch (IOException var18) {
......
......@@ -101,6 +101,7 @@ public class DataPackUtils {
inBuffer.put(b2).put(b);
}
order.put((byte) 102).put(dataPackWrapper.getInBuffer().array());
dataPackWrapper.setOutBytes(order.array());
return;
}
......
......@@ -39,7 +39,6 @@ dependencies {
implementation project(path: ':Transfer')
implementation files('libs\\wintecscales.jar')
implementation project(path: ':DigiTransfer')
implementation files('libs/DigiTransfer_v1.0.3_sdk.jar')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
......
......@@ -6,6 +6,7 @@ import android.util.Log;
import androidx.appcompat.app.AppCompatActivity;
import com.wmdigit.digitransfer.DigiScaleTransfer;
import com.wmdigit.transfer.ScaleTransfer;
import java.net.ServerSocket;
......@@ -18,14 +19,14 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
try {
DigiScaleTransfer.getInstance(new ScalesHandler()).init();
} catch (Exception e) {
e.printStackTrace();
Log.i("ATG", e.getLocalizedMessage());
}
// try {
// DigiScaleTransfer.getInstance(new ScalesHandler()).init();
// } catch (Exception e) {
// e.printStackTrace();
// Log.i("ATG", e.getLocalizedMessage());
// }
// startSocket(2141);
// ScaleTransfer.getInstance().startLoadPluData(new ScaleTransfer2(), 3001);
ScaleTransfer.getInstance().startLoadPluData(new ScaleTransfer2(), 3001);
// ScaleTransfer.getInstance().startLoadPluData(new ScaleTransfer2(), 2033);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment