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 = "youhua-dev"
+  myPack_branch = "main"
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2174,8 +2174,8 @@
 			children = (
 				A567E5742BD7643D00D5D5A0 /* YHSearchInfomationVC.swift */,
 				A567E5752BD7643D00D5D5A0 /* YHFourKingViewController.swift */,
-				04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */,
 				04F5F86B2C1A9B52004A463C /* YHOtherServiceListViewController.swift */,
+				04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */,
 				A567E5762BD7643D00D5D5A0 /* YHHomePageViewController.swift */,
 				A567E5772BD7643D00D5D5A0 /* YHStartPageViewController.swift */,
 				A567E5782BD7643D00D5D5A0 /* YHHomeWebViewController.swift */,
@@ -3332,7 +3332,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3357,7 +3357,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.0;
+				MARKETING_VERSION = 0.9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3536,7 +3536,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3561,7 +3561,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.0;
+				MARKETING_VERSION = 0.9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3582,7 +3582,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3607,7 +3607,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.0;
+				MARKETING_VERSION = 0.9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -231,7 +231,6 @@ private extension YHHomePageViewController {
     }
     
     func loadFirstData() {
-        DispatchQueue.global().async {
             self.viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
                 guard let self = self else { return }
                 
@@ -243,8 +242,8 @@ private extension YHHomePageViewController {
                 
                 DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                     self.homeCollectView.es.stopPullToRefresh()
-                })
-                DispatchQueue.main.async {
+                    
+                    
                     if self.viewModel.hasMoreForHomeNews == false {
                         self.homeCollectView.es.noticeNoMoreData()
                         self.homeCollectView.footer?.alpha = 1
@@ -253,9 +252,8 @@ private extension YHHomePageViewController {
                     CATransaction.setDisableActions(true)
                     self.homeCollectView.reloadData()
                     CATransaction.commit()
-                }
+                })
             }
-        }
     }
     
     func setupUI() {
@@ -438,7 +436,6 @@ extension YHHomePageViewController {
 }
 
 extension YHHomePageViewController {
-        
     // 请求未读消息总数
     @objc func getTotalUnreadMsgCount() {
         if !YHLoginManager.shared.isLogin() {
@@ -458,4 +455,20 @@ extension YHHomePageViewController {
             self.msgUnreadView.unreadCount = 0
         }
     }
+    
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        let itemNumber = viewModel.preloadItemIndex // 你想要检查的item的位置，例如10
+        // 首先，计算IndexPath
+        let section = 0 // 假设只有一个section
+        let itemIndex = itemNumber - 1 // UICollectionView的item索引从0开始
+        let indexPathToCheck = IndexPath(item: itemIndex, section: section)
+        // 然后，检查这个IndexPath是否在当前可见的item列表中
+        if homeCollectView.indexPathsForVisibleItems.contains(indexPathToCheck) {
+            printLog("第\(itemNumber)个item已经展示出来了")
+            loadMoreData()
+        } else {
+            printLog("\(itemNumber)目标不在范围内")
+        }
+    }
 }

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

@@ -43,6 +43,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     //有些界面需要保存图片的功能
     var showSavePicBottomFlag : Bool = false
     
+    //是否曾今有过网络
+    private var isNetWorkOkBefore : Bool = false
+    
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -154,7 +159,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
         }
         
-        view.addSubview(self.noNetWorkTipsView)
+        view.addSubview(noNetWorkTipsView)
         self.noNetWorkTipsView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
@@ -239,6 +244,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     }
     
     @objc func share() {
+        
+        if !YHNetworkStatusManager.shared.isNetWorkOK {
+            YHHUD.flash(message: "网络不可用，请检查网络设置")
+            return
+        }
+        
         if YHLoginManager.shared.isLogin() {
             if vcTitle == "香港身份测评码" {
                 guard let url = URL(string: url) else {
@@ -281,24 +292,22 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     func updateNetWorkStatusUI(needReload:Bool) {
         DispatchQueue.main.async {
             if YHNetworkStatusManager.shared.isNetWorkOK {
-                if needReload {
+                if needReload && self.isNetWorkOkBefore == false {
                     self.webview.stopLoading()
                     let targetUrl = NSURL(string: self.url)
                     let request = NSURLRequest(url: targetUrl! as URL)
                     self.webview.load(request as URLRequest)
                     self.getData()
                 }
+                
+                self.isNetWorkOkBefore = true
             }
-            self.view.bringSubviewToFront(self.noNetWorkTipsView)
-            self.noNetWorkTipsView.isHidden = YHNetworkStatusManager.shared.isNetWorkOK
-            if YHNetworkStatusManager.shared.isNetWorkOK {
-                if (self.vcTitle == "香港身份测评码" || !self.model.img_url.isEmpty) {
-                    self.addRightItems()
-                } else {
-                    self.gk_navRightBarButtonItem = nil
-                }
+            
+            if self.isNetWorkOkBefore == false {
+                self.view.bringSubviewToFront(self.noNetWorkTipsView)
+                self.noNetWorkTipsView.isHidden = YHNetworkStatusManager.shared.isNetWorkOK
             } else {
-                self.gk_navRightBarButtonItem = nil
+                self.noNetWorkTipsView.isHidden = true
             }
         }
     }
@@ -370,9 +379,9 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     }
     
     func saveImageToPhotoLib() {
-        var urlString = self.url
+        let urlString = self.url
         guard let url = URL(string: urlString) else {
-            YHHUD.flash(message: "参数错误,保存失败")
+            YHHUD.flash(message: "网络不可能，请检查您的网络设置~")
             return
         }
         
@@ -420,10 +429,6 @@ extension YHHomeWebViewController {
         gk_navRightBarButtonItem = rightButtonItem
         gk_navItemRightSpace = 16
     }
-    
-    func removeRightItems() {
-        gk_navRightBarButtonItems = []
-    }
 }
 
 

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

@@ -125,6 +125,10 @@ class YHHomeWebBottomView: UIView {
     }
     
     @objc private func likeBtnClick() {
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            YHHUD.flash(message: "网络不可用，请检查网络设置")
+            return
+        }
         if YHLoginManager.shared.isLogin() == false {
             if let block = likeBlock {
                 block(isLike)
@@ -148,6 +152,10 @@ class YHHomeWebBottomView: UIView {
     }
     
     @objc private func starBtnClick() {
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            YHHUD.flash(message: "网络不可用，请检查网络设置")
+            return
+        }
         if YHLoginManager.shared.isLogin() == false {
             if let block = starBlock {
                 block(isStar)

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -15,11 +15,16 @@ class YHHomePageViewModel : YHBaseViewModel {
     var banners: [YHBannerModel]?
     var classify: [YHHomeClassifyModel]?
     var hkList: [YHHKEventModel]?
+    
     //首页相关参数
     private var curPageIndex : Int = 1
     private var page_Size : Int = 50
+    var preloadItemIndex : Int = 25
+    private var isRequestHomeNewsDataFlag : Bool  = false
+    
     var totalCount : Int = 0
     var hasMoreForHomeNews : Bool = true
+    
     // 搜索
     let searchPageSize: Int = 20
 }
@@ -50,6 +55,22 @@ extension YHHomePageViewModel {
      firstPageFlag  true - 首次  false - 更多
      */
     func getHomeNewsList(firstPageFlag : Bool,callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        if firstPageFlag == false {
+            guard hasMoreForHomeNews == true  else {
+                printLog("无更多数据可请求")
+                return
+            }
+        }
+        
+        guard isRequestHomeNewsDataFlag == false else {
+            printLog("正在进行请求")
+            return
+        }
+        
+        isRequestHomeNewsDataFlag = true
+        
+        
         var params: [String : Any] = ["page": curPageIndex,
                                       "page_size": page_Size]
         if firstPageFlag {
@@ -62,6 +83,8 @@ extension YHHomePageViewModel {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.consultApi
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             guard let self = self else { return }
+            
+            self.isRequestHomeNewsDataFlag = false
             //1. json字符串 转 对象
             if json.code == 200 {
                 let dic = json.data
@@ -85,6 +108,8 @@ extension YHHomePageViewModel {
                     self.arrHomeNewsData?.append(contentsOf: result.data)
                 }
                 
+                
+                
                 if result.data.count >= page_Size {
                     if let count = self.arrHomeNewsData?.count {
                         if count >= self.totalCount {
@@ -97,14 +122,15 @@ extension YHHomePageViewModel {
                     self.hasMoreForHomeNews = false
                 }
                 
+                preloadItemIndex = 25 + (curPageIndex - 1) * page_Size
+                
                 callBackBlock(true, nil)
             } else {
-//                self.arrHomeNewsData = []
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock(false, error)
             }
         } failBlock: { err in
-//            self.arrHomeNewsData = []
+            self.isRequestHomeNewsDataFlag =  false
             callBackBlock(false,err)
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHHKIdentityCardViewController.swift

@@ -102,7 +102,7 @@ class YHHKIdentityCardViewController: YHBaseViewController {
         
         //2.网络请求
         loadData()
-        updateDefaultSearchKeyWord()
+//        updateDefaultSearchKeyWord()
     }
     
     func updateDefaultSearchKeyWord() {
@@ -120,6 +120,11 @@ class YHHKIdentityCardViewController: YHBaseViewController {
         super.viewDidLayoutSubviews()
         cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        updateDefaultSearchKeyWord()
+    }
 }
 
 // MARK: - 私有方法

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHHKLifeViewController.swift

@@ -102,11 +102,12 @@ class YHHKLifeViewController: YHBaseViewController {
         
         //2.网络请求
         loadData()
-        updateDefaultSearchKeyWord()
+        
+//        updateDefaultSearchKeyWord()
     }
     
     func updateDefaultSearchKeyWord() {
-        var placeHolder = "香港身份"
+        var placeHolder = "香港生活"
         if isHaveLocalSearchRecords() {
             let latestValidSearchWord = getLatestValidSearchWord()
             if !latestValidSearchWord.isEmpty {
@@ -120,6 +121,11 @@ class YHHKLifeViewController: YHBaseViewController {
         super.viewDidLayoutSubviews()
         cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        updateDefaultSearchKeyWord()
+    }
 }
 
 // MARK: - 私有方法
@@ -145,7 +151,7 @@ extension YHHKLifeViewController {
             make.left.right.bottom.equalToSuperview()
         }
         tableHeadView = YHServerTableHeadView()
-        tableHeadView.titleLabel.text = "香港身份攻略"
+        tableHeadView.titleLabel.text = "香港生活攻略"
         tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
         homeTableView.tableHeaderView = tableHeadView
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -98,6 +98,13 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         noDataView.clickShowBtnClickBlock = {
             YHServiceOrderAlertView.show()
         }
+        
+        
+        noDataView.isHidden = false
+        nameBgImageView.isHidden = true
+        segmentedView.isHidden = true
+        listContainerView.isHidden = true
+        orderButton.isHidden = true
     }
     
     override func viewWillAppear(_ animated: Bool) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift

@@ -14,7 +14,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
     var nameTextField: UITextField!
     var startTextField: UITextField!
     var endTextField: UITextField!
-    var longTimeButton: UIButton!
+//    var longTimeButton: UIButton!
     var messageTextField: UITextView!
     var startButton: UIButton!
     var endButton: UIButton!
@@ -153,43 +153,44 @@ class YHWorkIntroductionViewController: YHBaseViewController {
             make.right.equalTo(-18)
         }
         
-        longTimeButton = {
-            let button = UIButton(type: .custom)
-            button.setImage(UIImage(named: "main_time_normal"), for: .normal)
-            button.setImage(UIImage(named: "login_privacy_agree"), for: .selected)
-            button.setTitleColor(UIColor.mainTextColor, for: .normal)
-            button.setTitle("至今", for: .normal)
-            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
-            button.contentHorizontalAlignment = .right
-            button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
-            if dataSource.project_end_time == "至今" {
-                button.isSelected = true
-            } else {
-                button.isSelected = false
-            }
-            return button
-        }()
-        view.addSubview(longTimeButton)
-        if dataSource.project_end_time != "至今" {
-            longTimeButton.snp.makeConstraints { make in
-                make.right.equalTo(-18)
-                make.centerY.equalTo(endTextField.snp.centerY)
-                make.height.equalTo(32)
-                make.width.equalTo(43)
-            }
+//        longTimeButton = {
+//            let button = UIButton(type: .custom)
+//            button.setImage(UIImage(named: "main_time_normal"), for: .normal)
+//            button.setImage(UIImage(named: "login_privacy_agree"), for: .selected)
+//            button.setTitleColor(UIColor.mainTextColor, for: .normal)
+//            button.setTitle("至今", for: .normal)
+//            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+//            button.contentHorizontalAlignment = .right
+//            button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
+//            if dataSource.project_end_time == "至今" {
+//                button.isSelected = true
+//            } else {
+//                button.isSelected = false
+//            }
+//            return button
+//        }()
+//        view.addSubview(longTimeButton)
+//        if dataSource.project_end_time != "至今" {
+//            longTimeButton.snp.makeConstraints { make in
+//                make.right.equalTo(-18)
+//                make.centerY.equalTo(endTextField.snp.centerY)
+//                make.height.equalTo(32)
+//                make.width.equalTo(43)
+//            }
             endTextField.isHidden = false
             endButton.isHidden = false
-        } else {
-            longTimeButton.snp.makeConstraints { make in
-                make.left.equalTo(117)
-                make.centerY.equalTo(endTextField.snp.centerY)
-                make.height.equalTo(32)
-                make.width.equalTo(43)
-            }
-            endTextField.isHidden = true
-            endButton.isHidden = true
-        }
-        longTimeButton.iconInLeft(spacing: 3)
+//        } 
+//        else {
+//            longTimeButton.snp.makeConstraints { make in
+//                make.left.equalTo(117)
+//                make.centerY.equalTo(endTextField.snp.centerY)
+//                make.height.equalTo(32)
+//                make.width.equalTo(43)
+//            }
+//            endTextField.isHidden = true
+//            endButton.isHidden = true
+//        }
+//        longTimeButton.iconInLeft(spacing: 3)
         
         
         messageTextField = {
@@ -295,33 +296,33 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         }
     }
     
-    @objc func longTimeButtonClick() {
-        longTimeButton.isSelected = !longTimeButton.isSelected
-        if longTimeButton.isSelected {
-            longTimeButton.snp.remakeConstraints { make in
-                make.left.equalTo(117)
-                make.centerY.equalTo(endTextField.snp.centerY)
-                make.height.equalTo(32)
-                make.width.equalTo(43)
-            }
-            endTextField.isHidden = true
-            endButton.isHidden = true
-        } else {
-            longTimeButton.snp.remakeConstraints { make in
-                make.right.equalTo(-18)
-                make.centerY.equalTo(endTextField.snp.centerY)
-                make.height.equalTo(32)
-                make.width.equalTo(43)
-            }
-            endTextField.isHidden = false
-            endButton.isHidden = false
-        }
-    }
+//    @objc func longTimeButtonClick() {
+//        longTimeButton.isSelected = !longTimeButton.isSelected
+//        if longTimeButton.isSelected {
+//            longTimeButton.snp.remakeConstraints { make in
+//                make.left.equalTo(117)
+//                make.centerY.equalTo(endTextField.snp.centerY)
+//                make.height.equalTo(32)
+//                make.width.equalTo(43)
+//            }
+//            endTextField.isHidden = true
+//            endButton.isHidden = true
+//        } else {
+//            longTimeButton.snp.remakeConstraints { make in
+//                make.right.equalTo(-18)
+//                make.centerY.equalTo(endTextField.snp.centerY)
+//                make.height.equalTo(32)
+//                make.width.equalTo(43)
+//            }
+//            endTextField.isHidden = false
+//            endButton.isHidden = false
+//        }
+//    }
     
     @objc func submit() {
-        if longTimeButton.isSelected {
-            dataSource.project_end_time = "至今"
-        }
+//        if longTimeButton.isSelected {
+//            dataSource.project_end_time = "至今"
+//        }
         guard let _ = dataSource.project_name else {
             YHHUD.flash(message: "您还有信息未填写")
             return

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

@@ -60,6 +60,9 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     lazy var items: [PersonalModuleItem] = {
         // 是否需要展示版本更新红点
         let isShowVersionRedPoint = YHAppVersionManager.shared.needShowRedPointOfSuggestVersionUpdate()
+        
+        
+        let myVer = UIDevice.appVersion() + "_" + UIDevice.appBuild()
 #if DEBUG
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
@@ -68,7 +71,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
-                PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", isShowRedPoint:isShowVersionRedPoint, type:.version), ]
+                PersonalModuleItem(title: "版本 \(myVer)", isShowRedPoint:isShowVersionRedPoint, type:.version), ]
         
 #elseif TESTENV
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
@@ -78,7 +81,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
-                PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
+                PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
 #else
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
@@ -86,7 +89,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                 PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
                 PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
-                PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
+                PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
 #endif
         
     }()
@@ -139,7 +142,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
         versionLabel.text = version
 #else
-        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
+        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
         versionLabel.text = version
         versionLabel.isHidden = true
 #endif

galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift

@@ -237,6 +237,10 @@ extension YHVideoPlayerVC {
     }
     
     @objc func didShareButtonClicked() {
+        if !YHNetworkStatusManager.shared.isNetWorkOK {
+            YHHUD.flash(message: "网络不可用，请检查网络设置")
+            return
+        }
         shareVideoContent()
     }
 }
@@ -333,25 +337,25 @@ extension YHVideoPlayerVC {
     }
     
     @objc func updateNetWorkUI() {
-        updateNetWorkStatusUI(needReload:true)
+        
+        if YHNetworkStatusManager.shared.isNetWorkOK {
+            if self.noNetWorkTipsView.isHidden == false {
+                self.noNetWorkTipsView.isHidden = true
+                self.requestData()
+                if let videoURL = URL(string: self.url) {
+                    self.player.pause()
+                    let asset = BMPlayerResource(url: videoURL)
+                    self.player.setVideo(resource: asset)
+                    self.player.play()
+                }
+            }
+        }
     }
     
     func updateNetWorkStatusUI(needReload:Bool) {
         DispatchQueue.main.async {
-            if YHNetworkStatusManager.shared.isNetWorkOK {
-                if needReload {
-                    if let videoURL = URL(string: self.url) {
-                        self.player.pause()
-                        let asset = BMPlayerResource(url: videoURL)
-                        self.player.setVideo(resource: asset)
-                        self.player.play()
-                    }
-                    self.requestData()
-                }
-            }
-            self.view.bringSubviewToFront(self.noNetWorkTipsView)
             self.noNetWorkTipsView.isHidden = YHNetworkStatusManager.shared.isNetWorkOK
-            self.shareBtn.isHidden = !YHNetworkStatusManager.shared.isNetWorkOK
+            self.view.bringSubviewToFront(self.noNetWorkTipsView)
         }
     }
 }