da_funk 3.31.0 → 3.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5492c7a7c61fc8559c3d0267a010c62fc6b85f47ff9c40b6164d6afef3536cfd
-  data.tar.gz: 06cccc06f994055eb85e68163412af8b076b2342a59661f92e2ab2907514be32
+  metadata.gz: ca17006779ad6c0d5b9bda06b03b39206539d23769be8e1eae50368dcc341195
+  data.tar.gz: 25df4cf6175cf3b04053b16a7a99f8f27e36864bef6afe380a3baf2e1bd9ba79
 SHA512:
-  metadata.gz: 158eb51a52a2895383bfb2864c5717659aa3d601a3780c0abcc42029b3ad86e7606aa5b1c02c55bb95e6c90dbe187f55e5fdc0ab3a1af659a4320598ef192703
-  data.tar.gz: cdff69f582095c79cbe9a5e1e063e495aec2a21fd74e29cc132b12653942b770da6d56d8fa309a07c433ea4e2d0a3ac8b9680c47692c109897d68020d615fa56
+  metadata.gz: c19b050fec970e04fb6d681af3ae11d2eda01c42cde7ee8cc32cab784bda523f2967b4d175f6ceef84e35dc1376a26c7b063b2defac68c3a4711b41e02026331
+  data.tar.gz: 161f31d14b80fdaeeebe6120104471295ada25d06ae28940914169188ee01a64dde5b7d5c66c8cc91bcb3caa5332aaab8965056236faff1df28a17796eafd4c4

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.31.0)
+    da_funk (3.34.1)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,22 +15,25 @@ 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)
+    cloudwalk_handshake (2.0.0)
       funky-simplehttp (~> 0.6)
-    funky-emv (1.4.1)
-      funky-tlv (~> 0.2)
+    docile (1.3.5)
+    funky-emv (2.0.1)
+      funky-tlv (~> 1.0)
     funky-mock (0.1.0)
     funky-simplehttp (0.6.0)
-    funky-tlv (0.2.3)
+    funky-tlv (1.0.1)
     io-like (0.3.1)
+    minitest (5.14.4)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
-    posxml_parser (2.26.0)
-      funky-emv (~> 1)
+    posxml_parser (3.0.1)
+      funky-emv (~> 2)
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (1.8.2)
@@ -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,27 @@
 # 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);

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

@@ -18,21 +18,6 @@ module DaFunk
       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'
-        }
-      }
-
       # TODO: review the 'print_status_bar' API to reduce the number of files
       # to eleven?
       BATTERY_PERCENTAGE_IMAGES = [
@@ -72,6 +57,11 @@ module DaFunk
         './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"
@@ -109,7 +99,8 @@ module DaFunk
       }
 
       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
@@ -124,51 +115,56 @@ 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
           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, 
-                                               self.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