Skip to content

Commit 49cb646

Browse files
thenixanthenixan
authored
Merge pull request #12 from rMozg/devices
поддержка клиентской стороны сервиса оборудования с кастомными исключениями
2 parents 9745f11 + f42aaa5 commit 49cb646

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1364
-3
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion 22
99
targetSdkVersion 25
10-
versionCode 1
11-
versionName "1.0"
10+
versionCode 2
11+
versionName "0.1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
@@ -20,7 +20,6 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
2423
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
2524
}
2625
repositories {

‎app/src/main/aidl/ru/evotor/devices/commons/IPrinterService.aidl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package ru.evotor.devices.commons;
2+
3+
import android.graphics.Bitmap;
4+
5+
import ru.evotor.devices.commons.printer.PrinterDocument;
6+
import ru.evotor.devices.commons.result.ResultInt;
7+
import ru.evotor.devices.commons.result.ResultVoid;
8+
9+
interface IPrinterService {
10+
11+
/**
12+
* Возвращает количество печатных символов, которые помещаются на 1 строке
13+
*
14+
* @param deviceId - номер устройства
15+
*/
16+
ResultInt getAllowableSymbolsLineLength(int deviceId);
17+
18+
/**
19+
* Возвращает доступную для печати ширину бумаги в пикселях
20+
*
21+
* @param deviceId - номер устройства
22+
*/
23+
ResultInt getAllowablePixelLineLength(int deviceId);
24+
25+
/**
26+
* Печатает указанный массив объектов (тест, штрихкоды, картинки)
27+
*
28+
* @param deviceId - номер устройства
29+
* @param printedObjects - объекты для печати
30+
*/
31+
ResultVoid printDocument(int deviceId, in PrinterDocument printerDocument);
32+
33+
}

‎app/src/main/aidl/ru/evotor/devices/commons/printer/PrinterDocument.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.printer;
2+
3+
parcelable PrinterDocument;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultBoolean.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultBoolean;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultDouble.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultDouble;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultInt.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultInt;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultIntArray.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultIntArray;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultLong.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultLong;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultString.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultString;

‎app/src/main/aidl/ru/evotor/devices/commons/result/ResultVoid.aidl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ru.evotor.devices.commons.result;
2+
3+
parcelable ResultVoid;

0 commit comments

Comments
 (0)