@@ -46,11 +46,14 @@ import androidx.appcompat.app.AppCompatActivity
4646import androidx.core.content.ContextCompat
4747import com.aspose.barcode.cloud.ApiClient
4848import com.aspose.barcode.cloud.ApiException
49- import com.aspose.barcode.cloud.api.BarcodeApi
50- import com.aspose.barcode.cloud.model.CodeLocation
49+ import com.aspose.barcode.cloud.api.GenerateApi
50+ import com.aspose.barcode.cloud.api.ScanApi
51+ import com.aspose.barcode.cloud.model.BarcodeImageFormat
52+ import com.aspose.barcode.cloud.model.BarcodeResponseList
5153import com.aspose.barcode.cloud.model.EncodeBarcodeType
52- import com.aspose.barcode.cloud.requests.GetBarcodeGenerateRequest
53- import com.aspose.barcode.cloud.requests.ScanBarcodeRequest
54+ import com.aspose.barcode.cloud.model.EncodeDataType
55+ import com.aspose.barcode.cloud.requests.GenerateRequestWrapper
56+ import com.aspose.barcode.cloud.requests.ScanMultipartRequestWrapper
5457import com.google.android.material.snackbar.Snackbar
5558import java.io.File
5659import java.io.FileOutputStream
@@ -96,7 +99,8 @@ class MainActivity : AppCompatActivity() {
9699 private lateinit var barcodeTextEdit: EditText
97100 private lateinit var barcodeImgView: ImageView
98101
99- private lateinit var api: BarcodeApi
102+ private lateinit var scanApi: ScanApi
103+ private lateinit var generateApi: GenerateApi
100104 private val encodeTypes = EncodeBarcodeType .values().map { it.toString() }.sorted()
101105
102106 override fun onCreate (savedInstanceState : Bundle ? ) {
@@ -110,7 +114,8 @@ class MainActivity : AppCompatActivity() {
110114
111115 client.readTimeout = 60_000
112116
113- api = BarcodeApi (client)
117+ generateApi = GenerateApi (client)
118+ scanApi = ScanApi (client)
114119
115120 barcodeTypeSpinner = findViewById(R .id.typeSpinner)
116121 populateBarcodeTypesSpinner()
@@ -219,11 +224,11 @@ class MainActivity : AppCompatActivity() {
219224 smallerBmp.compress(Bitmap .CompressFormat .PNG , 100 , output)
220225 }
221226
222- val apiRequest = ScanBarcodeRequest (tmpFile);
227+ val apiRequest = ScanMultipartRequestWrapper (tmpFile);
223228
224229 Thread {
225230 try {
226- val recognized = api.scanBarcode (apiRequest)
231+ val recognized = scanApi.scanMultipart (apiRequest)
227232
228233 runOnUiThread {
229234 stopRecognizeAnimation()
@@ -271,15 +276,20 @@ class MainActivity : AppCompatActivity() {
271276 }
272277
273278 fun onBtnGenerateClick (@Suppress(" UNUSED_PARAMETER" ) view : View ) {
274- val type: String = barcodeTypeSpinner.selectedItem.toString()
275- val barcodeRequest = GetBarcodeGenerateRequest (type, barcodeTextEdit.text.toString())
276- barcodeRequest.imageHeight = barcodeImgView.measuredHeight.toDouble()
277- barcodeRequest.imageWidth = barcodeImgView.measuredWidth.toDouble()
278- barcodeRequest.format = " png"
279+
280+ val type: EncodeBarcodeType = EncodeBarcodeType .fromValue(barcodeTypeSpinner.selectedItem.toString())
281+
282+ val genRequest = GenerateRequestWrapper (
283+ type, barcodeTextEdit.text.toString());
284+
285+ genRequest.imageFormat = BarcodeImageFormat .PNG ;
286+ genRequest.imageHeight = barcodeImgView.measuredHeight.toFloat()
287+ genRequest.imageWidth = barcodeImgView.measuredWidth.toFloat()
288+
279289
280290 Thread {
281291 try {
282- val generated: File ? = api.getBarcodeGenerate(barcodeRequest)
292+ val generated: File ? = generateApi.generate(genRequest);
283293 runOnUiThread {
284294 val bitmap = BitmapFactory .decodeFile(generated!! .absolutePath)
285295 barcodeImgView.setImageBitmap(bitmap)
0 commit comments