Merge branch 'develop'

* develop:
  打包 使用相对文件
  修改版本号
  //  fastlane
  解决跳转搜索页抖动问题
  修改版本号
  // fastlane
  // readme
  // fastlane

galaxy/Gemfile

-source "https://gems.ruby-china.com"
+source "https://rubygems.org"
 
-#gem 'bundler', '2.5.9'
 gem "fastlane"
-
+gem "bundle"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

galaxy/Gemfile.lock

 GEM
-  remote: https://gems.ruby-china.com/
+  remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.7)
       base64
@@ -10,7 +10,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.917.0)
+    aws-partitions (1.918.0)
     aws-sdk-core (3.192.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -27,6 +27,8 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
+    bundle (0.0.1)
+      bundler
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -213,6 +215,7 @@ PLATFORMS
   x86_64-darwin-23
 
 DEPENDENCIES
+  bundle
   fastlane
   fastlane-plugin-pgyer
 

galaxy/fastlane/Fastfile

@@ -3,15 +3,24 @@ default_platform(:ios)
 platform :ios do
   desc "Description of what the lane does"
   # 打包时候用的名称   例如 fastlane app
-  lane :galaxy do 
+
+  # 打adhoc包 执行命令 fastlane galaxyTest
+
+  lane :galaxyTest do 
     # add actions here: https://docs.fastlane.tools/actions
 
+    # 拉取最新代码
+    develop_branch = "develop"
+    sh "git checkout #{develop_branch}"
+    sh "git pull origin #{develop_branch}"
+    # sh "pod install --no-repo-update"
+
     gym(
     workspace: 'galaxy.xcworkspace',
     # 每次打包之前clean一下
     clean: true,    
     # 打包出 ipa 文件的路径，我放到了桌面文件夹，你自行更改文件夹
-    output_directory: '/Users/edy/Desktop/App',
+    output_directory: './App/ad-hoc',
     # 打包的名称，可任意取 
     output_name: 'galaxy.ipa', 
     # 项目的 scheme，自己项目名   .xcworkspace 前面的项目名就是
@@ -45,6 +54,58 @@ platform :ios do
     # 蒲公英 API Key
     api_key: "ba79f62a052072f2486ad29632fefd46"
    )
+  end
+
+  
+  # 打realease包 执行命令 fastlane galaxyRelease
 
+ lane :galaxyRelease do 
+    # add actions here: https://docs.fastlane.tools/actions
+
+    # 拉取最新代码
+    develop_branch = "develop"
+    sh "git checkout #{develop_branch}"
+    sh "git pull origin #{develop_branch}"
+    # sh "pod install --no-repo-update"
+
+    gym(
+    workspace: 'galaxy.xcworkspace',
+    # 每次打包之前clean一下
+    clean: true,    
+    # 打包出 ipa 文件的路径，我放到了桌面文件夹，你自行更改文件夹
+    output_directory: './App/Release',
+    # 打包的名称，可任意取 
+    output_name: 'galaxy.ipa', 
+    # 项目的 scheme，自己项目名   .xcworkspace 前面的项目名就是
+    scheme: "galaxy",      
+    # 默认 Release，Release or Debug     
+    configuration: 'Release', 
+    # 是否包含 bitcode  
+    include_bitcode: false,  
+    # 是否包含 symbols 
+    include_symbols: true, 
+    # 打包导出方式，包含 app-store, validation, ad-hoc, package, enterprise, development, developer-id and mac-application   
+    export_method: 'app-store',  
+    # 这个设置是为了设置 xcode 自动配置证书和配置文件，当然也可以手动配置，可以参考文档
+    # export_xcargs: '-allowProvisioningUpdates', 
+    
+    #手动配置证书和配置文件
+    export_options: {
+      signingStyle: "manual",
+      provisioningProfiles: {
+        "com.intelligence.galaxy" => "dis.intelligence.com",
+      }
+    }
+    )
+
+
+    # mac上的通知弹窗，通知打包完毕
+    notification(app_icon: "./fastlane/icon.png", title: "manager", subtitle: "打包成功，已导出安装包", message: "准备发布到蒲公英中……")
+
+   #配置上传蒲公英账号  蒲公英的 api_key和 user_key  用自己蒲公英账号的，别用我的！！！如果没有可删除
+   pgyer(
+    # 蒲公英 API Key
+    api_key: "ac973522a8c357596c3dd58d311d10d8"
+   )
   end
 end
\ No newline at end of file

galaxy/fastlane/README.md

-1. 安装环境
-1.1 安装 Homebrew
-/bin/zsh -c "$(curl -fsSL https://gitee.com/cunkai/HomebrewCN/raw/master/Homebrew.sh)"
+fastlane documentation
+----
 
-1.2 安装 fastlane
-brew install fastlane
+# Installation
 
-2. fastlane 配置
-2.1 进入到工程目录 .xcworkspace 下面
-2.2 初始化 fastlane
-执行终端命令 fastlane init
-会显示4个选项 输入4并按下enter 表示手动配置你的项目
-完成后项目文件夹下会多几个文件Gemfile, Gemfile.lock 和文件夹
-2.3 加入蒲公英插件
-执行终端命令 fastlane add_plugin pgyer  或者 bundle exec fastlane add_plugin pgyer
+Make sure you have the latest version of the Xcode command line tools installed:
 
+```sh
+xcode-select --install
+```
 
-3. fastlane 自动打包上传
-3.1 
-Fastlane文件夹下的Fastlane文件已写好，只需修改output_directory的值为你本地文件夹路径即可
-3.2
-执行终端命令 fastlane galaxy 或者 bundle exec fastlane galaxy
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
 
+# Available Actions
 
+## iOS
+
+### ios galaxyTest
+
+```sh
+[bundle exec] fastlane ios galaxyTest
+```
+
+Description of what the lane does
+
+### ios galaxyRelease
+
+```sh
+[bundle exec] fastlane ios galaxyRelease
+```
+
+
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

galaxy/fastlane/usage.md

+1. 安装环境
+1.1 安装 Homebrew
+/bin/zsh -c "$(curl -fsSL https://gitee.com/cunkai/HomebrewCN/raw/master/Homebrew.sh)"
+
+1.2 安装 fastlane
+brew install fastlane
+
+2. fastlane 配置
+2.1 进入到工程目录 .xcworkspace 下面
+2.2 初始化 fastlane
+执行终端命令 fastlane init
+会显示4个选项 输入4并按下enter 表示手动配置你的项目
+完成后项目文件夹下会多几个文件Gemfile, Gemfile.lock 和文件夹
+2.3 加入蒲公英插件
+执行终端命令 fastlane add_plugin pgyer  或者 bundle exec fastlane add_plugin pgyer
+
+
+3. fastlane 自动打包上传
+3.1 
+Fastlane文件夹下的Fastlane文件已写好，只需修改output_directory的值为你本地文件夹路径即可
+3.2
+执行终端命令 fastlane galaxy 或者 bundle exec fastlane galaxy
+
+

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2985,7 +2985,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3191,7 +3191,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3239,7 +3239,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -54,6 +54,8 @@ extension YHHKEventViewController {
     
     func setupUI() {
         gk_navBarAlpha = 1
+        gk_navTitle = "香港办事"
+        printLog(gk_navigationBar.isHidden)
         
         sectionView = {
             let view = YHServiceSectionView()

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

@@ -124,6 +124,7 @@ private extension YHHomePageViewController {
     }
     
     func setupUI() {
+        gk_navigationBar.isHidden = false
         gk_navigationBar.isHidden = true
         view.backgroundColor = .white
         

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

@@ -156,7 +156,6 @@ class YHSearchInfomationVC: YHBaseViewController {
         view.addSubview(searchBar)
         view.addSubview(tableView)
         view.addSubview(searchHistoryView)
-        searchBar.textField.becomeFirstResponder()
         
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
@@ -304,6 +303,13 @@ class YHSearchInfomationVC: YHBaseViewController {
     @objc func didBackBtnClicked() {
         self.navigationController?.popViewController(animated: true)
     }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        if items.count == 0 {
+            searchBar.textField.becomeFirstResponder()
+        }
+    }
 }
 
 extension YHSearchInfomationVC: UITableViewDelegate, UITableViewDataSource {

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

@@ -151,6 +151,7 @@ private extension YHStartPageViewController {
     
     //1.设置主窗口
     func setupRootVC() {
+        gk_navigationBar.isHidden = false
         let tabBarController = YHTabBarViewController()
         let homeVC = YHHomePageViewController()
         tabBarController.delegate = homeVC