change new

app/services/push/igetui_ios.rb

@@ -14,8 +14,6 @@ module Push
       @user_device_ids = user_device_ids
       @user_device_ids = user_device_ids
     end
     end
 
 
-
-
     def push
     def push
       data_hash_opts = data_hash(@user_device_ids, @template_data, @igetui_opts)
       data_hash_opts = data_hash(@user_device_ids, @template_data, @igetui_opts)
   
   

app/services/push_tool_client.rb

@@ -7,23 +7,23 @@ class PushToolClient
   end
   end
 
 
   def do_push
   def do_push
-    @push_collections ||= push_collections
+    @push_device_collections ||= push_device_collections
 
 
-    Push::IgetuiIos.new(@push_collections[:igetui_ios], @opts).push if @push_collections[:igetui_ios].present?
-    Push::IgetuiAndroid.new(@push_collections[:igetui_android], @opts).push if @push_collections[:igetui_android].present?
+    Push::IgetuiIos.new(@push_device_collections[:igetui_ios], @opts).push if @push_device_collections[:igetui_ios].present?
+    Push::IgetuiAndroid.new(@push_device_collections[:igetui_android], @opts).push if @push_device_collections[:igetui_android].present?
 
 
     #现在好像不用了
     #现在好像不用了
     # Push::IgetuiIos.push(@push_collections[:igetui_ios], @opts) if @push_collections[:apns].present?
     # Push::IgetuiIos.push(@push_collections[:igetui_ios], @opts) if @push_collections[:apns].present?
     # Push::IgetuiAndroid.push(@push_collections[:igetui_android], @opts) if @push_collections[:apns].present?
     # Push::IgetuiAndroid.push(@push_collections[:igetui_android], @opts) if @push_collections[:apns].present?
 
 
-    Push::Xiaomi.push(@push_collections[:xiaomi], @opts[:message]) if @push_collections[:xiaomi].present?
-    Push::Huawei.push(@push_collections[:huawei], @opts[:message]) if @push_collections[:huawei].present?
+    Push::Xiaomi.push(@push_device_collections[:xiaomi], @opts[:message]) if @push_device_collections[:xiaomi].present?
+    Push::Huawei.push(@push_device_collections[:huawei], @opts[:message]) if @push_device_collections[:huawei].present?
   end
   end
 
 
   private
   private
   
   
-  def push_collections
-    _push_collection = {
+  def push_device_collections
+    _push_device_collections = {
       igetui_ios: [],
       igetui_ios: [],
       igetui_android: [],
       igetui_android: [],
       apns: [],
       apns: [],
@@ -39,16 +39,16 @@ class PushToolClient
       case user_device.platform
       case user_device.platform
         when 'igetui'
         when 'igetui'
          if user_device.device_platform == 'ios'
          if user_device.device_platform == 'ios'
-           _push_collection[:igetui_ios] << client_id
+           _push_device_collections[:igetui_ios] << client_id
          else
          else
-           _push_collection[:igetui_ios] << client_id
+           _push_device_collections[:igetui_ios] << client_id
          end
          end
         when 'apns'
         when 'apns'
-          _push_collection[:apns] << client_id
+          _push_device_collections[:apns] << client_id
         when 'xiaomi'
         when 'xiaomi'
-          _push_collection[:xiaomi] << client_id
+          _push_device_collections[:xiaomi] << client_id
         when 'huawei'
         when 'huawei'
-          _push_collection[:huawei] << client_id
+          _push_device_collections[:huawei] << client_id
       end
       end
     end
     end
   end
   end