Skip to content

选择发送消息类型和发送消息后反馈消息格式转换bug #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
winterbang wants to merge 5 commits into
base: master
Choose a base branch
from
Open

选择发送消息类型和发送消息后反馈消息格式转换bug #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc4aafb
选择发送消息类型和发送消息后反馈消息格式转换bug
May 6, 2015
3682368
修复initializers目录下配置文件无效的问题
May 6, 2015
216e8c3
修改参数顺序
May 6, 2015
270d7b4
修改bug
May 6, 2015
fd34de5
修改代码书写bug
May 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/xinge/android.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion lib/xinge/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down