Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ group 'com.codingdevs.thermal_printer'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.9.10'
ext.kotlin_version = '2.2.20'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -25,15 +25,16 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 33
namespace = "com.codingdevs.thermal_printer"
compileSdkVersion 36

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}

sourceSets {
Expand All @@ -42,10 +43,10 @@ android {

defaultConfig {
minSdkVersion 19
targetSdkVersion 33
targetSdkVersion 36
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import android.os.Looper
import android.os.Message
import android.util.Log
import android.widget.Toast
import androidx.annotation.NonNull
import androidx.annotation.RequiresApi
import androidx.core.app.ActivityCompat
import androidx.core.app.ActivityCompat.startActivityForResult
import com.codingdevs.thermal_printer.bluetooth.BluetoothConnection
Expand Down Expand Up @@ -52,7 +52,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
private var requestPermissionBT: Boolean = false
private var isBle: Boolean = false
private var isScan: Boolean = false
lateinit var adapter: USBPrinterService
private lateinit var adapter: USBPrinterService
private lateinit var bluetoothService: BluetoothService


Expand Down Expand Up @@ -92,7 +92,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
try {
val result = msg.obj as Result?
result?.success(true)
} catch (e: Exception) {
} catch (_: Exception) {
}
eventSink?.success(2)
bluetoothService.removeReconnectHandlers()
Expand All @@ -113,7 +113,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
try {
val result = msg.obj as Result?
result?.success(false)
} catch (e: Exception) {
} catch (_: Exception) {
}
eventSink?.success(0)
}
Expand Down Expand Up @@ -156,7 +156,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re

}

override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
channel.setMethodCallHandler(null)
messageChannel?.setStreamHandler(null)
messageUSBChannel?.setStreamHandler(null)
Expand All @@ -168,11 +168,11 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
adapter.setHandler(null)
}

override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
channel = MethodChannel(flutterPluginBinding.binaryMessenger, methodChannel)
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
channel = MethodChannel(flutterPluginBinding.binaryMessenger, METHOD_CHANNEL)
channel.setMethodCallHandler(this)

messageChannel = EventChannel(flutterPluginBinding.binaryMessenger, eventChannelBT)
messageChannel = EventChannel(flutterPluginBinding.binaryMessenger, EVENT_CHANNEL_BT)
messageChannel?.setStreamHandler(object : EventChannel.StreamHandler {

override fun onListen(p0: Any?, sink: EventChannel.EventSink) {
Expand All @@ -184,7 +184,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
}
})

messageUSBChannel = EventChannel(flutterPluginBinding.binaryMessenger, eventChannelUSB)
messageUSBChannel = EventChannel(flutterPluginBinding.binaryMessenger, EVENT_CHANNEL_USB)
messageUSBChannel?.setStreamHandler(object : EventChannel.StreamHandler {

override fun onListen(p0: Any?, sink: EventChannel.EventSink) {
Expand All @@ -203,7 +203,8 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
bluetoothService = BluetoothService.getInstance(bluetoothHandler)
}

override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
override fun onMethodCall(call: MethodCall, result: Result) {
isScan = false
when {
call.method.equals("getBluetoothList") -> {
Expand Down Expand Up @@ -315,6 +316,7 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
return true
}

@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
private fun getUSBDeviceList(result: Result) {
val usbDevices: List<UsbDevice> = adapter.deviceList
val list = ArrayList<HashMap<*, *>>()
Expand Down Expand Up @@ -380,6 +382,8 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
permissions.add(Manifest.permission.BLUETOOTH_CONNECT)
}

if (context == null || currentActivity == null) return false

if (!hasPermissions(context, *permissions.toTypedArray())) {
ActivityCompat.requestPermissions(currentActivity!!, permissions.toTypedArray(), PERMISSION_ALL)
return false
Expand Down Expand Up @@ -467,9 +471,9 @@ class ThermalPrinterPlugin : FlutterPlugin, MethodCallHandler, PluginRegistry.Re
companion object {
const val PERMISSION_ALL = 1
const val PERMISSION_ENABLE_BLUETOOTH = 999
const val methodChannel = "com.codingdevs.thermal_printer"
const val eventChannelBT = "com.codingdevs.thermal_printer/bt_state"
const val eventChannelUSB = "com.codingdevs.thermal_printer/usb_state"
const val METHOD_CHANNEL = "com.codingdevs.thermal_printer"
const val EVENT_CHANNEL_BT = "com.codingdevs.thermal_printer/bt_state"
const val EVENT_CHANNEL_USB = "com.codingdevs.thermal_printer/usb_state"

}
}
Loading