universal_link is not required any more. see OpenFlutter#581

TYJ1990 · Nov 4, 2023 · bd59b39 · bd59b39
1 parent 9c32714
commit bd59b39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -229,7 +229,7 @@
 				KnownAssetTags = (
 					New,
 				);
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80F0294D02FB00263BE5 = {

diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ios/fluwx.podspec b/ios/fluwx.podspec
@@ -52,7 +52,7 @@ else
 end
 Pod::UI.puts "using sdk with #{fluwx_subspec}"
 
-app_id = nil
+app_id = ''
 
 if cfg['fluwx'] && cfg['fluwx']['app_id']
     app_id = cfg['fluwx']['app_id']
@@ -63,18 +63,14 @@ if cfg['fluwx'] && cfg['fluwx']['ios'] && cfg['fluwx']['ios']['ignore_security']
     ignore_security = '-i'
 end
 Pod::UI.puts "ignore_security: #{ignore_security}"
-
+universal_link = ''
 if cfg['fluwx'] && (cfg['fluwx']['ios']  && cfg['fluwx']['ios']['universal_link'])
     universal_link = cfg['fluwx']['ios']['universal_link']
-    if app_id.nil?
-        system("ruby #{current_dir}/wechat_setup.rb #{ignore_security} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj")
-    else
-        system("ruby #{current_dir}/wechat_setup.rb #{ignore_security} -a #{app_id} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj")
-    end
-else
-    abort("required values:[universal_link] are missing. Please add them in pubspec.yaml:\nfluwx:\n \nios:\nuniversal_link: https://${applinks domain}/universal_link/${example_app}/wechat/\n")
 end
 
+Pod::UI.puts "app_id: #{app_id} universal_link: #{universal_link}"
+system("ruby #{current_dir}/wechat_setup.rb #{ignore_security} -a #{app_id} -u #{universal_link} -p #{project_dir} -n Runner.xcodeproj")
+
 Pod::Spec.new do |s|
   s.name             = 'fluwx'
   s.version          = '0.0.1'

diff --git a/ios/wechat_setup.rb b/ios/wechat_setup.rb
@@ -55,7 +55,11 @@
     if target.name == "Runner"
         app_id = options_dict[:app_id]
         universal_link = options_dict[:universal_link]
-        applinks = "applinks:#{URI.parse(universal_link).host}"
+        applinks = ''
+
+        if (!app_id.nil? && !app_id.empty?)
+           applinks = "applinks:#{URI.parse(universal_link).host}"
+        end
 
         sectionObject = {}
         project.objects.each do |object|