da_funk 3.32.0 → 3.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33827fb8e6019dae3a230de689a73d62065b71fe5d87cde66a5d034e10c8958
-  data.tar.gz: b88cd578be7d53abc94f00ffe3ff35fe21ecc028b75296c5d7b46391a35a6520
+  metadata.gz: a542a7e943d7feecfa0300ca6a42e21a68995b38dd3b0630e56dac4fd8de9c04
+  data.tar.gz: 857627718bb9959b86576368d3380e09b5501f387a200e021785a04eb299ba1c
 SHA512:
-  metadata.gz: 2f06599b79a0a3a2f098b2d544ef440231289d554737acf02cb7c1fae1a54509f503f6e66c7e90c2936eac9de0cab6aa3d9cdce8e9ebff2960adaf468c973dcb
-  data.tar.gz: 0d22fb804323266724e6efdf3eb79f075a69674cda33ee6321e3117a91983b9bed246bc2ae3c9408649c2ad20755c7e672b55a7c62502fdf77ff6d9562c9df20
+  metadata.gz: 7198fc96b3f58dbda4ef7a5c09f47581586b710f85908a7566d43452105bc7e9cd08228a6f65aa94784c561511d6d311d92e6616c1f00e603913a0b82bfce0c7
+  data.tar.gz: 0a356ecb0fef59b610333243e8ed320ef00c5da149fa3b885eaf9bdf92e8a40a20633b5107dcc350b6b4d2847b21b739c8691b5f9fa7211415350f429039babb

data/Gemfile.lock

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

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 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;

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/params_dat.rb

@@ -1,6 +1,10 @@
 module DaFunk
   class ParamsDat
-    FILE_NAME = "./main/params.dat"
+    FILE_NAME                   = "./main/params.dat"
+    SEARCHING_IMAGE_PATH        = './shared/searching_updates_app.bmp'
+    UPDATING_IMAGE_PATH         = './shared/updating.bmp'
+    ATTACH_IMAGE_PATH           = './shared/network_conectar_init.bmp'
+    CONNECTION_ERROR_IMAGE_PATH = './shared/network_system_error.bmp'
 
     include DaFunk::Helper
 
@@ -117,31 +121,40 @@ module DaFunk
     end
 
     def self.download(enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui))
         parse
-        ret = try(3) do |attempt|
+        try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+            getc(100)
           end
-          getc(100)
-          ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
-          unless check_download_error(ret, enable_txt_ui)
-            getc(2000)
-            false
-          else
-            true
-          end
+          Device::Display.print_bitmap(SEARCHING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
+          ret = check_download_error(download_ret, enable_txt_ui)
         end
+        show_download_error(download_ret, enable_txt_ui) unless ret
         parse if ret
-        ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
+        end
       end
+      ret
     end
 
     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
+      ret = true
+      if force_params || ! self.valid
+        ret = self.download(enable_txt_ui)
+      end
+
       main_updated = nil
-      if self.valid
+      if self.valid && ret
         apps_to_update = self.outdated_apps(force_crc, force)
         size_apps = apps_to_update.size
         apps_to_update.each_with_index do |app, index|
@@ -149,12 +162,15 @@ module DaFunk
           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, enable_txt_ui)
+        if ret
+          files_to_update = self.outdated_files(force_crc, force)
+          size_files = files_to_update.size
+          files_to_update.each_with_index do |file_, index|
+            ret = self.update_file(file_, index+1, size_files, force_crc || force, enable_txt_ui)
+          end
         end
       end
+      ret
     ensure
       self.restart if main_updated
     end
@@ -199,34 +215,58 @@ module DaFunk
     end
 
     def self.update_app(application, index = 1, all = 1, force = false, enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui)) && application
         try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+            getc(100)
           end
-          getc(100)
-          ret = check_download_error(application.download(force), enable_txt_ui)
-          getc(1000)
-          ret
+          Device::Display.print_bitmap(UPDATING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = application.download(force)
+          ret = check_download_error(download_ret, enable_txt_ui)
+        end
+        show_download_error(download_ret, enable_txt_ui) unless ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
         end
       end
+      ret
     end
 
     def self.update_file(file_parameter, index = 1, all = 1, force = false, enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui)) && file_parameter
         try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+            getc(100)
+          end
+          Device::Display.print_bitmap(UPDATING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = file_parameter.download(force)
+          ret = check_download_error(download_ret, enable_txt_ui)
+          if ret
+            file_parameter.unzip
+            getc(1000)
           end
-          getc(100)
-          ret = check_download_error(file_parameter.download(force), enable_txt_ui)
-          file_parameter.unzip if ret
-          getc(1000)
           ret
         end
+        show_download_error(download_ret, enable_txt_ui) unless ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
+        end
       end
+      ret
     end
 
     def self.apps

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.32.0"
+  VERSION="3.33.0"
 end
 

data/lib/device/io.rb

@@ -161,6 +161,59 @@ class Device
       end
     end
 
+    def self.get_format_or_touchscreen_action(max, touch_map, options = {})
+      set_default_format_option(options)
+      key = text = options[:value] || ""
+      time = Time.now + (options[:timeout] || 30000) / 1000
+      ret = {}
+      touch_clear
+      Device::Display.clear options[:line]
+      Device::Display.print_line format(text, options), options[:line], options[:column]
+      loop do
+        line_x, line_y = getxy_stream(100)
+        if line_x && line_y
+          ret = parse_touchscreen(touch_map, line_x, line_y)
+          break(ret) if ret.include?(:touch_action)
+        else
+          key = getc(100)
+          if key == BACK
+            text = text[0..-2]
+            Device::Display.clear options[:line]
+            Device::Display.print_line format(text, options), options[:line], options[:column]
+          elsif options[:timeout_enabled] && time < Time.now
+            ret[:timeout] = Device::IO::KEY_TIMEOUT
+            break(ret)
+          elsif key == ENTER
+            ret[:text] = text
+            break(ret)
+          elsif key == CANCEL
+            ret[:cancel] = Device::IO::CANCEL
+            break(ret)
+          elsif key == F1 || key == DOWN || key == UP || key == ALPHA
+            change_next(text, check_mask_type(text, options))
+            next
+          elsif text.size >= max
+            next
+          elsif insert_key?(key, options)
+            text << key
+            Device::Display.clear options[:line]
+            Device::Display.print_line format(text, options), options[:line], options[:column]
+          end
+        end
+      end
+    end
+
+    def self.parse_touchscreen(touch_map, line_x, line_y)
+      ret = {}
+      touch_map.each do |key, value|
+        if value[:x].include?(line_x) && value[:y].include?(line_y)
+          Device::Audio.beep(7, 60)
+          ret[:touch_action] = key
+        end
+      end
+      ret
+    end
+
     def self.set_default_format_option(options)
       options[:mode]   ||= IO_INPUT_LETTERS
       options[:line]   ||= 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.32.0
+  version: 3.33.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake