社区相关

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1253,6 +1253,8 @@
 		04B00FC72D9A420F00F640C5 /* YHMakePlanPriceAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B00FB82D9A420F00F640C5 /* YHMakePlanPriceAlertView.swift */; };
 		04B00FC82D9A420F00F640C5 /* YHMakePlanCusttomHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B00FB62D9A420F00F640C5 /* YHMakePlanCusttomHeadView.swift */; };
 		04B00FCA2D9AAD6100F640C5 /* YHMakePlanTopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B00FC92D9AAD6100F640C5 /* YHMakePlanTopView.swift */; };
+		04D4EC312E839C1000B0329B /* YHCircleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D4EC302E839C1000B0329B /* YHCircleViewController.swift */; };
+		04D4EC332E839C2B00B0329B /* YHResourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D4EC322E839C2B00B0329B /* YHResourceViewController.swift */; };
 		04D8FF552D9258AA00703C75 /* YHPlanScoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF542D9258AA00703C75 /* YHPlanScoreView.swift */; };
 		04D8FF572D925A0800703C75 /* YHPlanScoreChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF562D925A0800703C75 /* YHPlanScoreChart.swift */; };
 		04D8FF592D925E6700703C75 /* YHPlanModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF582D925E6700703C75 /* YHPlanModel.swift */; };
@@ -2593,6 +2595,8 @@
 		04B00FBA2D9A420F00F640C5 /* YHMakePlanShareAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanShareAlertView.swift; sourceTree = "<group>"; };
 		04B00FBB2D9A420F00F640C5 /* YHMakePlanStateHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanStateHeadView.swift; sourceTree = "<group>"; };
 		04B00FC92D9AAD6100F640C5 /* YHMakePlanTopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanTopView.swift; sourceTree = "<group>"; };
+		04D4EC302E839C1000B0329B /* YHCircleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCircleViewController.swift; sourceTree = "<group>"; };
+		04D4EC322E839C2B00B0329B /* YHResourceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResourceViewController.swift; sourceTree = "<group>"; };
 		04D8FF542D9258AA00703C75 /* YHPlanScoreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanScoreView.swift; sourceTree = "<group>"; };
 		04D8FF562D925A0800703C75 /* YHPlanScoreChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanScoreChart.swift; sourceTree = "<group>"; };
 		04D8FF582D925E6700703C75 /* YHPlanModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanModel.swift; sourceTree = "<group>"; };
@@ -2645,7 +2649,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -2655,7 +2659,18 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = yinheReplayExt; sourceTree = "<group>"; };
+		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */,
+			);
+			explicitFileTypes = {
+			};
+			explicitFolders = (
+			);
+			path = yinheReplayExt;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -3244,6 +3259,8 @@
 		045C0AA32D12CA5E00BD2DC0 /* Community(社区) */ = {
 			isa = PBXGroup;
 			children = (
+				04D4EC272E839A3100B0329B /* Resource(资源) */,
+				04D4EC262E839A0300B0329B /* Circle(下属社区) */,
 				045C0A822D12CA5E00BD2DC0 /* Activity(活动) */,
 				045C0A8A2D12CA5E00BD2DC0 /* C */,
 				045C0A8E2D12CA5E00BD2DC0 /* M */,
@@ -6854,6 +6871,86 @@
 			path = MakePlan;
 			sourceTree = "<group>";
 		};
+		04D4EC262E839A0300B0329B /* Circle(下属社区) */ = {
+			isa = PBXGroup;
+			children = (
+				04D4EC282E839B3000B0329B /* C */,
+				04D4EC292E839B3000B0329B /* M */,
+				04D4EC2A2E839B3000B0329B /* V */,
+				04D4EC2B2E839B3000B0329B /* VM */,
+			);
+			path = "Circle(下属社区)";
+			sourceTree = "<group>";
+		};
+		04D4EC272E839A3100B0329B /* Resource(资源) */ = {
+			isa = PBXGroup;
+			children = (
+				04D4EC2C2E839B4200B0329B /* C */,
+				04D4EC2D2E839B4200B0329B /* M */,
+				04D4EC2E2E839B4200B0329B /* V */,
+				04D4EC2F2E839B4200B0329B /* VM */,
+			);
+			path = "Resource(资源)";
+			sourceTree = "<group>";
+		};
+		04D4EC282E839B3000B0329B /* C */ = {
+			isa = PBXGroup;
+			children = (
+				04D4EC302E839C1000B0329B /* YHCircleViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		04D4EC292E839B3000B0329B /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
+		04D4EC2A2E839B3000B0329B /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		04D4EC2B2E839B3000B0329B /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
+		04D4EC2C2E839B4200B0329B /* C */ = {
+			isa = PBXGroup;
+			children = (
+				04D4EC322E839C2B00B0329B /* YHResourceViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		04D4EC2D2E839B4200B0329B /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
+		04D4EC2E2E839B4200B0329B /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		04D4EC2F2E839B4200B0329B /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
 		04D8FF4F2D9257F700703C75 /* Plan(方案) */ = {
 			isa = PBXGroup;
 			children = (
@@ -7238,14 +7335,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks.sh\"\n";
@@ -7259,14 +7352,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources.sh\"\n";
@@ -7458,6 +7547,7 @@
 				045C10072D12CA5F00BD2DC0 /* YHLiveMessageCell.swift in Sources */,
 				045C10082D12CA5F00BD2DC0 /* YHHuanXinUserModel.swift in Sources */,
 				045C10092D12CA5F00BD2DC0 /* YHCategoryDropdownView.swift in Sources */,
+				04D4EC312E839C1000B0329B /* YHCircleViewController.swift in Sources */,
 				045C100A2D12CA5F00BD2DC0 /* YHAdopterOtherViewController.swift in Sources */,
 				045C100B2D12CA5F00BD2DC0 /* YHResignAppointedScheduleSingleItemView.swift in Sources */,
 				045C100C2D12CA5F00BD2DC0 /* YHResignAppointedScheduleLineView.swift in Sources */,
@@ -7554,6 +7644,7 @@
 				045C105B2D12CA5F00BD2DC0 /* YHFilePreviewTool.swift in Sources */,
 				045C105C2D12CA5F00BD2DC0 /* YHPersonInfoCellModel1.swift in Sources */,
 				045C105D2D12CA5F00BD2DC0 /* YHSignerInfoModel.swift in Sources */,
+				04D4EC332E839C2B00B0329B /* YHResourceViewController.swift in Sources */,
 				045C105E2D12CA5F00BD2DC0 /* YHOtherSingleChoiceItemView.swift in Sources */,
 				045C105F2D12CA5F00BD2DC0 /* YHGrabFileCell.swift in Sources */,
 				045C10602D12CA5F00BD2DC0 /* YHServerTableHeadView.swift in Sources */,

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

@@ -13,7 +13,7 @@ class YHCommunityViewController: YHBaseViewController {
     var defaltIndex: Int = 0
     let friendViewModel = YHMatchUserViewModel()
 //    let arrItemTitles = ["会话", "人脉","活动"]
-    let arrItemTitles = ["会话", "活动"]
+    let arrItemTitles = ["会话", "社区", "资源", "人脉", "活动"]
 
     var arrItemVCs: [YHBaseViewController] = []
     
@@ -65,18 +65,18 @@ class YHCommunityViewController: YHBaseViewController {
         return cleanBtn
     }()
     
-//    lazy var friendsBtn:UIButton = {
-//        let btn = UIButton()
-//        btn.setImage(UIImage(named: "people_friends_btn"), for: .normal)
-//        btn.setTitle("好友", for: .normal)
-//        btn.setTitleColor(UIColor.white, for: .normal)
-//        btn.iconInLeft(spacing: 4.0)
-//        btn.titleLabel?.font = UIFont.PFSC_R(ofSize:15)
-//        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
-//        btn.addTarget(self, action: #selector(didFriendsBtnClicked), for: .touchUpInside)
-//        return btn
-//    }()
-//    
+    lazy var friendsBtn: UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "people_friends_btn"), for: .normal)
+        btn.setTitle("好友", for: .normal)
+        btn.setTitleColor(UIColor.white, for: .normal)
+        btn.iconInLeft(spacing: 4.0)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 15)
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
+        btn.addTarget(self, action: #selector(didFriendsBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
     let unreadHeight = 16.0
     lazy var unreadLabel: UILabel = {
         let label = UILabel()
@@ -92,30 +92,30 @@ class YHCommunityViewController: YHBaseViewController {
     
     var unreadCount: Int = 0 {
         didSet {
-//            self.updateUnreadCount(self.unreadCount)
+            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 <= count && count < 100 {
-//            width = 22.0
-//        } else if count >= 100 {
-//            width = 30.0
-//            leftMargin = -14
-//        }
-//        self.unreadLabel.snp.updateConstraints { make in
-//            make.width.equalTo(width)
-//            make.left.equalTo(self.friendsBtn.snp.right).offset(leftMargin)
-//        }
-//    }
+    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 <= count && count < 100 {
+            width = 22.0
+        } else if count >= 100 {
+            width = 30.0
+            leftMargin = -14
+        }
+        self.unreadLabel.snp.updateConstraints { make in
+            make.width.equalTo(width)
+            make.left.equalTo(self.friendsBtn.snp.right).offset(leftMargin)
+        }
+    }
 
     @objc func didBackBtnClicked() {
         self.navigationController?.popViewController(animated: true)
@@ -156,15 +156,21 @@ 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 == 1 { // 活动
+            } else if i == 1 { // 社区
+                let vc = YHCircleViewController()
+                arrItemVCs.append(vc)
+            } else if i == 2 { // 资源
+                let vc = YHResourceViewController()
+                arrItemVCs.append(vc)
+                
+            } else if i == 3 { // 人脉
+                let vc = YHMatchUserViewController()
+                arrItemVCs.append(vc)
+                
+            } else if i == 4 { // 活动
                 let vc = YHActivityListViewController()
                 arrItemVCs.append(vc)
+                
             }
         }
         
@@ -196,20 +202,20 @@ class YHCommunityViewController: YHBaseViewController {
             make.right.equalToSuperview().offset(-20)
         }
 
-//        self.view.addSubview(friendsBtn)
-//        friendsBtn.snp.makeConstraints { make in
-//            make.width.equalTo(54.0)
-//            make.height.equalTo(21)
-//            make.right.equalTo(-20)
-//            make.top.equalTo(12+k_Height_safeAreaInsetsTop())
-//        }
-//        
-//        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)
-//            make.top.equalTo(self.friendsBtn.snp.top).offset(-8)
-//        }
+        self.view.addSubview(friendsBtn)
+        friendsBtn.snp.makeConstraints { make in
+            make.width.equalTo(54.0)
+            make.height.equalTo(21)
+            make.right.equalTo(-20)
+            make.top.equalTo(12+k_Height_safeAreaInsetsTop())
+        }
+        
+        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)
+            make.top.equalTo(self.friendsBtn.snp.top).offset(-8)
+        }
         
         segmentedView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
@@ -264,7 +270,7 @@ class YHCommunityViewController: YHBaseViewController {
             self.friendViewModel.getMyFriendList { _, _ in
                 let unreadCount =  self.friendViewModel.friendListModel.applyFriends.count
                 self.unreadCount = unreadCount
-//                self.friendsBtn.isHidden = self.segmentedView.selectedIndex != 1
+                self.friendsBtn.isHidden = self.segmentedView.selectedIndex != 1
             }
         } else {
             self.unreadCount = 0
@@ -285,33 +291,33 @@ class YHCommunityViewController: YHBaseViewController {
     }
     
     @objc func goActivityVC() {
-        segmentedView.selectItemAt(index: 2)
+        segmentedView.selectItemAt(index: 4)
     }
     
     @objc func goConnectionVC() {
-        segmentedView.selectItemAt(index: 1)
+        segmentedView.selectItemAt(index: 3)
     }
 }
 
 extension YHCommunityViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
-//        if segmentedView.selectedIndex == 1 { // 人脉
-//            bgImgV.isHidden = false
-//            friendsBtn.isHidden = false
-//            cleanAllMsgBtn.isHidden = true
-//            segmentedDataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
-//            segmentedDataSource.titleSelectedColor = .white
-//            let indicator = JXSegmentedIndicatorLineView()
-//            indicator.indicatorWidth = 16
-//            indicator.indicatorHeight = 2
-//            indicator.indicatorCornerRadius = 0.0
-//            indicator.indicatorColor = UIColor.white
-//            segmentedView.indicators = [indicator]
-//            
-//        } else { // 非人脉tab
+        if segmentedView.selectedIndex == 3 { // 人脉
+            bgImgV.isHidden = false
+            friendsBtn.isHidden = false
+            cleanAllMsgBtn.isHidden = true
+            segmentedDataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
+            segmentedDataSource.titleSelectedColor = .white
+            let indicator = JXSegmentedIndicatorLineView()
+            indicator.indicatorWidth = 16
+            indicator.indicatorHeight = 2
+            indicator.indicatorCornerRadius = 0.0
+            indicator.indicatorColor = UIColor.white
+            segmentedView.indicators = [indicator]
+            
+        } else { // 非人脉tab
             bgImgV.isHidden = true
-//            friendsBtn.isHidden = true
+            friendsBtn.isHidden = true
             cleanAllMsgBtn.isHidden = segmentedView.selectedIndex != 0
             segmentedDataSource.titleNormalColor = UIColor.yhGreyColor
             segmentedDataSource.titleSelectedColor = UIColor.mainTextColor
@@ -321,7 +327,7 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
             indicator.indicatorCornerRadius = 0.0
             indicator.indicatorColor = UIColor.brandMainColor
             segmentedView.indicators = [indicator]
-//        }
+        }
         segmentedView.dataSource = segmentedDataSource
         self.segmentedView.reloadDataWithoutListContainer()
     }

galaxy/galaxy/Classes/Modules/Community(社区)/Circle(下属社区)/C/YHCircleViewController.swift

+//
+//  YHCircleViewController.swift
+//  galaxy
+//
+//  Created by alexzzw on 2025/9/24.
+//  Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCircleViewController: YHBaseViewController {
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

galaxy/galaxy/Classes/Modules/Community(社区)/Resource(资源)/C/YHResourceViewController.swift

+//
+//  YHResourceViewController.swift
+//  galaxy
+//
+//  Created by alexzzw on 2025/9/24.
+//  Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHResourceViewController: YHBaseViewController {
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}