Merge branch 'sess_0306' of 121.43.114.153:/home/git/repositories/shopnc into sess_0306

helper/umeng.php

@@ -178,7 +178,7 @@ class upush
         $extra['key1'] = "key2";
         $extra['key1'] = "key3";
 
-        $payload['display_type'] = display_type::notification;
+        $payload['display_type'] = display_type::message;
         $payload['body'] = $body;
         $payload['extra'] = $extra;
         $pack['payload'] = $payload;
@@ -216,6 +216,7 @@ class upush
     {
 //        $ret = $this->pre_pack();
 //        if ($ret) {
+        
             $pack_body = self::android_pack();
             $url = self::PUSH_URL . '?sign=' . self::make_sign("POST", self::PUSH_URL, $pack_body, self::APP_MASTER_SECRET);
             return $this->http_post_data($url, json_encode($pack_body));