diff --git a/app/build.gradle b/app/build.gradle index 281aee5..496bae2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting.dev" minSdk 21 targetSdk 34 - versionCode 75 - versionName "2.1.75" + versionCode 80 + versionName "2.1.80" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index 5eab711..57811c9 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -46,6 +46,8 @@ object Constants { const val HEMO_CUBE_V2_PRODUCT_ID = 60000 const val HEMO_CUBE_V2_VENDOR_ID = 4292 + const val HEMO_CUBE_PCB_VENDOR_ID = 678 + const val ERROR_NORMAL = 400 const val ERROR_CRITICAL = 401 diff --git a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt index d5d1b9f..1da523a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt @@ -104,7 +104,7 @@ class MainActivity : AppCompatActivity() { val deviceType = when { availableDrivers.isNotEmpty() -> { val device = availableDrivers[0].device - Toast.makeText(this, R.string.device, Toast.LENGTH_SHORT).show() + Toast.makeText(this, "Connected, productId: ${device.productId}, vendorId: ${device.vendorId}", Toast.LENGTH_SHORT).show() when { device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> { binding.cvItem1.visibility = View.VISIBLE @@ -124,6 +124,15 @@ class MainActivity : AppCompatActivity() { Constants.DEVICE_TYPE_HOMOCUBE } + device.productId == 8963 && device.vendorId == 1659 -> { + binding.cvItem1.visibility = View.VISIBLE + binding.cvItem3.visibility = View.VISIBLE + binding.cvItem2.visibility = View.GONE + binding.cvItem4.visibility = View.GONE + DataHolder.deviceType.postValue(Constants.DEVICE_TYPE_HOMOCUBE) + Constants.DEVICE_TYPE_HOMOCUBE + } + device.productId == Constants.DEVICE_PRODUCT_ID && device.vendorId == Constants.DEVICE_VENDOR_ID -> { Log.d( TAG, diff --git a/app/src/main/res/xml/device_filter.xml b/app/src/main/res/xml/device_filter.xml index bf03724..0caf22e 100644 --- a/app/src/main/res/xml/device_filter.xml +++ b/app/src/main/res/xml/device_filter.xml @@ -12,6 +12,7 @@ +