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

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

@@ -12,7 +12,8 @@ import JXSegmentedView
 class YHCommunityViewController: YHBaseViewController {
     var defaltIndex: Int = 0
     let friendViewModel = YHMatchUserViewModel()
-    let arrItemTitles = ["会话", "人脉","活动"]
+//    let arrItemTitles = ["会话", "人脉","活动"]
+    let arrItemTitles = ["会话"]
 
     var arrItemVCs : [YHBaseViewController] = []
     
@@ -155,15 +156,15 @@ class YHCommunityViewController: YHBaseViewController {
             if i == 0 { // 消息
                 let vc = YHMessageListVC()
                 arrItemVCs.append(vc)
-                
-            } else if i == 1 { // 人脉
-                let vc = YHMatchUserViewController()
-                arrItemVCs.append(vc)
-                
-            } else if i == 2 { // 活动
-                let vc = YHActivityListViewController()
-                arrItemVCs.append(vc)
             }
+//            } else if i == 1 { // 人脉
+//                let vc = YHMatchUserViewController()
+//                arrItemVCs.append(vc)
+//                
+//            } else if i == 2 { // 活动
+//                let vc = YHActivityListViewController()
+//                arrItemVCs.append(vc)
+//            }
         }
         
         //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -250,10 +250,10 @@ class YHMyNewViewController: YHBaseViewController {
             serviceGroupArr.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: .Mine_MyActivity) == 1 {
-            let item = PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity)
-            serviceGroupArr.append(item)
-        }
+//        if YHUatHelper.shared.getUatModuleStatusBy(module: .Mine_MyActivity) == 1 {
+//            let item = PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity)
+//            serviceGroupArr.append(item)
+//        }
         
         // 其他功能
         do {