diff --git a/lib/xinge/android.rb b/lib/xinge/android.rb index c484dc8..60aefd2 100644 --- a/lib/xinge/android.rb +++ b/lib/xinge/android.rb @@ -4,11 +4,11 @@ class Android < Base def initialize(accessId = nil, secretKey = nil, options = {}) super end - def pushToSingleDevice(token, title, content, params={}, custom_content={}) - self.push_single_device(token, 1, build_simple_message(title, content, custom_content), params) + def pushToSingleDevice(token, msg_type, title, content, custom_content={}, params={}) + self.push_single_device(token, msg_type, build_simple_message(title, content, custom_content), params) end - def pushToAllDevice(title, content, params={}, custom_content={}) - self.push_all_device(1, build_simple_message(title, content, custom_content), params) + def pushToAllDevice(msg_type, title, content, custom_content={}, params={}) + self.push_all_device(msg_type, build_simple_message(title, content, custom_content), params) end protected diff --git a/lib/xinge/base.rb b/lib/xinge/base.rb index 15edfd8..6a8d96e 100644 --- a/lib/xinge/base.rb +++ b/lib/xinge/base.rb @@ -25,6 +25,9 @@ class Base HTTP_METHOD = :post def initialize(accessId = nil, secretKey = nil, options = {}) + accessId ||= Xinge.config[:android_accessId] + secretKey ||= Xinge.config[:android_secretKey] + raise 'accessId is invalid' unless accessId.is_a? Integer raise 'secretKey is invalid' if !secretKey.is_a?(String) or secretKey.strip.size == 0 @accessId = accessId @@ -144,7 +147,7 @@ def send_request(type,method,params = {}) params.merge!({ sign: sign }) options = { body: params } - result = JSON.parse(self.class.send(HTTP_METHOD,self.get_request_url(type,method), options)) + result = JSON.parse(self.class.send(HTTP_METHOD,self.get_request_url(type,method), options).parsed_response) [result["ret_code"], result["err_msg"]] end