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

galaxy/fastlane/Fastfile

@@ -17,7 +17,7 @@ platform :ios do
   youhua_branch = "youhua-dev"
   
   #打包正使用的分支
-  myPack_branch = "main"
+  myPack_branch = "630-dev"
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 
@@ -27,9 +27,9 @@ platform :ios do
      # 拉取最新代码
      sh "git pull origin #{myPack_branch}"
      # 显示git当前分支最新submit id
-     sh "git rev-parse HEAD"
+     # sh "git rev-parse HEAD"
      # 更新pod第三方库
-     cocoapods(use_bundle_exec: true)
+     # cocoapods(use_bundle_exec: true)
 
     gym(
     workspace: 'galaxy.xcworkspace',

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3736,7 +3736,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3940,7 +3940,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3986,7 +3986,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -111,6 +111,8 @@ extension YHActivityDetailViewController {
         gk_navigationBar.isHidden = false
         gk_navigationBar.backgroundColor = .clear
         
+        gk_backImage = UIImage(named: "activity_nav_back")
+        
         //1.
         view.addSubview(tableView)
         view.addSubview(bottomView)

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -209,7 +209,7 @@ extension YHActivityListViewController {
             
             self.tableView.reloadData()
             self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
-            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+//            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                 self.tableView.es.stopPullToRefresh()
                 self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
 
@@ -221,7 +221,7 @@ extension YHActivityListViewController {
                         self.tableView.footer?.alpha = 0
                     }
                 }
-            })
+//            })
         }
     }
 }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityModel.swift

@@ -21,7 +21,7 @@ class YHActivityModel: YHBaseModel {
     
     private var beginTimeForUI : String = ""
     
-    func getDateString() -> String {
+    func getDateString(format : String = "MM-dd") -> String {
         if beginTimeForUI.isEmpty {
             
             if let tttt =  beginTime.double() {
@@ -33,7 +33,7 @@ class YHActivityModel: YHBaseModel {
                 let dateFormatter = DateFormatter()
 
                 // 设置日期格式，这里设置为"年-月-日 时:分:秒"
-                dateFormatter.dateFormat = "yyyy-MM-dd" // HH:mm:ss
+                dateFormatter.dateFormat = format // HH:mm:ss
 
                 // 使用DateFormatter将Date对象转换为字符串
                 let dateString = dateFormatter.string(from: date)

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTitleItemView.swift

@@ -53,7 +53,7 @@ class YHActivityTitleItemView: UIView {
         nameLabel.textColor = UIColor.mainTextColor
         nameLabel.textAlignment = .left
         nameLabel.font = UIFont.PFSC_R(ofSize:14)
-        nameLabel.text = "2024-08-06 周五  09:30"
+        nameLabel.text = "08-06 周五  09:30"
         return nameLabel
     }()
     
@@ -107,7 +107,7 @@ extension YHActivityTitleItemView {
             """
         }
         
-        timeLable.text = model.getDateString()//String(model.beginTime)
+        timeLable.text = model.getDateString(format: "yyyy-MM-dd")
         addressLable.text = model.place
         navAddressLable.text = model.guidance
     }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -292,7 +292,7 @@ private extension YHHomePageViewController {
                     UserDefaults.standard.synchronize()
                 }
                 
-                DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+//                DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                     self.homeCollectView.es.stopPullToRefresh()
                     
                     
@@ -305,8 +305,13 @@ private extension YHHomePageViewController {
                     self.homeCollectView.reloadData()
                     CATransaction.commit()
                     
-//                    self.requestOrder()
-                })
+                    
+                    DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25, execute: {
+                        self.requestOrder()
+                    })
+                    
+                    
+//                })
             }
     }
     
@@ -413,8 +418,18 @@ extension YHHomePageViewController: UICollectionViewDelegate, UICollectionViewDa
 
 extension YHHomePageViewController : CollectionViewWaterfallLayoutDelegate {
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath) -> CGSize {
-        guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return CGSize.zero }
-        return CGSize(width: model.img_width_cell, height: model.img_height_cell)
+        
+        let count = self.viewModel.arrHomeNewsData?.count ?? 0
+        
+        if indexPath.row < count {
+            guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return CGSize.zero }
+            return CGSize(width: model.img_width_cell, height: model.img_height_cell)
+        }
+        
+        let width = (KScreenWidth - 47) / 2
+        return CGSize(width: width, height: 140.0)
+        
+        
     }
 }
 

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift

@@ -270,9 +270,9 @@ class YHSearchInfomationVC: YHBaseViewController {
             emptyDataTipsView.isHidden = (items.count > 0)
             searchHistoryView.isHidden = true
             self.tableView.reloadData()
-            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
-                self.tableView.es.stopPullToRefresh()
-            })
+//            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+            self.tableView.es.stopPullToRefresh()
+//            })
             // 只有一页的时候不展示没有更多数据了
             if self.viewModel.totalCount < self.viewModel.searchPageSize { // 不足一页
                 tableView.footer?.isHidden = true

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerCollectionViewCell.swift

@@ -89,7 +89,7 @@ private extension YHHomeBannerCollectionViewCell {
             visualEffectView.isHidden = false
             
             if let url = URL(string: model.img_url) {
-                if let avifUrl = URL(string: model.img_url) {
+                if let avifUrl = URL(string: model.img_url_compress) {
                     bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
                         switch result {
                         case .success: break

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeCollectionViewCell.swift

@@ -183,7 +183,7 @@ extension YHHomeCollectionViewCell {
             make.height.equalTo(listModel.img_height_use)
         }
         if let url = URL(string: listModel.img_url) {
-            if let avifUrl = URL(string: listModel.img_url) {
+            if let avifUrl = URL(string: listModel.img_url_compress) {
                 titleImageView.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
                     switch result {
                     case .success: break

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -227,7 +227,7 @@ private extension YHServiceBannerCollectionViewCell {
         } else {
             bannerTitleLable.isHidden = false
             if let url = URL(string: model.img_url) {
-                if let avifUrl = URL(string: model.img_url) {
+                if let avifUrl = URL(string: model.img_url_compress) {
                     bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
                         switch result {
                         case .success: break

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift

@@ -30,14 +30,15 @@ class YHUserInfoSettingViewController: YHBaseViewController {
             userViewModel.requestUserInfo {[weak self] success, error in
                 guard let self = self else { return }
                 let url = URL(string: self.userViewModel.model.avatar)
+                self.headUrl = self.userViewModel.model.avatar
                 self.photoImageView.kf.setImage(with: url)
                 self.nameTextField.text = self.userViewModel.model.username
                 if self.nameTextField.text?.count != 0  {
                     self.nextButton.isEnabled = true
-                    self.nextButton.backgroundColor =  UIColor.brandMainColor
+                    self.nextButton.backgroundColor = UIColor.brandMainColor
                 } else {
                     self.nextButton.isEnabled = false
-                    self.nextButton.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.4)
+                    self.nextButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.4)
                 }
             }
         }

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -16,15 +16,15 @@ class YHBaseUrlManager {
     //正式环境
     static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com"
     // UAT灰度环境
-    static let baseGrayUrlTest: String = "https://uat-go-api.galaxy-immi.com"
+    static let baseUatUrlTest: String = "https://uat-go-api.galaxy-immi.com"
     
     
     func curURL() -> String {
 #if DEBUG
         return YHBaseUrlManager.baseUrlTest + "/"
 #elseif TESTENV
-        return YHBaseUrlManager.baseGrayUrlTest + "/"
-//        return YHBaseUrlManager.baseUrlTest + "/"
+//        return YHBaseUrlManager.baseUatUrlTest + "/"
+        return YHBaseUrlManager.baseUrlTest + "/"
 #else
         return YHBaseUrlManager.baseUrlRelease + "/"
 #endif

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_nav_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 2033194370@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 2033194370@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_school.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "set_example_school@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "set_example_school@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_work.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "set_example_work@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "set_example_work@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }