da_funk 3.30.0 → 3.34.0

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

@@ -31,7 +31,7 @@ module DaFunk
       @resources_out     ||= @resources.pathmap("%{resources,#{File.join(root_path, "out")}}p")
       @tests_res_out     ||= @tests_resources.pathmap("%{test/resources,out}p")
       @mruby             ||= "cloudwalk run -b"
-      @mrbc              = get_mrbc_bin(@mrbc)
+      @mrbc                = get_mrbc_bin(@mrbc)
 
       define
     end
@@ -44,14 +44,21 @@ module DaFunk
       end
     end
 
+    # Searches for a mrbc binary.
     def get_mrbc_bin(from_user)
-      if (! system("type mrbc > /dev/null 2>&1 ")) && from_user
+      device = "/dev/null"
+
+      if %w[i386-mingw32 x64-mingw32].include?(RUBY_PLATFORM) && !ENV['SHELL']
+        device = "NUL" # Windows Command Prompt
+      end
+
+      if !system("type mrbc > #{device} 2>&1") && from_user
         from_user
-      elsif system("type mrbc > /dev/null 2>&1 ")
+      elsif system("type mrbc > #{device} 2>&1")
         "env mrbc"
       elsif ENV["MRBC"]
         ENV["MRBC"]
-      elsif system("type cloudwalk > /dev/null 2>&1 ")
+      elsif system("type cloudwalk > #{device} 2>&1")
         "env cloudwalk compile"
       else
         puts "$MRBC isn't set or mrbc/cloudwalk isn't on $PATH"
@@ -64,7 +71,7 @@ module DaFunk
       command_line     = File.join(File.dirname(__FILE__), "..", "..", "utils", "command_line_platform.rb")
       command_line_obj = File.join(root_path, "out", "main", "command_line_platform.mrb")
       all_files        = FileList["test/test_helper.rb"] + libs + files + [command_line] + [File.join(File.dirname(__FILE__), "..", "..", "utils", "test_run.rb")]
-      if platform_call("#{mrbc} -g -o #{command_line_obj} #{command_line}") && platform_call("#{mrbc} -g -o #{test_out} #{all_files.uniq}")
+      if platform_call("#{@mrbc} -g -o #{command_line_obj} #{command_line}") && platform_call("#{@mrbc} -g -o #{test_out} #{all_files.uniq}")
         puts "cd #{File.dirname(out_path)}"
         FileUtils.cd File.dirname(out_path)
         platform_call("#{mruby} #{File.join(name, "test.mrb")}")
@@ -108,7 +115,7 @@ module DaFunk
 
       desc "Compile app to mrb and process resources"
       task :build => :resources do
-        platform_call "#{mrbc} #{debug_flag} -o #{main_out} #{libs} "
+        platform_call "#{@mrbc} #{debug_flag} -o #{main_out} #{libs} "
       end
 
       desc "Compile, build and pack app and resources"

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.30.0"
+  VERSION="3.34.0"
 end
 

data/lib/device/display.rb

@@ -81,7 +81,8 @@ class Device
 
     private
     def self.main_image_format
-      if DaFunk::Transaction::Reversal.exists?
+      major, min, patch = Device.version.to_s.split('.').map { |v| v.to_i }
+      if DaFunk::Transaction::Reversal.exists? && major >= 8
         "main_#{Device::System.model}_reversal.bmp"
       else
         "main_#{Device::System.model}.bmp"

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

data/lib/device/network.rb

@@ -159,9 +159,7 @@ class Device
     #   Device::Setting.mode           = selected[:mode]
     def self.scan
       if wifi?
-        ThreadScheduler.pausing_communication do
-          adapter.scan if Device::Network.init(*self.config)
-        end
+        adapter.scan if Device::Network.init(*self.config)
       end
     end
 
@@ -192,39 +190,28 @@ class Device
     def self.attach(options = nil)
       Device::Network.connected?
       if self.code != SUCCESS
-        ThreadScheduler.pausing_communication do
-          self.code = Device::Network.init(*self.config)
-          self.code = Device::Network.connect
-          Device::Network.connected? if self.code != SUCCESS
-
-          hash = try_user(self.attach_timeout, options) do |process|
-            Device::Network.connected?
-            process[:ret] = self.code
-            # TODO develop an interface to keep waiting communication module dial
-            # based on platform returns
-            process[:ret] == PROCESSING || process[:ret] == 2 || process[:ret] == -3307 # if true keep trying
-          end
-          self.code = hash[:ret]
-
-          if self.code == SUCCESS
-            self.load_metadata
-            self.code = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
-          else
-            self.code = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
-            Device::Network.shutdown
-          end
+        self.code = Device::Network.init(*self.config)
+        self.code = Device::Network.connect
+        Device::Network.connected? if self.code != SUCCESS
+
+        hash = try_user(self.attach_timeout, options) do |process|
+          Device::Network.connected?
+          process[:ret] = self.code
+          # TODO develop an interface to keep waiting communication module dial
+          # based on platform returns
+          process[:ret] == PROCESSING || process[:ret] == 2 || process[:ret] == -3307 # if true keep trying
         end
-      end
-      Context::ThreadPubSub.publish('communication_update')
-      self.code
-    end
+        self.code = hash[:ret]
 
-    def self.load_metadata
-      if Object.const_defined?(:CwMetadata)
-        CwMetadata.load_variable if CwMetadata.respond_to?(:load_variable)
+        if self.code == SUCCESS
+          self.code = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
+        else
+          self.code = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
+          Device::Network.shutdown
+        end
       end
+      self.code
     end
-
     def self.shutdown
       if self.adapter.started?
         Device::Network.disconnect
@@ -276,4 +263,3 @@ class Device
     end
   end
 end
-

data/lib/device/system.rb

@@ -45,6 +45,15 @@ class Device
       adapter.battery
     end
 
+    # Checks the type of the battery capacity return (percentage or scale).
+    def self.battery_capacity_type
+      begin
+        adapter.battery_capacity_type
+      rescue StandardError => exception
+        'scale'
+      end
+    end
+
     def self.beep
       adapter.beep
     end

data/lib/device/virtual_keyboard.rb

@@ -82,34 +82,76 @@ class Device
       ],
 
       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 }
+        { x: 0..34,  y: 191..209, char: '1' },
+        { x: 0..46,  y: 191..209, char: '2' },
+        { x: 0..65,  y: 191..209, char: '3' },
+        { x: 0..96,  y: 191..209, char: '4' },
+        { x: 0..115, y: 191..209, char: '5' },
+        { x: 0..145, y: 191..209, char: '6' },
+        { x: 0..161, y: 191..209, char: '7' },
+        { x: 0..191, y: 191..209, char: '8' },
+        { x: 0..216, y: 191..209, char: '9' },
+        { x: 0..255, y: 191..209, char: '0' },
+        { x: 0..31,  y: 223..241, char: '%' },
+        { x: 0..52,  y: 223..241, char: '#' },
+        { x: 0..77,  y: 223..241, char: '$' },
+        { x: 0..97,  y: 223..241, char: '_' },
+        { x: 0..121, y: 223..241, char: '&' },
+        { x: 0..143, y: 223..241, char: '-' },
+        { x: 0..168, y: 223..241, char: '+' },
+        { x: 0..186, y: 223..241, char: '(' },
+        { x: 0..215, y: 223..241, char: ')' },
+        { x: 0..236, y: 223..241, char: '/' },
+        { x: 0..42,  y: 223..274, char: :keyboard_symbol_number_2 },
+        { x: 0..60,  y: 223..274, char: '*' },
+        { x: 0..84,  y: 223..274, char: '"' },
+        { x: 0..107, y: 223..274, char: "'" },
+        { x: 0..130, y: 223..274, char: ':' },
+        { x: 0..152, y: 223..274, char: ';' },
+        { x: 0..171, y: 223..274, char: '!' },
+        { x: 0..197, y: 223..274, char: '?' },
+        { x: 0..255, y: 223..274, char: :erase },
+        { x: 0..36,  y: 223..315, char: :keyboard_capital },
+        { x: 0..63,  y: 223..315, char: '@' },
+        { x: 0..88,  y: 223..315, char: ',' },
+        { x: 0..152, y: 223..315, char: :space },
+        { x: 0..168, y: 223..315, char: '.' },
+        { x: 0..255, y: 223..315, char: :enter }
+      ],
+
+      keyboard_symbol_number_2: [
+        { x: 0..34,  y: 191..209, char: '1' },
+        { x: 0..46,  y: 191..209, char: '2' },
+        { x: 0..69,  y: 191..209, char: '3' },
+        { x: 0..96,  y: 191..209, char: '4' },
+        { x: 0..115, y: 191..209, char: '5' },
+        { x: 0..145, y: 191..209, char: '6' },
+        { x: 0..161, y: 191..209, char: '7' },
+        { x: 0..191, y: 191..209, char: '8' },
+        { x: 0..216, y: 191..209, char: '9' },
+        { x: 0..255, y: 191..209, char: '0' },
+        { x: 0..35,  y: 223..241, char: '^' },
+        { x: 0..63,  y: 223..241, char: '[' },
+        { x: 0..97,  y: 223..241, char: ']' },
+        { x: 0..128, y: 223..241, char: '{' },
+        { x: 0..158, y: 223..241, char: '}' },
+        { x: 0..193, y: 223..241, char: '<' },
+        { x: 0..255, y: 223..241, char: '>' },
+        { x: 0..39,  y: 223..274, char: :keyboard_symbol_number },
+        { x: 0..63,  y: 223..274, char: '\\' },
+        { x: 0..86,  y: 223..274, char: '-' },
+        { x: 0..106, y: 223..274, char: '+' },
+        { x: 0..130, y: 223..274, char: '=' },
+        { x: 0..149, y: 223..274, char: '_' },
+        { x: 0..175, y: 223..274, char: '˜' },
+        { x: 0..195, y: 223..274, char: '|' },
+        { x: 0..255, y: 223..274, char: :erase },
+        { x: 0..34,  y: 223..310, char: :keyboard_capital },
+        { x: 0..61,  y: 223..310, char: '@' },
+        { x: 0..87,  y: 223..310, char: ',' },
+        { x: 0..146, y: 223..313, char: :space },
+        { x: 0..168, y: 223..311, char: '.' },
+        { x: 0..194, y: 223..319, char: :enter }
       ]
     }
 
@@ -117,9 +159,11 @@ class Device
       phisical_keys = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', "\017"]
       change_keyboard
       Device::Display.print_line("#{self.text}", params[:line], params[:column])
-      time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
-      key = nil
+      if params[:timeout_enabled]
+        time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
+      end
 
+      key = nil
       while text_not_ready?(key)
         line_x, line_y = getxy_stream(100)
 
@@ -127,8 +171,9 @@ class Device
           touch_clear
           key = parse(line_x, line_y, params)
         else
-          break(Device::IO::KEY_TIMEOUT) if Time.now > time
-
+          if params[:timeout_enabled]
+            break(Device::IO::KEY_TIMEOUT) if Time.now > time
+          end
           key = getc(100)
           if phisical_keys.include?(key)
             if key == Device::IO::BACK
@@ -161,7 +206,7 @@ class Device
 
     def self.show_text(key, params)
       case key[:char]
-      when :keyboard_uppercase, :keyboard_symbol_number, :keyboard_capital
+      when :keyboard_uppercase, :keyboard_symbol_number, :keyboard_symbol_number_2, :keyboard_capital
         self.type = key[:char]
         change_keyboard
       when :erase
@@ -170,7 +215,9 @@ class Device
       when :space
         self.text += ' '
       else
-        self.text << key[:char] unless key[:char] == :enter
+        if self.text && self.text.size < 20
+          self.text << key[:char] unless key[:char] == :enter
+        end
       end
       Device::Display.print_line("#{self.text}", params[:line], params[:column])
     end