Печать в чеке (#75)

thenixan · web-flow · commit 47e8cc789ee4 · 2017-07-19T11:37:34.000+03:00
* Update README.md (#74) * Extra print in receipt (#72) * немного кода для печати доп.полей в чеке * првильные преобразования печатных типов * javadoc + consts
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ allprojects {
 
 ```
 dependencies {
-compile 'com.github.evotor:integration-library:v0.3.+'
+compile 'com.github.evotor:integration-library:v0.4.+'
 }
 ```
 
diff --git a/app/src/main/java/ru/evotor/framework/Utils.java b/app/src/main/java/ru/evotor/framework/Utils.java
@@ -1,6 +1,8 @@
 package ru.evotor.framework;
 
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,4 +36,19 @@ public static <T, R> List<R> filterByClass(@NonNull List<T> source, @NonNull Cla
         }
         return list;
     }
+
+    @Nullable
+    public static <T> List<T> convertParcelables(@Nullable Parcelable[] parcelables, @NonNull Class<T> clazz) {
+        if (parcelables != null) {
+            List<T> exports = new ArrayList<>();
+            for (Parcelable parcelable : parcelables) {
+                if (clazz.isInstance(parcelable)) {
+                    exports.add((T) parcelable);
+                }
+            }
+            return exports;
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/app/src/main/java/ru/evotor/framework/core/action/datamapper/ChangesMapper.kt b/app/src/main/java/ru/evotor/framework/core/action/datamapper/ChangesMapper.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import ru.evotor.framework.core.action.event.receipt.changes.IChange
 import ru.evotor.framework.core.action.event.receipt.changes.UnknownChange
 import ru.evotor.framework.core.action.event.receipt.changes.position.*
+import ru.evotor.framework.core.action.event.receipt.changes.receipt.print_extra.SetPrintExtra
 import ru.evotor.framework.safeValueOf
 
 object ChangesMapper {
@@ -72,6 +73,7 @@ object ChangesMapper {
             IChange.Type.SET_EXTRA -> SetExtra.from(bundle)
             IChange.Type.SET_POSITION_PRINT_GROUP -> SetPrintGroup.from(bundle)
             IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP -> SetPrintGroup.from(bundle)
+            IChange.Type.SET_PRINT_EXTRA -> SetPrintExtra.from(bundle)
             null, IChange.Type.UNKNOWN -> UnknownChange.from(typeName, bundle)
         }
     }
diff --git a/app/src/main/java/ru/evotor/framework/core/action/datamapper/PrintExtraPlaceMapper.kt b/app/src/main/java/ru/evotor/framework/core/action/datamapper/PrintExtraPlaceMapper.kt
@@ -0,0 +1,35 @@
+package ru.evotor.framework.core.action.datamapper
+
+import android.os.Bundle
+import ru.evotor.framework.receipt.print_extras.*
+import ru.evotor.framework.safeValueOf
+
+object PrintExtraPlaceMapper {
+
+    private const val KEY_TYPE = "type"
+
+    fun toBundle(printExtraPlace: PrintExtraPlace): Bundle =
+            Bundle().let {
+                it.putString(KEY_TYPE, printExtraPlace.placeType.name)
+                when (printExtraPlace) {
+                    is PrintExtraPlacePrintGroupTop -> PrintExtraPlacePrintGroupTop.addToBundle(it, printExtraPlace)
+                    is PrintExtraPlacePrintGroupHeader -> PrintExtraPlacePrintGroupHeader.addToBundle(it, printExtraPlace)
+                    is PrintExtraPlacePrintGroupSummary -> PrintExtraPlacePrintGroupSummary.addToBundle(it, printExtraPlace)
+                    is PrintExtraPlacePositionFooter -> PrintExtraPlacePositionFooter.addToBundle(it, printExtraPlace)
+                    is PrintExtraPlacePositionAllSubpositionsFooter -> PrintExtraPlacePositionAllSubpositionsFooter.addToBundle(it, printExtraPlace)
+                }
+                it
+            }
+
+
+    fun fromBundle(bundle: Bundle): PrintExtraPlace? =
+            when (safeValueOf<PrintExtraPlaceType>(bundle.getString(KEY_TYPE))) {
+                PrintExtraPlaceType.PRINT_GROUP_TOP -> PrintExtraPlacePrintGroupTop.fromBundle(bundle)
+                PrintExtraPlaceType.PRINT_GROUP_HEADER -> PrintExtraPlacePrintGroupHeader.fromBundle(bundle)
+                PrintExtraPlaceType.PRINT_GROUP_SUMMARY -> PrintExtraPlacePrintGroupSummary.fromBundle(bundle)
+                PrintExtraPlaceType.POSITION_FOOTER -> PrintExtraPlacePositionFooter.fromBundle(bundle)
+                PrintExtraPlaceType.POSITION_ALL_SUBPOSITIONS_FOOTER -> PrintExtraPlacePositionAllSubpositionsFooter.fromBundle(bundle)
+                else -> null
+            }
+
+}
diff --git a/app/src/main/java/ru/evotor/framework/core/action/datamapper/PrintablesMapper.kt b/app/src/main/java/ru/evotor/framework/core/action/datamapper/PrintablesMapper.kt
@@ -0,0 +1,92 @@
+package ru.evotor.framework.core.action.datamapper
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.Bundle
+import android.os.Parcelable
+import ru.evotor.devices.commons.printer.printable.IPrintable
+import ru.evotor.devices.commons.printer.printable.PrintableBarcode
+import ru.evotor.devices.commons.printer.printable.PrintableImage
+import ru.evotor.devices.commons.printer.printable.PrintableText
+import ru.evotor.framework.safeValueOf
+import java.io.ByteArrayOutputStream
+
+
+object PrintablesMapper {
+
+    private const val KEY_PRINTABLE_TYPE = "printableType"
+    private const val KEY_PRINTABLE_ARRAY = "printablesArray"
+    private const val KEY_PRINTABL_TEXT = "printableText"
+    private const val KEY_PRINTABL_BARCODE_TYPE = "printableBarcodeType"
+    private const val KEY_PRINTABL_IMAGE = "printableImage"
+
+
+    fun toBundle(printables: Array<IPrintable>): Bundle =
+            Bundle().apply {
+                val printablesParcelable = arrayOfNulls<Parcelable>(printables.size)
+                printables.indices.forEach {
+                    printablesParcelable[it] = toBundle(printables.get(it))
+                }
+                putParcelableArray(KEY_PRINTABLE_ARRAY, printablesParcelable)
+            }
+
+    private fun toBundle(printable: IPrintable): Bundle =
+            Bundle().let {
+                when (printable) {
+                    is PrintableText -> {
+                        it.putString(KEY_PRINTABLE_TYPE, PrintableType.TEXT.name)
+                        it.putString(KEY_PRINTABL_TEXT, printable.text)
+                    }
+                    is PrintableBarcode -> {
+                        it.putString(KEY_PRINTABLE_TYPE, PrintableType.BARCODE.name)
+                        it.putString(KEY_PRINTABL_TEXT, printable.barcodeValue)
+                        it.putString(KEY_PRINTABL_BARCODE_TYPE, printable.barcodeType.name)
+                    }
+                    is PrintableImage -> {
+                        it.putString(KEY_PRINTABLE_TYPE, PrintableType.IMAGE.name)
+                        it.putByteArray(KEY_PRINTABL_IMAGE,
+                                ByteArrayOutputStream().let {
+                                    printable.bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
+                                    it.toByteArray()
+                                }
+                        )
+                    }
+                }
+                it
+            }
+
+    fun fromBundle(bundle: Bundle): Array<IPrintable>? =
+            arrayListOf<IPrintable>().let {
+                list ->
+                val bundleParcelables: Array<Parcelable> = bundle.getParcelableArray(KEY_PRINTABLE_ARRAY)
+                bundleParcelables.forEach {
+                    bundle ->
+                    if (bundle is Bundle) {
+                        singleFromBundle(bundle)?.let { list.add(it) }
+                    }
+                }
+                list.toTypedArray()
+            }
+
+    private fun singleFromBundle(bundle: Bundle): IPrintable? =
+            when (safeValueOf<PrintableType>(bundle.getString(KEY_PRINTABLE_TYPE), null)) {
+                PrintableType.TEXT -> PrintableText(
+                        bundle.getString(KEY_PRINTABL_TEXT)
+                )
+                PrintableType.BARCODE -> PrintableBarcode(
+                        bundle.getString(KEY_PRINTABL_TEXT),
+                        safeValueOf<PrintableBarcode.BarcodeType>(bundle.getString(KEY_PRINTABL_BARCODE_TYPE), PrintableBarcode.BarcodeType.CODE39)
+                )
+                PrintableType.IMAGE ->
+                    bundle.getByteArray(KEY_PRINTABL_IMAGE).let {
+                        PrintableImage(
+                                BitmapFactory.decodeByteArray(it, 0, it.size)
+                        )
+                    }
+                null -> null
+            }
+
+    enum class PrintableType {
+        TEXT, BARCODE, IMAGE
+    }
+}
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/IChange.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/IChange.kt
@@ -12,6 +12,7 @@ interface IChange : IBundlable {
         SET_EXTRA,
         SET_POSITION_PRINT_GROUP,
         SET_PAYMENT_PURPOSE_PRINT_GROUP,
+        SET_PRINT_EXTRA,
         UNKNOWN
     }
 }
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/receipt/SetPrintGroup.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/receipt/SetPrintGroup.kt
@@ -24,9 +24,7 @@ data class SetPrintGroup(val printGroup: PrintGroup?, val paymentPurposeIds: Lis
         }
     }
 
-    override fun getType(): IChange.Type {
-        return IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP
-    }
+    override fun getType() = IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP
 
     companion object {
         const val KEY_PRINT_GROUP = "printGroup"
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/receipt/print_extra/SetPrintExtra.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/changes/receipt/print_extra/SetPrintExtra.kt
@@ -0,0 +1,43 @@
+package ru.evotor.framework.core.action.event.receipt.changes.receipt.print_extra
+
+import android.os.Bundle
+import ru.evotor.devices.commons.printer.printable.IPrintable
+import ru.evotor.framework.core.action.datamapper.PrintExtraPlaceMapper
+import ru.evotor.framework.core.action.datamapper.PrintablesMapper
+import ru.evotor.framework.core.action.event.receipt.changes.IChange
+import ru.evotor.framework.receipt.print_extras.PrintExtraPlace
+
+class SetPrintExtra(
+        val printPlace: PrintExtraPlace,
+        val printables: Array<IPrintable>
+) : IChange {
+
+    override fun getType() = IChange.Type.SET_PRINT_EXTRA
+
+    override fun toBundle(): Bundle =
+            Bundle().apply {
+                putBundle(KEY_PRINT_PLACE, PrintExtraPlaceMapper.toBundle(printPlace))
+                putBundle(KEY_PRINTABLES, PrintablesMapper.toBundle(printables))
+            }
+
+    companion object {
+
+        const val KEY_PRINT_PLACE = "printPlace"
+        const val KEY_PRINTABLES = "printables"
+
+        @JvmStatic
+        fun from(bundle: Bundle?): SetPrintExtra? {
+            bundle ?: return null
+
+            val printPlace = PrintExtraPlaceMapper.fromBundle(bundle.getBundle(KEY_PRINT_PLACE))
+            val printables = PrintablesMapper.fromBundle(bundle.getBundle(KEY_PRINTABLES))
+
+            if (printPlace == null || printables == null) {
+                return null
+            }
+
+            return SetPrintExtra(printPlace, printables)
+        }
+    }
+
+}
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/merges/PositionsMergeEvent.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/merges/PositionsMergeEvent.kt
@@ -17,8 +17,8 @@ class PositionsMergeEvent(val receiptUuid: String, val merges: ArrayList<Positio
     }
 
     companion object {
-        val NAME_SELL_RECEIPT = "evo.v2.receipt.sell.mergingPositions"
-        val NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.mergingPositions"
+        const val NAME_SELL_RECEIPT = "evo.v2.receipt.sell.mergingPositions"
+        const val NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.mergingPositions"
         private val KEY_RECEIPT_UUID = "receiptUuid"
         private val KEY_MERGES = "merges"
 
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEvent.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEvent.kt
@@ -0,0 +1,25 @@
+package ru.evotor.framework.core.action.event.receipt.print_extra
+
+import android.os.Bundle
+import ru.evotor.IBundlable
+
+class PrintExtraRequiredEvent() : IBundlable {
+
+    override fun toBundle(): Bundle {
+        return Bundle()
+    }
+
+    companion object {
+        const val NAME_PERMISSION = "ru.evotor.permission.receipt.printExtra.SET"
+        const val NAME_SELL_RECEIPT = "evo.v2.receipt.sell.printExtra.REQUIRED"
+        const val NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.printExtra.REQUIRED"
+
+        fun create(bundle: Bundle?): PrintExtraRequiredEvent? {
+            if (bundle == null) {
+                return null
+            }
+
+            return PrintExtraRequiredEvent()
+        }
+    }
+}
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEventProcessor.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEventProcessor.kt
@@ -0,0 +1,15 @@
+package ru.evotor.framework.core.action.event.receipt.print_extra
+
+import android.os.Bundle
+import ru.evotor.framework.core.action.processor.ActionProcessor
+
+abstract class PrintExtraRequiredEventProcessor : ActionProcessor() {
+
+    override fun process(action: String, bundle: Bundle?, callback: ActionProcessor.Callback) {
+        val event = PrintExtraRequiredEvent.create(bundle) ?: return
+        call(action, event, callback)
+    }
+
+    abstract fun call(action: String, event: PrintExtraRequiredEvent, callback: ActionProcessor.Callback)
+
+}
diff --git a/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEventResult.kt b/app/src/main/java/ru/evotor/framework/core/action/event/receipt/print_extra/PrintExtraRequiredEventResult.kt
@@ -0,0 +1,46 @@
+package ru.evotor.framework.core.action.event.receipt.print_extra
+
+import android.os.Bundle
+import android.os.Parcelable
+import ru.evotor.IBundlable
+import ru.evotor.framework.Utils
+import ru.evotor.framework.core.action.datamapper.ChangesMapper
+import ru.evotor.framework.core.action.event.receipt.changes.receipt.print_extra.SetPrintExtra
+
+class PrintExtraRequiredEventResult(
+        val printExtras: List<SetPrintExtra>?
+) : IBundlable {
+
+    override fun toBundle(): Bundle {
+        val bundle = Bundle()
+        bundle.putParcelableArray(KEY_PRINT_EXTRA,
+                if (printExtras != null) {
+                    val setPrintGroupsParcelableArray = mutableListOf<Parcelable>()
+                    printExtras.map {
+                        ChangesMapper.toBundle(it)
+                    }.forEach {
+                        setPrintGroupsParcelableArray.add(it)
+                    }
+                    setPrintGroupsParcelableArray.toTypedArray()
+                } else {
+                    null
+                })
+        return bundle
+    }
+
+    companion object {
+        private val KEY_PRINT_EXTRA = "printExtras"
+
+        fun create(bundle: Bundle?): PrintExtraRequiredEventResult? {
+            if (bundle == null) {
+                return null
+            }
+            return PrintExtraRequiredEventResult(
+                    Utils.filterByClass(
+                            ChangesMapper.create(bundle.getParcelableArray(KEY_PRINT_EXTRA)),
+                            SetPrintExtra::class.java
+                    )
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlace.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlace.kt
@@ -0,0 +1,6 @@
+package ru.evotor.framework.receipt.print_extras
+
+/**
+ * Класс-родитель для указания на место в чеке, куда будет добавлена дополнительная печатная информация
+ */
+abstract class PrintExtraPlace(val placeType: PrintExtraPlaceType)
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePositionAllSubpositionsFooter.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePositionAllSubpositionsFooter.kt
@@ -0,0 +1,23 @@
+package ru.evotor.framework.receipt.print_extras
+
+import android.os.Bundle
+
+/**
+ * Печатная информация будет добавлена после позиции в чеке и после всех её модификаторов (подпозиций)
+ */
+class PrintExtraPlacePositionAllSubpositionsFooter(
+        val positionUuid: String?
+) : PrintExtraPlace(PrintExtraPlaceType.POSITION_ALL_SUBPOSITIONS_FOOTER) {
+
+    companion object {
+        val KEY_POSITION_UUID = "positionUuid"
+
+        fun addToBundle(bundle: Bundle, place: PrintExtraPlacePositionAllSubpositionsFooter): Bundle =
+                bundle.apply { putString(KEY_POSITION_UUID, place.positionUuid) }
+
+        fun fromBundle(bundle: Bundle): PrintExtraPlacePositionAllSubpositionsFooter? =
+                bundle.getString(KEY_POSITION_UUID)?.let {
+                    PrintExtraPlacePositionAllSubpositionsFooter(it)
+                }
+    }
+}
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePositionFooter.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePositionFooter.kt
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupHeader.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupHeader.kt
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupSummary.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupSummary.kt
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupTop.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlacePrintGroupTop.kt
diff --git a/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlaceType.kt b/app/src/main/java/ru/evotor/framework/receipt/print_extras/PrintExtraPlaceType.kt

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ allprojects {`
`16`	`16`
`17`	`17`	```
`18`	`18`	`dependencies {`
`19`		`-compile 'com.github.evotor:integration-library:v0.3.+'`
	`19`	`+compile 'com.github.evotor:integration-library:v0.4.+'`
`20`	`20`	`}`
`21`	`21`	```
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import android.util.Log`
`6`	`6`	`import ru.evotor.framework.core.action.event.receipt.changes.IChange`
`7`	`7`	`import ru.evotor.framework.core.action.event.receipt.changes.UnknownChange`
`8`	`8`	`import ru.evotor.framework.core.action.event.receipt.changes.position.*`
	`9`	`+import ru.evotor.framework.core.action.event.receipt.changes.receipt.print_extra.SetPrintExtra`
`9`	`10`	`import ru.evotor.framework.safeValueOf`
`10`	`11`
`11`	`12`	`object ChangesMapper {`
`@@ -72,6 +73,7 @@ object ChangesMapper {`
`72`	`73`	`IChange.Type.SET_EXTRA -> SetExtra.from(bundle)`
`73`	`74`	`IChange.Type.SET_POSITION_PRINT_GROUP -> SetPrintGroup.from(bundle)`
`74`	`75`	`IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP -> SetPrintGroup.from(bundle)`
	`76`	`+ IChange.Type.SET_PRINT_EXTRA -> SetPrintExtra.from(bundle)`
`75`	`77`	`null, IChange.Type.UNKNOWN -> UnknownChange.from(typeName, bundle)`
`76`	`78`	`}`
`77`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ interface IChange : IBundlable {`
`12`	`12`	`SET_EXTRA,`
`13`	`13`	`SET_POSITION_PRINT_GROUP,`
`14`	`14`	`SET_PAYMENT_PURPOSE_PRINT_GROUP,`
	`15`	`+ SET_PRINT_EXTRA,`
`15`	`16`	`UNKNOWN`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,7 @@ data class SetPrintGroup(val printGroup: PrintGroup?, val paymentPurposeIds: Lis`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- override fun getType(): IChange.Type {`
`28`		`- return IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP`
`29`		`- }`
	`27`	`+ override fun getType() = IChange.Type.SET_PAYMENT_PURPOSE_PRINT_GROUP`
`30`	`28`
`31`	`29`	`companion object {`
`32`	`30`	`const val KEY_PRINT_GROUP = "printGroup"`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ class PositionsMergeEvent(val receiptUuid: String, val merges: ArrayList<Positio`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`companion object {`
`20`		`- val NAME_SELL_RECEIPT = "evo.v2.receipt.sell.mergingPositions"`
`21`		`- val NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.mergingPositions"`
	`20`	`+ const val NAME_SELL_RECEIPT = "evo.v2.receipt.sell.mergingPositions"`
	`21`	`+ const val NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.mergingPositions"`
`22`	`22`	`private val KEY_RECEIPT_UUID = "receiptUuid"`
`23`	`23`	`private val KEY_MERGES = "merges"`
`24`	`24`