|
|
@@ -5944,7 +5944,7 @@ U.MD.F.J.groupExit = function(groupinfo, userinfo, el) {
|
|
|
//如果推出群的是群主处理
|
|
|
if (_isgroupmain) {
|
|
|
//如果群主自己推出，则解散群
|
|
|
- if (userinfo.UserId == _userid) {
|
|
|
+ if (userInfo.userid == _userid) {
|
|
|
U.UF.UI.confirm("是否解散该群", function() {
|
|
|
U.MD.F.J.enterGroupExit(groupinfo, userinfo, true, el);
|
|
|
}); //创建提示框 提示是否删除备份
|
|
|
@@ -5974,7 +5974,7 @@ U.MD.F.J.enterGroupExit = function(groupinfo, userinfo, isdelete, el) {
|
|
|
if (isdelete === true) {
|
|
|
U.A.Request(US.FRIEND, ["DeleteGroup", US.userInfo.userid, groupinfo.GroupManageID], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]); //解散群
|
|
|
} else {
|
|
|
- U.A.Request(US.FRIEND, ["ExitGroup", US.userInfo.userid, groupinfo.GroupManageID, userinfo.UserId], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]);
|
|
|
+ U.A.Request(US.FRIEND, ["ExitGroup", US.userInfo.userid, groupinfo.GroupManageID, userInfo.userid], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -9435,7 +9435,7 @@ U.MD.F.H.recentContacts = function(userinfo) {
|
|
|
|
|
|
if (US.friend.recentcontacts) {
|
|
|
//判断联系人是否已经在最近联系人中
|
|
|
- _num = US.friend.recentcontacts.objIndexOf({ "UserId": userinfo.UserId }) || US.friend.recentcontacts.objIndexOf({ "GroupManageID": userinfo.GroupManageID });
|
|
|
+ _num = US.friend.recentcontacts.objIndexOf({ "UserId": userInfo.userid }) || US.friend.recentcontacts.objIndexOf({ "GroupManageID": userinfo.GroupManageID });
|
|
|
//如果存在最近联系人，那么直接从最近联系人中找到
|
|
|
if (_num > -1) {
|
|
|
_recentcontactsinfo = US.friend.recentcontacts.splice(_num, 1)[0];
|
|
|
@@ -9443,7 +9443,7 @@ U.MD.F.H.recentContacts = function(userinfo) {
|
|
|
//否则生成一个新的最近联系人
|
|
|
else {
|
|
|
//生成一个新的最近联系人
|
|
|
- _recentcontactsinfo = new U.MD.F.T.recentContactsEntity(userinfo.GroupManageID || userinfo.UserId,
|
|
|
+ _recentcontactsinfo = new U.MD.F.T.recentContactsEntity(userinfo.GroupManageID || userInfo.userid,
|
|
|
userinfo.GroupManageName || userinfo.UserName, userinfo.UserImageHead || "", userinfo.UserNickName || "",
|
|
|
userinfo.UserThumbnailImageHead || "", userinfo.maxMessageSendTime || new Date(),
|
|
|
userinfo.GroupManageDescript || userinfo.FriendsDescript, userinfo.GroupManageRemark || userinfo.UserIndividualitysignature || "",
|
|
|
@@ -9458,7 +9458,7 @@ U.MD.F.H.recentContacts = function(userinfo) {
|
|
|
_recentcontactsel = U.selectEl(_recentcontactsel).Child()[0];
|
|
|
//如果当前显示的不是好友、群而是最近联系人，那么则重新打印
|
|
|
if (_recentcontactsel.className.indexOf("U_MD_F_H_ZLTSO") > -1) {
|
|
|
- _recentcontactsel = U.selectEl("[tid='" + (userinfo.GroupManageID || userinfo.UserId + "']"), U.selectEl("#U_MD_F_H_ZLZ")[0])[0]; //获取最近联系人
|
|
|
+ _recentcontactsel = U.selectEl("[tid='" + (userinfo.GroupManageID || userInfo.userid + "']"), U.selectEl("#U_MD_F_H_ZLZ")[0])[0]; //获取最近联系人
|
|
|
//如果最近联系人原本就存在，则直接追加到最前面
|
|
|
if (_recentcontactsel) {
|
|
|
($(_recentcontactsel).appendTo(_contentel, 0, _contentel.firstChild)); //追加到第一个
|
|
|
@@ -9708,9 +9708,9 @@ U.MD.F.M.addFriend = function(userinfo, cb, typename) {
|
|
|
if (!U.MD.U.L.isLogin()) {
|
|
|
typename = typename || "1"; //判断是添加直接对方为好友还是添加对方为好友需好友验证。
|
|
|
//无法加本人为好友 同时不可与本人对话
|
|
|
- if (userinfo.UserId != US.userInfo.userid) {
|
|
|
+ if (userInfo.userid != US.userInfo.userid) {
|
|
|
//在好友里获取用户
|
|
|
- var _friendinfo = U.Json.select(US.friend.friends, { "UserId": userinfo.UserId })[0];
|
|
|
+ var _friendinfo = U.Json.select(US.friend.friends, { "UserId": userInfo.userid })[0];
|
|
|
//判断是否已经添加了用户
|
|
|
if (!_friendinfo) {
|
|
|
U.MD.F.M.addFriendForm(userinfo, cb, typename); //弹出添加好友框
|
|
|
@@ -9792,12 +9792,12 @@ U.MD.F.M.addFriendToDb = function(userinfo, cb, selectel, loadingel, typename, _
|
|
|
//添加好友分组的ajax
|
|
|
//对方发送添加好友信息给你，同意后把用户直接加到好友分组里
|
|
|
if (typename == "0") {
|
|
|
- U.A.Request(US.FRIEND, ["AgreeAddFriend", US.userInfo.userid, userinfo.UserId, _friendid, _groupid, (userinfo.UserNickName || userinfo.UserName), userinfo.MessageContent.toUpperCase()],
|
|
|
+ U.A.Request(US.FRIEND, ["AgreeAddFriend", US.userInfo.userid, userInfo.userid, _friendid, _groupid, (userinfo.UserNickName || userinfo.UserName), userinfo.MessageContent.toUpperCase()],
|
|
|
U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
|
|
|
}
|
|
|
//添加用户为好友
|
|
|
else {
|
|
|
- U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "AddFriend", US.userInfo.userid, _friendid, userinfo.UserId, _groupid, _messageid, (userinfo.UserNickName || userinfo.UserName), ("" || _descript)]), U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
|
|
|
+ U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "AddFriend", US.userInfo.userid, _friendid, userInfo.userid, _groupid, _messageid, (userinfo.UserNickName || userinfo.UserName), ("" || _descript)]), U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
|
|
|
}
|
|
|
//提示
|
|
|
//U.alert("正在添加中...");
|
|
|
@@ -9849,7 +9849,7 @@ U.MD.F.M.displayAddFriend = function(userinfo, friendid, classid, friendgroupinf
|
|
|
var _childs,
|
|
|
_groupel,
|
|
|
//好友分组的信息
|
|
|
- _friendinfo = new U.MD.F.T.friendEntity(userinfo.UserIndividualitysignature, userinfo.UserId, userinfo.UserImageHead,
|
|
|
+ _friendinfo = new U.MD.F.T.friendEntity(userinfo.UserIndividualitysignature, userInfo.userid, userinfo.UserImageHead,
|
|
|
userinfo.UserThumbnailImageHead, userinfo.UserNickName || userinfo.UserName,
|
|
|
userinfo.UserName, friendid, userinfo.UserNickName || userinfo.UserName, classid, 0);
|
|
|
_friendinfo["IsLogin"] = r[1] == "True" ? 1 : 0; //设置用户在线
|
|
|
@@ -13773,7 +13773,7 @@ U.MD.U.V.AddFriend = function(button, userinfo) {
|
|
|
button.innerText = '删除好友';
|
|
|
button.style.backgroundColor = '#e20f0f';
|
|
|
button.onclick = function() {
|
|
|
- _friendinfo = U.Json.select(US.friend.friends, { UserId: userinfo.UserId })[0];
|
|
|
+ _friendinfo = U.Json.select(US.friend.friends, { UserId: userInfo.userid })[0];
|
|
|
U.MD.F.M.deleteFriend(_friendinfo);
|
|
|
button.innerText = '+好友';
|
|
|
button.style.backgroundColor = '';
|
root