|
@@ -41,6 +41,14 @@ class Push
|
|
{
|
|
{
|
|
$result = array();
|
|
$result = array();
|
|
$method = $source_type . '_message';
|
|
$method = $source_type . '_message';
|
|
|
|
+ if ($param && is_array($param)) {
|
|
|
|
+ if ($source_type == 'android' && isset($param[0])) {
|
|
|
|
+ $param = $param[0];
|
|
|
|
+ }
|
|
|
|
+ if ($source_type == 'ios' && isset($param[1])) {
|
|
|
|
+ $param = $param[1];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
$message = $this->$method($name, $content, $param);
|
|
$message = $this->$method($name, $content, $param);
|
|
|
|
|
|
$push = $this->get($source_type);
|
|
$push = $this->get($source_type);
|
|
@@ -159,8 +167,10 @@ class Push
|
|
$message->setContent($content);
|
|
$message->setContent($content);
|
|
$message->setType($type);
|
|
$message->setType($type);
|
|
$action = new \ClickAction();
|
|
$action = new \ClickAction();
|
|
- $action->setActionType(\ClickAction::TYPE_ACTIVITY);
|
|
|
|
- $action->setActivity($param);
|
|
|
|
|
|
+ //$action->setActionType(\ClickAction::TYPE_ACTIVITY);
|
|
|
|
+ //$action->setActivity($param);
|
|
|
|
+ $action->setActionType(\ClickAction::TYPE_INTENT);
|
|
|
|
+ $action->setIntent($param);
|
|
$message->setAction($action);
|
|
$message->setAction($action);
|
|
|
|
|
|
return $message;
|
|
return $message;
|