da_funk 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f6f58be57a4a45bf02ae2cd90a1c64010d0c44
-  data.tar.gz: e22bd2eb2bf8665858ea01c6e18b4f0ffd454542
+  metadata.gz: 4ecfc56704e73c282ee07fba23ce1fd9b80a3999
+  data.tar.gz: 23a3e8272e9b54cf3f83eb50f61935fda1c480d4
 SHA512:
-  metadata.gz: 7667ba7a022b1688171194841dd3b95a74b18c99290dac956f6f14068f2f1a29ccbf88a605ed74e2a974e9b31609b1a98caf794ef2e458fe7577f9892a91aeed
-  data.tar.gz: 4e59379bb67fbcad861f1a62c30120252a29a63a5d7d57fe0b06a16144dd79497f2d5497ccdc46244e07668ba872405d0300cb948dfc11c8f9364d642ea1c102
+  metadata.gz: 6332262e7d61471e94141fba3358a43130d35c64504fafb74ab494c8572ad9a9d29f185dc641fd7f3df35096232ef75b7b8082297f9b1ff2244c9669d7909dee
+  data.tar.gz: 750db4f4957e904bf1800c786cefcf5b7784c13cc6b0a0da041934c15f5ec9a4adbe3495d84aff5cc443f421d3160960db5d6021154ba4401d7c54b5c5d65cb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.6.6)
+    da_funk (0.6.7)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.5)
       posxml_parser (~> 0.6)
@@ -13,7 +13,7 @@ GEM
   specs:
     cloudwalk_handshake (0.5.4)
     funky-simplehttp (0.4.4)
-    posxml_parser (0.7.2)
+    posxml_parser (0.7.3)
     rake (10.5.0)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,15 @@
 # DaFunk
 
+### 0.6.7 - 2016-02-29 - DaFunk::Engine and DaFunk::StatusBar
+
+- Refactoring screen string manipulation.
+- Only call signal if Network connected.
+- Bug fix, only consider Network configured if Device::Setting.media is defined and Device::Setting.network_configured is 1.
+- Implement DaFunk::Engine and support to display status bar icons(battery, wifi and mobile).
+- Add support to remove all files from ./shared/ on Device::ParamsDat.format!(excluding main.bmp).
+- Device::Display.main_image check if platform respond_to main_image and if the file exists to return the method.
+- Update posxml_parser to version 0.7.3.
+
 ### 0.6.6 - 2016-02-18 - Update map keys adding some special chars
 
 - Update map keys adding some special chars.

data/Rakefile

@@ -20,6 +20,8 @@ FILES = FileList[
   "lib/da_funk/i18n_error.rb",
   "lib/da_funk/i18n.rb",
   "lib/da_funk/file_parameter.rb",
+  "lib/da_funk/helper/status_bar.rb",
+  "lib/da_funk/engine.rb",
   "lib/device.rb",
   "lib/device/audio.rb",
   "lib/device/crypto.rb",

data/lib/da_funk/engine.rb

@@ -0,0 +1,15 @@
+module DaFunk
+  class Engine
+    def self.setup
+      Device::Display.clear
+      puts "SETUP NOTIFICATIONS..."
+      Device::Notification.setup
+    end
+
+    def self.check
+      Device::Notification.check
+      DaFunk::Helper::StatusBar.check
+    end
+  end
+end
+

data/lib/da_funk/helper/status_bar.rb

@@ -0,0 +1,93 @@
+module DaFunk
+  module Helper
+    class StatusBar
+      STATUS_TIMEOUT  = 10
+      SLOT_CONNECTION = 0
+      SLOT_BATTERY    = 7
+
+      BATTERY_IMAGES = {
+        0 => "./shared/battery0.png",
+        1 => "./shared/battery25.png",
+        2 => "./shared/battery50.png",
+        3 => "./shared/battery75.png",
+        4 => "./shared/battery100.png",
+        5 => "./shared/battery0c.png",
+        6 => "./shared/battery100c.png",
+        7 => nil
+      }
+
+      WIFI_IMAGES = {
+        0..29   => "./shared/wifi0.png",
+        30..59  => "./shared/wifi30.png",
+        60..79  => "./shared/wifi60.png",
+        80..100 => "./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..100 => "./shared/mobile100.png"
+      }
+
+      class << self
+        attr_accessor :status_timeout, :signal, :battery
+      end
+
+      def self.check
+        if self.valid?
+          self.change_connection
+          self.change_battery
+        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))
+          end
+        end
+      end
+
+      def self.change_battery
+        bat = Device::System.battery
+        if self.battery != bat
+          self.battery = bat
+          Device::Display.print_status_bar(
+            SLOT_BATTERY, get_image_path(:battery, self.battery))
+        end
+      end
+
+      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 }
+        when :wifi
+          WIFI_IMAGES.each {|k,v| return v if k.include? sig }
+        when :battery
+          BATTERY_IMAGES[sig]
+        else
+          nil
+        end
+      end
+
+      self.status_timeout ||= Time.now
+      def self.valid?
+        if self.status_timeout < Time.now
+          self.status_timeout = Time.now + STATUS_TIMEOUT
+          true
+        end
+      end
+    end
+  end
+end
+

data/lib/da_funk/screen.rb

@@ -45,7 +45,7 @@ class Screen
     if n_strings?(args)
       args = args.map {|str| "#{str}\n" }
     else
-      args[0] = "#{args[0]}\n"
+      args[0] = "#{args.first}\n"
     end
     print(*args)
   end
@@ -64,9 +64,9 @@ class Screen
         jump_line if string[-1] == "\n"
       else
         space = @max_x - @x
-        Device::Display.print("#{string[0..(space - 1)]}", @y, @x)
+        Device::Display.print("#{string[0..(space - 1)]}", @y.to_i, @x.to_i)
         jump_line
-        loop_split_strings("#{string[(space)..-1]}")
+        loop_split_strings("#{string[space..-1]}")
       end
     end
   end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.6.6"
+  VERSION="0.6.7"
 end
 

data/lib/device/application.rb

@@ -32,13 +32,16 @@ class Device
     end
 
     def download(force = false)
-      if force || outdated?
+      if force || self.outdated?
         ret = Device::Transaction::Download.request_file(remote, file, crc_local)
       else
         ret = Device::Transaction::Download::FILE_NOT_CHANGE
       end
       @crc_local = @crc if ret == Device::Transaction::Download::SUCCESS
       ret
+    rescue => e
+      puts "ERROR #{e.message}"
+      Device::Transaction::Download::IO_ERROR
     end
 
     def dir
@@ -63,6 +66,8 @@ class Device
         @crc_local = Device::Crypto.crc16_hex(handle.read)
       end
       @crc_local != @crc
+    rescue
+      true
     ensure
       handle.close if handle
     end

data/lib/device/display.rb

@@ -1,5 +1,7 @@
 class Device
   class Display
+    MAIN_BMP = "main.bmp"
+
     def self.adapter
       Device.adapter::Display
     end
@@ -44,5 +46,35 @@ class Device
         adapter.clear_line line
       end
     end
+
+    # Print image in slot of status bar
+    #
+    # @param slot [Fixnum] Status bar slot.
+    # @param image_path [String] Path to image, or send nil to clear the slot.
+    # @return [NilClass] Failure.
+    # @return [TrueClass] Success.
+    def self.print_status_bar(slot, image_path)
+      slots = self.adapter.status_bar_slots_available - 1
+      if (0..slots).include?(slot)
+        if image_path.nil? || File.exists?(image_path)
+          self.adapter.print_status_bar(slot, image_path)
+        end
+      end
+    end
+
+    def self.print_main_image
+      bmp = "./shared/#{self.main_image}"
+      self.print_bitmap(bmp,0,0) if File.exists?(bmp)
+    end
+
+    def self.main_image
+      if adapter.respond_to?(:main_image) &&
+        File.exists?("./shared/#{adapter.main_image}")
+        adapter.main_image
+      else
+        MAIN_BMP
+      end
+    end
   end
 end
+

data/lib/device/network.rb

@@ -70,7 +70,7 @@ class Device
     end
 
     def self.configured?
-      Device::Setting.network_configured == "1"
+      Device::Setting.network_configured == "1" && ! Device::Setting.media.to_s.empty?
     end
 
     def self.ping(host, port)
@@ -82,10 +82,8 @@ class Device
     end
 
     def self.sim_id
-      if adapter.respond_to? :sim_id
+      if self.adapter.started?
         adapter.sim_id
-      else
-        ""
       end
     end
 
@@ -93,7 +91,9 @@ class Device
     #
     # @return [Fixnum] Signal value between 0 and 5.
     def self.signal
-      adapter.signal
+      if self.connected? == 0
+        adapter.signal
+      end
     end
 
     # Scan for wifi aps available

data/lib/device/params_dat.rb

@@ -129,6 +129,13 @@ class Device
       File.delete(FILE_NAME) if exists?
       @apps = []
       @files = []
+      Dir.entries("./shared/").each do |f|
+        begin
+          path = "./shared/#{f}"
+          File.delete(path) if File.file?(path) && f != Device::Display::MAIN_BMP
+        rescue
+        end
+      end
     end
 
     def self.update_app(application, index = 1, all = 1, force = false)

data/lib/device/transaction/download.rb

@@ -118,6 +118,8 @@ class Device
         return_code
       rescue SocketError
         return COMMUNICATION_ERROR
+      rescue
+        return IO_ERROR
       end
 
       def generate_crc(local_path)

data/lib/device.rb

@@ -19,11 +19,9 @@ class Device
   end
 
   def self.app_loop(&block)
-    Device::Display.clear
-    puts "SETUP NOTIFICATIONS..."
-    Notification.setup
+    DaFunk::Engine.setup
     loop do
-      Notification.check
+      DaFunk::Engine.check
       block.call(self)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,8 +111,10 @@ files:
 - imgs/daft-punk-da-funk.jpg
 - lib/da_funk.rb
 - lib/da_funk/callback_flow.rb
+- lib/da_funk/engine.rb
 - lib/da_funk/file_parameter.rb
 - lib/da_funk/helper.rb
+- lib/da_funk/helper/status_bar.rb
 - lib/da_funk/i18n.rb
 - lib/da_funk/i18n_error.rb
 - lib/da_funk/iso8583.rb