Merge branch '630-dev' into youhua-dev

* 630-dev:
  修改环境
  修改版本号
  处理图片展示的问题
  修改几处bug
  细节优化
  细节修复
  几处bug修改
  no message
  //  灰度环境
  处理一处bug
  //  灰度环境
  处理 首页的数据刷新
  细节修复

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3732,7 +3732,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3936,7 +3936,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3982,7 +3982,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

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

@@ -110,6 +110,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(活动)/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/YHActivityListCell.swift

@@ -215,7 +215,7 @@ extension YHActivityListCell {
             make.top.equalTo(statusLabel.snp.top)
             make.left.equalTo(dateLabel.snp.left)
             make.height.equalTo(17)
-            make.right.equalTo(statusLabel.snp.left).offset(16)
+            make.right.equalTo(statusLabel.snp.left).offset(-16)
         }
     }
 }

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
     }()
     
@@ -73,6 +73,7 @@ class YHActivityTitleItemView: UIView {
         nameLabel.textAlignment = .left
         nameLabel.font = UIFont.PFSC_R(ofSize:14)
         nameLabel.text = "深圳市本元大厦26A银河集团体验中心"
+        nameLabel.numberOfLines = 0
         return nameLabel
     }()
     
@@ -106,7 +107,7 @@ extension YHActivityTitleItemView {
             """
         }
         
-        timeLable.text = model.getDateString()//String(model.beginTime)
+        timeLable.text = model.getDateString()
         addressLable.text = model.place
         navAddressLable.text = model.guidance
     }

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

@@ -604,7 +604,7 @@ extension YHApplyActivityAlert: UITextFieldDelegate {
                 return false
             } else if  let item = Int(newText),item < 1 {
                 textField.text = "1"
-                YHHUD.flash(message: "至少添加1人")
+                YHHUD.flash(message: "最少添加1人")
                 updateButtonUI()
                 return false
             }

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

@@ -108,6 +108,9 @@ class YHHomePageViewController: YHBaseViewController {
     
     // 请求订单数据
     func requestOrder() {
+        if YHLoginManager.shared.isLogin()  == false {
+            return
+        }
         
         DispatchQueue.global().async {
             self.serviceCenterMainReqVM.getContactList {
@@ -189,6 +192,7 @@ private extension YHHomePageViewController {
     func getData() {
         loadFirstData()
         getHomeBannerData()
+//        requestOrder()
     }
     
     //获取缓存的 banner数据
@@ -300,6 +304,8 @@ private extension YHHomePageViewController {
                     CATransaction.setDisableActions(true)
                     self.homeCollectView.reloadData()
                     CATransaction.commit()
+                    
+//                    self.requestOrder()
                 })
             }
     }
@@ -358,12 +364,7 @@ private extension YHHomePageViewController {
         }
     }
     
-    @objc func homepageRefresh() {
-        loadFirstData()
-    }
-    
     @objc func loginSuccess() {
-        requestOrder()
         getData()
     }
     

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/Home(首页)/V/YHOrderTipsItemView.swift

@@ -58,7 +58,7 @@ class YHOrderTipsItemView: UIView {
             let time = (distance/60).int
             return "\(time)分钟前"
         } else if distance < 24 * 60 * 60 {
-            let time = (distance/24/60).int
+            let time = (distance/60/60).int
             return "\(time)小时前"
         } else if distance < 48 * 60 * 60 {
             return "昨天"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHFileRenameInputView.swift

@@ -115,7 +115,7 @@ class YHFileRenameInputView: UIView {
         view.textField.text = defalutText
         view.textField.attributedPlaceholder = NSAttributedString(string: placeholde, attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
         view.titleLabel.text = title
-        if placeholde == "请输入自定义标签" {
+        if placeholde == "请输入10字以内的标签" {
             view.maxWordsCount = 10
         }
         return view

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

@@ -22,7 +22,6 @@ class YHUserInfoSettingViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
-        changeHead()
         getData()
     }
     

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditInterestViewController.swift

@@ -27,7 +27,7 @@ class YHEditInterestViewController: YHBaseViewController {
     }()
     
     var renameInputView: YHFileRenameInputView = {
-        let view = YHFileRenameInputView.inputView(defalutText: "请输入自定义标签", "请输入自定义标签", "请输入自定义标签")
+        let view = YHFileRenameInputView.inputView(defalutText: "请输入自定义标签", "请输入10字以内的标签", "请输入自定义标签")
         return view
     }()
     override func viewDidLoad() {
@@ -114,8 +114,15 @@ class YHEditInterestViewController: YHBaseViewController {
             guard let self = self else { return }
             
             if let text = text {
+                if let index = normalItems.firstIndex(where: {$0.name == text}) {
+                    YHHUD.flash(message: "请不要添加重复的标签噢")
+                    return
+                }
+                if let index = likeItems.firstIndex(where: {$0.name == text}) {                    YHHUD.flash(message: "请不要添加重复的标签噢")
+                    return
+                }
                 let model = YHInterestModel(name: text, isNormal: false, isSelect: false)
-                self.likeItems.insert(model, at: likeItems.count - 1)
+                self.likeItems.insert(model, at: 0)
                 self.collectionView.reloadData()
             }
         }

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

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

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
+  }
+}