cocoapods-aomi-bin 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea7471eae842634649c220a62e11f4589f20634d5b9c0808f4408316b49d3de
-  data.tar.gz: 643fc2465fc83994e6438ccb12f9f93c8aa0b94762bf98c1e1fbb63c08567fc7
+  metadata.gz: 61ce22dc3e41408e8777e312780ce5a0a313acd15344f6026371e119d4af87f4
+  data.tar.gz: c0d34b7525c2ada3970d6d758a5082c67f8bbe00826f459571be509ea42de8eb
 SHA512:
-  metadata.gz: 71c5d7acda6dc021b007cb27b81bc7ddc37b8d24f6a143236650d8054b07231fd1d98fe25df236b901530c2990f53716df4473ebd33b55f62e1d3dde62896d8d
-  data.tar.gz: 2256e7b73731522f3e649141332db91f3328b2c0d83cfd0c84feb4ab4e4d57de8b021ee624cf5e29efd3f26dc6813f2e326f69ac6cdebc27fede34a5a2d6936d
+  metadata.gz: aacb0bf501176001a01146859b4a460c7d3be79c907d2d9f4e9d15f00aaf40a11d06569587d8845bdbfe8c4a2b7f83ede9633a79bf3a864ecfa979cb574df52b
+  data.tar.gz: 9fc30ba67b383560b301bbd41e637904dade14a4f6afb451f45419830d514b08551b4db053e0715cf9f6b80a76c0ac27180ad71fe6d7a295d0294e58cfd8634c

data/lib/cocoapods-lhj-bin/command/bin.rb

@@ -59,7 +59,7 @@ module Pod
       end
 
       def validate!
-        # super
+        super
         # 这里由于 --help 是在 validate! 方法中提取的，会导致 --help 失效
         # pod lib create 也有这个问题
         banner! if @help

data/lib/cocoapods-lhj-bin/command/bin/model.rb

@@ -1,6 +1,7 @@
 require 'net/https'
 require 'uri'
 require 'json'
+require 'plist'
 
 module Pod
   class Command
@@ -15,6 +16,20 @@ module Pod
         end
 
         def run
+          gen_model
+          # handle_plist
+        end
+
+        def handle_plist
+          entitlements_file = File.expand_path('~/config.plist')
+          result = Plist.parse_xml(entitlements_file)
+          result.delete('com.apple.security.application-groups')
+          result['type'] = '0'
+          result.delete('version')
+          result.save_plist(entitlements_file)
+        end
+
+        def gen_model
           model = fetch_model
           fetch_models(nil, model) if model
           print_models

data/lib/cocoapods-lhj-bin/command/bin/view.rb

@@ -7,12 +7,35 @@ module Pod
         def initialize(argv)
           @name = argv.option('name', 'titleLabel')
           @type = argv.option('type', 'UILabel')
+          super
         end
 
         def names
           @name.split(",").map(&:strip)
         end
 
+        def type
+          @ele_type ||= begin
+                          if @type =~ /image/i
+                            'UIImageView'
+                          elsif  @type =~ /stack/i
+                            'UIStackView'
+                          elsif @type =~ /label/i
+                            'UILabel'
+                          elsif @type =~ /table/i
+                            'UITableView'
+                          elsif @type =~ /text/i
+                            'UITextField'
+                          elsif @type =~ /button/i
+                            'UIButton'
+                          elsif @type =~ /view/i
+                            'UIView'
+                          else
+                            @type
+                          end
+                      end
+        end
+
         def run
           print_declare
           puts "\n\n"
@@ -26,13 +49,13 @@ module Pod
         def print_declare
           names.each do |name|
             puts "///"
-            puts "@property (nonatomic, strong) #{@type} *#{name};"
+            puts "@property (nonatomic, strong) #{type} *#{name};"
           end
         end
 
         def print_instance
           names.each do |name|
-            puts "-(#{@type} *)#{name}"
+            puts "-(#{type} *)#{name}"
             puts "{"
             puts "    if(!_#{name}){"
             print_alloc(name)
@@ -46,37 +69,50 @@ module Pod
         end
 
         def print_alloc(name)
-          if @type.eql?('UIImageView')
+          if type.eql?('UIImageView')
             puts "        _#{name} = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@\"xxxx\"]];"
-          elsif @type.eql?('UIButton')
+          elsif type.eql?('UIButton')
             puts "        _#{name} = [UIButton buttonWithType:UIButtonTypeCustom];"
+          elsif type.eql?('UITableView')
+            puts "        _#{name} = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];"
           else
-            puts "        _#{name} = [[#{@type} alloc] init];"
+            puts "        _#{name} = [[#{type} alloc] init];"
           end
         end
 
         def print_property(name)
-          if @type.eql?('UILabel')
+          if type.eql?('UILabel')
             puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
             puts "        _#{name}.text = @\"xxxxxxxx\";"
             puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
             puts "        _#{name}.textAlignment = NSTextAlignmentCenter;"
-          elsif @type.eql?('UIImageView')
+          elsif type.eql?('UIImageView')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
             puts "        _#{name}.contentMode = UIViewContentModeScaleAspectFit;"
             puts "        _#{name}.clipsToBounds = YES;"
             puts "        _#{name}.layer.cornerRadius = 6.0f;"
             puts "        _#{name}.layer.borderColor = kLineColor.CGColor;"
             puts "        _#{name}.layer.borderWidth = 0.5;"
-          elsif @type.eql?('UITextField')
+          elsif type.eql?('UITextField')
             puts "        _#{name}.textColor = kSetCOLOR(0x333333);"
             puts "        _#{name}.font = [UIFont systemFontOfSize:12.0 weight:UIFontWeightRegular];"
-          elsif @type.eql?('UIView')
+          elsif type.eql?('UIView')
+            puts "        _#{name}.backgroundColor = kBackgroundColor;"
+          elsif type.eql?('UIStackView')
+            puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
+            puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
+          elsif type.eql?('UITableView')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
-          elsif @type.eql?('UIButton')
+            puts "        _#{name}.delegate = self;"
+            puts "        _#{name}.delegate = self;"
+            puts "        _#{name}.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+            puts "        _#{name}.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, CGFLOAT_MIN)];"
+            puts "        _#{name}.separatorStyle = UITableViewCellSeparatorStyleNone;"
+          elsif type.eql?('UIButton')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
             puts "        [_#{name} setTitle:@\"xxx\" forState:UIControlStateNormal];"
             puts "        [_#{name} setTitleColor:kSetCOLOR(0x999999) forState:UIControlStateNormal];"
+            puts "        _#{name}.titleLabel.font = [UIFont systemFontOfSize:14.0 weight:UIFontWeightRegular];"
             puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateNormal];"
             puts "        [_#{name} setImage:[UIImage imageNamed:@\"xx\"] forState:UIControlStateSelected];"
             puts "        [_#{name} addTarget:self action:@selector(actionHandler:) forControlEvents:UIControlEventTouchUpInside];"
@@ -90,13 +126,15 @@ module Pod
             puts "[self.#{name}.trailingAnchor constraintEqualToAnchor:contentView.trailingAnchor constant:0].active = YES;"
             puts "[self.#{name}.topAnchor constraintEqualToAnchor:contentView.topAnchor].active = YES;"
             puts "[self.#{name}.bottomAnchor constraintEqualToAnchor:contentView.bottomAnchor].active = YES;"
+            puts "[self.#{name}.widthAnchor constraintEqualToConstant:80].active = YES;"
+            puts "[self.#{name}.heightAnchor constraintEqualToAnchor:80].active = YES;"
             puts "\n\n"
           end
         end
 
         def print_value
           names.each do |name|
-            if @type.eql?('UILabel')
+            if type.eql?('UILabel')
               puts "self.#{name}.text = @\"xxxxx\";"
             end
           end

data/lib/cocoapods-lhj-bin/command/bin/yapi.rb

@@ -8,9 +8,18 @@ module Pod
       class Yapi < Bin
         self.summary = '通过yapi接口生成请求'
 
+        def self.options
+          [
+            %w[--id api的id],
+            %w[--model-pre 模型的前缀],
+            %w[--save 保存生成文件]
+          ]
+        end
+
         def initialize(argv)
           @id = argv.option('id')
           @model_pre_name = argv.option('model-pre')
+          @save = argv.flag?('save', false)
           @http_url = ''
           @http_headers = []
           @data_json = {}
@@ -20,12 +29,43 @@ module Pod
           @type_trans = {}
           @config_model_names = []
           @model_names = []
+          super
         end
 
         def run
           load_config
           fetch_model
           print_methods
+          save_to_file if @save
+        end
+
+        def test_ding
+          require 'net/http'
+          require 'uri'
+          body = { "msgtype" => "text", "text" => { "content" => "error:上传蒲公英超时失败!" } }.to_json
+          Net::HTTP.post(URI('https://oapi.dingtalk.com/robot/send?access_token=6a3519057170cdb1b7274edfe43934c84a0062ffe2c9bcced434699296a7e26e'), body, "Content-Type" => "application/json")
+        end
+
+        def puts_h(str)
+          puts str
+          @h_file_array ||= []
+          @h_file_array << str
+        end
+
+        def puts_m(str)
+          puts str
+          @m_file_array ||= []
+          @m_file_array << str
+        end
+
+        def save_to_file
+          @model_names = []
+          file_name = gen_model_name('')
+          h_file = File.join('.', "#{file_name}.h")
+          m_file = File.join('.', "#{file_name}.m")
+          File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count > 0
+          File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count > 0
+          puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}"
         end
 
         def url_str
@@ -161,24 +201,25 @@ module Pod
           @models.each do |model|
             model_name = model[:name] || ''
             model_properties = model[:properties]
-            puts "@interface #{model_name} : NSObject"
+            puts_h "@interface #{model_name} : NSObject"
             model_properties.each do |m|
               print_model(m)
             end
-            puts "@end\n\n\n"
+            puts_h "@end\n\n\n"
           end
         end
 
         def print_models_implementation
           @models.each do |model|
-            puts "@implementation #{model[:name]}"
+            puts_m "@implementation #{model[:name]}"
             str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map{ |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
             if str && str.length > 0
-              puts "+(NSDictionary *)modelContainerPropertyGenericClass {"
-              puts "  return @{#{str}};"
-              puts "}"
+              puts_m "+(NSDictionary *)modelContainerPropertyGenericClass {"
+              puts_m "  return @{#{str}};"
+              puts_m "}"
             end
-            puts "@end\n\n\n"
+            puts_m "@end\n"
+            puts "\n\n"
           end
         end
 
@@ -187,63 +228,68 @@ module Pod
           type_name = m[:type_name]
           type = m[:type]
           des = m[:description] || ''
-          des.gsub!(/\n/, '')
+          des.gsub!(/\n/, '  ')
           default = m[:default]
-          puts "///#{des} #{default}"
+          puts_h "///#{des} #{default}"
           if type.eql?('integer')
-            puts "@property (nonatomic, assign) NSInteger #{key};"
+            puts_h "@property (nonatomic, assign) NSInteger #{key};"
+            if des.include?('分')
+              puts_h "/////////==========删掉其中一个属性"
+              puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
+            end
           elsif type.eql?('cent')
-            puts "@property (nonatomic, strong) MLCentNumber *#{key};"
+            puts_h "@property (nonatomic, strong) MLCentNumber *#{key};"
           elsif type.eql?('string')
-            puts "@property (nonatomic, copy) NSString *#{key};"
+            puts_h "@property (nonatomic, copy) NSString *#{key};"
           elsif type.eql?('number')
-            puts "@property (nonatomic, strong) NSNumber *#{key};"
+            puts_h "@property (nonatomic, strong) NSNumber *#{key};"
           elsif type.eql?('float')
-            puts "@property (nonatomic, assign) CGFloat #{key};"
+            puts_h "@property (nonatomic, assign) CGFloat #{key};"
           elsif type.eql?('double')
-            puts "@property (nonatomic, assign) double #{key};"
+            puts_h "@property (nonatomic, assign) double #{key};"
           elsif type.eql?('boolean')
-            puts "@property (nonatomic, assign) BOOL #{key};"
+            puts_h "@property (nonatomic, assign) BOOL #{key};"
           elsif type.eql?('object')
-            puts "@property (nonatomic, strong) #{type_name} *#{key};"
+            puts_h "@property (nonatomic, strong) #{type_name} *#{key};"
           elsif type.eql?('array')
-            puts "@property (nonatomic, strong) NSArray<#{type_name} *> *#{key};"
+            puts_h "@property (nonatomic, strong) NSArray<#{type_name} *> *#{key};"
           else
-            puts "@property (nonatomic, copy) NSString *#{key};"
+            puts_h "@property (nonatomic, copy) NSString *#{key};"
           end
         end
 
         def print_methods
           puts "\n<===============方法调用=====================>\n"
-          puts "/**"
-          puts " *  #{@data_json['title']} -- #{@data_json['username']}"
-          puts " */"
+          puts_m "/**"
+          puts_m " *  #{@data_json['title']} -- #{@data_json['username']}"
+          puts_m " */"
           key_str = @data_json['path'].split('/').map{ |s| s.gsub(/[^A-Za-z0-9]/, '').gsub(/^\w/){ $&.upcase } }.join('')
           key = "k#{key_str}URL"
-          puts "static NSString * const #{key} = @\"#{@data_json['path']}\";"
-          puts "\n\n"
-          puts "@interface MLParamModel : NSObject"
+          puts_m "static NSString * const #{key} = @\"#{@data_json['path']}\";"
+          puts_m "\n\n"
+          puts_h "@interface MLParamModel : NSObject"
           @data_json['req_query'].each do |h|
-            puts "///#{h['desc']}  #{h['example']}"
-            puts "@property (nonatomic, copy) NSString *#{h['name']};"
+            des = h['desc'].gsub(/\n/, '  ')
+            puts_h "///#{des}  #{h['example']}"
+            puts_h "@property (nonatomic, copy) NSString *#{h['name']};"
           end
-          puts "@end"
+          puts_h "@end"
           puts "\n\n"
           model = @models.last
           if @data_json['method'].eql?('GET')
-            puts "    [MLNetworkingManager getWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-            puts "        if (response.resultCode == 0 && !response.error){"
-            puts "            NSDictionary *detailMsg = response.detailMsg"
-            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-            puts "        }"
-            puts "    }];"
+            puts_m "    [MLNetworkingManager getWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
+            puts_m "        if (response.resultCode == 0 && !response.error){"
+            puts_m "            NSDictionary *detailMsg = response.detailMsg"
+            puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
+            puts_m "        }"
+            puts_m "    }];"
           else
-            puts "    [MLNetworkingManager postWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
-            puts "        if (response.resultCode == 0 && !response.error){"
-            puts "            NSDictionary *detailMsg = response.detailMsg"
-            puts "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
-            puts "        }"
-            puts "    }];"
+            puts_m "    [MLNetworkingManager postWithUrl:#{key} params:nil response:^(MLResponseMessage *responseMessage) {"
+            puts_m "        if (response.resultCode == 0 && !response.error){"
+            puts_m "            NSDictionary *detailMsg = response.detailMsg"
+            puts_m "            #{model[:name]} *model = [#{model[:name]} yy_modelWithDictionary:detailMsg];" if model
+            puts_m "        }"
+            puts_m "    }];"
           end
         end
       end

data/lib/cocoapods-lhj-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.21'
+  VERSION = '0.1.26'
 end
 
 module Pod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.26
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement