da_funk 3.20.0 → 3.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a61984983d2f7c168e0a4e84d60ac44d3060f7be
-  data.tar.gz: 490ef400806c5e7329d28426ca95fa4284c3ea02
+SHA256:
+  metadata.gz: bc5abcda84d3caf3982e38fe2ec5c10e59de3ea4c171ec086355a4192e610e21
+  data.tar.gz: a3bac877e9dc0e25a3b0da2f015c87ba64431dab8c1bc7db8f513c89cdf46289
 SHA512:
-  metadata.gz: c0f22c650827eec86b2fb87251771d519c1132d6a8b488b76ad940fb2e66491810e7235033cfe1ac0f4191058520b39022546ba789fa1dedd279f0cebb52f7d3
-  data.tar.gz: 11da367af36fc688bce9ccc0f7979fc17491b5102d4cd056df675b0e69699e7ff79a817f7f25926aa8ab3e25d58ef7da7b3f63066aedde0de7780e09f0884579
+  metadata.gz: 32172e2717e34860bd3df6eb6a8a8c1bae0eb54dce61fa45e93b9dcd59af4d9da939450f724defa7a41de8612453f73bd50a05ee8dd60d950a4e56d2000768b6
+  data.tar.gz: 59de0b4dbdca94dbd077c37e220e22305030823b7a171b2a77e1ea1778f05fc17f6eb2d999a98911348a2a57bd0b101a7f2e2535f4acd60fe740a50289195981

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.20.0)
+    da_funk (3.21.0)
       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.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,22 @@
 # DaFunk
 
+### 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;

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

@@ -296,6 +296,8 @@ module DaFunk
 
       if key == Device::IO::ENTER
         options[:default]
+      elsif key == Device::IO::KEY_TIMEOUT
+        options[:timeout]
       else
         selected
       end
@@ -303,7 +305,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
@@ -313,7 +318,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
@@ -321,7 +332,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
@@ -441,18 +453,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
-        info = (!! DaFunk::PaymentChannel.alive?)
-        if self.link.nil? || self.link != info
-          self.link = info
-          if info
-            PAX::Display.print_status_bar(SLOT_LINK, "./shared/link.png")
-          else
-            PAX::Display.print_status_bar(SLOT_LINK, "./shared/unlink.png")
-          end
-        end
-      end
-
       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 Device::Network.connected?
+          sig = Device::Network.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/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.20.0"
+  VERSION="3.21.0"
 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.20.0
+  version: 3.21.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-12 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
@@ -253,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: MRuby Embedded System Framework