da_funk 3.11.1 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff422f0819641159d57b9ee06ff57d7801df0b2490f567e490786ff8b6ba9b39
-  data.tar.gz: 398f0d2fb391fff08ece5fbea0cd35cb8757599a11de862fcf9f1f3918dbdfd9
+  metadata.gz: 8ffde433da3076be7fa1b4744b927c148a832a7422a3f49bc6d8ddef0077bcc9
+  data.tar.gz: 13f551cab79ffb6ea0cba2b79ce04508b9a59ffe1559e7d8aee5a055f9eebcec
 SHA512:
-  metadata.gz: 3ec6672c67fb07a2daa651d2e7e70c199acacf586fb7ebb4c11a30005cde293b7429e185e67162e804c4a59353c7edf2d38f58c3e11e4106eaced129edb73cf0
-  data.tar.gz: 8ec81d6d8649732f51619cf0b71a37f22a27e6b9eddcba20f62bf81cfe9e869a2d9e602c95355dbcb8835ef62b38558849a40cba9b3120b5606264080148e27b
+  metadata.gz: 98fa3b9a68ebed4f1257c6774568e5afa19ca5024395344e598c8dfb75d0d4301ae8d48fa0f58430af5d39d2757409d62e7b3c7866e6e54d35f62a81229e03b9
+  data.tar.gz: 7f6817f2c22d7abb575ea0745c50b0eddd8f3ce56814f3fc8b10008426b058c3c6a261252a1db87cf32876e7b02e2436c9aed4d8dacc81d6eb3abfc2b496a457

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.11.1)
+    da_funk (3.12.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 3.12.0 - 2019-11-14
+
+- Added DaFunk::Helper#wait_touchscreen_or_keyboard_event.
+- Added Added DaFunk::Helper#menu_image_touchscreen_or_keyboard.
+
 ### 3.11.1 - 2019-10-24
 
 - Fixed method call on ISO8583Exception rescue.

data/lib/da_funk/helper.rb

@@ -145,6 +145,98 @@ module DaFunk
       end
     end
 
+    # Create a menu with touchscreen and keyboard selection support.
+    #
+    # @param path [String] file with path to be displayed
+    #
+    # @param menu_itens [Hash] Hash in this format:
+    # {
+    #   menu_item_index => {:x => range..range, :y => range..range},
+    #   menu_item_index => {:x => range..range, :y => range..range}
+    # }
+    #
+    # @param options [Hash] Hash containing options to change the menu behaviour.
+    #
+    # @example
+    #   options = {
+    #     # Input Timeout in miliseconds
+    #     :timeout => 30_000
+    #   }
+    #
+    #   menu_itens = {
+    #     1 => {:x => 0..225, :y => 10..98},
+    #     2 => {:x => 290..300, :y => 50..100}
+    #   }
+    #
+    #   menu_image_touchscreen_or_keyboard('image.bmp', menu_itens, options)
+    #
+    # @return menu_item_index selected will be returned
+    # @return if timeout nil will be returned
+    def menu_image_touchscreen_or_keyboard(path, menu_itens, options = {})
+      return nil if menu_itens.empty?
+
+      Device::Display.print_bitmap(path)
+
+      timeout = options[:timeout] || Device::IO.timeout
+      options[:special_keys] = [Device::IO::CANCEL]
+
+      event, key = wait_touchscreen_or_keyboard_event(menu_itens, timeout, options)
+
+      if event == :keyboard
+        if key == Device::IO::CANCEL
+          options[:default]
+        else
+          index = key.to_i-1 == -1 ? 0 : key.to_i-1
+          menu_itens.keys[index]
+        end
+      elsif event == :touchscreen
+        menu_itens.select {|k, v| k == key}.shift[0]
+      end
+    end
+
+    # Wait for touchscreen or keyboard event.
+    #
+    # @param menu_itens [Hash] Hash in this format:
+    # {
+    #   menu_item_index => {:x => range..range, :y => range..range},
+    #   menu_item_index => {:x => range..range, :y => range..range}
+    # }
+    #
+    # @param timeout [Fixnum] in miliseconds.
+    #
+    # @example
+    #
+    #   menu_itens = {
+    #     1 => {:x => 0..225, :y => 10..98},
+    #     2 => {:x => 290..300, :y => 50..100}
+    #   }
+    #
+    #   wait_touchscreen_or_keyboard_event(menu_itens, 30_000)
+    #
+    # @return array with event happened and key
+    def wait_touchscreen_or_keyboard_event(menu_itens, timeout, options = {})
+      time = Time.now + timeout / 1000
+      keys = ((1..(menu_itens.size)).to_a.map(&:to_s) + options[:special_keys]).flatten
+
+      loop do
+        break([:timeout, Device::IO::KEY_TIMEOUT]) if Time.now > time
+        x, y = getxy_stream(100)
+        if x && y
+          menu_itens.each do |key, value|
+            if value[:x].include?(x) && value[:y].include?(y)
+              return([:touchscreen, key])
+            end
+          end
+        elsif key = getc(100)
+          if key != Device::IO::KEY_TIMEOUT
+            if keys.include?(key)
+              break([:keyboard, key])
+            end
+          end
+        end
+      end
+    end
+
     # Create a form menu.
     #
     # @param title [String] Text to display on line 0. If nil title won't be

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.11.1"
+  VERSION="3.12.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.12.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake