Merge branch 'develop'

* develop:
  隐私政策  用户条款 使用官方主页
  修改 版本号0.5.0.3
  20001  token无效
  // fastlane
  // fastlane
  修改版本号 0.5.0.2

galaxy/Gemfile

+source "https://gems.ruby-china.com"
+
+#gem 'bundler', '2.5.9'
+gem "fastlane"
+
+
+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/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.917.0)
+    aws-sdk-core (3.192.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.79.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.147.0)
+      aws-sdk-core (~> 3, >= 3.192.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.110.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-pgyer (0.2.8)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.5.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.6)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.24.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+  x86_64-darwin-23
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-pgyer
+
+BUNDLED WITH
+   2.5.9

galaxy/fastlane/Appfile

+# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app
+# apple_id("[[APPLE_ID]]") # Your Apple Developer Portal username
+
+
+# For more information about the Appfile, see:
+#     https://docs.fastlane.tools/advanced/#appfile

galaxy/fastlane/Fastfile

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

galaxy/fastlane/Pluginfile

+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-pgyer'

galaxy/fastlane/README.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 = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				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 = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				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 = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -147,7 +147,7 @@ class YHAgreementAlertView: UIView {
         
         let aa: ASAttributedString = .init("《智汇银河App隐私协议》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
-                block("https://www.baidu.com")
+                block(YHBaseUrlManager.shared.curPrivacyAgreementUrl())
             }
         })
         
@@ -157,7 +157,7 @@ class YHAgreementAlertView: UIView {
         
         let aab: ASAttributedString = .init("《智汇银河App用户条款》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
-                block("https://www.baidu.com")
+                block(YHBaseUrlManager.shared.curUserItemsUrl())
             }
         })
         

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

@@ -13,12 +13,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     var webview = WKWebView()
     var progBar = UIProgressView()
-//    var url = "https://www.baidu.com"
-    var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
-    
-//    var url = "https://upload-cdn.galaxy-immi.com/crm/development/1616581669271.xlsx"
-
-    
+    var url = ""
     override func viewDidLoad() {
         super.viewDidLoad()
         

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginPrivacyView.swift

@@ -116,13 +116,13 @@ class YHLoginPrivacyView: UIView {
     
     @objc func firstUrlClick() {
         let vc = YHWebViewViewController()
-        vc.url = "https://www.baidu.com"
+        vc.url = YHBaseUrlManager.shared.curPrivacyAgreementUrl()
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
     
     @objc func secondUrlClick() {
         let vc = YHWebViewViewController()
-        vc.url = "https://www.baidu.com"
+        vc.url = YHBaseUrlManager.shared.curUserItemsUrl()
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift

@@ -58,13 +58,13 @@ class YHPrivacyAlertView: UIView {
         let aa: ASAttributedString = .init("请先阅读并同意", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         let cc: ASAttributedString = .init("《隐私协议》", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
-                block("https://www.baidu.com")
+                block(YHBaseUrlManager.shared.curPrivacyAgreementUrl())
             }
         })
         let bb: ASAttributedString = .init("和", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         let dd: ASAttributedString = .init("《用户条款》", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
-                block("https://www.baidu.com")
+                block(YHBaseUrlManager.shared.curUserItemsUrl())
             }
         })
         messageLabel.attributed.text = aa + cc + bb + dd

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

@@ -36,4 +36,14 @@ class YHBaseUrlManager {
     func curH5URL() -> String {
         return YHConfigManager.shared.h5Url
     }
+    
+    //隐私协议 PrivacyAgreement
+    func curPrivacyAgreementUrl() -> String {
+        return "https://www.galaxy-immi.com"
+    }
+    
+    //用户政策 UserItems
+    func curUserItemsUrl() -> String {
+        return "https://www.galaxy-immi.com"
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -290,7 +290,7 @@ class YHNetRequest: NSObject {
 #if DEBUG
             printLog("服务器返回数据是：\(obj)")
 #endif
-            if obj.code == 10010 {
+            if obj.code == 20001 {
                 DispatchQueue.main.async {
                     YHLoginManager.shared.clearUserInfo()
                     YHHUD.flash(message: "登录状态失效")