Skip to content

Commit 440662c

Browse files
committed
update version V2.0.0.18 修改点如下:
1.更新版本号V2.0.0.18 2.添加getSDKVersionName接口 3.添加getPrinterTestData接口,供设备管家虚拟蓝牙打印获取测试数据
1 parent 7bdd910 commit 440662c

3 files changed

Lines changed: 86 additions & 8 deletions

File tree

IminPrinterLibrary/build.gradle

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,35 @@ plugins {
33
id 'maven-publish'
44
}
55

6+
/**
7+
* 接口版本号
8+
*/
9+
ext{
10+
// versionCode = 'V2.0.0.17'
11+
versionCodeString = 'V2.0.0.18'
12+
versionCodeNumber = 18 // 确保这个属性存在
13+
}
14+
15+
616
android {
717
compileSdk 33
818

919
defaultConfig {
1020
minSdk 21
1121
targetSdk 33
1222

23+
// 使用根项目中的版本信息
24+
versionCode project.ext.versionCodeNumber
25+
versionName project.ext.versionCodeString
26+
27+
// 将版本字符串添加到 BuildConfig
28+
buildConfigField "String", "VERSION_CODE", "\"${project.ext.versionCodeNumber}\""
29+
// 将版本字符串添加到 BuildConfig
30+
buildConfigField "String", "VERSION_CODE_STRING", "\"${project.ext.versionCodeString}\""
31+
32+
// // 可选:将版本信息添加到资源文件
33+
// resValue "string", "version_code_string", project.ext.versionCodeString
34+
1335
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1436
consumerProguardFiles "consumer-rules.pro"
1537
}
@@ -28,6 +50,11 @@ android {
2850
lintOptions{
2951
disable'LongLogTag'
3052
}
53+
54+
buildFeatures {
55+
aidl true
56+
}
57+
namespace 'com.imin.printer'
3158
}
3259

3360
dependencies {
@@ -39,12 +66,7 @@ dependencies {
3966
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'*/
4067
}
4168

42-
/**
43-
* 接口版本号
44-
*/
45-
ext{
46-
versionCode = 'V2.0.0.17'
47-
}
69+
4870

4971
/**
5072
* @return formattedDate
@@ -60,7 +82,7 @@ def getBuildTime() {
6082
* @return buildName
6183
*/
6284
def getBuildName(boolean isRelease) {
63-
def buildName = "iMinPrinter_SDK2_" + ext.versionCode + "_" + getBuildTime()
85+
def buildName = "iMinPrinter_SDK2_" + ext.versionCodeString + "_" + getBuildTime()
6486
if(!isRelease) {
6587
buildName = buildName + "_debug"
6688
}
@@ -99,7 +121,7 @@ afterEvaluate {
99121
from components.release
100122
groupId = 'com.imin.printer'
101123
artifactId = 'library'
102-
version = 'V2.0.0.17'
124+
version = 'V2.0.0.18'
103125
}
104126
}
105127
}

IminPrinterLibrary/src/main/java/com/imin/printer/INeoPrinterService.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,10 @@ public static class Default implements com.imin.printer.INeoPrinterService
534534
{
535535
return null;
536536
}
537+
@Override public byte[] getPrinterTestData(int fd) throws android.os.RemoteException
538+
{
539+
return null;
540+
}
537541
@Override
538542
public android.os.IBinder asBinder() {
539543
return null;
@@ -2636,6 +2640,16 @@ public static com.imin.printer.INeoPrinterService asInterface(android.os.IBinder
26362640
reply.writeString(_result);
26372641
return true;
26382642
}
2643+
case TRANSACTION_getPrinterTestData:
2644+
{
2645+
data.enforceInterface(descriptor);
2646+
int _arg0;
2647+
_arg0 = data.readInt();
2648+
byte[] _result = this.getPrinterTestData(_arg0);
2649+
reply.writeNoException();
2650+
reply.writeByteArray(_result);
2651+
return true;
2652+
}
26392653
default:
26402654
{
26412655
return super.onTransact(code, data, reply, flags);
@@ -6173,6 +6187,27 @@ public java.lang.String getInterfaceDescriptor()
61736187
}
61746188
return _result;
61756189
}
6190+
@Override public byte[] getPrinterTestData(int fd) throws android.os.RemoteException
6191+
{
6192+
android.os.Parcel _data = android.os.Parcel.obtain();
6193+
android.os.Parcel _reply = android.os.Parcel.obtain();
6194+
byte[] _result;
6195+
try {
6196+
_data.writeInterfaceToken(DESCRIPTOR);
6197+
_data.writeInt(fd);
6198+
boolean _status = mRemote.transact(Stub.TRANSACTION_getPrinterTestData, _data, _reply, 0);
6199+
if (!_status && getDefaultImpl() != null) {
6200+
return getDefaultImpl().getPrinterTestData(fd);
6201+
}
6202+
_reply.readException();
6203+
_result = _reply.createByteArray();
6204+
}
6205+
finally {
6206+
_reply.recycle();
6207+
_data.recycle();
6208+
}
6209+
return _result;
6210+
}
61766211
public static com.imin.printer.INeoPrinterService sDefaultImpl;
61776212
}
61786213
static final int TRANSACTION_initPrinter = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
@@ -6340,6 +6375,7 @@ public java.lang.String getInterfaceDescriptor()
63406375
static final int TRANSACTION_getPrinterInfo = (android.os.IBinder.FIRST_CALL_TRANSACTION + 162);
63416376
static final int TRANSACTION_getPrinterInfoList = (android.os.IBinder.FIRST_CALL_TRANSACTION + 163);
63426377
static final int TRANSACTION_getPrinterInfoString = (android.os.IBinder.FIRST_CALL_TRANSACTION + 164);
6378+
static final int TRANSACTION_getPrinterTestData = (android.os.IBinder.FIRST_CALL_TRANSACTION + 165);
63436379
public static boolean setDefaultImpl(com.imin.printer.INeoPrinterService impl) {
63446380
// Only one user of this interface can use this function
63456381
// at a time. This is a heuristic to detect if two different
@@ -6522,4 +6558,5 @@ public static com.imin.printer.INeoPrinterService getDefaultImpl() {
65226558
public void getPrinterInfo(int fd, java.lang.String keyName, com.imin.printer.IPrinterCallback callback) throws android.os.RemoteException;
65236559
public java.util.List<java.lang.String> getPrinterInfoList(int fd, java.lang.String keyName) throws android.os.RemoteException;
65246560
public java.lang.String getPrinterInfoString(int fd, java.lang.String keyName) throws android.os.RemoteException;
6561+
public byte[] getPrinterTestData(int fd) throws android.os.RemoteException;
65256562
}

IminPrinterLibrary/src/main/java/com/imin/printer/PrinterHelper.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,4 +1577,23 @@ public String getPrinterInfoString(String keyName){
15771577
}
15781578
return null;
15791579
}
1580+
1581+
/**
1582+
* 3.45 获取开发包信息
1583+
* @return String
1584+
*/
1585+
public static String getSDKVersionName() {
1586+
return BuildConfig.VERSION_CODE_STRING;
1587+
}
1588+
1589+
public byte[] getPrinterTestData(){
1590+
if (iNeoPrinterService == null)return null;
1591+
try {
1592+
return iNeoPrinterService.getPrinterTestData(fd);
1593+
} catch (RemoteException e) {
1594+
e.printStackTrace();
1595+
}
1596+
return null;
1597+
}
1598+
15801599
}

0 commit comments

Comments
 (0)