debug friends

data/model/room.model.php

@@ -134,6 +134,10 @@ class roomModel extends Model
     {
         return $this->table('room_msg')->field('*')->where(['room_id' => $room_id,'member_id' => $userid,'type' => $msg_type])->order('add_time desc')->select();
     }
+    public function updateMsg($msgid,$data) {
+        if($msgid <= 0) return false;
+        return $this->table('room_msg')->where(['msg_id' => $msgid])->update($data);
+    }
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function getRoomExtend($userid,$lock=false)
     {

helper/relation_helper.php

@@ -24,8 +24,7 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("{$msg} member_id = {$member_id}");
+            Log::record("{$ex->getMessage()} member_id = {$member_id}",Log::ERR);
         }
     }
 
@@ -40,8 +39,7 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("{$msg} member_id = {$user}");
+            Log::record("{$ex->getMessage()} member_id = {$user}",Log::ERR);
         }
     }
 
@@ -54,8 +52,7 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("{$msg} member_id = {$member_id}");
+            Log::record("{$ex->getMessage()} member_id = {$member_id}",Log::ERR);
         }
     }
 
@@ -71,8 +68,7 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("onInvite: {$msg} param = {$me_id},{$user_id}");
+            Log::record("onInvite: {$ex->getMessage()} param = {$me_id},{$user_id}",Log::ERR);
             return false;
         }
     }
@@ -91,8 +87,7 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("onInvite: {$msg} param = {$me_id},{$someone_id}");
+            Log::record("onInvite: {$ex->getMessage()} param = {$me_id},{$someone_id}");
             return false;
         }
     }
@@ -122,8 +117,20 @@ class relation_helper
         }
         catch (Exception $ex)
         {
-            $msg = $ex->getMessage();
-            Log::record("onInvite: {$msg} param = {$me_id},{$someone_id}");
+            Log::record("onInvite: {$ex->getMessage()} param = {$me_id},{$someone_id}",Log::ERR);
+            return false;
+        }
+    }
+
+    static public function onAccept($me_id,$someone_id)
+    {
+        try
+        {
+            $relation = new relation\mem_relation($me_id);
+            return $relation->pass_onesub($someone_id);
+        }
+        catch (Exception $ex) {
+            Log::record("onAccept: {$ex->getMessage()} param = {$me_id},{$someone_id}",Log::ERR);
             return false;
         }
     }

helper/room/room_processor.php

@@ -336,7 +336,15 @@ class room_processor implements IProcessor
                 $msgid = $mod_room->addRoomMsg(['room_id' => 0,'member_id' => $user, 'type' => $msg_type,'msg' => $msg, 'orgmsg' => $orgmsg, 'add_time' => time(),'msg_type' => 1]);
                 $send['msgid'] = $msgid;
                 $send['send_time'] = time();
-                $this->write_push_users($pushid,$users,$send);
+                $this->write_push_users($pushid,[$user],$send);
+            }
+        }
+        else
+        {
+            foreach ($users as $user) {
+                $send['msgid'] = 0;
+                $send['send_time'] = time();
+                $this->write_push_users($pushid,[$user],$send);
             }
         }
 

mobile/control/member_relation.php

@@ -9,6 +9,8 @@
 require_once (BASE_ROOT_PATH . '/helper/relation_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/model_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/util_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/room_helper.php');
+
 
 class member_relationControl extends mbMemberControl
 {
@@ -226,6 +228,52 @@ class member_relationControl extends mbMemberControl
     //处理好友申请
     public function handle_applysOp()
     {
+        $msgid = intval($_GET['msg_id']);
+        $pass  = boolval($_GET['pass']);
+
+        $item = room_helper::message($msgid);
+        if($item == false) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $msg = json_decode($item['orgmsg'],true);
+        $apply_user = intval($msg['from']['userid']);
+        if($apply_user <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        if($msg['state'] === 'pending')
+        {
+            $mod_room = Model('room');
+            if($msg['type'] == 'apply_friend')
+            {
+                if($pass) {
+                    relation_helper::onAccept(session_helper::memberid(),$apply_user);
+                    room\pusher::instance()->new_friend(session_helper::memberid(),$apply_user);
+                    room\pusher::instance()->new_friend($apply_user,session_helper::memberid());
+                    $msg['state'] = 'accept';
+                } else {
+                    $msg['state'] = 'refuse';
+                }
+            }
+            elseif($msg['type'] == 'apply_room')
+            {
+                $roomid = $msg['room_id'];
+                if($pass) {
+                    room\factory_client::instance()->invite($roomid, session_helper::memberid(), $apply_user);
+                    $msg['state'] = 'accept';
+                } else {
+                    $msg['state'] = 'refuse';
+                }
+            }
+            else {
+
+            }
+            if($msg['state'] != 'pending') {
+                $mod_room->updateMsg($msgid,['orgmsg' => json_encode($msg,JSON_UNESCAPED_UNICODE)]);
+            }
+        }
+
         return self::outsuccess(null,"处理成功");
     }
 }

mobile/templates/default/member/index.php

@@ -162,7 +162,8 @@
     $(function(){
         var jsBridge = new Bridge();
 
-        $('#send').on('click',function(){
+        $('#send').on('click',function()
+        {
             var jsonobject = {
                 action:"chat_to",
                 params:{
@@ -174,7 +175,8 @@
             jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject));
         });
 
-        $('#thief_bonus').on('click',function(){
+        $('#thief_bonus').on('click',function()
+        {
             var jsonobject = {
                 action:"thief_bonus",
                 params:{
@@ -191,7 +193,8 @@
         });
 
 
-        $("#pass_verify_btn").on('click',function(){
+        $("#pass_verify_btn").on('click',function()
+        {
             var msg_id = $(this).attr('data-msg-id');
             $.showLoading();
             $.get("/mobile/index.php", {
@@ -211,7 +214,8 @@
             });
         });
 
-        $("#refuse_btn").on('click',function(){
+        $("#refuse_btn").on('click',function()
+        {
             var msg_id = $(this).attr('data-msg-id');
             $.showLoading();
             $.get("/mobile/index.php", {