Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/controllers/Message.php

@@ -153,9 +153,11 @@ class MessageController extends \Our\Controller_AbstractApi {
     }
     public function setAction(){
         $messageService = \Business\Message\MessageServiceModel::getInstance();
-        $pushSet['canPush']=$this->req['data']['canPush'];
-        $pushSet['sound']=$this->req['data']['sound'];
-        $pushSet['vibrate']=$this->req['data']['vibrate'];
+        $memberCenterService=\Business\User\MemberCenterServiceModel::getInstance();
+        $messageSet=$memberCenterService->getMessageSet($this->memberId);
+        $pushSet['canPush']=!empty($this->req['data']['canPush'])?$this->req['data']['canPush']:$messageSet['canPush'];
+        $pushSet['sound']=!empty($this->req['data']['sound'])?$this->req['data']['sound']:$messageSet['sound'];
+        $pushSet['vibrate']=!empty($this->req['data']['vibrate'])?$this->req['data']['vibrate']:$messageSet['vibrate'];
         $pushSet['timeDiff']=$this->req['data']['timeDiff'];
         if(isset($pushSet['canPush'])&& isset($pushSet['sound']) && isset($pushSet['vibrate']) ){
             $res=$messageService->set($this->memberId,$pushSet);

scripts/crontab/push/jpush.php

@@ -48,25 +48,26 @@ class cliOrderClose extends basecli
             $redis->auth($conf['password']);
         }
         $clientPush=\JPush\ClientPush::getInstance();
-        $memberCenterServiceDao=\Business\User\MemberCenterServiceModel::getInstance();
+       $memberCenterServiceDao=\Business\User\MemberCenterServiceModel::getInstance();
         //$messageService=\DAO\MessageHistoryModel::getInstance();
         while($pushData=$redis->rPop('push_center')){
             $addData = unserialize($pushData);
             $addData['message'] = unserialize($addData['message']);
             $res=$memberCenterServiceDao->getMessageSet($addData['toId']);
-            if($res['canPush']==\Our\ApiConst::one){
+            if($res['canPush']!=\Our\ApiConst::one){
                 continue;
-            }else{
-                if(!empty($res['timeDiff'])){
-                    $timeArr=explode('-',$res['timeDiff']);
-                    if(!empty($timeArr)){
-                        if(\Our\Common::isCurentTimeInSection($timeArr[0],$timeArr[1])){
-                            continue;
-                        }
-                    }
-                }
-
             }
+//            else{
+//                if(!empty($res['timeDiff'])){
+//                    $timeArr=explode('-',$res['timeDiff']);
+//                    if(!empty($timeArr)){
+//                        if(\Our\Common::isCurentTimeInSection($timeArr[0],$timeArr[1])){
+//                            continue;
+//                        }
+//                    }
+//                }
+//
+//            }
             $clientPush->push($addData);
         }
         $redis->close();