notification opposite site to add friend

scalad · May 10, 2017 · 0b81137 · 0b81137
1 parent 67849cf
commit 0b81137
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/main/scala/com/silence/websocket/WebSocket.scala b/src/main/scala/com/silence/websocket/WebSocket.scala
@@ -58,6 +58,11 @@ class WebSocket {
             case "addFriend" => {
                 WebSocketUtil.addFriend(uid, mess)
             }
+            case "agreeAddFriend" => {
+                if (WebSocketUtil.getSessions.get(mess.getTo.getId) != null) {                  
+                  	WebSocketUtil.sendMessage(message, WebSocketUtil.getSessions.get(mess.getTo.getId))
+                }
+            }
             case "unHandMessage" => {
                 val result = WebSocketUtil.countUnHandMessage(uid)
                 WebSocketUtil.sendMessage(gson.toJson(result), session)

diff --git a/src/main/webapp/static/html/msgbox.html b/src/main/webapp/static/html/msgbox.html
@@ -112,15 +112,13 @@
       ,from_group = li.data('fromgroup')
       ,user = cache[uid]
       ,messageBoxId = li.data('messageboxid');
-      console.log(messageBoxId);
       //选择分组
       parent.layui.layim.setFriendGroup({
         type: 'friend'
         ,username: user.username
         ,avatar: user.avatar
         ,group: parent.layui.layim.cache().friend //获取好友分组数据
         ,submit: function(group, index){
-
           //实际部署时，请开启下述注释，并改成你的接口地址
           $.post('/user/agreeFriend', {
             uid: uid //对方用户ID
@@ -141,6 +139,13 @@
               ,id: uid //好友ID
               ,sign: user.sign //好友签名
             });
+            //通知对方添加我
+            socket.send(JSON.stringify({
+		    	 type:"agreeAddFriend",
+		    	 mine:layim.cache().mine,
+		    	 to:{"id":uid},
+		    	 msg:'{"group":'+from_group +'}'
+		    }));
             parent.layer.close(index);
             othis.parent().html('已同意');
           },"json");

diff --git a/src/main/webapp/static/js/websocket.js b/src/main/webapp/static/js/websocket.js
@@ -113,8 +113,23 @@ layui.use(['layim', 'jquery', 'laytpl'], function(layim){
 					layim.msgbox(1);
 					break;
 				};
+				//同意添加好友时添加dao好友列表中
+				case "agreeAddFriend": {
+					var group = eval("(" + json.msg + ")");
+					layim.addList({
+						type: 'friend'
+						,avatar: json.mine.avatar
+						,username: json.mine.username
+						,groupid: group.group
+						,id: json.mine.id
+						,sign: json.mine.sign
+					});
+					layer.alert("用户'"+json.mine.username+"'已同意添加你为好友!", {icon: 0,time:0,title:"添加信息"});
+					break;
+				}
 			}
 		},
+
 		sendData:function(data){
 			this.waitForConnection(function () {
 				socket.send(data);