Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  社区
  //  我的好友
  //  人脉

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHCommunityViewController.swift

@@ -78,17 +78,22 @@ class YHCommunityViewController: YHBaseViewController {
     
     var unreadCount:Int = 0 {
         didSet {
-            self.unreadLabel.isHidden = (self.unreadCount <= 0)
-            if 0 < self.unreadCount && self.unreadCount < 100 {
-                self.unreadLabel.text = "\(self.unreadCount)"
-            } else if self.unreadCount >= 100 {
+            self.updateUnreadCount(self.unreadCount)
+        }
+    }
+    
+    func updateUnreadCount(_ count : Int) {
+        self.unreadLabel.isHidden = (count <= 0)
+        if 0 < count && count < 100 {
+            self.unreadLabel.text = "\(count)"
+        } else if count >= 100 {
             self.unreadLabel.text = "99+"
         }
         var width = unreadHeight
         var leftMargin = -8
-            if 10 <= self.unreadCount && self.unreadCount < 100 {
+        if 10 <= count && count < 100 {
             width = 22.0
-            } else if self.unreadCount >= 100 {
+        } else if count >= 100 {
             width = 30.0
             leftMargin = -14
         }
@@ -97,7 +102,6 @@ class YHCommunityViewController: YHBaseViewController {
             make.left.equalTo(self.friendsBtn.snp.right).offset(leftMargin)
         }
     }
-    }
 
     @objc func didBackBtnClicked() {
         self.navigationController?.popViewController(animated: true)
@@ -159,7 +163,7 @@ class YHCommunityViewController: YHBaseViewController {
             make.top.equalTo(12+k_Height_safeAreaInsetsTop())
         }
         
-        self.view.addSubview(self.unreadLabel)
+        self.friendsBtn.addSubview(self.unreadLabel)
         self.unreadLabel.snp.makeConstraints { make in
             make.width.height.equalTo(unreadHeight)
             make.left.equalTo(self.friendsBtn.snp.right).offset(-8)
@@ -193,6 +197,7 @@ class YHCommunityViewController: YHBaseViewController {
             self.friendViewModel.getMyFriendList { success, error in
                 let unreadCount =  self.friendViewModel.friendListModel.applyFriends.count
                 self.unreadCount = unreadCount
+                self.friendsBtn.isHidden = self.segmentedView.selectedIndex != 0
             }
         } else {
             self.unreadCount = 0