dever 6 years ago
parent
commit
5864d6957e
2 changed files with 5 additions and 5 deletions
  1. 1 1
      lib/Data.php
  2. 4 4
      lib/Push.php

+ 1 - 1
lib/Data.php

@@ -116,7 +116,7 @@ class Data
 
 
         $push = json_encode($push);
         $push = json_encode($push);
         $uid = -1;
         $uid = -1;
-        $to_uid = 2;
+        $to_uid = Dever::input('uid', 7);
         $name = Dever::input('name', 'test');
         $name = Dever::input('name', 'test');
         $content = Dever::input('content', 'test');
         $content = Dever::input('content', 'test');
         $result = $this->push($uid, $to_uid, $name, $content, 11, 1, 1, $push);
         $result = $this->push($uid, $to_uid, $name, $content, 11, 1, 1, $push);

+ 4 - 4
lib/Push.php

@@ -122,9 +122,9 @@ class Push
 
 
     private function sendAll($name, $content, $param)
     private function sendAll($name, $content, $param)
    	{
    	{
-   		$result = $this->sendAction('android', 1, false, $name, $content, $param);
+   		$result = array();
+   		$result += $this->sendAction('android', 1, false, $name, $content, $param);
    		$result += $this->sendAction('ios', 1, false, $name, $content, $param);
    		$result += $this->sendAction('ios', 1, false, $name, $content, $param);
-
    		return $result;
    		return $result;
    	}
    	}
 
 
@@ -168,9 +168,9 @@ class Push
 		$message->setAlert(array('title' => $name, 'content' => $content));
 		$message->setAlert(array('title' => $name, 'content' => $content));
 		$message->setBadge(-2);
 		$message->setBadge(-2);
 		//$mess->setSound("beep.wav");
 		//$mess->setSound("beep.wav");
-		$custom = json_decode($param);
+		$custom = Dever::json_decode($param);
 		$message->setCustom($custom);
 		$message->setCustom($custom);
-		$message->setRaw($param);
+		//$message->setRaw($param);
 		$time = new \TimeInterval(0, 0, 23, 59);
 		$time = new \TimeInterval(0, 0, 23, 59);
 		$message->addAcceptTime($time);
 		$message->addAcceptTime($time);