da_funk 3.30.0 → 3.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cb59f7b97099d4e94b66bdf46f9cfc7e4f39893cf88b56b23b352476f3bb2f
-  data.tar.gz: 2c81b4d5a3226c0c5d3cc25176625183f5a3766bea7a120b134604bfb030dc16
+  metadata.gz: b3a687d541cc683675f05e5ebcf8d28504a929c97a57606e9af3d5f238f04def
+  data.tar.gz: f3a1c52920ca5d00f3b43a3d9e513dad9ae883b7167c4b8c37509089bc489af6
 SHA512:
-  metadata.gz: dcea670e59016cb7b6a6b297239130ee3a9ff372a94acc8edd4f31a623a6db842f9a43d3cf92ff8253eb77108055ad213d82f12645f572f40548968d435ec7ec
-  data.tar.gz: bde518c1731e7ae15d864f87f423d518672ea856251263092f408875c8c6d8c4acc52f023015c90edbb9cc917b15243539e37c7f7f093684837718c8accac798
+  metadata.gz: 7c7d8b462ac97d930628a593a27bc5a7388d3543683f9950db9449d34d22159c68250dc6a8cd2aa24abbed62c5b0ddd09711d0ca0b040924e9337d4f85e1b1e0
+  data.tar.gz: 40d72d5925bfaf49d65bc54ccbfb2c231d8d2f548fd13f784a8bc1bf1b4c863418251e4a1b773ef44836a01dc3fe53321f5f736e33ae9666fd7783546676eac2

data/Gemfile

@@ -4,4 +4,13 @@ gem 'cloudwalk'
 gem 'rubocop', require: false
 gem 'funky-mock'
 
-gemspec
+group :test do
+  gem 'minitest', group: :test
+  gem 'simplecov', group: :test
+end
+
+group :development, :test do
+  gem 'byebug'
+end
+
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.30.0)
+    da_funk (3.34.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,17 +15,20 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     ast (2.4.1)
+    byebug (11.1.3)
     cloudwalk (1.15.0)
       bundler
       rake
     cloudwalk_handshake (1.21.3)
       funky-simplehttp (~> 0.6)
+    docile (1.3.5)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
     funky-mock (0.1.0)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)
     io-like (0.3.1)
+    minitest (5.14.4)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -47,6 +50,10 @@ GEM
     rubocop-ast (1.1.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
     unicode-display_width (1.7.0)
     yard (0.9.25)
 
@@ -56,12 +63,15 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  byebug
   cloudwalk
   da_funk!
   funky-mock
   funky-simplehttp
+  minitest
   rubocop
+  simplecov
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.7

data/RELEASE_NOTES.md

@@ -1,5 +1,32 @@
 # DaFunk
 
+### 3.33.1 - 2021-02-19
+
+- Fixed argument being passed to hours2seconds method which was nil;
+
+### 3.33.0 - 2021-02-08
+
+- Added method Device::IO#get_format_or_touchscreen_action;
+- Added support to images on ParamsDat#download, ParamsDat#update_app and ParamsDat#update_file;
+- Return result of ParamsDat#update_apps call to the caller.
+
+### 3.32.0 - 2021-01-04
+
+- Remapped virtual keyboard to add support to new layout;
+- Make timeout of virtual keyboard parametrized;
+- Limit size of string to 20 on virtual keyboard;
+- Refactoring status bar:
+  - Check if thread is paused which means communication it's being configured. In this case 'sem sinal' message should be displayed;
+  - Do not show media type an media icon if thread is paused;
+- Removed thread pause from attach and scan calls, let the application that is doing the configuration take care of that;
+- Move reload of metadata to communication thread;
+- Added support to check network conn status from time to time, default is each 5 minutes.
+
+### 3.31.0 - 2020-11-27
+
+- Added support to new battery view (Exact percentage);
+- Added support to new main screen when there's a pending sale.
+
 ### 3.30.0 - 2020-11-16
 
 - Replace GPRS icon to 3G;

data/Rakefile

@@ -90,3 +90,17 @@ end
 task "test:all"         => :build
 task "test:unit"        => :build
 task "test:integration" => :build
+
+Rake::TestTask.new('test:iso8583') do |t|
+  Bundler.require(:default, :test)
+  t.libs << File.join("lib", "da_funk", "helper")
+  t.libs << File.join("lib","iso8583")
+  t.libs << File.join("test", "iso8583")
+  t.test_files = FileList['test/iso8583/**/*_test.rb']
+end
+
+task "test:iso8583:cov" do
+  ENV.store('COV', '1')
+  Bundler.require(:default, :test)
+  Rake::Task["test:iso8583"].execute
+end

data/lib/da_funk/connection_management.rb

@@ -1,21 +1,23 @@
 module DaFunk
   class ConnectionManagement
     class << self
-      attr_accessor :drops, :primary_timeout
+      attr_accessor :drops, :primary_timeout, :last_time_check
     end
     self.drops = 0
     DEFAULT_DROP_LIMIT = 2
 
     def self.check
-      if Device::Network.connected?
-        if primary_try?
-          :primary_communication
-        end
-      else
-        if fallback?
-          :fallback_communication
+      if must_check?
+        if Device::Network.connected?
+          if primary_try?
+            :primary_communication
+          end
         else
-          :attach_registration_fail
+          if fallback?
+            :fallback_communication
+          else
+            :attach_registration_fail
+          end
         end
       end
     end
@@ -125,6 +127,19 @@ module DaFunk
     def self.schedule_primary_timeout
       self.primary_timeout = (Time.now + self.conn_fallback_timer)
     end
+
+    def self.must_check?
+      if self.last_time_check
+        if self.last_time_check < Time.now
+          self.last_time_check = Time.now + @value
+          true
+        end
+      else
+        @value = DaFunk::ParamsDat.file['conn_check_timer']
+        @value = @value.nil? ? 300 : @value * 60
+        self.last_time_check = Time.now + @value
+        true
+      end
+    end
   end
 end
-

data/lib/da_funk/event_handler.rb

@@ -52,7 +52,7 @@ module DaFunk
       end
 
       unless config["timestamp"]
-        config["timestamp"] = hours2seconds(option["interval"])
+        config["timestamp"] = hours2seconds(option[:hours])
       else
         if config["interval"]["hours"].to_s != option[:hours].to_s
           config["timestamp"] = hours2seconds(option[:hours])

data/lib/da_funk/helper.rb

@@ -61,38 +61,77 @@ module DaFunk
       end
     end
 
-    def check_download_error(ret, enable_txt_ui = true)
-      value = true
+    def check_download_error(download_ret, enable_txt_ui = true)
+      value = false
+
+      if download_ret == DaFunk::Transaction::Download::FILE_NOT_CHANGE
+        if enable_txt_ui
+          I18n.pt(:download_file_is_the_same, :args => [download_ret])
+          getc(1000)
+        end
+        value = true
+      elsif download_ret == DaFunk::Transaction::Download::SUCCESS
+        if enable_txt_ui
+          I18n.pt(:download_success, :args => [download_ret])
+          getc(1000)
+        end
+        value = true
+      end
+      value
+    end
+
+    def show_download_error(download_ret, enable_txt_ui = true)
       ui = {}
 
-      case ret
+      case download_ret
       when DaFunk::Transaction::Download::SERIAL_NUMBER_NOT_FOUND
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_serial_number_not_found
-        value =  false
+        ContextLog.info "[I] Download error, serial number not registered"
       when DaFunk::Transaction::Download::FILE_NOT_FOUND
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_file_not_found
-        value = false
-      when DaFunk::Transaction::Download::FILE_NOT_CHANGE
-        ui[:i18n] = :download_file_is_the_same
-      when DaFunk::Transaction::Download::SUCCESS
-        ui[:i18n] = :download_success
+        ContextLog.info "[I] Download error, file not found"
       when DaFunk::Transaction::Download::COMMUNICATION_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/network_system_error.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_communication_failure
-        value = false
+        ContextLog.info "[I] Download error, connection problem"
       when DaFunk::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_encoding_error
-        value = false
+        ContextLog.info "[I] Download error, encoding problem"
       when DaFunk::Transaction::Download::IO_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_io_error
-        value = false
+        ContextLog.info "[I] Download error, IO error"
       else
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/network_system_error.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_communication_failure
-        value = false
+        ContextLog.info "[I] Download error, connection problem"
       end
 
-      I18n.pt(ui[:i18n], :args => [ret]) if enable_txt_ui
-
-      value
+      if enable_txt_ui
+        I18n.pt(ui[:i18n], :args => [download_ret])
+        getc(5000)
+      end
     end
 
     def try(tries, &block)

data/lib/da_funk/helper/status_bar.rb

@@ -1,31 +1,75 @@
+#
+# @file status_bar.rb
+# @brief DaFunk status bar helper script.
+# @platform N/A
+#
+# @copyright Copyright (c) 2016 CloudWalk, Inc.
+#
+
 module DaFunk
   module Helper
+    # Status bar class definition.
     class StatusBar
-      STATUS_TIMEOUT          = 60
-      SLOT_MEDIA              = 0
-      SLOT_SIGNAL_LEVEL       = 1
-      SLOT_UPDATE             = 2
+      # Class macros and constants
+      STATUS_TIMEOUT = 60
+      SLOT_MEDIA = 0
+      SLOT_SIGNAL_LEVEL = 1
+      SLOT_UPDATE = 2
       SLOT_BATTERY_PERCENTUAL = 6
-      SLOT_BATTERY_LEVEL      = 7
-      SLOT_MESSAGE_CONNECTION = {
-        true  => {
-          :slot1 => 2,
-          :slot2 => 3,
-          :message1 => './shared/conectado_01.png',
-          :message2 => './shared/conectado_02.png'
-        },
-        false => {
-          :slot1 => 2,
-          :slot2 => 3,
-          :message1 => './shared/buscando_01.png',
-          :message2 => './shared/buscando_02.png'
-        }
+      SLOT_BATTERY_LEVEL = 7
+
+      # TODO: review the 'print_status_bar' API to reduce the number of files
+      # to eleven?
+      BATTERY_PERCENTAGE_IMAGES = [
+         './shared/1%.png',  './shared/1%.png',  './shared/2%.png',
+         './shared/3%.png',  './shared/4%.png',  './shared/5%.png',
+         './shared/6%.png',  './shared/7%.png',  './shared/8%.png',
+         './shared/9%.png', './shared/10%.png', './shared/11%.png',
+        './shared/12%.png', './shared/13%.png', './shared/14%.png',
+        './shared/15%.png', './shared/16%.png', './shared/17%.png',
+        './shared/18%.png', './shared/19%.png', './shared/20%.png',
+        './shared/21%.png', './shared/22%.png', './shared/23%.png',
+        './shared/24%.png', './shared/25%.png', './shared/26%.png',
+        './shared/27%.png', './shared/28%.png', './shared/29%.png',
+        './shared/30%.png', './shared/31%.png', './shared/32%.png',
+        './shared/33%.png', './shared/34%.png', './shared/35%.png',
+        './shared/36%.png', './shared/37%.png', './shared/38%.png',
+        './shared/39%.png', './shared/40%.png', './shared/41%.png',
+        './shared/42%.png', './shared/43%.png', './shared/44%.png',
+        './shared/45%.png', './shared/46%.png', './shared/47%.png',
+        './shared/48%.png', './shared/49%.png', './shared/50%.png',
+        './shared/51%.png', './shared/52%.png', './shared/53%.png',
+        './shared/54%.png', './shared/55%.png', './shared/56%.png',
+        './shared/57%.png', './shared/58%.png', './shared/59%.png',
+        './shared/60%.png', './shared/61%.png', './shared/62%.png',
+        './shared/63%.png', './shared/64%.png', './shared/65%.png',
+        './shared/66%.png', './shared/67%.png', './shared/68%.png',
+        './shared/69%.png', './shared/70%.png', './shared/71%.png',
+        './shared/72%.png', './shared/73%.png', './shared/74%.png',
+        './shared/75%.png', './shared/76%.png', './shared/77%.png',
+        './shared/78%.png', './shared/79%.png', './shared/80%.png',
+        './shared/81%.png', './shared/82%.png', './shared/83%.png',
+        './shared/84%.png', './shared/85%.png', './shared/86%.png',
+        './shared/87%.png', './shared/88%.png', './shared/89%.png',
+        './shared/90%.png', './shared/91%.png', './shared/92%.png',
+        './shared/93%.png', './shared/94%.png', './shared/95%.png',
+        './shared/96%.png', './shared/97%.png', './shared/98%.png',
+        './shared/99%.png', './shared/100%.png'
+      ].freeze
+
+      MEDIA_PATH = {
+        :gprs => './shared/3G.png',
+        :wifi => './shared/WIFI.png'
       }
 
+      BATTERY_CHARGING = [
+        "./shared/battery_charging.png",
+        "./shared/battery_charged.png"
+      ].freeze
+
       BATTERY_IMAGES = {
         0..4     => "./shared/battery0.png",
-        5..9     => "./shared/baterry5.png",
-        10..19   => "./shared/battery10.png",
+        5..19    => "./shared/battery10.png",
         20..29   => "./shared/battery20.png",
         30..39   => "./shared/battery30.png",
         40..49   => "./shared/battery40.png",
@@ -34,48 +78,29 @@ module DaFunk
         70..79   => "./shared/battery70.png",
         80..89   => "./shared/battery80.png",
         90..99   => "./shared/battery90.png",
-        100..100 => "./shared/battery100.png",
-      }
-
-      BATTERY_CHARGE_IMAGES = {
-        50  => "./shared/battery0c.png",
-        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",
+        100..100 => "./shared/battery100.png"
       }
 
       WIFI_IMAGES = {
-        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"
+        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 = {
-        0..0    => "./shared/mobile0.png",
-        1..20   => "./shared/mobile20.png",
-        21..40  => "./shared/mobile40.png",
-        41..60  => "./shared/mobile60.png",
-        61..80  => "./shared/mobile80.png",
-        81..200 => "./shared/mobile100.png"
+        0..0     => "./shared/mobile0.png",
+        1..20    => "./shared/mobile20.png",
+        21..40   => "./shared/mobile40.png",
+        41..60   => "./shared/mobile60.png",
+        61..80   => "./shared/mobile80.png",
+        81..200  => "./shared/mobile100.png"
       }
 
       class << self
-        attr_accessor :signal, :battery, :power, :managment, :connected
+        attr_accessor :current_signal, :current_message, :battery, :power, :managment
+        attr_accessor :current_media
       end
 
       def self.check
@@ -90,98 +115,127 @@ module DaFunk
         if File.exists?('./shared/system_update')
           PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
           PAX::Display.print_status_bar(3, nil)
-          self.connected = false
         else
-          change_message
+          self.change_message
         end
       end
 
       def self.change_message
-        unless File.exists?('./shared/system_update')
-          connected = Device::Network.connected?
-
-          if connected != self.connected
-            self.connected = connected
-
-            slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
-            slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
-
-            message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
-            message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
-
-            Device::Display.print_status_bar(slot_message_1, message_1)
-            Device::Display.print_status_bar(slot_message_2, message_2)
+        if ThreadScheduler.pause?(ThreadScheduler::THREAD_EXTERNAL_COMMUNICATION, 200)
+          if self.current_message != :pause
+            self.current_message = :pause
+            Device::Display.print_status_bar(2, './shared/semsinal_01.png')
+            Device::Display.print_status_bar(3, './shared/semsinal_02.png')
+          end
+        elsif Device::Network.connected?
+          if self.current_message != :connected
+            self.current_message = :connected
+            Device::Display.print_status_bar(2, './shared/conectado_01.png')
+            Device::Display.print_status_bar(3, './shared/conectado_02.png')
+          end
+        else
+          if self.current_message != :searching
+            self.current_message = :searching
+            Device::Display.print_status_bar(2, './shared/buscando_01.png')
+            Device::Display.print_status_bar(3, './shared/buscando_02.png')
           end
         end
       end
 
       def self.change_connection
-        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/3G.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
+        if ThreadScheduler.pause?(ThreadScheduler::THREAD_EXTERNAL_COMMUNICATION, 200)
+          Device::Display.print_status_bar(SLOT_MEDIA, nil)
+          Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, nil)
+          self.current_media = nil
+          self.current_signal = nil
+        elsif Device::Network.connected?
+          media  = Device::Network.gprs? ? :gprs : :wifi
+          signal = Device::Network.signal
+          if media != self.current_media
+            self.current_media = media
+            Device::Display.print_status_bar(SLOT_MEDIA, MEDIA_PATH[self.current_media])
+          end
+          if signal != self.current_signal
+            self.current_signal = signal
+            Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
+                                              self.get_image_path(self.current_media, self.current_signal))
           end
         else
           Device::Display.print_status_bar(SLOT_MEDIA, nil)
           Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, "./shared/searching.png")
+          self.current_media = nil
+          self.current_signal = nil
         end
       end
 
+      # Updates the battery slot whenever a capacity or power supply change is
+      # detected.
       def self.change_battery
-        bat  = Device::System.battery
-        dock = Device::System.power_supply
+        capacity_type = Device::System.battery_capacity_type
+
+        capacity = Device::System.battery
+        charging = Device::System.power_supply
 
-        if self.battery != bat || self.power != dock
-          self.battery = bat
-          self.power   = dock
+        if self.battery != capacity || self.power != charging
 
-          if self.power && self.battery == 50
-            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, nil)
+          if self.battery.nil? # basic integrity check
+            self.battery = capacity
+          elsif charging
+            capacity >= self.battery && self.battery = capacity
           else
-            percentual = get_image_path(:battery_percentual, self.battery)
-            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, percentual)
+            capacity <= self.battery && self.battery = capacity
+          end
+
+          if self.power == charging && capacity != self.battery
+            return nil
           end
 
-          if self.power
-            Device::Display.print_status_bar(
-              SLOT_BATTERY_LEVEL, get_image_path(:battery_charge, self.battery))
+          self.power = charging
+
+          rsc = self.get_image_path(self.power ? :battery_charge : :battery, self.battery)
+
+          Device::Display.print_status_bar(SLOT_BATTERY_LEVEL, rsc)
+
+          if capacity_type == 'percentage' || !self.power
+            rsc = self.get_image_path(:battery_percentual, self.battery)
           else
-            Device::Display.print_status_bar(SLOT_BATTERY_LEVEL,
-                                             get_image_path(:battery, self.battery))
+            rsc = nil
           end
+
+          Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, rsc)
         end
       end
 
+      # Searches for the correspondent image to 'type' and 'signal strength'.
       def self.get_image_path(type, sig)
         return if sig.nil?
         case type
         when :gprs
-          MOBILE_IMAGES.each {|k,v| return v if k.include? sig }
+          MOBILE_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :wifi
-          WIFI_IMAGES.each {|k,v| return v if k.include? sig }
+          WIFI_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :battery
-          BATTERY_IMAGES.each {|k,v| return v if k.include? sig }
+          BATTERY_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :battery_charge
-          BATTERY_CHARGE_IMAGES[sig]
+          if sig < 100
+            BATTERY_CHARGING[0]
+          else
+            BATTERY_CHARGING[1]
+          end
         when :battery_percentual
-          BATTERY_PERCENTAGE_IMAGES.each {|k,v| return v if k.include? sig }
+          BATTERY_PERCENTAGE_IMAGES[sig]
         else
           nil
         end
       end
 
-      self.managment      ||= true
+      self.managment ||= true
       def self.valid?
         if self.managment
           true
@@ -190,4 +244,3 @@ module DaFunk
     end
   end
 end
-