tgios 0.0.39 → 0.0.40

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGI1N2Q0YWY4YWJlNzQ4M2YyZWM2ZTMyN2UyM2RkNTY1NGM2MGRhNQ==
+    MDcyNTVlZWQ0NTFmZTM2NWY2OWUzODUwYzAxZWIwNmQxY2FkOTcxYQ==
   data.tar.gz: !binary |-
-    ODM4NjY3M2I4MzdlZjdlZjIxMTkzM2Y0ZGJlMjFhY2UxMWUxMzMyZg==
+    MmI0NDA0N2E4N2FlYWE3ZDVhM2ViM2E0MmI4MzcwOTE4MjFjZWQyYw==
 SHA512:
   metadata.gz: !binary |-
-    ZGNlZTQzNzJiN2RjMDliOWE3YjBkNDMzOTVmM2FkYjA4MjY4OWM0ZDgzZjZh
-    ZDhiYTRjYWZhZmEyNzMyMmJmNWNmNWNhNGY5OTk5YzhiMDYzZjAwY2U2ZmE0
-    ZjY0NTc3ZDQ3YTlkN2U1NWI1NzQ3YTcwN2JjODBiNmQ0NzUwZWM=
+    NmE4ZDk2ZDljMDc4MTBlMzNiNmIxNGEzZTdkNGY0YzU0N2Q3YTU3OWZjZDhm
+    ODVkNmQ4OWJhYTE5NzU1NTI5ZWNmZDkxZTBiODczMmQ2NWQ0MDNjZTQ3ZjU5
+    NWY3ZDM0MTg0MGU1N2M5ZGUxNWU2ZTc4YWM1NTE1ZmE4ZjIyYjQ=
   data.tar.gz: !binary |-
-    ODBhZDg0NmRlN2M1NjhhZTdlY2JmYjI0NTJmZjk0MjVmZDE0ZWIxYmQ2ZjE4
-    MjliN2M4ZTgxMjg2M2NlNTlkYjExZDcxYmZhYzA0OTlmODY1MWQ2ODE4MDlk
-    YmUwYTM1YjI5ZDBiMTI3MjUxMTYzYTY1Y2E1MTQwMmE2OGM3Y2M=
+    ZDU0OTg5OWE3NjNhZTdjY2M2MWMyMjlhMWU1N2Q4NmZhZmQ1ZDY1NmJlYWQ3
+    NjAzYTQyNmJlYjY1OWJhY2JjNzRiZDQ4YmY5ZjEwN2VmNzhmMmU2NWNmZDk2
+    N2NmYjgwMTgxNGM5NjgzMzBiZDFmMzUxY2YyYzRlZmMwNDZlZDE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tgios (0.0.39)
+    tgios (0.0.40)
       awesome_print_motion
       motion-layout
       plastic_cup (>= 0.1.1)

data/lib/tgios/beacon_manager.rb

@@ -111,10 +111,10 @@ module Tgios
     def algorithm=(val)
       alg = val.to_s.to_sym
       return unless alg.present?
+      raise ArgumentError.new("Algorithm not found, valid algorithm are: [#{ALGORITHMS.join(', ')}]") unless ALGORITHMS.include?(alg)
       if @algorithm != alg
         @previous_beacons.clear
       end
-      raise ArgumentError.new("Algorithm not found, valid algorithm are: [#{ALGORITHMS.join(', ')}]") unless ALGORITHMS.include?(alg)
 
       @algorithm = alg
     end
@@ -142,8 +142,12 @@ module Tgios
       region_hash = get_region_hash(region)
       return unless region_hash[:active]
 
-      beacons = beacons.sort_by{|b| b.try(@range_method)}
-      beacons = beacons.reverse if @range_method == :rssi
+      beacons = beacons.sort_by{|b|
+        val = b.try(@range_method)
+        val = val * -1 if val && @range_method == :rssi
+        val
+      }
+
       known_beacons = beacons.select{|b| b.proximity != CLProximityUnknown}
       unknown_beacons = beacons - known_beacons
       beacon = nil
@@ -156,9 +160,11 @@ module Tgios
       end
       push_beacon(beacon) # nil value will signify null beacon
 
+      # use known_beacons + unknown_beacons to make sure closest range comes to the top
+      all_beacons = known_beacons + unknown_beacons
+
       if has_event(:beacons_found)
-        # use known_beacons + unknown_beacons to make sure closest range comes to the top
-        @events[:beacons_found].call(beacons_in_range, known_beacons + unknown_beacons, @current_beacon)
+        @events[:beacons_found].call(beacons_in_range, all_beacons, @current_beacon)
       end
 
       if has_event(:beacon_found)
@@ -166,7 +172,7 @@ module Tgios
       end
 
       BeaconFoundKey.post_notification(self, {region: region, beacon: @current_beacon})
-      BeaconsFoundKey.post_notification(self, {region: region, beacon: @current_beacon, beacons_in_range: beacons_in_range, any_beacons: known_beacons + unknown_beacons})
+      BeaconsFoundKey.post_notification(self, {region: region, beacon: @current_beacon, beacons_in_range: beacons_in_range, any_beacons: all_beacons})
     end
 
     def locationManager(manager, rangingBeaconsDidFailForRegion: region, withError: error)

data/lib/tgios/scan_qr_controller.rb

@@ -1,6 +1,6 @@
 module Tgios
   class ScanQrController < UIViewController
-    attr_accessor :types
+    attr_accessor :types, :bottom_text
 
     def viewDidLoad
       super
@@ -75,6 +75,32 @@ module Tgios
       @output = AVCaptureMetadataOutput.alloc.init
       @output.setMetadataObjectsDelegate self, queue: @queue.dispatch_object
 
+      if @bottom_text
+        whole_lbl_h = 36
+        lbl_h = 18
+        t_frame = layerRect.dup
+        t_frame.origin.y = t_frame.size.height - whole_lbl_h
+        t_frame.size.height = whole_lbl_h
+        bg_layer = Base.style(CALayer.layer,
+            frame: t_frame,
+            backgroundColor: :black.cgcolor(0.3),
+        )
+        self.view.layer.addSublayer(bg_layer)
+
+        t_frame.origin.y = (whole_lbl_h - lbl_h)/ 2.0
+        t_frame.size.height = lbl_h
+        text_layer = Base.style(CATextLayer.layer,
+            contentsScale: UIScreen.mainScreen.scale,
+            frame: t_frame,
+            foregroundColor: :white.cgcolor,
+            alignmentMode: KCAAlignmentCenter,
+            truncationMode: KCATruncationEnd,
+            fontSize: 14,
+        )
+        bg_layer.addSublayer(text_layer)
+        text_layer.string = @bottom_text
+      end
+
       camera_size = layerRect.size
       sq_size = 240
       sq_border = 20
@@ -131,8 +157,9 @@ module Tgios
     def openQRCode(result)
       stop_scanning
 
-      @events[:result_scanned].call(result)
-      self.dismissViewControllerAnimated(true, completion: nil)
+      self.dismissViewControllerAnimated(true, completion: -> {
+            @events[:result_scanned].call(result)
+          })
     end
 
     def stop_scanning

data/lib/tgios/ui_table_view_utility_binding.rb

@@ -76,6 +76,7 @@ module Tgios
     end
 
     def reset_content_inset_bottom
+      return unless @table.weakref_alive?
       @table.contentInset = UIEdgeInsetsZero
       @table.scrollIndicatorInsets = UIEdgeInsetsZero
       @expanding = false

data/lib/tgios/ui_text_field_binding.rb

@@ -81,9 +81,9 @@ module Tgios
 
     def textFieldDidEndEditing(textField)
       puts "textFieldDidEndEditing"
-      @model.send("#{@field_name}=", textField.text)
+      @model.send("#{@field_name}=", textField.text) if @model.present?
       weak_text_field=WeakRef.new(textField)
-      @events[:end_edit].call(@model, @field_name, {text_field: weak_text_field}) unless @events[:end_edit].nil?
+      @events[:end_edit].call(@model, @field_name, {text_field: weak_text_field}) unless @events.nil? || @events[:end_edit].nil?
       @decimal_button.removeFromSuperview unless @decimal_button.nil?
     end
 
@@ -279,17 +279,21 @@ module Tgios
     end
 
     def onPrepareForRelease
-      stop_listen
-      @model=nil
-      @decimal_button=nil
-      if !@ui_field.nil? && @ui_field.weakref_alive? && @ui_field.delegate == self
-        @ui_field.delegate = nil
-        toolbar = @ui_field.inputAccessoryView
-        toolbar.items = nil unless toolbar.nil?
-        @ui_field.inputAccessoryView = nil
+      begin
+        stop_listen
+        @model=nil
+        @decimal_button=nil
+        if @ui_field.is_a?(WeakRef) && @ui_field.weakref_alive? && !@ui_field.nil? && @ui_field.delegate == self
+          @ui_field.delegate = nil
+          toolbar = @ui_field.inputAccessoryView
+          toolbar.items = nil unless toolbar.nil?
+          @ui_field.inputAccessoryView = nil
+        end
+        @ui_field=nil
+        @events=nil
+      rescue Exception => e
+        NSLog e.inspect
       end
-      @ui_field=nil
-      @events=nil
     end
 
     def dealloc

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.39'
+  VERSION = '0.0.40'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube