QWebChannel 2019.1.18 → 2019.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6425a8862df2126405215d7d558adc626823e92
-  data.tar.gz: af18a573275cc0ae50b37bbfd2b8c999fea9e1ab
+  metadata.gz: 8f394022d2e3c2f74ab9ef064933c743473667b1
+  data.tar.gz: 654ebbce5769e974100b724a54004f631c3d158e
 SHA512:
-  metadata.gz: 64cbf10140ed651dc3c03ea0a913d36a66b73ec41a29e3323f5f556480e785b0fd55bc64a98a94cad6a0c8d8f216b240122ba11f1a0041deb1ada5128d5827e8
-  data.tar.gz: 202b5b2b7f4c8189a541c20ec85125fc64ebeb159d3cc08ae577f7aef8ae58d3ce52699785a49c7502a404a246ecd8f10a5596c9d21ccb3189e8da8f537f5c35
+  metadata.gz: 2969a873dd42c91b616f6f1d4a84d32a10bc233212a08bb243090b720788b12050129c4f60585703ae97628b4378153101f6a9058b7445ab8fec6608f788fc5e
+  data.tar.gz: af18e4c38107e8f748d26dd07c3e2554a10e6e039262b88249afcc67fa5888a1004600a05323268eb7194fea287b2ee3edf01e782c35177e9068a8766298be8f

data/lib/QWebChannel.rb

@@ -83,6 +83,7 @@ class QWebChannel
     def exec(data, &block)
         if !(block_given?)
             @channel.send(data)
+            return
         end
         
         @channel.execId=@channel.execId+1
@@ -108,6 +109,18 @@ class QWebChannel
         end
     end #def handleSignal(message)
     
+    def handlePropertyUpdate(message)
+        message['data'].each do |data| #一个个数据地处理。
+            object= @channel.objects[data['object']] #获取发生变更的对象。
+            
+            if (object) #对象存在。
+                object.propertyUpdate(data['signals'], data['properties']) #更新属性。
+            else #对象不存在。
+            end #if (object) #对象存在。
+        end #message['data'].each do |data| #一个个数据地处理。
+        
+        @channel.exec({ 'type' => QWebChannelMessageTypes::IDLE })
+    end #def handlePropertyUpdate(message)
     
     def initialize(websocket, &block)
         @index = nil #索引对象。
@@ -146,9 +159,7 @@ class QWebChannel
             end
         end
         
-        
         @channel.exec({'type' => QWebChannelMessageTypes::INIT}) do |data|
-
             puts "data type: #{data.class}"
             puts "data content: #{data}"
             

data/lib/QWebChannel/QObject.rb

@@ -94,6 +94,7 @@ class QObject
         self.instance_eval %Q{
             def #{propertyName}
                 propertyIndex=@propertyNameIndexMap["#{propertyName}"] #获取属性索引。
+                puts "propertyIndex: #{propertyIndex}, propertyName: #{propertyName}, object: #{@object}" #Debug.
                @object.__propertyCache__[propertyIndex]
             end
             }
@@ -111,9 +112,10 @@ class QObject
                 if (valueToSend.is_a?(QObject) && @webChannel.objects[valueToSend.__id__] != nil)
                     valueToSend={"id" => valueToSend.__id__}
                     
-                    @webChannel.exec( {"type" => QWebChannelMessageTypes::SETPROPERTY, "object" => @object.__id__ , "property" => propertyIndex, "value" => valueToSend } )
                 end
                 
+                puts "Sending set property message" #Debug.
+                @webChannel.exec( {"type" => QWebChannelMessageTypes::SETPROPERTY, "object" => @object.__id__ , "property" => propertyIndex, "value" => valueToSend } )
                 
 
             end
@@ -133,6 +135,20 @@ class QObject
         end #if (connections)
     end #def invokeSignalCallbacks(signalName, signalArgs)
     
+    def propertyUpdate(signals, propertyMap)
+        propertyMap.each do |propertyIndex, propertyValue|
+            puts "updating property, index: #{propertyIndex}, value: #{propertyValue}, object: #{@object}" #Debug.
+            @object.__propertyCache__[propertyIndex]=propertyValue
+            puts "updating property, property cache: #{@object.__propertyCache__}" #Debug.
+            puts "updating property, updated property value: #{@object.__propertyCache__[propertyIndex]}" #Debug.
+            
+        end #propertyMap.each do |propertyIndex, propertyValue|
+        
+        signals.each do |signalName|
+            invokeSignalCallbacks(signalName, signals[signalName])
+        end #signals.each do |signalName|    
+    end #def propertyUpdate(signals, propertyMap)
+    
     def signalEmitted(signalName, signalArgs)
         puts "signalArgs: #{signalArgs}" #debug.
         invokeSignalCallbacks(signalName, self.unwrapQObject(signalArgs))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: QWebChannel
 version: !ruby/object:Gem::Version
-  version: 2019.1.18
+  version: 2019.1.23
 platform: ruby
 authors:
 - Hxcan Cai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: QWebChannel ruby.