Skip to content

Commit 3fd3e47

Browse files
ouyangwanliouyangwanli
committed
fix:update Printer SDK version to 1.7.5
1 parent 810c45b commit 3fd3e47

11 files changed

Lines changed: 125 additions & 118 deletions

File tree

‎flutter_printer_qpos/CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@
1919

2020
## 0.0.7
2121

22-
* add the optional parameter isConvert to api addBitmap
22+
* add the optional parameter isConvert to api addBitmap
23+
24+
## 0.0.8
25+
26+
* update SDK version to 1.7.5

‎flutter_printer_qpos/android/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ android {
3636
}
3737

3838
dependencies {
39-
//implementation 'com.dspread.print:dspread_print_sdk:1.2.5'
40-
implementation 'com.dspread.print:dspread_print_sdk:1.4.0-beta'
39+
implementation 'com.dspread.print:dspread_print_sdk:1.7.5-beta'
4140
implementation "com.android.support:appcompat-v7:28.0.0"
4241
implementation 'androidx.core:core:1.1.0'
4342
implementation files('libs/fastjson-1.2.62.jar')

‎flutter_printer_qpos/android/src/main/java/com/dspread/flutter_printer_qpos/FlutterPrinterQposPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
119119
String text = call.argument("text");
120120
PosPrinterPluginHandler.printText(text);
121121
} else if (call.method.equals("printBarCode")) {
122-
TRACE.d("printBarCode");
123122
String symbology = call.argument("symbology");
124123
int width = Integer.parseInt(call.argument("width"));
125124
int height = Integer.parseInt(call.argument("height"));
@@ -173,7 +172,8 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
173172
PosPrinterPluginHandler.addBitmap(bitmap);
174173
}
175174
} else if (call.method.equals("setFooter")) {
176-
int height = Integer.parseInt(call.argument("height"));
175+
// int height = Integer.parseInt(call.argument("height"));
176+
int height = call.argument("height");
177177
PosPrinterPluginHandler.setFooter(height);
178178
}else if (call.method.equals("addQRCode")){
179179
int size = Integer.parseInt(call.argument("size"));

‎flutter_printer_qpos/android/src/main/java/com/dspread/flutter_printer_qpos/PosPrinterPluginHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ public static void printQRCode(String errorLevel, int width, String content, Str
140140

141141
public static void printBitmap(Bitmap bitmap) {
142142
try {
143-
PrinterLayout printerLayout = new PrinterLayout(mContext);
143+
/* PrinterLayout printerLayout = new PrinterLayout(mContext);
144144
BitmapPrintLine bitmapPrintLine = new BitmapPrintLine(bitmap, PrintLine.CENTER, true);
145145
printerLayout.addBitmap(bitmapPrintLine);
146-
Bitmap bitmap1 = printerLayout.viewToBitmap();
147-
mPrinter.printBitmap(mContext, bitmap1);
146+
Bitmap bitmap1 = printerLayout.viewToBitmap();*/
147+
mPrinter.printBitmap(mContext, bitmap);
148148
} catch (Exception e) {
149149
e.printStackTrace();
150150
}
@@ -200,13 +200,12 @@ public static void addBitmap(Bitmap bitmap) {
200200
public static void addBitmap(Bitmap bitmap, boolean isConvert) {
201201
try {
202202
TRACE.d("handler addBitmap:isConvert:"+isConvert);
203-
204203
// Bitmap bitmapSmall = setImgSize(bitmap,10);
205204
PrinterLayout printerLayout = new PrinterLayout(mContext);
206205
BitmapPrintLine bitmapPrintLine = new BitmapPrintLine(bitmap, PrintLine.CENTER, isConvert);
207206
printerLayout.addBitmap(bitmapPrintLine);
208207
Bitmap bitmap1 = printerLayout.viewToBitmap();
209-
mPrinter.addBitmap(bitmap1);
208+
mPrinter.addBitmap(bitmap);
210209
} catch (Exception e) {
211210
e.printStackTrace();
212211
}
@@ -215,6 +214,7 @@ public static void addBitmap(Bitmap bitmap, boolean isConvert) {
215214

216215
public static void setFooter(int height) {
217216
try {
217+
TRACE.d("setFooter height--:"+height);
218218
mPrinter.setFooter(height);
219219
} catch (Exception e) {
220220
e.printStackTrace();

‎flutter_printer_qpos/example/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
defaultConfig {
3131
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3232
applicationId "com.dspread.flutter_printer_qpos_example"
33-
minSdkVersion 19
33+
minSdkVersion 24
3434
targetSdkVersion flutter.targetSdkVersion
3535
versionCode flutterVersionCode.toInteger()
3636
versionName flutterVersionName

‎flutter_printer_qpos/example/lib/pages/PrintItemsPage.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,29 @@ class _PrintState extends State<PrintItemsPage> {
132132
_flutterPrinterQpos.setFontSize(16);
133133
_flutterPrinterQpos.setFontStyle(FontStyle.BOLD.name);
134134
_flutterPrinterQpos.setPrintStyle();
135+
_flutterPrinterQpos.setFooter(100);
135136
_flutterPrinterQpos.printText("12312312345678");
136137
}
137138

138139
void printBarcode() {
140+
_flutterPrinterQpos.setFooter(200);
139141
_flutterPrinterQpos.printBarCode(Symbology.CODE_128.name, "400", "100",
140142
"test123", PrintLine.CENTER.name);
143+
141144
}
142145

143146
void printQRcode() {
147+
_flutterPrinterQpos.setFooter(100);
144148
_flutterPrinterQpos.printQRCode(
145149
ErrorLevel.L.name, "300", "test123", PrintLine.CENTER.name);
150+
146151
}
147152

148153
Future<void> printPicture() async {
149154
// final ByteData bytes = await rootBundle.load('assets/images/1/image.jpg');
150155
final ByteData bytes = await rootBundle.load('configs/test_store.jpg');
151156
final bitmip = bytes.buffer.asUint8List(0);
157+
_flutterPrinterQpos.setFooter(100);
152158
_flutterPrinterQpos.printBitmap(bitmip);
153159
}
154160

‎flutter_printer_qpos/example/pubspec.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ packages:
7474
dependency: "direct main"
7575
description:
7676
name: flutter_printer_qpos
77-
sha256: c9d5831f75165274abc64e18ddb163d16bd3ed99c248e4c958ae75bdd492ee74
77+
sha256: "8525e3cb1116623a7f2f8a16b1ea1264fc1e80938a1de9fadc9e126fb70b42fd"
7878
url: "https://pub.flutter-io.cn"
7979
source: hosted
80-
version: "0.0.7"
80+
version: "0.0.8"
8181
flutter_test:
8282
dependency: "direct dev"
8383
description: flutter

‎flutter_printer_qpos/example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ environment:
1515
# the latest version available on pub.dev. To see which dependencies have newer
1616
# versions available, run `flutter pub outdated`.
1717
dependencies:
18-
flutter_printer_qpos: ^0.0.7
18+
flutter_printer_qpos: ^0.0.8
1919
# flutter_printer_qpos:
2020
# path: ../
2121
flutter:

‎flutter_printer_qpos/lib/flutter_printer_qpos.dart‎

Lines changed: 33 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,26 @@ import 'package:meta/meta.dart' show visibleForTesting;
88

99
import 'package:flutter_printer_qpos/QPOSPrintModel.dart';
1010

11-
enum PrintLine {
12-
LEFT,
13-
CENTER,
14-
RIGHT
15-
}
16-
17-
enum FontStyle {
18-
NORMAL,
19-
BOLD,
20-
ITALIC,
21-
BOLD_ITALIC
22-
}
23-
24-
enum Symbology {
25-
CODE_128,
26-
CODABAR,
27-
CODE_39,
28-
EAN_8,
29-
EAN_13,
30-
UPC_A,
31-
UPC_E
32-
}
11+
enum PrintLine { LEFT, CENTER, RIGHT }
3312

34-
enum ErrorLevel {
35-
L,
36-
M,
37-
Q,
38-
H
39-
}
13+
enum FontStyle { NORMAL, BOLD, ITALIC, BOLD_ITALIC }
4014

15+
enum Symbology { CODE_128, CODABAR, CODE_39, EAN_8, EAN_13, UPC_A, UPC_E }
4116

17+
enum ErrorLevel { L, M, Q, H }
4218

43-
enum Barcode2D {
44-
QR_CODE
45-
}
19+
enum Barcode2D { QR_CODE }
4620

47-
48-
enum Barcode1D {
49-
CODE_128,
50-
CODABAR
51-
}
21+
enum Barcode1D { CODE_128, CODABAR }
5222

5323
class FlutterPrinterQpos {
54-
55-
factory FlutterPrinterQpos(){
24+
factory FlutterPrinterQpos() {
5625
if (_instance == null) {
57-
final MethodChannel methodChannel = const MethodChannel(
58-
'flutter_printer_qpos');
26+
final MethodChannel methodChannel =
27+
const MethodChannel('flutter_printer_qpos');
5928

60-
final EventChannel eventChannel = const EventChannel(
61-
'flutter_printer_qpos_event');
29+
final EventChannel eventChannel =
30+
const EventChannel('flutter_printer_qpos_event');
6231

6332
_instance = FlutterPrinterQpos.private(methodChannel, eventChannel);
6433
}
@@ -152,19 +121,33 @@ class FlutterPrinterQpos {
152121
params['height'] = height;
153122
params['content'] = content;
154123
params['position'] = position;
155-
print('dart:printBarCode' + symbology + " " + width + " " + height + " " +
156-
content + " " + position);
124+
print('dart:printBarCode' +
125+
symbology +
126+
" " +
127+
width +
128+
" " +
129+
height +
130+
" " +
131+
content +
132+
" " +
133+
position);
157134
_methodChannel.invokeMethod('printBarCode', params);
158135
}
159136

160-
void printQRCode(String errorLevel, String width, String content,
161-
String position) {
137+
void printQRCode(
138+
String errorLevel, String width, String content, String position) {
162139
Map<String, String> params = Map<String, String>();
163140
params['errorLevel'] = errorLevel;
164141
params['width'] = width;
165142
params['content'] = content;
166143
params['position'] = position;
167-
print('dart:printQRCode' + errorLevel + " " + width + " " + content + " " +
144+
print('dart:printQRCode' +
145+
errorLevel +
146+
" " +
147+
width +
148+
" " +
149+
content +
150+
" " +
168151
position);
169152
_methodChannel.invokeMethod('printQRCode', params);
170153
}
@@ -176,15 +159,13 @@ class FlutterPrinterQpos {
176159
_methodChannel.invokeMethod('printBitmap', params);
177160
}
178161

179-
180162
void addtext(String text) {
181163
Map<String, String> params = Map<String, String>();
182164
params['text'] = text;
183165
print('dart:addtext' + text.toString());
184166
_methodChannel.invokeMethod('addText', params);
185167
}
186168

187-
188169
void addTexts(String text1, String text2, String row1, String row2,
189170
String position1, String position2) {
190171
Map<String, String> params = Map<String, String>();
@@ -198,7 +179,6 @@ class FlutterPrinterQpos {
198179
_methodChannel.invokeMethod('addTexts', params);
199180
}
200181

201-
202182
// void addBitmap(Uint8List bitmap) {
203183
// Map<String, Uint8List> params = Map<String, Uint8List>();
204184
// params['bitmap'] = bitmap;
@@ -215,7 +195,7 @@ class FlutterPrinterQpos {
215195
_methodChannel.invokeMethod('addBitmap', params);
216196
}
217197

218-
void addQRCode(String size, String qrName, String context, String position){
198+
void addQRCode(String size, String qrName, String context, String position) {
219199
Map<String, String> params = Map<String, String>();
220200
params['size'] = size;
221201
params['qrName'] = qrName;
@@ -225,8 +205,8 @@ class FlutterPrinterQpos {
225205
_methodChannel.invokeMethod('addQRCode', params);
226206
}
227207

228-
229-
void addBarCode(String BarName, String width, String height,String context, String position){
208+
void addBarCode(String BarName, String width, String height, String context,
209+
String position) {
230210
Map<String, String> params = Map<String, String>();
231211
params['BarName'] = BarName;
232212
params['width'] = width;
@@ -237,7 +217,6 @@ class FlutterPrinterQpos {
237217
_methodChannel.invokeMethod('addBarCode', params);
238218
}
239219

240-
241220
void printReceipt() {
242221
_methodChannel.invokeMethod('print');
243222
}
@@ -269,5 +248,4 @@ class FlutterPrinterQpos {
269248
void releaseSound() {
270249
_methodChannel.invokeMethod('releaseSound');
271250
}
272-
273251
}

0 commit comments

Comments
 (0)