| 
					
				 | 
			
			
				@@ -122,9 +122,9 @@ class Push 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     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);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    		return $result;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    	}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -168,9 +168,9 @@ class Push 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$message->setAlert(array('title' => $name, 'content' => $content));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$message->setBadge(-2);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		//$mess->setSound("beep.wav");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		$custom = json_decode($param);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		$custom = Dever::json_decode($param);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$message->setCustom($custom);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		$message->setRaw($param);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		//$message->setRaw($param);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$time = new \TimeInterval(0, 0, 23, 59);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$message->addAcceptTime($time);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 |