1.deal with huawei error 2.create pusher by device_platform

app/services/push/igetui/push.rb

@@ -5,7 +5,7 @@ module Push
 
 
       PUSHERTYPES = %w[push_message_to_single push_message_to_list push_message_to_app].freeze
       PUSHERTYPES = %w[push_message_to_single push_message_to_list push_message_to_app].freeze
       TEMPLATETYPES = %w[LinkTemplate NotificationTemplate TransmissionTemplate NotyPopLoadTemplate].freeze
       TEMPLATETYPES = %w[LinkTemplate NotificationTemplate TransmissionTemplate NotyPopLoadTemplate].freeze
-      DEVICEPLATFORMS = %w[android ios]
+      DEVICEPLATFORMS = %w[android ios].freeze
 
 
 
 
       def initialize(template_data, opts = {})
       def initialize(template_data, opts = {})
@@ -16,6 +16,7 @@ module Push
         @template_type = TEMPLATETYPES.include?((opts[:template_type]).to_s) ? opts[:template_type] : 'NotificationTemplate'
         @template_type = TEMPLATETYPES.include?((opts[:template_type]).to_s) ? opts[:template_type] : 'NotificationTemplate'
         @device_platform = opts[:device_platform].to_s
         @device_platform = opts[:device_platform].to_s
 
 
+        ::Push::Log.info("@template_data is #{@template_data.to_json}")
         set_message
         set_message
         set_template_data
         set_template_data
         @message.data = @template
         @message.data = @template
@@ -45,24 +46,24 @@ module Push
 
 
       def pusher
       def pusher
         @pusher ||=
         @pusher ||=
-          if DEVICEPLATFORMS.include?((@device_platform))
-            case @device_platform
+          if DEVICEPLATFORMS.include?((@template_data['device_platform'].to_s))
+            case @template_data['device_platform'].to_s
 
 
               when 'android'
               when 'android'
                 IGeTui.pusher(
                 IGeTui.pusher(
-                  Settings.platform_settings.android.igetui['app_id'],
-                  Settings.platform_settings.android.igetui['app_key'],
-                  Settings.platform_settings.android.igetui['master_secret']
+                  Settings.platform_settings.igetui.android['app_id'],
+                  Settings.platform_settings.igetui.android['app_key'],
+                  Settings.platform_settings.igetui.android['master_secret']
                 )
                 )
               when 'ios'
               when 'ios'
                 IGeTui.pusher(
                 IGeTui.pusher(
-                  Settings.platform_settings.ios.igetui['app_id'],
-                  Settings.platform_settings.ios.igetui['app_key'],
-                  Settings.platform_settings.ios.igetui['master_secret']
+                  Settings.platform_settings.igetui.ios['app_id'],
+                  Settings.platform_settings.igetui.ios['app_key'],
+                  Settings.platform_settings.igetui.ios['master_secret']
                 )
                 )
             end
             end
           else
           else
-            ::Push::Log.error("设备类型不正确#{@device_platform}")
+            ::Push::Log.info("设备类型不正确#{@device_platform}")
             raise "Failed to create pusher"
             raise "Failed to create pusher"
           end
           end
       end
       end