Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 System/Chat/ChatRecently.cs

@@ -59,6 +59,7 @@
            if(_cell.index!= ChatCtrl.Inst.PteChatID)
            {
                ChatCtrl.Inst.PteChatID = _cell.index;
                ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
                m_RecentlyControl.m_Scorller.RefreshActiveCellViews();
            }
        }
@@ -76,12 +77,14 @@
            if (friendModel.tempFriendData != null)
            {
                ChatCtrl.Inst.PteChatID = (int)friendModel.tempFriendData.PlayerID;
                ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
                return;
            }
            var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);
            if (_dict != null && _dict.Count > 0)
            {
                ChatCtrl.Inst.PteChatID = (int)_dict.Keys.First();
                ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
            }
        }
    }