From ab1ec8d295082d65ce636a574a83cee7cb493462 Mon Sep 17 00:00:00 2001 From: lincf0912 Date: Wed, 26 Dec 2018 15:31:21 +0800 Subject: [PATCH] =?UTF-8?q?-=E6=96=B0=E5=A2=9E=E5=A4=84=E7=90=86=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA=20-=E8=B0=83=E6=95=B4=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E5=B1=85=E4=B8=AD=E5=A4=84=E7=90=86=20-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=9B=BE=E7=89=87=E7=9A=84=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8E=E5=8E=9F=E5=9B=BE=E6=9C=89=E7=BB=86=E5=BE=AE=E5=81=8F?= =?UTF-8?q?=E5=B7=AE=E7=9A=84=E9=97=AE=E9=A2=98=20-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=8B=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=97=B6=EF=BC=8C=E5=BA=95=E9=83=A8=E6=A0=8F?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -绘画&模糊 --优化2指缩放与笔画的协调性。 --调整笔画粗细自动根据图片与屏幕尺寸的比例调整，适配图片放大后笔画太粗的情况。 --调整绘画结束后适当延迟1s才显示工具栏。 --修复快速绘画时底部的工具栏会显示的问题。 -贴图&文字 --调整视图可根据屏幕缩放比例改变控件大小。 --调整视图内容的缩放率与屏幕缩放比例协调性（放大后创建文字不会超出屏幕） --- .../project.pbxproj | 36 +++++++++++-------- .../utils/CancelBlock/LFMECancelBlock.h | 0 .../utils/CancelBlock/LFMECancelBlock.m | 0 3 files changed, 22 insertions(+), 14 deletions(-) rename LFMediaEditingController/class/{LFPhotoEditingController => common}/utils/CancelBlock/LFMECancelBlock.h (100%) rename LFMediaEditingController/class/{LFPhotoEditingController => common}/utils/CancelBlock/LFMECancelBlock.m (100%) diff --git a/LFMediaEditingController.xcodeproj/project.pbxproj b/LFMediaEditingController.xcodeproj/project.pbxproj index e398045..caddf8f 100644 --- a/LFMediaEditingController.xcodeproj/project.pbxproj +++ b/LFMediaEditingController.xcodeproj/project.pbxproj @@ -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 */; }; @@ -208,8 +208,8 @@ C78B9C4E1FC54E2100D82F1F /* NaviViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NaviViewController.m; sourceTree = ""; }; C78B9C541FC55DF400D82F1F /* LFEditCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFEditCollectionView.h; sourceTree = ""; }; C78B9C551FC55DF500D82F1F /* LFEditCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFEditCollectionView.m; sourceTree = ""; }; - C7E4245221CB6B4F00CAE08C /* LFMECancelBlock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LFMECancelBlock.h; sourceTree = ""; }; - C7E4245321CB6B4F00CAE08C /* LFMECancelBlock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFMECancelBlock.m; sourceTree = ""; }; + C7E2F85521D3655B000A9CAE /* LFMECancelBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LFMECancelBlock.h; sourceTree = ""; }; + C7E2F85621D3655B000A9CAE /* LFMECancelBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFMECancelBlock.m; sourceTree = ""; }; C7E750EF21182F6700022FCF /* LFFilterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LFFilterView.h; sourceTree = ""; }; C7E750F021182F6700022FCF /* LFFilterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LFFilterView.m; sourceTree = ""; }; C7E750F321183A5300022FCF /* LFImageUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LFImageUtil.m; sourceTree = ""; }; @@ -336,20 +336,10 @@ isa = PBXGroup; children = ( C7ED893920ABBC7100D37465 /* GIFUtils */, - 6F14E6031EE6439E0049AE56 /* CancelBlock */, ); path = utils; sourceTree = ""; }; - 6F14E6031EE6439E0049AE56 /* CancelBlock */ = { - isa = PBXGroup; - children = ( - C7E4245221CB6B4F00CAE08C /* LFMECancelBlock.h */, - C7E4245321CB6B4F00CAE08C /* LFMECancelBlock.m */, - ); - path = CancelBlock; - sourceTree = ""; - }; 6F14E6051EE6439E0049AE56 /* view */ = { isa = PBXGroup; children = ( @@ -490,6 +480,7 @@ children = ( 6F359B491F21A326009F2035 /* LFMediaEditingController.bundle */, 6F359B181F1C8AA3009F2035 /* define */, + C7E2F85321D3655B000A9CAE /* utils */, 6FAB0D341F27345600C1BCFD /* view */, 6FAB0D3E1F2735D800C1BCFD /* category */, ); @@ -634,6 +625,23 @@ path = Model; sourceTree = ""; }; + C7E2F85321D3655B000A9CAE /* utils */ = { + isa = PBXGroup; + children = ( + C7E2F85421D3655B000A9CAE /* CancelBlock */, + ); + path = utils; + sourceTree = ""; + }; + C7E2F85421D3655B000A9CAE /* CancelBlock */ = { + isa = PBXGroup; + children = ( + C7E2F85521D3655B000A9CAE /* LFMECancelBlock.h */, + C7E2F85621D3655B000A9CAE /* LFMECancelBlock.m */, + ); + path = CancelBlock; + sourceTree = ""; + }; C7E750F221183A5300022FCF /* ColorMatrix */ = { isa = PBXGroup; children = ( @@ -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 */, @@ -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 */, diff --git a/LFMediaEditingController/class/LFPhotoEditingController/utils/CancelBlock/LFMECancelBlock.h b/LFMediaEditingController/class/common/utils/CancelBlock/LFMECancelBlock.h similarity index 100% rename from LFMediaEditingController/class/LFPhotoEditingController/utils/CancelBlock/LFMECancelBlock.h rename to LFMediaEditingController/class/common/utils/CancelBlock/LFMECancelBlock.h diff --git a/LFMediaEditingController/class/LFPhotoEditingController/utils/CancelBlock/LFMECancelBlock.m b/LFMediaEditingController/class/common/utils/CancelBlock/LFMECancelBlock.m similarity index 100% rename from LFMediaEditingController/class/LFPhotoEditingController/utils/CancelBlock/LFMECancelBlock.m rename to LFMediaEditingController/class/common/utils/CancelBlock/LFMECancelBlock.m