cocoapods-aomi-bin 0.1.24 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524830d65e6ab6976b71a596760e02d3ab1778537d181fc0c3309d67fa8f16dc
-  data.tar.gz: b02d57e9a23525c083a64f5dcb420a03d35437eb566ae930dd02b8f18d6845ac
+  metadata.gz: 8b23d08fce41cc6477f55bbb2267d4cb01bb47666db21271ab088eb05d927561
+  data.tar.gz: c1de98fd28db066db52b352dc0aa67f2a54d097d43ff4c1387196a6e6acd173a
 SHA512:
-  metadata.gz: d907a713bdb39a9ced799f2bf23d67684d4e568d1cdcefb8f674963aec21ef16cf7109994e8f3574f0457eb0a9a531c37dbdb8230c010b40dac0289efff6c037
-  data.tar.gz: 612d18532a6b97633531c2a7e4a1a17a19a3d379637c7f31ee6080e85a87b24c61e8c6a81a5aae8605ad71f1b2df2e090f91199125f3722cb12d96e765853028
+  metadata.gz: 14ea5d910bc3810d784ce7e44ace8f44a16fc44942b53bb9db36b27b5d42ea397ba494909f2d8b0468f716f1626fad20a7d60a23bf2e297116984b99a322d492
+  data.tar.gz: 16708b835b342bef5651e14f359a060eb154ce6b913cca310aa615c5096785f01d05771956cc14cdd7a297fc0a3bd595d245711e2ba7ad58b9055ca0452a6f76

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

@@ -14,6 +14,28 @@ module Pod
           @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"
@@ -27,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)
@@ -47,46 +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')
+          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?('UITableView')
+          elsif type.eql?('UIStackView')
+            puts "        _#{name}.axis = UILayoutConstraintAxisHorizontal;"
+            puts "        _#{name}.distribution = UIStackViewDistributionFillEqually;"
+          elsif type.eql?('UITableView')
             puts "        _#{name}.backgroundColor = kBackgroundColor;"
             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')
+          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];"
@@ -100,13 +126,19 @@ 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 constraintEqualToConstant:80].active = YES;"
+            if type.eql?('UILabel')
+              puts "[self.#{name} setContentHuggingPriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+              puts "[self.#{name} setContentCompressionResistancePriority:300 forAxis:UILayoutConstraintAxisHorizontal];"
+            end
             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

@@ -11,19 +11,22 @@ module Pod
         def self.options
           [
             %w[--id api的id],
-            %w[--model-pre 模型的前缀]
+            %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 = {}
           @models = []
           @config_id = ''
           @config_model_pre = 'ML'
+          @model_default_suffix = 'Model'
           @type_trans = {}
           @config_model_names = []
           @model_names = []
@@ -34,6 +37,7 @@ module Pod
           load_config
           fetch_model
           print_methods
+          save_to_file if @save
         end
 
         def test_ding
@@ -43,6 +47,28 @@ module Pod
           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
           "#{@http_url}#{api_id}"
         end
@@ -56,6 +82,7 @@ module Pod
           @http_url = config['url']
           @config_id = config['id']
           @config_model_pre = config['model_pre']
+          @config_model_suffix = config['model_suffix']
           @config_model_names = config['model_names']
           @type_trans = config['type_trans']
         end
@@ -68,6 +95,10 @@ module Pod
           @model_pre_name || @config_model_pre
         end
 
+        def model_suffix
+          @config_model_suffix || @model_default_suffix
+        end
+
         def req_model
           uri = URI.parse(url_str)
           req = Net::HTTP::Get.new(uri)
@@ -135,7 +166,7 @@ module Pod
           if n.length <= 0
             n = @config_model_names.detect{ |c| !@model_names.any?{ |n| n.gsub(/#{model_pre}(.*)Model/, '\1').eql?(c) } }
           end
-          model_name = "#{model_pre}#{n}Model"
+          model_name = "#{model_pre}#{n}#{model_suffix}"
           @model_names << model_name
           model_name
         end
@@ -176,24 +207,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
 
@@ -204,66 +236,66 @@ module Pod
           des = m[:description] || ''
           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 "/////////==========删掉其中一个属性"
-              puts "@property (nonatomic, strong) MLCentNumber *#{key};"
+              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|
             des = h['desc'].gsub(/\n/, '  ')
-            puts "///#{des}  #{h['example']}"
-            puts "@property (nonatomic, copy) NSString *#{h['name']};"
+            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.24'
+  VERSION = '0.1.28'
 end
 
 module Pod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.28
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods