Improve pod scripts (#664)

- Cherry-pick #659
- Cherry-pick #663

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 4.6.2
+* 修复 iOS 进行 pod install 时的输出和数据操作
+
 # 4.6.1
 * 修复 iOS 使用 thumbnail 字段分享的问题
 

ios/fluwx.podspec

@@ -21,7 +21,7 @@ end
 
 flutter_project_dir = calling_dir.slice(0..(symlinks_index))
 
-puts Psych::VERSION
+Pod::UI.puts "[fluwx] #{Psych::VERSION}"
 psych_version_gte_500 = Gem::Version.new(Psych::VERSION) >= Gem::Version.new('5.0.0')
 if psych_version_gte_500 == true
     cfg = YAML.load_file(File.join(flutter_project_dir, 'pubspec.yaml'), aliases: true)
@@ -50,26 +50,37 @@ if cfg['fluwx'] && cfg['fluwx']['ios'] && cfg['fluwx']['ios']['no_pay'] == true
 else
     fluwx_subspec = 'pay'
 end
-Pod::UI.puts "using sdk with #{fluwx_subspec}"
+Pod::UI.puts "[fluwx] Using SDK with #{fluwx_subspec}"
 
 app_id = ''
-
 if cfg['fluwx'] && cfg['fluwx']['app_id']
     app_id = cfg['fluwx']['app_id']
 end
+if !app_id.nil? && !app_id.empty?
+    Pod::UI.puts "[fluwx] app_id: #{app_id}"
+end
 
 ignore_security = ''
 if cfg['fluwx'] && cfg['fluwx']['ios'] && cfg['fluwx']['ios']['ignore_security'] == true
     ignore_security = '-i'
 end
-Pod::UI.puts "ignore_security: #{ignore_security}"
+if !ignore_security.nil? && !ignore_security.empty?
+    Pod::UI.puts "[fluwx] ignore_security: #{ignore_security}"
+end
+
 universal_link = ''
 if cfg['fluwx'] && (cfg['fluwx']['ios']  && cfg['fluwx']['ios']['universal_link'])
     universal_link = cfg['fluwx']['ios']['universal_link']
 end
+if !universal_link.nil? && !universal_link.empty?
+    Pod::UI.puts "[fluwx] universal_link: #{universal_link}"
+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")
+command = "ruby #{current_dir}/wechat_setup.rb #{ignore_security}"
+command += " -p #{project_dir} -n Runner.xcodeproj"
+command += " -a #{app_id}" unless app_id.nil? || app_id.empty?
+command += " -u #{universal_link}" unless universal_link.nil? || universal_link.empty?
+system(command)
 
 Pod::Spec.new do |s|
   s.name             = 'fluwx'

ios/wechat_setup.rb

@@ -55,10 +55,14 @@
     if target.name == "Runner"
         app_id = options_dict[:app_id]
         universal_link = options_dict[:universal_link]
-        applinks = ''
 
-        if (!app_id.nil? && !app_id.empty?)
-           applinks = "applinks:#{URI.parse(universal_link).host}"
+        applinks = ''
+        if (!app_id.nil? && !app_id.empty? && !universal_link.nil? && !universal_link.empty?)
+            begin
+                applinks = "applinks:#{URI.parse(universal_link).host}"
+            rescue URI::InvalidURIError
+                applinks = nil
+            end
         end
 
         sectionObject = {}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: fluwx
 description: The capability of implementing WeChat SDKs in Flutter. With Fluwx, developers can use WeChatSDK easily, such as sharing, payment, lanuch mini program and etc.
-version: 4.6.1
+version: 4.6.2
 homepage: https://github.com/OpenFlutter/fluwx
 
 environment: