Commit 393af7a8 authored by UIUANG\Zsc's avatar UIUANG\Zsc

修改传称

parent 3956d706
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 31
versionCode 1
versionName "1.0.0"
versionCode 4
versionName "1.0.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
......@@ -27,7 +27,7 @@ android {
}
android.libraryVariants.all { variant ->
variant.outputs.all {
outputFileName = "${project.name}_v" + android.defaultConfig.versionName + '_sdk.aar'
outputFileName = "${project.name}_v" + android.defaultConfig.versionName + '_sdk.jar'
}
}
}
......@@ -42,8 +42,9 @@ dependencies {
}
task makeJar(type: Copy) {
def outAar = "${project.name}_v" + android.defaultConfig.versionName + "_sdk.jar"
//删除存在的
delete 'build/libs/myjar.jar'
delete 'build/libs/'+outAar
//设置拷贝的文件
from('build/intermediates/aar_main_jar/release/')
//打进jar包后的文件目录
......@@ -53,7 +54,7 @@ task makeJar(type: Copy) {
//(我们只关心classes.jar这个文件)
include('classes.jar')
//重命名
rename ('classes.jar', 'myjar.jar')
rename ('classes.jar', outAar)
}
makeJar.dependsOn(build)
\ No newline at end of file
......@@ -5,6 +5,7 @@ import android.util.Log;
import com.wmdigit.digitransfer.exception.ErrCode;
import com.wmdigit.digitransfer.exception.ScalesApiException;
import com.wmdigit.digitransfer.handler.ObjectHandler;
import com.wmdigit.digitransfer.handler.Printer;
import com.wmdigit.digitransfer.util.NetWorkUtils;
import java.io.IOException;
......@@ -16,26 +17,28 @@ public class DigiScaleTransfer {
private static DigiScaleTransfer instance;
private int addressFour;
private ObjectHandler scalesApiHandler;
private Printer printer;
private final String TAG = DigiScaleTransfer.this.getClass().getSimpleName();
private ServerSocket serverSocket;
public static DigiScaleTransfer getInstance(ObjectHandler scalesApiHandler) {
public static DigiScaleTransfer getInstance(ObjectHandler scalesApiHandler, Printer printer) {
if (instance == null) {
instance = new DigiScaleTransfer(scalesApiHandler);
instance = new DigiScaleTransfer(scalesApiHandler,printer);
}
return instance;
}
private DigiScaleTransfer(ObjectHandler scalesApiHandler) {
private DigiScaleTransfer(ObjectHandler scalesApiHandler, Printer printer) {
this.scalesApiHandler = scalesApiHandler;
this.printer = printer;
String hostAddress = null;
hostAddress = NetWorkUtils.getLocalIp();
int of = hostAddress.lastIndexOf(".");
String addressFourStr = hostAddress.substring(of + 1);
addressFour = Integer.parseInt(addressFourStr);
Log.i("AT", hostAddress);
printer.d("ip地址:" + hostAddress);
}
......@@ -55,8 +58,8 @@ public class DigiScaleTransfer {
try {
socket =serverSocket.accept();
int localPort = serverSocket.getLocalPort();
Log.i("port", "端口号" + localPort);
scalesApiHandler.setSocket(socket, addressFour);
printer.i("端口号" + localPort);
scalesApiHandler.setSocket(socket, addressFour,printer);
ThreadCacheManager.getExecutorService().execute(scalesApiHandler);
// Thread thread = new Thread(this.scalesApiHandler);
// thread.start();
......
......@@ -10,6 +10,6 @@ public interface ObjectHandler extends Runnable{
void downPlu(Commodity commodity);
void setSocket(Socket socket,int addressFour);
void setSocket(Socket socket,int addressFour, Printer printer);
}
package com.wmdigit.digitransfer.handler;
public interface Printer {
void i(String msg);
void v(String msg);
void d(String msg);
void w(String msg);
void e(String msg);
// void v(String format, Object... args)
}
......@@ -39,6 +39,7 @@ 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.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
......
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