lhj-tools 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224052a6a416f97ba5b9827cd4fdcb49d345d2ff30721062d3f7fbe6e3a7693a
-  data.tar.gz: f605d6eff40aa500c863e4dddf8dc532584e1ee4abf7505112679aa629888dab
+  metadata.gz: 00bcfbfc57ef29c17ccb992fe52decd1dc169a2f4595c6c291edc99e8d5516b4
+  data.tar.gz: 48ea09b1938d81b27293719247d9382d1b92627ccb4e9544a312d0c00029a942
 SHA512:
-  metadata.gz: d6388d57ad1fee26262cbca46c2cf472059c27557b6c7ff5512299a89f75ee97093bf29792756ed5bb8072c0b86dceae68589408ab3cfd1fb3db5dcfa25a2e05
-  data.tar.gz: f8d1d882382c5853eb495a7a3cb9d75953c27c9bfe1af7a2a1f1d1ee6e3cb012648f22fb859554fd2bc0c845642d55bc56c9b26b913cc4a00766f052a24dee3a
+  metadata.gz: 19fa3572c6c8cf794f74299710c5b2a0a0e24d4ac25abec6a7d0e5bce4ef339d039aa86418a228c039b999fb63b2e00423674c584e9e1ee8cc476597da5cb180
+  data.tar.gz: d65ecfea427f73d635670475c9b811e4f998358de57ac1a27e9091489bf877d998008c9454e2e207e6661e74a8201192701c3e1c9d97998e61a665b84e38d90d

data/lib/lhj/command/code/code_template.rb

@@ -5,8 +5,8 @@ module Lhj
       self.description = '生成的代码模板'
 
       CODE_TEMPLATE_INDEX = [{ name: 'dispatch Source 模板', template: 'dispatch_source.erb' },
-                             { name: '另一个 模板', template: 'fffaaa' },
-                             { name: '代码模板', template: 'fffbbb' }].freeze
+                             { name: '消息队列', template: 'message_query.erb' },
+                             { name: '代码模板', template: 'test.erb' }].freeze
 
       def initialize(argv)
         @cli = HighLine.new

data/lib/lhj/command/code/template/dispatch_source.erb

@@ -1,12 +1,12 @@
 @implementation ODOrderTimerManager
 
 + (instancetype)sharedInstance {
-static dispatch_once_t onceToken;
-static ODOrderTimerManager *instance = nil;
-dispatch_once(&onceToken,^{
-    instance = [[ODOrderTimerManager alloc] init];
-});
-return instance;
+    static dispatch_once_t onceToken;
+    static ODOrderTimerManager *instance = nil;
+    dispatch_once(&onceToken,^{
+        instance = [[ODOrderTimerManager alloc] init];
+    });
+    return instance;
 }
 
 - (void)calcOrderPay:(NSString *)orderId timeout:(NSInteger)timeout

data/lib/lhj/command/code/template/message_query.erb

@@ -0,0 +1,58 @@
+- (void)handleWithBlock:(void (^)(AMGoodsSellingMessageModel *, void(^completion)(BOOL finished, AMGoodsSellingMessageModel *current)))block completion:(void (^)(AMGoodsSellingMessageModel *, void(^)(BOOL)))completion
+{
+    dispatch_once(&onceMessageQueueManagerToken, ^{
+        [self processWithPreModel:nil block:block completion:completion];
+    });
+}
+
+- (void)processWithPreModel:(AMGoodsSellingMessageModel *)preModel block:(void (^)(AMGoodsSellingMessageModel *, void(^completion)(BOOL finished, AMGoodsSellingMessageModel *current)))block completion:(void (^)(AMGoodsSellingMessageModel *, void(^)(BOOL)))completion
+{
+    AMGoodsSellingMessageModel *next = [self popModel];
+    if(next && block){
+        __weak __typeof(self)weakSelf = self;
+        if(preModel){
+            if(![next isEqual:preModel]){
+                next.animationType = AMMessageAnimationTypeReShowAndAnimation;
+                next.currentNum = MAX(1, [next.sellingNumber integerValue]);
+            }else{
+                next.animationType = AMMessageAnimationTypeAnimation;
+                NSInteger num = MAX(1, [next.sellingNumber integerValue]);
+                next.currentNum = preModel.currentNum + num;
+            }
+        }else{
+            next.animationType = AMMessageAnimationTypeShowAndAnimation;
+            next.currentNum = MAX(1, [next.sellingNumber integerValue]);
+        }
+        next.displayNumber = [NSString stringWithFormat:@"%ld", next.currentNum];
+        block(next, ^(BOOL finished, AMGoodsSellingMessageModel *current){
+            if(finished){
+                [weakSelf processWithPreModel:next block:block completion:completion];
+            }
+        });
+    }else{
+        if(completion){
+            completion(preModel, ^(BOOL finished){
+                onceMessageQueueManagerToken = 0;
+            });
+        }
+    }
+}
+
+-(void)beginProductSoldOutAnimation
+{
+      __weak __typeof(self)weakSelf = self;
+      [[AMMessageQueueManager sharedInstance] handleWithBlock:^(AMGoodsSellingMessageModel * model, void (^ _Nonnull completion)(BOOL ,AMGoodsSellingMessageModel *)) {
+          if(model){
+              [weakSelf productSoldOutViewAnimation:model completion:^(BOOL finished, AMGoodsSellingMessageModel *current) {
+              completion(finished, current);
+          }];
+      }
+      } completion:^(AMGoodsSellingMessageModel *preModel, void (^ _Nonnull finishCallback)(BOOL)) {
+          NSInteger des = preModel ? preModel.dismissSec : 3;
+          [[AMMessageTimerManager sharedInstance] scheduledWithMessageType:AMCustomMessageTypeGoodsSelling timeout:des completion:^{
+              [weakSelf hideProductSoldOutView:^(BOOL finished) {
+                  finishCallback(finished);
+              }];
+          }];
+      }];
+}

data/lib/lhj/command/oss/del.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'lhj/helper/oss_helper'
+require 'highline'
 
 module Lhj
   class Command
@@ -7,42 +8,24 @@ module Lhj
       class Del < OSS
         self.summary = '删除OSS的key'
 
-        self.arguments = [
-          CLAide::Argument.new('--key=XX', true),
-          CLAide::Argument.new('--type=XX', true)
-        ]
-
-        def self.options
-          [
-            %w[--key OSS对应的key],
-            %w[--type OSS对应的类型]
-          ]
-        end
-
         def initialize(argv)
-          @key = argv.option('key')
-          @type = argv.option('type')
-          super
-        end
-
-        def validate!
-          help! '请输入key或者类型' unless @key || @type
+          @cli = HighLine.new
           super
         end
 
         def handle
-          if @type
-            objects = Lhj::OSS::Helper.instance.list
-            objects.each do |o|
-              if /#{@type}/ =~ o.key
-                puts "成功删除#{o.key}"
-                Lhj::OSS::Helper.instance.delete(o.key)
-              end
-            end
-          else
-            Lhj::OSS::Helper.instance.delete(@key)
+          objects = Lhj::OSS::Helper.instance.list
+          obj_keys = []
+          objects.each_with_index do |o, i|
+            obj_keys << o.key
+            puts "#{i}.#{o.key}".yellow
           end
+          idx = @cli.ask('请选择删除的key: '.green).strip.to_i
+          oss_key = obj_keys[idx]
+          puts "删除的key为:#{oss_key}".red
+          Lhj::OSS::Helper.instance.delete(oss_key)
         end
+
       end
     end
   end

data/lib/lhj/command/oss/list.rb

@@ -10,8 +10,8 @@ module Lhj
         def handle
           objects = Lhj::OSS::Helper.instance.list
           rows = []
-          objects.each do |o|
-            path = "#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
+          objects.each_with_index do |o, i|
+            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
             rows << [path]
           end
           table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows

data/lib/lhj/command/oss/upload.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'lhj/helper/oss_helper'
+require 'highline'
 
 module Lhj
   class Command
@@ -10,41 +11,34 @@ module Lhj
         self.summary = '上传文件'
 
         self.arguments = [
-          CLAide::Argument.new('type', false),
-          CLAide::Argument.new('name', false),
           CLAide::Argument.new('tag', false)
         ]
 
         def self.options
           [
-            %w[--type 文件类型],
-            %w[--name 文件名],
             %w[--tag 标签]
           ]
         end
 
-        def validate!
-          super
-          help! '类型或名字必须输入' unless @name || @type
-        end
-
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
-          @type = argv.option('type')
-          @name = argv.option('name')
           @tag = argv.option('tag')
+          @cli = HighLine.new
           super
         end
 
         def handle
-          Dir.glob("#{@current_path}/*").each do |f|
-            file_name = File.basename(f)
-            if @name && /#{@name}/ =~ file_name
-              upload(f, file_name)
-            elsif @type && /#{@type}/ =~ file_name
-              upload(f, file_name)
-            end
+          file_list = []
+          file_name_list = []
+          Dir.glob("#{@current_path}/*").each_with_index do |f, i|
+            file_base_name = File.basename(f)
+            file_list << f
+            file_name_list << file_base_name
+            puts "#{i}.#{file_base_name}".yellow
           end
+          idx = @cli.ask('请选择上传文件序号: '.green).strip.to_i
+          puts "上传的文件名:#{file_name_list[idx]}".yellow
+          upload(file_list[idx], file_name_list[idx])
         end
 
         private
@@ -54,7 +48,7 @@ module Lhj
           oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)
           url = Lhj::OSS::Helper.instance.object_url(oss_key)
-          puts "云端上传成功：#{url}\n"
+          puts "云端上传成功：#{url}\n".yellow
         end
       end
     end

data/lib/lhj/command/refactor_rename.rb

@@ -53,6 +53,8 @@ module Lhj
 
       def modify_file(file)
         File.chmod(0o644, file)
+        # arr = File.open(file, 'r+').readlines
+        # lines = arr.size
         str = file_string(file)
         File.open(file, 'w+') do |f|
           f.write(str)

data/lib/lhj/command/trans.rb

@@ -26,7 +26,8 @@ module Lhj
       end
 
       def handler_files
-        Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+        search_type = @file_type.gsub('.', '')
+        Dir.glob("#{@current_path}/**/*.{#{search_type}}").each do |f|
           handler_file f
         end
       end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.36"
+    VERSION = "0.1.37"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -296,6 +296,7 @@ files:
 - lib/lhj/command.rb
 - lib/lhj/command/code/code_template.rb
 - lib/lhj/command/code/template/dispatch_source.erb
+- lib/lhj/command/code/template/message_query.erb
 - lib/lhj/command/code/view.rb
 - lib/lhj/command/config.rb
 - lib/lhj/command/config/info.rb