Skip to content

Commit

Permalink
-新增处理进度显示
Browse files Browse the repository at this point in the history
-调整编辑状态下的缩放居中处理
-修复输出图片的位置与原图有细微偏差的问题
-修复编辑状态下快速滑动时,底部栏消失的问题

-绘画&模糊
--优化2指缩放与笔画的协调性。
--调整笔画粗细自动根据图片与屏幕尺寸的比例调整,适配图片放大后笔画太粗的情况。
--调整绘画结束后适当延迟1s才显示工具栏。
--修复快速绘画时底部的工具栏会显示的问题。

-贴图&文字
--调整视图可根据屏幕缩放比例改变控件大小。
--调整视图内容的缩放率与屏幕缩放比例协调性(放大后创建文字不会超出屏幕)
  • Loading branch information
lincf0912 committed Dec 26, 2018
1 parent 1732d8b commit ab1ec8d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
36 changes: 22 additions & 14 deletions LFMediaEditingController.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
C77BFBFB21197FD3003BD7AE /* JRFilterBar.m in Sources */ = {isa = PBXBuildFile; fileRef = C77BFBF821197FD3003BD7AE /* JRFilterBar.m */; };
C78B9C4F1FC54E2100D82F1F /* NaviViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C78B9C4E1FC54E2100D82F1F /* NaviViewController.m */; };
C78B9C561FC55DF500D82F1F /* LFEditCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = C78B9C551FC55DF500D82F1F /* LFEditCollectionView.m */; };
C7E4245421CB6B4F00CAE08C /* LFMECancelBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E4245321CB6B4F00CAE08C /* LFMECancelBlock.m */; };
C7E2F85721D3655B000A9CAE /* LFMECancelBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E2F85621D3655B000A9CAE /* LFMECancelBlock.m */; };
C7E750F121182F6700022FCF /* LFFilterView.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E750F021182F6700022FCF /* LFFilterView.m */; };
C7E750F621183A5300022FCF /* LFImageUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E750F321183A5300022FCF /* LFImageUtil.m */; };
C7E750F92119294F00022FCF /* LFColorMatrixType.m in Sources */ = {isa = PBXBuildFile; fileRef = C7E750F82119294F00022FCF /* LFColorMatrixType.m */; };
Expand Down Expand Up @@ -208,8 +208,8 @@
C78B9C4E1FC54E2100D82F1F /* NaviViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NaviViewController.m; sourceTree = "<group>"; };
C78B9C541FC55DF400D82F1F /* LFEditCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFEditCollectionView.h; sourceTree = "<group>"; };
C78B9C551FC55DF500D82F1F /* LFEditCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFEditCollectionView.m; sourceTree = "<group>"; };
C7E4245221CB6B4F00CAE08C /* LFMECancelBlock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LFMECancelBlock.h; sourceTree = "<group>"; };
C7E4245321CB6B4F00CAE08C /* LFMECancelBlock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFMECancelBlock.m; sourceTree = "<group>"; };
C7E2F85521D3655B000A9CAE /* LFMECancelBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFMECancelBlock.h; sourceTree = "<group>"; };
C7E2F85621D3655B000A9CAE /* LFMECancelBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFMECancelBlock.m; sourceTree = "<group>"; };
C7E750EF21182F6700022FCF /* LFFilterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LFFilterView.h; sourceTree = "<group>"; };
C7E750F021182F6700022FCF /* LFFilterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFFilterView.m; sourceTree = "<group>"; };
C7E750F321183A5300022FCF /* LFImageUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFImageUtil.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -336,20 +336,10 @@
isa = PBXGroup;
children = (
C7ED893920ABBC7100D37465 /* GIFUtils */,
6F14E6031EE6439E0049AE56 /* CancelBlock */,
);
path = utils;
sourceTree = "<group>";
};
6F14E6031EE6439E0049AE56 /* CancelBlock */ = {
isa = PBXGroup;
children = (
C7E4245221CB6B4F00CAE08C /* LFMECancelBlock.h */,
C7E4245321CB6B4F00CAE08C /* LFMECancelBlock.m */,
);
path = CancelBlock;
sourceTree = "<group>";
};
6F14E6051EE6439E0049AE56 /* view */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -490,6 +480,7 @@
children = (
6F359B491F21A326009F2035 /* LFMediaEditingController.bundle */,
6F359B181F1C8AA3009F2035 /* define */,
C7E2F85321D3655B000A9CAE /* utils */,
6FAB0D341F27345600C1BCFD /* view */,
6FAB0D3E1F2735D800C1BCFD /* category */,
);
Expand Down Expand Up @@ -634,6 +625,23 @@
path = Model;
sourceTree = "<group>";
};
C7E2F85321D3655B000A9CAE /* utils */ = {
isa = PBXGroup;
children = (
C7E2F85421D3655B000A9CAE /* CancelBlock */,
);
path = utils;
sourceTree = "<group>";
};
C7E2F85421D3655B000A9CAE /* CancelBlock */ = {
isa = PBXGroup;
children = (
C7E2F85521D3655B000A9CAE /* LFMECancelBlock.h */,
C7E2F85621D3655B000A9CAE /* LFMECancelBlock.m */,
);
path = CancelBlock;
sourceTree = "<group>";
};
C7E750F221183A5300022FCF /* ColorMatrix */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -738,6 +746,7 @@
buildActionMask = 2147483647;
files = (
6F359B321F1D95E2009F2035 /* LFVideoPlayer.m in Sources */,
C7E2F85721D3655B000A9CAE /* LFMECancelBlock.m in Sources */,
6F14E6471EE6439E0049AE56 /* LFEditingView.m in Sources */,
6F14E65B1EE6439E0049AE56 /* JRPickColorView.m in Sources */,
6F14E6591EE6439E0049AE56 /* LFStickerBar.m in Sources */,
Expand Down Expand Up @@ -777,7 +786,6 @@
6F14E65A1EE6439E0049AE56 /* LFTextBar.m in Sources */,
6F14E6571EE6439E0049AE56 /* LFColorSlider.m in Sources */,
6FAB0D371F27345600C1BCFD /* LFScrollView.m in Sources */,
C7E4245421CB6B4F00CAE08C /* LFMECancelBlock.m in Sources */,
6F61BC1B1F2987DA005A1E63 /* LFVideoExportSession.m in Sources */,
6F14E6501EE6439E0049AE56 /* LFMaskLayer.m in Sources */,
6F14E6461EE6439E0049AE56 /* LFClippingView.m in Sources */,
Expand Down

0 comments on commit ab1ec8d

Please sign in to comment.