QWebChannel 2019.1.9 → 2019.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5ec7275d2cc6fad1feced2008c305adf8ab9a5
-  data.tar.gz: 33877144b5af5cd54234d4a473eeb18a85c520fa
+  metadata.gz: d6425a8862df2126405215d7d558adc626823e92
+  data.tar.gz: af18a573275cc0ae50b37bbfd2b8c999fea9e1ab
 SHA512:
-  metadata.gz: 6612ea782c3afdbb9d31d9ed041d4bd153c0816ff10ddecd1c715b82972cf3784f28e3d5cf304d1a223506a8b1218c44e7ad890fd899dd45c4aa828f6ce05f68
-  data.tar.gz: ecf3782bb3c0f4fbd5a2382f2fb8b652a176aefda9283aad3003c7071446a9c102b8c19916dbb0770a32cf850a9a7b2b722d91e7205d7c05df3b18ed050c3971
+  metadata.gz: 64cbf10140ed651dc3c03ea0a913d36a66b73ec41a29e3323f5f556480e785b0fd55bc64a98a94cad6a0c8d8f216b240122ba11f1a0041deb1ada5128d5827e8
+  data.tar.gz: 202b5b2b7f4c8189a541c20ec85125fc64ebeb159d3cc08ae577f7aef8ae58d3ce52699785a49c7502a404a246ecd8f10a5596c9d21ccb3189e8da8f537f5c35

data/lib/QWebChannel.rb

@@ -158,9 +158,9 @@ class QWebChannel
                 object=QObject.new(objectName, data[objectName], @channel)
             end
             
-            @channel.objects.each do |objectName, objectObject|
+            @channel.objects.each do |objectName, objectObject| #一个个地解析出属性。
                 @channel.objects[objectName].unwrapProperties()
-            end
+            end #@channel.objects.each do |objectName, objectObject| #一个个地解析出属性。
             
             
 #             puts "Self: #{self}"

data/lib/QWebChannel/QObject.rb

@@ -51,10 +51,12 @@ class QObject
         return qObject
     end #def unwrapQObject(response)
     
+    #解码出属性。
     def unwrapProperties()
-        @object.__propertyCache__.each do |propertyIdx, propertyObject|
+        @object.__propertyCache__.each do |propertyIdx, propertyObject| #一个个地解码属性。
+            puts "propertyIdx: #{propertyIdx}" #Debug.
             @object.__propertyCache__[propertyIdx]=@object.unwrapQObject(@object.__propertyCache__[propertyIdx])
-        end
+        end #@object.__propertyCache__.each do |propertyIdx, propertyObject| #一个个地解码属性。
     end #def unwrapProperties()
     
     def []=(signalName, signalObject)
@@ -79,10 +81,11 @@ class QObject
             addSignal(notifySignalData, true)
         end #if (notifySignalData)
         
-        defineProperty(propertyName) #定义属性。对应于Object.defineProperty.
+        defineProperty(propertyName, propertyIndex) #定义属性。对应于Object.defineProperty.
     end #def bindGetterSetter(propertyInfo)
     
-    def defineProperty(propertyName)
+    def defineProperty(propertyName, propertyIndex)
+        @propertyNameIndexMap[propertyName]=propertyIndex #记录映射关系。
 #         define_property_by_prototype(propertyName)
         
         
@@ -90,6 +93,7 @@ class QObject
 #         self.class_eval( " def #{attr_name}; @#{attr_name};   end  " )
         self.instance_eval %Q{
             def #{propertyName}
+                propertyIndex=@propertyNameIndexMap["#{propertyName}"] #获取属性索引。
                @object.__propertyCache__[propertyIndex]
             end
             }
@@ -97,7 +101,9 @@ class QObject
         #setter
         self.instance_eval %Q{
             def #{propertyName}=(val)
+                propertyIndex=@propertyNameIndexMap["#{propertyName}"] #获取属性索引。
 
+                
                 @object.__propertyCache__[propertyIndex]=val
                 
                 valueToSend=val
@@ -179,6 +185,8 @@ class QObject
         @signalNameObjectHash={} #信号名字与信号对象的映射。
         @__id__=name
         @webChannel=webChannel
+        @propertyNameIndexMap={} #记录映射关系。属性名字与属性索引之间的映射关系。
+        
         webChannel.objects[name]=self
         
         puts "__id__: #{@__id__}" #debug.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: QWebChannel
 version: !ruby/object:Gem::Version
-  version: 2019.1.9
+  version: 2019.1.18
 platform: ruby
 authors:
 - Hxcan Cai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client