da_funk 3.17.0 → 3.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c82dec00d1972662fd08cf16e11940ee65d47483256abfff5eb06230d48f28d
-  data.tar.gz: 5e23db4a7d7b2d6a13d5bb2289d224cf8a60422f8c782bc5f2df465b4f7a7277
+  metadata.gz: cbb46ee9400d7652a74252864cfe292c4dd0ea5d96ef09bc53505812f7c75e11
+  data.tar.gz: 879162e1d06908fbabc24f462f47b365db1dbd8bed8fd66b3bdf4669de006f7d
 SHA512:
-  metadata.gz: cc24e1168ae6c73d50777fc196d370570da0de84f897d6a209f17b17165233a6d596571c3d45e960abd44f5e591a2ea541f4977845ea5109910f0be1ff93b641
-  data.tar.gz: 64463d88a2d9d64ff1dfb8a367c3c10296dee9f28ee799773c093e072a9d7dec55e7869e55fba6a106d3eafc3bcf45d95b0be2294457c46731a27573326b3a93
+  metadata.gz: 4607840b3eae2bdd4e02463d0b89ce6f6b599bb75d25f00e6d9158592384626b2597dd81c327ac12cfd8d67a9752c6d297864bd489421f2b7c56de05017e9ae8
+  data.tar.gz: 6bca8598d604b3c5532cb31e1ab64b5dc066be8e160be9ce28a5140a0b0c249082576e45d81751204ecc8160a7bab01ec0f7772cdadd655acce20bfc849a1595

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.17.0)
+    da_funk (3.21.1)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -14,36 +14,41 @@ GEM
   specs:
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
-    ast (2.4.0)
+    ast (2.4.1)
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.13.0)
+    cloudwalk_handshake (1.13.1)
       funky-simplehttp (~> 0.6)
-    funky-emv (1.2.2)
+    funky-emv (1.3.0)
       funky-tlv (~> 0.2)
     funky-mock (0.1.0)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)
     io-like (0.3.1)
-    jaro_winkler (1.5.4)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     posxml_parser (2.26.0)
       funky-emv (~> 1)
     rainbow (3.0.0)
     rake (13.0.1)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.1)
-    yard (0.9.24)
+    unicode-display_width (1.7.0)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -59,4 +64,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/RELEASE_NOTES.md

@@ -1,5 +1,45 @@
 # DaFunk
 
+### 3.21.1 - 2020-06-16
+
+- Fix error when timeout on DaFunk::menu_image_touchscreen_or_keyboard.
+
+### 3.21.0 - 2020-06-12
+
+- Removed unnecessary processing method call;
+- Status bar refactored:
+  - Removed link icon;
+  - Added support to SLOT_MEDIA to print WIFI or GPRS;
+  - Renamed SLOT_CONNECTION to SLOT_SIGNAL_LEVEL;
+  - Added support to SLOT_BATTERY_PERCENTUAL to print percentual of battery level;
+  - Renamed SLOT_BATTERY to SLOT_BATTERY_LEVEL;
+  - Update battery and wifi images;
+  - Added BATTERY_PERCENTAGE_IMAGES;
+  - Show searching icon when network is not connected;
+- Added support to virtual keyboard;
+- Added support to touchscreen event on DaFunk::Helper#menu;
+- Added support to return timeout parameter on DaFunk::Helper#menu when timeout is achieved;
+- Update funky-emv 1.3.0.
+
+### 3.20.0 - 2020-05-28
+
+- Rename PaymentChannel::client to ::current;
+- Fix status bar change link to cache old value.
+
+### 3.18.1 - 2020-05-20
+
+- Fix issue on DaFunk::Helper#menu_image_touchscreen_or_keyboard it was not checking for special keys
+
+### 3.18.0 - 2020-04-03
+
+- Added enable_txt_ui parameter on the following methods
+ - DaFunk::ParamsDat#download;
+ - DaFunk::ParamsDat#update_apps;
+ - DaFunk::ParamsDat#update_app;
+ - DaFunk::ParamsDat#update_file;
+ - DaFunk::Helper#attach_options;
+ - DaFunk::Helper#check_download_error;
+
 ### 3.17.0 - 2020-02-10
 
 - Added support to infinitepay endpoints config on config.dat file;

data/Rakefile

@@ -68,7 +68,8 @@ FILES = FileList[
   "lib/device/setting.rb",
   "lib/device/support.rb",
   "lib/device/system.rb",
-  "lib/device/magnetic.rb"
+  "lib/device/magnetic.rb",
+  "lib/device/virtual_keyboard.rb"
 ]
 
 DaFunk::RakeTask.new do |t|

data/lib/da_funk/helper.rb

@@ -14,11 +14,11 @@ module DaFunk
       string
     end
 
-    def attach_options
-      if DaFunk::PaymentChannel.client == Context::CommunicationChannel
-        {:print_last => true}
+    def attach_options(enable_txt_ui = true)
+      if DaFunk::PaymentChannel.current == Context::CommunicationChannel
+        {:print_last => true, :enable_txt_ui => enable_txt_ui}
       else
-        {:print_last => false}
+        {:print_last => false, :enable_txt_ui => enable_txt_ui}
       end
     end
 
@@ -35,55 +35,63 @@ module DaFunk
 
     def attach(options = attach_options)
       if Device::Network.configured?
-        print_attach(:attach_connecting, options)
+        print_attach(:attach_connecting, options) if options[:enable_txt_ui]
         unless Device::Network.connected?
           if Device::Network.attach(options) == Device::Network::SUCCESS
             Device::Setting.network_configured = 1
-            print_attach(:attach_connected, options)
+            print_attach(:attach_connected, options) if options[:enable_txt_ui]
           else
             Device::Setting.network_configured = 0 if DaFunk::ParamsDat.file["connection_management"] == "0"
-            print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
-            getc(10000)
+            if options[:enable_txt_ui]
+              print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
+              getc(10000)
+            end
             return false
           end
         else
-          print_attach(:attach_already_connected, options)
+          print_attach(:attach_already_connected, options) if options[:enable_txt_ui]
         end
         true
       else
-        print_attach(:attach_device_not_configured, options)
-        getc(2000)
+        if options[:enable_txt_ui]
+          print_attach(:attach_device_not_configured, options)
+          getc(2000)
+        end
         false
       end
     end
 
-    def check_download_error(ret)
+    def check_download_error(ret, enable_txt_ui = true)
       value = true
+      ui = {}
+
       case ret
       when DaFunk::Transaction::Download::SERIAL_NUMBER_NOT_FOUND
-        I18n.pt(:download_serial_number_not_found, :args => [ret])
+        ui[:i18n] = :download_serial_number_not_found
         value =  false
       when DaFunk::Transaction::Download::FILE_NOT_FOUND
-        I18n.pt(:download_file_not_found, :args => [ret])
+        ui[:i18n] = :download_file_not_found
         value = false
       when DaFunk::Transaction::Download::FILE_NOT_CHANGE
-        I18n.pt(:download_file_is_the_same, :args => [ret])
+        ui[:i18n] = :download_file_is_the_same
       when DaFunk::Transaction::Download::SUCCESS
-        I18n.pt(:download_success, :args => [ret])
+        ui[:i18n] = :download_success
       when DaFunk::Transaction::Download::COMMUNICATION_ERROR
-        I18n.pt(:download_communication_failure, :args => [ret])
+        ui[:i18n] = :download_communication_failure
         value = false
       when DaFunk::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
-        I18n.pt(:download_encoding_error, :args => [ret])
+        ui[:i18n] = :download_encoding_error
         value = false
       when DaFunk::Transaction::Download::IO_ERROR
-        I18n.pt(:download_io_error, :args => [ret])
+        ui[:i18n] = :download_io_error
         value = false
       else
-        I18n.pt(:download_communication_failure, :args => [ret])
+        ui[:i18n] = :download_communication_failure
         value = false
       end
 
+      I18n.pt(ui[:i18n], :args => [ret]) if enable_txt_ui
+
       value
     end
 
@@ -171,26 +179,34 @@ module DaFunk
     #   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
+    # @return if timeout Device::IO::KEY_TIMEOUT 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]
+
+      if options.include?(:special_keys)
+        options[:special_keys] += options[:special_keys]
+      else
+        options[:special_keys] = [Device::IO::CANCEL]
+      end
 
       event, key = wait_touchscreen_or_keyboard_event(menu_itens, timeout, options)
 
       if event == :keyboard
         if key == Device::IO::CANCEL
           options[:default]
+        elsif options[:special_keys].include?(key)
+          key
         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]
+      elsif event == :timeout
+        Device::IO::KEY_TIMEOUT
       end
     end
 
@@ -282,6 +298,8 @@ module DaFunk
 
       if key == Device::IO::ENTER
         options[:default]
+      elsif key == Device::IO::KEY_TIMEOUT
+        options[:timeout]
       else
         selected
       end
@@ -289,7 +307,10 @@ module DaFunk
 
     # TODO Scalone: Refactor.
     def pagination(title, options, collection, &block)
+      timeout = Device::IO.timeout
+      touchscreen_options = {}
       start_line, options[:limit], options[:header] = pagination_limit(title, options)
+
       if collection.size > (options[:limit] - options[:header]) # minus pagination header
         key   = Device::IO.back_key
         pages = pagination_page(collection, options[:limit] - options[:header]) # minus pagination header
@@ -299,7 +320,13 @@ module DaFunk
           pagination_header(title, page, pages.size, start_line, options[:default], options[:header])
           values = pages[page].to_a
           block.call(values, start_line + options[:header])
-          key  = try_key(pagination_keys(values.size, true))
+
+          params = {special_keys: pagination_keys(values.size, true)}
+          if options.include?(:touchscreen_options)
+            touchscreen_options = options[:touchscreen_options]
+          end
+
+          _, key = wait_touchscreen_or_keyboard_event(touchscreen_options, timeout, params)
           page = pagination_key_page(page, key, pages.size)
         end
       else
@@ -307,7 +334,8 @@ module DaFunk
         print_title(title, options[:default]) if title
         values = collection.to_a
         block.call(values, start_line)
-        key = try_key(pagination_keys(collection.size, false))
+        params = {special_keys: pagination_keys(collection.size, false)}
+        _, key = wait_touchscreen_or_keyboard_event(touchscreen_options, timeout, params)
       end
       result = values[key.to_i-1] if key.integer?
       if result.is_a? Array
@@ -427,18 +455,6 @@ module DaFunk
       end
     end
 
-    def processing(image, message = {})
-      Device::Display.print_bitmap(to_bmp(image)) if bmp_exists?(image)
-    end
-
-    def bmp_exists?(bmp)
-      File.exists?(to_bmp(bmp))
-    end
-
-    def to_bmp(image)
-      "./shared/#{image.to_s}.bmp"
-    end
-
     private
     def parse_touchscreen_event(menu_itens, x, y)
       menu_itens.each do |key, value|

data/lib/da_funk/helper/status_bar.rb

@@ -1,18 +1,26 @@
 module DaFunk
   module Helper
     class StatusBar
-      STATUS_TIMEOUT  = 60
-      SLOT_CONNECTION = 0
-      SLOT_BATTERY    = 7
-      SLOT_LINK       = 1
-      SLOT_UPDATE     = 2
+      STATUS_TIMEOUT          = 60
+      SLOT_MEDIA              = 0
+      SLOT_SIGNAL_LEVEL       = 1
+      SLOT_UPDATE             = 2
+      SLOT_BATTERY_PERCENTUAL = 6
+      SLOT_BATTERY_LEVEL      = 7
 
       BATTERY_IMAGES = {
-        0..24    => "./shared/battery0.png",
-        25..49   => "./shared/battery25.png",
-        50..74   => "./shared/battery50.png",
-        75..99   => "./shared/battery75.png",
-        100..100 => "./shared/battery100.png"
+        0..4     => "./shared/battery0.png",
+        5..9     => "./shared/baterry5.png",
+        10..19   => "./shared/battery10.png",
+        20..29   => "./shared/battery20.png",
+        30..39   => "./shared/battery30.png",
+        40..49   => "./shared/battery40.png",
+        50..59   => "./shared/battery50.png",
+        60..69   => "./shared/battery60.png",
+        70..79   => "./shared/battery70.png",
+        80..89   => "./shared/battery80.png",
+        90..99   => "./shared/battery90.png",
+        100..100 => "./shared/battery100.png",
       }
 
       BATTERY_CHARGE_IMAGES = {
@@ -20,11 +28,27 @@ module DaFunk
         100 => "./shared/battery100c.png"
       }
 
+      BATTERY_PERCENTAGE_IMAGES = {
+        0..4     => "./shared/battery1_percent.png",
+        5..9     => "./shared/battery5_percent.png",
+        10..19   => "./shared/battery10_percent.png",
+        20..29   => "./shared/battery20_percent.png",
+        30..39   => "./shared/battery30_percent.png",
+        40..49   => "./shared/battery40_percent.png",
+        50..59   => "./shared/battery50_percent.png",
+        60..69   => "./shared/battery60_percent.png",
+        70..79   => "./shared/battery70_percent.png",
+        80..89   => "./shared/battery80_percent.png",
+        90..99   => "./shared/battery90_percent.png",
+        100..100 => "./shared/battery100_percent.png",
+      }
+
       WIFI_IMAGES = {
-        0..29   => "./shared/wifi0.png",
-        30..59  => "./shared/wifi30.png",
-        60..79  => "./shared/wifi60.png",
-        80..200 => "./shared/wifi100.png"
+        0..0    => "./shared/wifi0.png",
+        1..25   => "./shared/wifi25.png",
+        26..50  => "./shared/wifi50.png",
+        59..75  => "./shared/wifi75.png",
+        76..200 => "./shared/wifi100.png"
       }
 
       MOBILE_IMAGES = {
@@ -37,14 +61,13 @@ module DaFunk
       }
 
       class << self
-        attr_accessor :signal, :battery, :power, :managment, :link
+        attr_accessor :signal, :battery, :power, :managment
       end
 
       def self.check
         if self.valid?
           self.change_connection
           self.change_battery
-          self.change_link
           self.change_update
         end
       end
@@ -57,44 +80,45 @@ module DaFunk
         end
       end
 
-      def self.change_link
+      def self.change_connection
         if Device::Network.connected?
-          if DaFunk::PaymentChannel.alive?
-            PAX::Display.print_status_bar(SLOT_LINK, "./shared/link.png")
-          else
-            PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
-          end
-        else
-          PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
-        end
-      end
+          sig = Device::Network.signal
 
-      def self.change_connection
-        sig = Device::Network.signal
-        if self.signal != sig
-          self.signal = sig
-          if Device::Network.gprs?
-            Device::Display.print_status_bar(SLOT_CONNECTION,
-                                             get_image_path(:gprs, self.signal))
-          elsif Device::Network.wifi?
-            Device::Display.print_status_bar(SLOT_CONNECTION,
-                                             get_image_path(:wifi, self.signal))
+          if self.signal != sig
+            self.signal = sig
+
+            if Device::Network.gprs?
+              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/GPRS.png")
+              Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
+                                               get_image_path(:gprs, self.signal))
+            elsif Device::Network.wifi?
+              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/WIFI.png")
+              Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
+                                               get_image_path(:wifi, self.signal))
+            end
           end
+        else
+          Device::Display.print_status_bar(SLOT_MEDIA, nil)
+          Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, "./shared/searching.png")
         end
       end
 
       def self.change_battery
         bat  = Device::System.battery
         dock = Device::System.power_supply
+
         if self.battery != bat || self.power != dock
           self.battery = bat
           self.power   = dock
+
+          Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL,
+                                           get_image_path(:battery_percentual, self.battery))
           if self.power
             Device::Display.print_status_bar(
-              SLOT_BATTERY, get_image_path(:battery_charge, self.battery))
+              SLOT_BATTERY_LEVEL, get_image_path(:battery_charge, self.battery))
           else
-            Device::Display.print_status_bar(
-              SLOT_BATTERY, get_image_path(:battery, self.battery))
+            Device::Display.print_status_bar(SLOT_BATTERY_LEVEL,
+                                             get_image_path(:battery, self.battery))
           end
         end
       end
@@ -110,6 +134,8 @@ module DaFunk
           BATTERY_IMAGES.each {|k,v| return v if k.include? sig }
         when :battery_charge
           BATTERY_CHARGE_IMAGES[sig]
+        when :battery_percentual
+          BATTERY_PERCENTAGE_IMAGES.each {|k,v| return v if k.include? sig }
         else
           nil
         end

data/lib/da_funk/params_dat.rb

@@ -104,15 +104,17 @@ module DaFunk
       nil
     end
 
-    def self.download
-      if attach
+    def self.download(enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui))
         parse
         ret = try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+          end
           getc(100)
           ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
-          unless check_download_error(ret)
+          unless check_download_error(ret, enable_txt_ui)
             getc(2000)
             false
           else
@@ -124,21 +126,21 @@ module DaFunk
       end
     end
 
-    def self.update_apps(force_params = false, force_crc = false, force = false)
-      self.download if force_params || ! self.valid
+    def self.update_apps(force_params = false, force_crc = false, force = false, enable_txt_ui = true)
+      self.download(enable_txt_ui) if force_params || ! self.valid
       main_updated = nil
       if self.valid
         apps_to_update = self.outdated_apps(force_crc, force)
         size_apps = apps_to_update.size
         apps_to_update.each_with_index do |app, index|
-          ret = self.update_app(app, index+1, size_apps, force_crc || force)
+          ret = self.update_app(app, index+1, size_apps, force_crc || force, enable_txt_ui)
           main_updated ||= (ret && app.main_application?)
         end
 
         files_to_update = self.outdated_files(force_crc, force)
         size_files = files_to_update.size
         files_to_update.each_with_index do |file_, index|
-          self.update_file(file_, index+1, size_files, force_crc || force)
+          self.update_file(file_, index+1, size_files, force_crc || force, enable_txt_ui)
         end
       end
     ensure
@@ -179,26 +181,30 @@ module DaFunk
       File.file?(path) && ! keep
     end
 
-    def self.update_app(application, index = 1, all = 1, force = false)
-      if attach && application
+    def self.update_app(application, index = 1, all = 1, force = false, enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui)) && application
         try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+          end
           getc(100)
-          ret = check_download_error(application.download(force))
+          ret = check_download_error(application.download(force), enable_txt_ui)
           getc(1000)
           ret
         end
       end
     end
 
-    def self.update_file(file_parameter, index = 1, all = 1, force = false)
-      if attach && file_parameter
+    def self.update_file(file_parameter, index = 1, all = 1, force = false, enable_txt_ui = true)
+      if attach(attach_options(enable_txt_ui)) && file_parameter
         try(3) do |attempt|
-          Device::Display.clear
-          I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+          if enable_txt_ui
+            Device::Display.clear
+            I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+          end
           getc(100)
-          ret = check_download_error(file_parameter.download(force))
+          ret = check_download_error(file_parameter.download(force), enable_txt_ui)
           file_parameter.unzip if ret
           getc(1000)
           ret

data/lib/da_funk/payment_channel.rb

@@ -3,11 +3,29 @@ module DaFunk
     DEFAULT_HEARBEAT = "180"
 
     class << self
-      attr_accessor :client, :app
+      attr_accessor :current, :app
     end
 
     attr_accessor :handshake_response, :handshake_request, :client, :host, :port
 
+    # Backward compatibility
+    def self.client
+      self.current
+    end
+
+    # Backward compatibility
+    def self.client=(obj)
+      self.current = obj
+    end
+
+    def self.current
+      @current
+    end
+
+    def self.current=(obj)
+      @current = obj
+    end
+
     def self.ready?
       Device::Network.connected? && self.configured?
     end
@@ -22,8 +40,8 @@ module DaFunk
       if @app != application
         @app = application
         # if Context::CommunicationChannel send application name thought threads
-        if @client == Context::CommunicationChannel
-          @client.app = application
+        if self.current == Context::CommunicationChannel
+          self.current.app = application
         else
           Device::System.klass = application
         end
@@ -48,11 +66,11 @@ module DaFunk
         self.print_info(I18n.t(:attach_attaching), display_message)
         create
         self.print_info(I18n.t(:attach_authenticate), display_message)
-        @client.handshake
+        self.current.handshake
       else
         client_clear!
       end
-      @client
+      self.current
     end
 
     def self.payment_channel_limit?
@@ -84,18 +102,16 @@ module DaFunk
       if self.dead?
         unless self.channel_limit_exceed?
           PaymentChannel.connect(display_message)
-          if @client
+          if self.current
             self.print_info(I18n.t(:attach_waiting), display_message)
-            if message = @client.check || @client.handshake?
+            if message = self.current.check || self.current.handshake?
               self.print_info(I18n.t(:attach_connected), display_message)
               message
             end
           end
         end
       else
-        if @client
-          @client.check
-        end
+        self.current&.check
       end
     end
 
@@ -104,11 +120,11 @@ module DaFunk
     end
 
     def self.alive?
-      Device::Network.connected? && @client && @client.connected?
+      Device::Network.connected? && self.current&.connected?
     end
 
     def self.close!
-      @client && @client.close
+      self.current&.close
     ensure
       client_clear!
     end
@@ -133,16 +149,16 @@ module DaFunk
     end
 
     def self.create
-      if @client != Context::CommunicationChannel
+      if self.current != Context::CommunicationChannel
         payment_channel_increment_attempts
-        @client = PaymentChannel.new
+        self.current = PaymentChannel.new
       else
-        @client.connect
+        self.current.connect
       end
     end
 
     def self.client_clear!
-      @client = nil unless @client == Context::CommunicationChannel
+      self.current = nil unless self.current == Context::CommunicationChannel
     end
 
     def initialize(client = nil)
@@ -180,13 +196,13 @@ module DaFunk
     end
 
     def close
-      @client.close if @client
+      @client&.close
       @client = nil
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
     end
 
     def connected?
-      self.client && self.client.connected?
+      self.client&.connected?
     end
 
     def handshake?
@@ -215,7 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.client = nil
+      PaymentChannel.current = nil
       @client = nil
     end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.17.0"
+  VERSION="3.21.1"
 end
 

data/lib/device/runtime.rb

@@ -14,7 +14,6 @@ class Device
     # @param json [String] Parameters to confifure new aplication.
     # @return [Object] From the new runtime instance.
     def self.execute(app, json = nil)
-      processing(:processing)
       buf = "#{json.dup}" if json.is_a?(String)
       mrb_eval("Context.execute('#{app.dup}', '#{Device.adapter}', '#{buf}')", "#{app.dup}")
     ensure

data/lib/device/virtual_keyboard.rb

@@ -0,0 +1,187 @@
+# frozen_string_literal: true
+
+class Device
+  class VirtualKeyboard
+    class << self
+      attr_accessor :attributes, :type, :text
+    end
+
+    self.attributes = {
+      keyboard_capital: [
+        { x: 0..34,  y: 191..209, char: 'q' },
+        { x: 0..46,  y: 191..209, char: 'w' },
+        { x: 0..65,  y: 191..209, char: 'e' },
+        { x: 0..96,  y: 191..209, char: 'r' },
+        { x: 0..115, y: 191..209, char: 't' },
+        { x: 0..145, y: 191..209, char: 'y' },
+        { x: 0..161, y: 191..209, char: 'u' },
+        { x: 0..191, y: 191..209, char: 'i' },
+        { x: 0..216, y: 191..209, char: 'o' },
+        { x: 0..255, y: 191..209, char: 'p' },
+        { x: 0..34,  y: 223..241, char: 'a' },
+        { x: 0..59,  y: 223..241, char: 's' },
+        { x: 0..83,  y: 223..241, char: 'd' },
+        { x: 0..106, y: 223..241, char: 'f' },
+        { x: 0..131, y: 223..241, char: 'g' },
+        { x: 0..153, y: 223..241, char: 'h' },
+        { x: 0..178, y: 223..241, char: 'j' },
+        { x: 0..201, y: 223..241, char: 'k' },
+        { x: 0..230, y: 223..241, char: 'l' },
+        { x: 0..30,  y: 223..273, char: :keyboard_uppercase },
+        { x: 0..56,  y: 223..273, char: 'y' },
+        { x: 0..82,  y: 223..273, char: 'x' },
+        { x: 0..109, y: 223..273, char: 'c' },
+        { x: 0..130, y: 223..273, char: 'v' },
+        { x: 0..154, y: 223..273, char: 'b' },
+        { x: 0..176, y: 223..273, char: 'n' },
+        { x: 0..201, y: 223..273, char: 'm' },
+        { x: 0..240, y: 223..273, char: :erase },
+        { x: 0..34,  y: 223..315, char: :keyboard_symbol_number },
+        { x: 0..58,  y: 223..315, char: '@' },
+        { x: 0..83,  y: 223..315, char: ',' },
+        { x: 0..148, y: 223..315, char: :space },
+        { x: 0..177, y: 223..315, char: '.' },
+        { x: 0..255, y: 223..315, char: :enter }
+      ],
+
+      keyboard_uppercase: [
+        { x: 0..34,  y: 191..209, char: 'Q' },
+        { x: 0..46,  y: 191..209, char: 'W' },
+        { x: 0..65,  y: 191..209, char: 'E' },
+        { x: 0..96,  y: 191..209, char: 'R' },
+        { x: 0..115, y: 191..209, char: 'T' },
+        { x: 0..145, y: 191..209, char: 'Y' },
+        { x: 0..161, y: 191..209, char: 'U' },
+        { x: 0..191, y: 191..209, char: 'I' },
+        { x: 0..216, y: 191..209, char: 'O' },
+        { x: 0..255, y: 191..209, char: 'P' },
+        { x: 0..34,  y: 223..241, char: 'A' },
+        { x: 0..59,  y: 223..241, char: 'S' },
+        { x: 0..83,  y: 223..241, char: 'D' },
+        { x: 0..106, y: 223..241, char: 'F' },
+        { x: 0..131, y: 223..241, char: 'G' },
+        { x: 0..153, y: 223..241, char: 'H' },
+        { x: 0..178, y: 223..241, char: 'J' },
+        { x: 0..201, y: 223..241, char: 'K' },
+        { x: 0..230, y: 223..241, char: 'L' },
+        { x: 0..30,  y: 223..273, char: :keyboard_capital },
+        { x: 0..56,  y: 223..273, char: 'Y' },
+        { x: 0..82,  y: 223..273, char: 'X' },
+        { x: 0..109, y: 223..273, char: 'C' },
+        { x: 0..130, y: 223..273, char: 'V' },
+        { x: 0..154, y: 223..273, char: 'B' },
+        { x: 0..176, y: 223..273, char: 'N' },
+        { x: 0..201, y: 223..273, char: 'M' },
+        { x: 0..240, y: 223..273, char: :erase },
+        { x: 0..34,  y: 223..315, char: :keyboard_symbol_number },
+        { x: 0..58,  y: 223..315, char: '@' },
+        { x: 0..83,  y: 223..315, char: ',' },
+        { x: 0..148, y: 223..315, char: :space },
+        { x: 0..177, y: 223..315, char: '.' },
+        { x: 0..255, y: 223..315, char: :enter }
+      ],
+
+      keyboard_symbol_number: [
+        { x: 0..35,  y: 190..210, char: '(' },
+        { x: 0..68,  y: 190..210, char: ')' },
+        { x: 0..104, y: 190..210, char: '1' },
+        { x: 0..138, y: 190..210, char: '2' },
+        { x: 0..169, y: 190..210, char: '3' },
+        { x: 0..203, y: 190..210, char: '+' },
+        { x: 0..239, y: 190..210, char: '-' },
+        { x: 0..35,  y: 220..245, char: '?' },
+        { x: 0..68,  y: 220..245, char: '$' },
+        { x: 0..104, y: 220..245, char: '4' },
+        { x: 0..138, y: 220..245, char: '5' },
+        { x: 0..169, y: 220..245, char: '6' },
+        { x: 0..203, y: 220..245, char: '*' },
+        { x: 0..239, y: 220..245, char: '/' },
+        { x: 0..35,  y: 255..275, char: '!' },
+        { x: 0..68,  y: 255..275, char: ';' },
+        { x: 0..104, y: 255..275, char: '7' },
+        { x: 0..138, y: 255..275, char: '8' },
+        { x: 0..169, y: 255..275, char: '9' },
+        { x: 0..203, y: 255..275, char: '=' },
+        { x: 0..239, y: 255..275, char: :erase },
+        { x: 0..35,  y: 290..315, char: :keyboard_capital },
+        { x: 0..68,  y: 290..315, char: '@' },
+        { x: 0..104, y: 290..315, char: '%' },
+        { x: 0..138, y: 290..315, char: '0' },
+        { x: 0..169, y: 290..315, char: '#' },
+        { x: 0..203, y: 290..315, char: '_' },
+        { x: 0..239, y: 290..315, char: :enter }
+      ]
+    }
+
+    def self.type_text(params = {})
+      change_keyboard
+      Device::Display.print_line("#{self.text}", params[:line], params[:column])
+      time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
+      key = nil
+
+      while text_not_ready?(key)
+        line_x, line_y = getxy_stream(100)
+
+        if line_x && line_y
+          touch_clear
+          key = parse(line_x, line_y, params)
+        else
+          break(Device::IO::KEY_TIMEOUT) if Time.now > time
+
+          key = getc(100)
+        end
+      end
+
+      [key, self.text]
+    end
+
+    def self.text_not_ready?(key)
+      key != :enter && key != Device::IO::ENTER && key != Device::IO::CANCEL
+    end
+
+    def self.parse(line_x, line_y, params)
+      key = attributes[type].find do |value|
+        value[:x].include?(line_x) && value[:y].include?(line_y)
+      end
+      return if key.nil?
+
+      Device::Audio.beep(7, 60)
+      show_text(key, params)
+
+      key[:char]
+    end
+
+    def self.show_text(key, params)
+      case key[:char]
+      when :keyboard_uppercase, :keyboard_symbol_number, :keyboard_capital
+        self.type = key[:char]
+        change_keyboard
+      when :erase
+        self.text += '' if text.nil?
+        self.text = text[0..-2]
+      when :space
+        self.text += ' '
+      else
+        self.text << key[:char] unless key[:char] == :enter
+      end
+      Device::Display.print_line("#{self.text}", params[:line], params[:column])
+    end
+
+    def self.change_keyboard
+      if type.nil?
+        self.type = :keyboard_capital
+        Device::Display.print_bitmap('./shared/keyboard_capital.bmp')
+      else
+        Device::Display.print_bitmap("./shared/#{type}.bmp")
+      end
+    end
+
+    def self.wifi_password
+      self.text = if Device::Setting.wifi_password == 'false'
+                    ''
+                  else
+                    Device::Setting.wifi_password
+                  end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.21.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -192,6 +192,7 @@ files:
 - lib/device/support.rb
 - lib/device/system.rb
 - lib/device/version.rb
+- lib/device/virtual_keyboard.rb
 - lib/ext/array.rb
 - lib/ext/float.rb
 - lib/ext/hash.rb