pindo 4.8.2 → 4.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8780beb56ee2ec66b0c9f8af141281fb24d62dbd77c3589400c704757ae877dc
-  data.tar.gz: 58f39534fa0031d1909a6a7ad1d797fb0ca1c480d161b07013fa4d19273ca0b1
+  metadata.gz: f77f41090639d86cb2f9c9d9f2cfc70658700c79066a08a312936ed75f4297df
+  data.tar.gz: afe8ad53ca20bda0c124c6df7a0f76a554555fdac9eea2ddfe635204fdec9f3d
 SHA512:
-  metadata.gz: 4b99125ae4096cf988e6f6ad4cf1147d242b62d350d67693b2385761470d7fb8efd3ddb18ccc764adb230611a0bc559a70eb840245211d918b2374cb6fe55119
-  data.tar.gz: e7b2476acdcdfffa63167e0c7232670fba9d7509df138ab7da6634ce091875e68d00ed4af010105e4b8c6b91152429225676115a9018dd1684618cff8af3325f
+  metadata.gz: b0e985bb992fc5e25a81a7b977be5a4d6c8be69052f2b200496ec838b9118f995f8b8384dde96a0f534cc795e0c034796b1c84a1b075bdabc8f1f036ce47a33c
+  data.tar.gz: 15082bfd14a5e2a4aa3e780b3455b5ca6a22486280889f9b5103bcc771b282115da6097936c2121bdd6bac60e5b11809ae03dca222388f1d94a00b6c419c6667

data/lib/pindo/command/deploy/build.rb

@@ -118,12 +118,22 @@ module Pindo
                     project_path = File.dirname(project_fullname)
                     proj_name = File.basename(project_fullname, ".xcodeproj")
                     project_obj = Xcodeproj::Project.open(project_fullname)
+
+                    build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
                     main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
                     provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
 
+
+
                     build_type = "app-store"
                     icloud_env = "Production"
-                    if provisioning_profile_name.include?("adhoc")
+                    if provisioning_profile_name.include?("direct") && provisioning_profile_name.include?("macos")
+                        build_type = "developer-id"
+                        icloud_env = "Production"
+                    elsif provisioning_profile_name.include?("development") && provisioning_profile_name.include?("macos")
+                        build_type = "development"
+                        icloud_env = "Development"
+                    elsif provisioning_profile_name.include?("adhoc")
                         build_type = "ad-hoc"
                         icloud_env = "Development"
                     elsif provisioning_profile_name.include?("development")
@@ -134,6 +144,12 @@ module Pindo
                         icloud_env = "Production"
                     end
 
+                    if build_type.eql?("app-store") || build_type.eql?("ad-hoc")
+                        if File.exist?(File.join(project_path, "Unity/Data/Raw/SettingsPluginFlag.txt"))
+                            raise Informative, "Unity代码包含测试模板，请重新导出Unity代码"
+                        end
+                    end
+
 
                     app_ipaname_temp = main_target.build_configurations.first.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] || main_target.display_name
                     app_ipaname_temp = app_ipaname_temp.gsub(/ /, '');
@@ -150,6 +166,11 @@ module Pindo
                       }
 
 
+                    if !build_platform.nil? && build_platform.eql?("macosx")
+                        values[:output_name] = nil
+                        values[:destination] = "generic/platform=macosx"
+                    end
+
                     if File.exist?(File.join(project_path, "Podfile"))
                         values[:workspace] = "#{proj_name}.xcworkspace"
                         values[:project] = nil

data/lib/pindo/command/deploy/cert.rb

@@ -32,6 +32,7 @@ module Pindo
               [
                 ['--dev', '操作dev证书'],
                 ['--adhoc', '操作adhoc证书'],
+                ['--macos', 'macos平台证书'],
                 ['--clean', '删除本地缓存的证书'],
                 ['--cleangit', '删除远程仓库中的证书'],
                 ['--upload', '生成上传pgyer的证书'],
@@ -57,6 +58,11 @@ module Pindo
                 @build_type = "development"
               end
 
+              @args_platform = "ios"
+              if @args_macos_flag
+                @args_platform = "macos"
+              end
+
             end
 
             def run
@@ -81,11 +87,22 @@ module Pindo
                 bundle_id_array = get_bundle_id_map.values
                 provisioning_info_array = nil
 
+
+                platform_type = "ios"
+                if @args_macos_flag
+                  platform_type = "macos"
+                else
+                  if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
+                    platform_type = "macos"
+                  end 
+                end
+
+
                 if @renew_cert_flag || @match_flag
-                  values = get_create_cert_match_values(apple_id:@apple_id, bundle_id_array:bundle_id_array, build_type:@build_type, renew_flag:@renew_cert_flag)
+                  values = get_create_cert_match_values(apple_id:@apple_id, bundle_id_array:bundle_id_array, build_type:@build_type, platform_type:platform_type, renew_flag:@renew_cert_flag)
                   config = FastlaneCore::Configuration.create(Match::Options.available_options, values)
                   Match::Runner.new.run(config)
-                  provisioning_info_array = create_provisioning_info_array(build_type:@build_type)
+                  provisioning_info_array = create_provisioning_info_array(build_type:@build_type, platform_type:platform_type)
                   pindo_single_config.set_cert_info(dict: provisioning_info_array)
                 
                 else
@@ -96,10 +113,9 @@ module Pindo
                   cert_reponame = cert_git_url.split("/").last.chomp(".git")
                   certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:@apple_id)
 
-                  install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type)
+                  install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type, platform_type:platform_type)
                   bundle_id_map = get_bundle_id_map
-
-                  provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type)
+                  provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type, platform_type:platform_type)
                   pindo_single_config.set_cert_info(dict: provisioning_info_array)
                 end
 
@@ -124,12 +140,12 @@ module Pindo
                 end
 
                 if @upload_flag
-                  create_upload_cert_info(apple_id:@apple_id, cert_type:@build_type)
-                  create_upload_provisioning_info(apple_id:@apple_id, cert_type:@build_type, provisioning_info_array:provisioning_info_array)
+                  create_upload_cert_info(apple_id:@apple_id, cert_type:@build_type, platform_type:platform_type)
+                  create_upload_provisioning_info(apple_id:@apple_id, cert_type:@build_type, platform_type:platform_type, provisioning_info_array:provisioning_info_array)
                 end
             end
 
-          def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, renew_flag:false)
+          def get_create_cert_match_values(apple_id:nil, bundle_id_array:nil, build_type:nil, platform_type:nil, renew_flag:false)
 
             if build_type.eql?("appstore") && (apple_id.eql?(pindo_single_config.demo_apple_id))
               raise Informative, "#{apple_id} 是测试账号，不能创建appstore证书!!!"
@@ -148,11 +164,6 @@ module Pindo
               force_for_new_devices_flag = false
             end
 
-            platform_type = "ios"
-            if @config_json && @config_json['project_info'] && @config_json['project_info']['build_type'].include?("MacOS")
-              platform_type = "macos"
-            end
-
             values = {
               username:apple_id,
               app_identifier: bundle_id_array,

data/lib/pindo/command/deploy/configproj.rb

@@ -69,8 +69,9 @@ module Pindo
                     end
 
                     Funlog.instance.fancyinfo_start("正在替换启动页...")
-                    launchimg_filename = File.join(app_config_dir,"launch","w768_h1024@2x.png")
-                    XcodeResHelper.install_launchimg(proj_dir:current_dir, launchimg_filename:launchimg_filename)
+
+                    launchimg_pub_path = File.join(app_config_dir,"launch")
+                    XcodeResHelper.install_launchimg(proj_dir:current_dir, launchimg_pub_path:launchimg_pub_path)
                     Funlog.instance.fancyinfo_success("启动页处理完成!")
                     
                     add_project_modue(project_dir:current_dir, proj_name:@proj_name, config_json:@config_json)

data/lib/pindo/command/dev/debug.rb

@@ -26,6 +26,7 @@ module Pindo
               [
                 ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
                 ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
+                ['--macos', 'macos平台证书'],
                 ['--upload', '生成上传pgyer的证书'],
               ].concat(super)
             end
@@ -33,6 +34,7 @@ module Pindo
             def initialize(argv)
               @args_adhoc_flag = argv.flag?('adhoc', false)
               @args_deploy_flag = argv.flag?('deploy', false)
+              @args_macos_flag = argv.flag?('macos', false)
               @upload_flag = argv.flag?('upload', false)
               super 
             end
@@ -64,9 +66,14 @@ module Pindo
                   args_temp << "--dev"
               end
 
+              if @args_macos_flag
+                args_temp << "--macos"
+              end
+
               if @upload_flag
                 args_temp << "--upload"
               end
+              
               Pindo::Command::Deploy::Cert::run(args_temp)
 
             end

data/lib/pindo/config/pindouserlocalconfig.rb

@@ -56,7 +56,41 @@ module Pindo
         end
     end
 
-    
+
+    def get_last_work_project_array()
+        last_work_project_array = nil
+        if !@pindo_user_local_config_json.nil?
+            last_work_project_array = @pindo_user_local_config_json["last_work_project_array"] || []
+        end
+        return last_work_project_array;
+    end
+
+
+    def write_last_work_project(proj_name:nil)
+        if proj_name.nil? 
+          return
+        end
+        if proj_name.length < 1
+          return
+        end
+
+        last_work_project_array = @pindo_user_local_config_json["last_work_project_array"] || []
+
+        # 从数组中删除目标字符串
+        last_work_project_array.delete(proj_name)
+        # 将目标字符串插入到数组末尾
+        last_work_project_array.unshift(proj_name)
+        # 如果数组长度超过5，删除第一个元素
+        last_work_project_array.pop if last_work_project_array.length > 6
+        last_work_project_array.pop if last_work_project_array.length > 6
+
+        @pindo_user_local_config_json["last_work_project_array"] = last_work_project_array
+        File.open(@pindo_user_local_config_file, "w") do |file|
+            file.write(JSON.pretty_generate(@pindo_user_local_config_json))
+            file.close
+        end
+    end
+
 
     
     def self.reload_instance

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -78,7 +78,7 @@ module Pindo
             begin
                 client = Spaceship::ConnectAPI
                 app_sharedsecrets_item = nil
-                response = client.tunes_request_client.get("apps/#{app_id}/appSharedSecrets")
+                response = client.tunes_request_client.get("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/apps/#{app_id}/appSharedSecrets")
                 # puts JSON.pretty_generate(response.body)
                 result_data = response.body
 
@@ -1128,6 +1128,7 @@ module Pindo
 
                 itc_usa_latest_price = nil
                 itc_usa_latest_start_date = nil
+                itc_usa_latest_price_point_id = nil
                 need_modify_price = true
 
                 if subscription_item["state"].to_s.eql?("APPROVED")
@@ -1168,6 +1169,7 @@ module Pindo
                         include_item = respose_price[:included].last
                         if include_item[:type].to_s.eql?("subscriptionPricePoints")
                             itc_usa_latest_price = include_item[:attributes][:customer_price]
+                            itc_usa_latest_price_point_id = include_item[:id]
                             puts "          最新线上价格:" + itc_usa_latest_price +"$"
                         end
                     end
@@ -1280,10 +1282,10 @@ module Pindo
                             }
                         }
 
-                        price_change_relationships_data[:newSubscriptionPricePoints][:data] << {
-                                        type:"subscriptionPricePoints",
-                                        id: price_point_id
-                                    }
+                        # price_change_relationships_data[:newSubscriptionPricePoints][:data] << {
+                        #                 type:"subscriptionPricePoints",
+                        #                 id: price_point_id
+                        #             }
 
                         index_num = index_num +1
 
@@ -1368,7 +1370,7 @@ module Pindo
 
                                 if last_data_items.size > 0
                                     last_data_items.each do |last_data_item|
-                                        if last_data_item[:type].to_s.eql?("subscriptionPrices")
+                                        if last_data_item[:type].to_s.eql?("subscriptionPrices") && !last_data_item[:relationships][:subscription_price_point][:data][:id].eql?(itc_usa_latest_price_point_id)
                                             price_change_relationships_data[:currentSubscriptionPricePoints][:data] << {
                                                         type:"subscriptionPricePoints",
                                                         id: last_data_item[:relationships][:subscription_price_point][:data][:id]
@@ -1392,7 +1394,7 @@ module Pindo
 
                                 begin
 
-                                    respose_price = client.tunes_request_client.post("subscriptionPriceChangeConsentReasons", body)
+                                    respose_price = client.tunes_request_client.post("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptionPriceChangeConsentReasons", body)
 
                                     # puts JSON.pretty_generate(respose_price)
                                 rescue => err
@@ -1418,7 +1420,7 @@ module Pindo
                                 # puts "included_data.size: #{included_data.size}"
                                 # puts JSON.pretty_generate(body)
 
-                                respose_price = client.tunes_request_client.patch("subscriptions/#{subscription_id}", body)
+                                respose_price = client.tunes_request_client.patch("#{Spaceship::ConnectAPI::Tunes::API::Version::V1}/subscriptions/#{subscription_id}", body)
                                 # respose_price = appstore_client.update_subscription(
                                 #         id:subscription_id,
                                 #         relationships: relationships_data,