tgios 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTgwNWZlYjdjMDRiMjUxMzcxZTkxZDhjYzA5NjNkMDVkZTZhMDNhMw==
+    MTIzZDUyZTdiNGY4ZGQwODBjNTI2ZDk2ZTkyN2NmZTNhNGEzNzI5ZQ==
   data.tar.gz: !binary |-
-    MGRkYjE1Mzg0YTg5NTNkYzkwOGVlYzgzNzk3NGVkZDA5ODhhNzRhNg==
+    YzRlYWViYjJlYjBlYzk4YzBjY2M1YzAzMTgyOGQ3OGM2ODkwMTEzMg==
 SHA512:
   metadata.gz: !binary |-
-    OWE1NGZhMzc4OGJlYWRkMjBiOWU0NDU5ZjRjMjc5ZDUxNjAwY2VjNDRkYWQ2
-    MTU1YTg3YWQxYTcwZTI0MTQ3Njg0Y2MzM2U2MDgyMjljY2U1NTI1ZmZhODZm
-    ZGI3MmZjYTRhYWRmMTkyYjkxZjc3ZjY3ZmQ0NTZjMDdlYmZjZTc=
+    MDZhMDk5Mjk0OTIxOGNlNDYzMzJmM2JiNzRmNDY3ZTU1OTE1NGYyNTUwMGMy
+    NTFmN2RlNTg4ZDllZjMzYmFiZmQyNmI4ZGVmMWNlZDVhNDZjNGYzYjRkZDE3
+    NTQzYjNjNWFmMzVhNzk3N2RlODJiMjBlOTQ3MmFlNzc4NTU1ZGE=
   data.tar.gz: !binary |-
-    NzNjYjhhMDIxOGVmOWExNzM4YWJmOGEwMDc3ZDE2MWI5Mzk4N2Q1ZWE0NDEw
-    ZWMzNTU2ZGMyZGEwMThhZThmMTUxY2Y4NzQ4ZTRkYTFiYzJiNTYyN2NjMjA3
-    YzZlYmI2NDBlNWNhNmRhZjI0NDQxZTJjNGRhMjM1ZWE3NGVlODc=
+    M2U3MzU2M2FhYzllMjUzYThmMzYxNjM0NjU5YjJlM2JhMzEzOGVkYjkxMWMy
+    N2I3ZDRkNzJkYjZlMDgwNTlhZTczOGVjY2ZiYzMxZGExNzE1Y2NkMjk1NDhi
+    MmQwZjliYTNiNGY2ZTNiZTY2ODM1NDUxYjJiOWFiZTNhZDNjY2Q=

data/lib/tgios/beacon_manager.rb

@@ -5,7 +5,7 @@
 
 module Tgios
   class FakeBeacon
-    attr_accessor :proximityUUID, :major, :minor
+    attr_accessor :proximityUUID, :major, :minor, :accuracy, :proximity, :rssi
 
     def initialize(attributes)
       attributes.each do |k, v|
@@ -17,8 +17,10 @@ module Tgios
 
   class BeaconManager < BindingBase
     attr_accessor :range_method, :range_limit, :tolerance, :current_beacon, :background
+    ALGORITHMS = [:continue, :timeout]
 
     BeaconFoundKey = 'Tgios::BeaconManager::BeaconFound'
+    BeaconsFoundKey = 'Tgios::BeaconManager::BeaconsFound'
     EnterRegionKey = 'Tgios::BeaconManager::EnterRegion'
     ExitRegionKey = 'Tgios::BeaconManager::ExitRegion'
 
@@ -30,17 +32,36 @@ module Tgios
       @default
     end
 
-    def initialize(uuid, range_limit=-70, background=false, tolerance=5, range_method=:rssi)
+    #############################################
+    # range_method: :rssi or :accuracy
+    # range_limit: around -70 for :rssi / around 1.5 (meters) for :accuracy
+    # background: range beacons when device is in background
+    # algorithm: :continue or :timeout
+    # tolerance: for algorithm continue: number of times a beacon is ranged continuously required to trigger beacon changed event, for algorithm timeout: time in seconds for a beacon marked as changed
+    #############################################
+
+    def initialize(options)
       @events = {}
       @previous_beacons = []
-      @background = background
-      @tolerance = (tolerance || 5)
-
-      @uuid = NSUUID.alloc.initWithUUIDString(uuid)
-      @range_method = range_method
-      @range_limit = range_limit
-
-      @region = CLBeaconRegion.alloc.initWithProximityUUID(@uuid, identifier: uuid.split('-').first)
+      @beacons_last_seen_at = {}
+      @background = options[:background]
+
+      self.algorithm = (options[:algorithm] || :continue)
+      @tolerance = (options[:tolerance] || 5)
+
+      @uuid = NSUUID.alloc.initWithUUIDString(options[:uuid])
+      @major = options[:major]
+      @minor = options[:minor]
+      @range_method = (options[:range_method] || :rssi)
+      @range_limit = (options[:range_limit] || -70)
+
+      @region = if @major && @minor
+                  CLBeaconRegion.alloc.initWithProximityUUID(@uuid, major: @major, minor: @minor, identifier: identifier)
+                elsif @major
+                  CLBeaconRegion.alloc.initWithProximityUUID(@uuid, major: @major, identifier: identifier)
+                else
+                  CLBeaconRegion.alloc.initWithProximityUUID(@uuid, identifier: identifier)
+                end
       @region.notifyOnEntry = true
       @region.notifyOnExit = true
       @region.notifyEntryStateOnDisplay = true
@@ -49,6 +70,11 @@ module Tgios
 
       UIApplicationWillEnterForegroundNotification.add_observer(self, 'on_enter_foreground:')
       UIApplicationDidEnterBackgroundNotification.add_observer(self, 'on_enter_background:')
+
+    end
+
+    def identifier
+      [@uuid.UUIDString, @major, @minor].join('/')
     end
 
     def on(event_key,&block)
@@ -56,28 +82,35 @@ module Tgios
       self
     end
 
+    def algorithm=(val)
+      alg = val.to_s.to_sym
+      return unless alg.present?
+      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
+
     def locationManager(manager, didDetermineState: state, forRegion: region)
       NSLog "didDetermineState #{state}"
       if state == CLRegionStateInside
         manager.startRangingBeaconsInRegion(region)
+        did_enter_region(region)
+      elsif state == CLRegionStateOutside
+        did_exit_region(region)
       end
     end
 
     def locationManager(manager, didEnterRegion: region)
       NSLog 'didEnterRegion'
-      if region.isKindOfClass(CLBeaconRegion)
-        manager.startRangingBeaconsInRegion(region)
-      end
+      did_enter_region(region)
     end
 
     def locationManager(manager, didExitRegion: region)
       NSLog 'didExitRegion'
-      if region.isKindOfClass(CLBeaconRegion)
-        manager.stopRangingBeaconsInRegion(region)
-        if has_event(:exit_region)
-          @events[:exit_region].call(region)
-        end
-      end
+      did_exit_region(region)
     end
 
     def locationManager(manager, didRangeBeacons: beacons, inRegion: region)
@@ -105,6 +138,11 @@ 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})
+    end
+
+    def locationManager(manager, rangingBeaconsDidFailForRegion: region, withError: error)
+      @events[:ranging_failed].call(region, error) if @events[:range_failed]
     end
 
     def location_manager
@@ -159,22 +197,67 @@ module Tgios
       stop_monitor unless @background
     end
 
+    def did_enter_region(region)
+      if region.isKindOfClass(CLBeaconRegion)
+        location_manager.startRangingBeaconsInRegion(region)
+        if has_event(:enter_region)
+          @events[:enter_region].call(region)
+        end
+        EnterRegionKey.post_notification(self, {region: region})
+      end
+    end
+
+    def did_exit_region(region)
+      if region.isKindOfClass(CLBeaconRegion)
+        location_manager.stopRangingBeaconsInRegion(region)
+        if has_event(:exit_region)
+          @events[:exit_region].call(region)
+        end
+        ExitRegionKey.post_notification(self, {region: region})
+      end
+    end
+
     def has_event(event)
       @events.has_key?(event)
     end
 
     def push_beacon(beacon)
-      if beacon_eqs(beacon, @current_beacon)
-        @current_beacon = beacon
-      else
-        if @previous_beacons.find { |b| !beacon_eqs(beacon, b) }.blank?
-          @current_beacon = beacon
-        else
-          @current_beacon = nil if @previous_beacons.find{ |b| beacon_eqs(@current_beacon, b)}.blank?
-        end
+      case @algorithm
+        when :continue
+          if beacon_eqs(beacon, @current_beacon)
+            @current_beacon = beacon
+          else
+            if @previous_beacons.find { |b| !beacon_eqs(beacon, b) }.blank? # all previous beacons is the new beacon
+              @current_beacon = beacon
+            else
+              @current_beacon = nil if @previous_beacons.find{ |b| beacon_eqs(@current_beacon, b)}.blank? # all previous beacons is not the current beacon
+            end
+          end
+          @previous_beacons << beacon
+          @previous_beacons.delete_at(0) if @previous_beacons.length > @tolerance
+
+        when :timeout
+          time_now = Time.now
+          beacon_hash = {beacon: beacon, time: time_now}
+          @beacons_last_seen_at[self.class.beacon_key(beacon)] = beacon_hash
+
+          while @previous_beacons.present? && time_now - @previous_beacons.first[:time] > @tolerance do
+            @previous_beacons.delete_at(0)
+          end
+          @previous_beacons << beacon_hash
+
+          current_beacon_hash = @beacons_last_seen_at[self.class.beacon_key(@current_beacon)]
+          if current_beacon_hash
+
+          end
+          if !current_beacon_hash || time_now - current_beacon_hash[:time] < @tolerance
+             # current beacon not change
+          else
+            count_hash = @previous_beacons.each_with_object(Hash.new(0)) {|e, h| h[self.class.beacon_key(e[:beacon])] += @tolerance - (time_now - e[:time])} # beacon has more weighting if time is later
+            max_beacon_key = count_hash.max_by(&:last).first
+            @current_beacon = @beacons_last_seen_at[max_beacon_key][:beacon]
+          end
       end
-      @previous_beacons << beacon
-      @previous_beacons.delete_at(0) if @previous_beacons.length > @tolerance
     end
 
     def beacon_eqs(beacon1, beacon2)
@@ -186,6 +269,10 @@ module Tgios
       beacon1.minor == beacon2.minor && beacon1.major == beacon2.major && beacon1.proximityUUID == beacon2.proximityUUID
     end
 
+    def self.beacon_key(beacon)
+      [beacon.try(:proximityUUIDbeacon), beacon.try(:major), beacon.try(:minor)].join('/')
+    end
+
     def new_fake_beacon(options)
       FakeBeacon.new({uuid: @uuid}.merge(options))
     end

data/lib/tgios/image_loader.rb

@@ -3,7 +3,7 @@ module Tgios
 
     def initialize(url)
       super
-      @url = url
+      @url = url.stringByAddingPercentEscapesUsingEncoding(NSUTF8StringEncoding)
       @events = {}
     end
 

data/lib/tgios/photo_controller.rb

@@ -1,20 +1,17 @@
 module Tgios
   class PhotoController < ExtendedUIViewController
-    include LoadingIndicator
     attr_accessor :url
 
     def viewDidLoad
       super
       self.view.backgroundColor = :black.uicolor
 
-      add_loading_indicator_to(self.view)
+      @load_view = LoadingView.add_loading_view_to(self.view)
       unless @url.nil?
-        start_loading
-        image_loader = ImageLoader.new(@url)
-        image_loader.on(:image_loaded) do |image, success|
-          stop_loading
-          if success
-            ap 'image loaded'
+        @load_view.start_loading
+        ImageLoader.load_url(@url) do |image, success|
+          @load_view.stop_loading
+          if success && self.view
             # TODO: use motion layout or other way to handle frame size (or allow full screen)
             small_frame = self.view.bounds
             small_frame.size.height -= 20 + 44 if small_frame == UIScreen.mainScreen.bounds
@@ -22,9 +19,7 @@ module Tgios
             scroll_view = PhotoScrollView.alloc.initWithFrame(small_frame, image: image)
             self.view.addSubview(scroll_view)
           end
-          image_loader.prepareForRelease
         end
-        image_loader.load
 
       end
     end

data/lib/tgios/scan_qr_controller.rb

@@ -7,14 +7,38 @@ module Tgios
       self.view.backgroundColor = :dark_gray.uicolor
       @load_view = Tgios::LoadingView.add_loading_view_to(self.view)
       @load_view.start_loading
-      if Device.simulator?
+      if NSProcessInfo.processInfo.environment[:IPHONE_SIMULATOR_DEVICE].present?
         self.performSelector('fake_scan', withObject: nil, afterDelay: 3)
       else
-        self.performSelector('startScanning', withObject: nil, afterDelay: 0.5)
+        check_permission
+        # self.performSelector('startScanning', withObject: nil, afterDelay: 0.5)
       end
 
     end
 
+    def check_permission
+      status = AVCaptureDevice.authorizationStatusForMediaType(AVMediaTypeVideo)
+      if status == AVAuthorizationStatusAuthorized
+        self.performSelector('startScanning', withObject: nil, afterDelay: 0.5)
+      elsif status == AVAuthorizationStatusNotDetermined
+        Dispatch::Queue.new('ScanQrController').async do
+          AVCaptureDevice.requestAccessForMediaType(AVMediaTypeVideo, completionHandler: ->(granted) {
+                if granted
+                  Dispatch::Queue.main.async do
+                    startScanning
+                  end
+                else
+                  Dispatch::Queue.main.async do
+                    @events[:permission_denied].call if @events[:permission_denied]
+                  end
+                end
+              })
+        end
+      else
+        @events[:permission_denied].call if @events[:permission_denied]
+      end
+    end
+
     def startScanning
       @load_view.stop_loading
       setupCapture
@@ -27,6 +51,16 @@ module Tgios
       @session.sessionPreset = AVCaptureSessionPresetHigh
 
       @device = AVCaptureDevice.defaultDeviceWithMediaType AVMediaTypeVideo
+      if @device.lockForConfiguration(nil)
+        if @device.isFocusModeSupported(AVCaptureFocusModeContinuousAutoFocus)
+          @device.focusMode = AVCaptureFocusModeContinuousAutoFocus
+        end
+        if @device.isAutoFocusRangeRestrictionSupported
+          @device.autoFocusRangeRestriction = AVCaptureAutoFocusRangeRestrictionNear
+        end
+        @device.unlockForConfiguration
+      end
+
       @error = Pointer.new('@')
       @input = AVCaptureDeviceInput.deviceInputWithDevice @device, error: @error
 

data/lib/tgios/search_controller.rb

@@ -35,7 +35,7 @@ module Tgios
       @search_bar.sizeToFit
       @search_bar.delegate=self
       @search_result_table.tableHeaderView=@search_bar
-      @search_bar.becomeFirstResponder unless @hide_keyboard
+      @search_bar.performSelector('becomeFirstResponder', withObject: nil, afterDelay: 0.0) unless @hide_keyboard
       @events[:after_layout].call(@search_bar, @search_result_table) unless @events[:after_layout].nil?
 
     end
@@ -64,6 +64,16 @@ module Tgios
       end
     end
 
+    def viewWillAppear(animated)
+      super
+      @search_result_table_binding.listen_to_keyboard
+    end
+
+    def viewWillDisappear(animated)
+      @search_result_table_binding.stop_listen_to_keyboard
+      super
+    end
+
     def init
       super
       @events={}

data/lib/tgios/table_section_list_binding.rb

@@ -1,8 +1,9 @@
 module Tgios
   class TableSectionListBinding < BindingBase
-    Events = [:cell_identifier, :build_cell, :update_cell,
+    Events = [:cell_identifier, :build_cell, :update_cell, :update_accessory,
         :get_section, :get_section_text, :get_section_footer_text, :get_rows, :get_row, :get_row_text, :get_row_detail_text,
-        :touch_row, :cell_height, :section_header, :section_footer, :reach_bottom, :header_height, :footer_height
+        :touch_row, :delete_row, :can_delete_row, :should_indent, :editing_style,
+        :cell_height, :section_header, :section_footer, :reach_bottom, :header_height, :footer_height
     ]
 
     def initialize(table_view, list, options={})
@@ -137,6 +138,26 @@ module Tgios
       end
     end
 
+    def tableView(tableView, commitEditingStyle: editingStyle, forRowAtIndexPath: index_path)
+      if editingStyle == UITableViewCellEditingStyleDelete
+        if @events[:delete_row].present?
+          record = @events[:get_row].call(index_path)
+          @events[:delete_row].call(index_path, record) do |success|
+            tableView.deleteRowsAtIndexPaths([index_path], withRowAnimation: UITableViewRowAnimationFade) if success
+          end
+        end
+      end
+    end
+
+    def tableView(tableView, canEditRowAtIndexPath:index_path)
+      if @events[:can_delete_row].present?
+        record = @events[:get_row].call(index_path)
+        @events[:can_delete_row].call(index_path, record)
+      else
+        @events[:delete_row].present?
+      end
+    end
+
     def tableView(tableView, numberOfRowsInSection: section)
       rows = @events[:get_rows].call(section)
       rows.length
@@ -196,6 +217,23 @@ module Tgios
       0
     end
 
+    def tableView(tableView, shouldIndentWhileEditingRowAtIndexPath:index_path)
+      flag = if @events.has_key?(:should_indent)
+               record = @events[:get_row].call(index_path)
+               @events[:should_indent].call(index_path, record)
+             end
+      return flag unless flag.nil?
+      true
+    end
+
+    def tableView(tableView, editingStyleForRowAtIndexPath:index_path)
+      style = if @events.has_key?(:editing_style)
+               record = @events[:get_row].call(index_path)
+               @events[:editing_style].call(index_path, record)
+             end
+      return style unless style.nil?
+      UITableViewCellEditingStyleDelete
+    end
 
     def tableView(tableView, willDisplayCell:cell, forRowAtIndexPath:index_path)
       unless @events[:reach_bottom].nil? || index_path.section < @list.length - 1 || index_path.row < @events[:get_rows].call(index_path).length - 1

data/lib/tgios/ui_collection_view_binding.rb

@@ -43,6 +43,18 @@ module Tgios
       @events[:item_tapped].call(view_at(indexPath), indexPath.row) unless @events[:item_tapped].nil?
     end
 
+    def collectionView(collectionView, layout:collectionViewLayout, sizeForItemAtIndexPath:indexPath)
+      size = if @events[:item_size].nil?
+               view_at(indexPath).try(:bounds).try(:size)
+             else
+               @events[:item_size].call(view_at(indexPath), indexPath)
+             end
+      unless size && size != CGSizeZero
+        size = collectionViewLayout.itemSize
+      end
+      size
+    end
+
     def scrollViewDidEndDecelerating(scrollView)
       page = (scrollView.contentOffset.x / scrollView.frame.size.width).round
       if page != @current_page

data/lib/tgios/ui_table_view_list_binding.rb

@@ -12,6 +12,11 @@ module Tgios
       @tableView.delegate=self
       @display_field=display_field
       set_list(list)
+      if @table_utility_binding.nil?
+        @table_utility_binding = UITableViewUtilityBinding.new.bind(@tableView)
+      else
+        @table_utility_binding.bind(@tableView)
+      end
       @options=(options || {})
       return self
     end
@@ -44,7 +49,8 @@ module Tgios
     end
 
     def update_cell_text(record, cell, index_path)
-      cell.textLabel.text=record[@display_field]
+      text = record.is_a?(Hash) ? record[@display_field] : record.send(@display_field)
+      cell.textLabel.text=text.to_s
       cell
     end
 
@@ -85,21 +91,23 @@ module Tgios
     end
 
     def tableView(tableView, willDisplayCell:cell, forRowAtIndexPath:indexPath)
-      unless @events[:load_more].nil? || indexPath.row < @list.length - 1 || !@total.nil? && @total <= @list.count || @loading
-        @loading = true
-        @events[:load_more].call(@page+1, indexPath) do |success, results, total|
-          if success && !@list.nil?
-            @total = total
-            @page += 1
-            @list += results
-            @tableView.reloadData
+      if indexPath.row >= @list.length - 1
+        unless @events[:load_more].nil? || !@total.nil? && @total <= @list.size || @loading
+          @loading = true
+          @events[:load_more].call(@page+1, indexPath) do |success, results, total|
+            if success && !@list.nil?
+              @total = total
+              @page += 1
+              @list.concat(results)
+              @tableView.reloadData
+            end
+            @loading = false
           end
-          @loading = false
         end
-      end
 
-      unless @events[:reach_bottom].nil? || indexPath.row < @list.length - 1
-        @events[:reach_bottom].call(indexPath)
+        unless @events[:reach_bottom].nil?
+          @events[:reach_bottom].call(indexPath)
+        end
       end
     end
     
@@ -129,7 +137,24 @@ module Tgios
       can_edit
     end
 
+    def scrollViewDidScroll(scroll_view)
+      @events[:did_scroll].call(scroll_view) if @events[:did_scroll]
+    end
+
+    def scrollViewDidEndDragging(scroll_view, willDecelerate:decelerate)
+      @events[:did_end_scroll].call(scroll_view, decelerate) if @events[:did_end_scroll]
+    end
+
+    def listen_to_keyboard
+      @table_utility_binding.listen_to_keyboard
+    end
+
+    def stop_listen_to_keyboard
+      @table_utility_binding.stop_listen_to_keyboard
+    end
+
     def onPrepareForRelease
+      @table_utility_binding.prepareForRelease
       @events=nil
       @list=nil
       @display_field=nil

data/lib/tgios/version.rb

@@ -1,3 +1,3 @@
 module Tgios
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgios
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - April Tsang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcube