diff --git a/FULiveDemo.xcodeproj/project.pbxproj b/FULiveDemo.xcodeproj/project.pbxproj index 66700c9e..1688a1c5 100644 --- a/FULiveDemo.xcodeproj/project.pbxproj +++ b/FULiveDemo.xcodeproj/project.pbxproj @@ -7,7 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 0B0B317D20809F6C0089BDAB /* FUAPIDemoBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B30FE95207F891C008E0543 /* FUAPIDemoBar.framework */; }; + 0B0B317E20809F6C0089BDAB /* FUAPIDemoBar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0B30FE95207F891C008E0543 /* FUAPIDemoBar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0B0D01EF2073575200E97B2F /* men_ztt_fu.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B0D01EE2073575200E97B2F /* men_ztt_fu.png */; }; + 0B1853C020C93C560079F31D /* xiandai_ztt_fu.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B1853BC20C93C550079F31D /* xiandai_ztt_fu.bundle */; }; + 0B1853C120C93C560079F31D /* xiandai_ztt_fu.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B1853BD20C93C560079F31D /* xiandai_ztt_fu.png */; }; + 0B1853C220C93C560079F31D /* sea_lm_fu.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B1853BE20C93C560079F31D /* sea_lm_fu.bundle */; }; + 0B1853C320C93C560079F31D /* sea_lm_fu.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B1853BF20C93C560079F31D /* sea_lm_fu.png */; }; + 0B30FE96207F891C008E0543 /* FUAPIDemoBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B30FE95207F891C008E0543 /* FUAPIDemoBar.framework */; }; 0B55D2E02069E9B800D17895 /* armesh_ex.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B55D2DE2069E9B800D17895 /* armesh_ex.png */; }; 0B55D2E12069E9B800D17895 /* armesh.png in Resources */ = {isa = PBXBuildFile; fileRef = 0B55D2DF2069E9B800D17895 /* armesh.png */; }; 0B55D2E52069EE5800D17895 /* douyin.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0B55D2E42069EE5800D17895 /* douyin.mp3 */; }; @@ -20,8 +27,6 @@ 0B5A0CC82021913900AAD47D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0CC72021913900AAD47D /* main.m */; }; 0B5A0CD22021913900AAD47D /* FULiveDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0CD12021913900AAD47D /* FULiveDemoTests.m */; }; 0B5A0CDD2021913900AAD47D /* FULiveDemoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0CDC2021913900AAD47D /* FULiveDemoUITests.m */; }; - 0B5A0D422021918000AAD47D /* libnama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B5A0CF02021917F00AAD47D /* libnama.a */; }; - 0B5A0D432021918000AAD47D /* release_note.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0B5A0CF12021917F00AAD47D /* release_note.txt */; }; 0B5A0D6D2021918000AAD47D /* CircleProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0D2D2021917F00AAD47D /* CircleProgressView.m */; }; 0B5A0D6E2021918000AAD47D /* FUCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0D2F2021917F00AAD47D /* FUCamera.m */; }; 0B5A0D6F2021918000AAD47D /* FUManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0D312021917F00AAD47D /* FUManager.m */; }; @@ -35,15 +40,14 @@ 0B5A0D7A2021918A00AAD47D /* FURenderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B5A0D792021918A00AAD47D /* FURenderViewController.m */; }; 0B5A0D7C2021919700AAD47D /* dataSource.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0B5A0D7B2021919600AAD47D /* dataSource.plist */; }; 0B5A0D82202191B600AAD47D /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B5A0D81202191B600AAD47D /* Accelerate.framework */; }; - 0B5A0D842021921800AAD47D /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B5A0D832021921700AAD47D /* libstdc++.tbd */; }; - 0BA87BFB2074EF1F00CA972E /* FUAPIDemoBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BA87BFA2074EF1F00CA972E /* FUAPIDemoBar.framework */; }; - 0BA87BFC2074EF2F00CA972E /* FUAPIDemoBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BA87BFA2074EF1F00CA972E /* FUAPIDemoBar.framework */; }; - 0BA87BFD2074EF2F00CA972E /* FUAPIDemoBar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0BA87BFA2074EF1F00CA972E /* FUAPIDemoBar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 0BF32A842068D39C00A59FD9 /* face_beautification.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A7E2068D39C00A59FD9 /* face_beautification.bundle */; }; - 0BF32A852068D39C00A59FD9 /* fxaa.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A7F2068D39C00A59FD9 /* fxaa.bundle */; }; - 0BF32A862068D39C00A59FD9 /* v3.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A802068D39C00A59FD9 /* v3.bundle */; }; - 0BF32A872068D39C00A59FD9 /* anim_model.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A812068D39C00A59FD9 /* anim_model.bundle */; }; - 0BF32A882068D39C00A59FD9 /* ardata_ex.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A822068D39C00A59FD9 /* ardata_ex.bundle */; }; + 0B95D72F2089ED6D006A6FBA /* libnama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B95D7272089ED6D006A6FBA /* libnama.a */; }; + 0B95D7302089ED6D006A6FBA /* release_note.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D7282089ED6D006A6FBA /* release_note.txt */; }; + 0B95D7312089ED6D006A6FBA /* anim_model.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D72A2089ED6D006A6FBA /* anim_model.bundle */; }; + 0B95D7322089ED6D006A6FBA /* ardata_ex.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D72B2089ED6D006A6FBA /* ardata_ex.bundle */; }; + 0B95D7332089ED6D006A6FBA /* face_beautification.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D72C2089ED6D006A6FBA /* face_beautification.bundle */; }; + 0B95D7342089ED6D006A6FBA /* fxaa.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D72D2089ED6D006A6FBA /* fxaa.bundle */; }; + 0B95D7352089ED6D006A6FBA /* v3.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B95D72E2089ED6D006A6FBA /* v3.bundle */; }; + 0B95D7382089ED9E006A6FBA /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B5A0D832021921700AAD47D /* libstdc++.tbd */; }; 0BF32AFC2068EDA000A59FD9 /* chiji_lm_fu.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A8A2068EDA000A59FD9 /* chiji_lm_fu.bundle */; }; 0BF32AFD2068EDA000A59FD9 /* chiji_lm_fu.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A8B2068EDA000A59FD9 /* chiji_lm_fu.png */; }; 0BF32AFE2068EDA000A59FD9 /* gufeng_zh_fu.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0BF32A8C2068EDA000A59FD9 /* gufeng_zh_fu.bundle */; }; @@ -173,13 +177,22 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 0B30FE7B207F8879008E0543 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 0B5A0D7F202191AF00AAD47D /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 0BA87BFD2074EF2F00CA972E /* FUAPIDemoBar.framework in Embed Frameworks */, + 0B0B317E20809F6C0089BDAB /* FUAPIDemoBar.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -188,6 +201,11 @@ /* Begin PBXFileReference section */ 0B0D01EE2073575200E97B2F /* men_ztt_fu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = men_ztt_fu.png; sourceTree = ""; }; + 0B1853BC20C93C550079F31D /* xiandai_ztt_fu.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = xiandai_ztt_fu.bundle; sourceTree = ""; }; + 0B1853BD20C93C560079F31D /* xiandai_ztt_fu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = xiandai_ztt_fu.png; sourceTree = ""; }; + 0B1853BE20C93C560079F31D /* sea_lm_fu.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = sea_lm_fu.bundle; sourceTree = ""; }; + 0B1853BF20C93C560079F31D /* sea_lm_fu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sea_lm_fu.png; sourceTree = ""; }; + 0B30FE95207F891C008E0543 /* FUAPIDemoBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FUAPIDemoBar.framework; sourceTree = ""; }; 0B55D2DE2069E9B800D17895 /* armesh_ex.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = armesh_ex.png; sourceTree = ""; }; 0B55D2DF2069E9B800D17895 /* armesh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = armesh.png; sourceTree = ""; }; 0B55D2E42069EE5800D17895 /* douyin.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = douyin.mp3; sourceTree = ""; }; @@ -210,10 +228,6 @@ 0B5A0CDC2021913900AAD47D /* FULiveDemoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FULiveDemoUITests.m; sourceTree = ""; }; 0B5A0CDE2021913900AAD47D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0B5A0CEB2021917F00AAD47D /* authpack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = authpack.h; sourceTree = ""; }; - 0B5A0CEE2021917F00AAD47D /* funama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = funama.h; sourceTree = ""; }; - 0B5A0CEF2021917F00AAD47D /* FURenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FURenderer.h; sourceTree = ""; }; - 0B5A0CF02021917F00AAD47D /* libnama.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libnama.a; sourceTree = ""; }; - 0B5A0CF12021917F00AAD47D /* release_note.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_note.txt; sourceTree = ""; }; 0B5A0D2C2021917F00AAD47D /* CircleProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleProgressView.h; sourceTree = ""; }; 0B5A0D2D2021917F00AAD47D /* CircleProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleProgressView.m; sourceTree = ""; }; 0B5A0D2E2021917F00AAD47D /* FUCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUCamera.h; sourceTree = ""; }; @@ -239,12 +253,15 @@ 0B5A0D7B2021919600AAD47D /* dataSource.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dataSource.plist; sourceTree = ""; }; 0B5A0D81202191B600AAD47D /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 0B5A0D832021921700AAD47D /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; - 0BA87BFA2074EF1F00CA972E /* FUAPIDemoBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FUAPIDemoBar.framework; sourceTree = ""; }; - 0BF32A7E2068D39C00A59FD9 /* face_beautification.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = face_beautification.bundle; sourceTree = ""; }; - 0BF32A7F2068D39C00A59FD9 /* fxaa.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = fxaa.bundle; sourceTree = ""; }; - 0BF32A802068D39C00A59FD9 /* v3.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = v3.bundle; sourceTree = ""; }; - 0BF32A812068D39C00A59FD9 /* anim_model.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = anim_model.bundle; sourceTree = ""; }; - 0BF32A822068D39C00A59FD9 /* ardata_ex.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = ardata_ex.bundle; sourceTree = ""; }; + 0B95D7252089ED6D006A6FBA /* funama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = funama.h; sourceTree = ""; }; + 0B95D7262089ED6D006A6FBA /* FURenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FURenderer.h; sourceTree = ""; }; + 0B95D7272089ED6D006A6FBA /* libnama.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libnama.a; sourceTree = ""; }; + 0B95D7282089ED6D006A6FBA /* release_note.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_note.txt; sourceTree = ""; }; + 0B95D72A2089ED6D006A6FBA /* anim_model.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = anim_model.bundle; sourceTree = ""; }; + 0B95D72B2089ED6D006A6FBA /* ardata_ex.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = ardata_ex.bundle; sourceTree = ""; }; + 0B95D72C2089ED6D006A6FBA /* face_beautification.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = face_beautification.bundle; sourceTree = ""; }; + 0B95D72D2089ED6D006A6FBA /* fxaa.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = fxaa.bundle; sourceTree = ""; }; + 0B95D72E2089ED6D006A6FBA /* v3.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = v3.bundle; sourceTree = ""; }; 0BF32A8A2068EDA000A59FD9 /* chiji_lm_fu.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = chiji_lm_fu.bundle; sourceTree = ""; }; 0BF32A8B2068EDA000A59FD9 /* chiji_lm_fu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = chiji_lm_fu.png; sourceTree = ""; }; 0BF32A8C2068EDA000A59FD9 /* gufeng_zh_fu.bundle */ = {isa = PBXFileReference; lastKnownFileType = file; path = gufeng_zh_fu.bundle; sourceTree = ""; }; @@ -364,11 +381,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0BA87BFB2074EF1F00CA972E /* FUAPIDemoBar.framework in Frameworks */, - 0B5A0D842021921800AAD47D /* libstdc++.tbd in Frameworks */, + 0B95D7382089ED9E006A6FBA /* libstdc++.tbd in Frameworks */, + 0B30FE96207F891C008E0543 /* FUAPIDemoBar.framework in Frameworks */, 0B5A0D82202191B600AAD47D /* Accelerate.framework in Frameworks */, - 0BA87BFC2074EF2F00CA972E /* FUAPIDemoBar.framework in Frameworks */, - 0B5A0D422021918000AAD47D /* libnama.a in Frameworks */, + 0B0B317D20809F6C0089BDAB /* FUAPIDemoBar.framework in Frameworks */, + 0B95D72F2089ED6D006A6FBA /* libnama.a in Frameworks */, 1489B052F80EF752AAACF444 /* libPods-FULiveDemo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -473,44 +490,12 @@ isa = PBXGroup; children = ( 0B5A0CEB2021917F00AAD47D /* authpack.h */, + 0B95D7232089ED6D006A6FBA /* FaceUnity-SDK-iOS */, 0B482C422064FBBB0073939A /* items */, - 0B5A0CEC2021917F00AAD47D /* FaceUnity-SDK-iOS */, ); path = Faceunity; sourceTree = ""; }; - 0B5A0CEC2021917F00AAD47D /* FaceUnity-SDK-iOS */ = { - isa = PBXGroup; - children = ( - 0B5A0CED2021917F00AAD47D /* Headers */, - 0B5A0CF02021917F00AAD47D /* libnama.a */, - 0B5A0CF12021917F00AAD47D /* release_note.txt */, - 0B5A0CF22021917F00AAD47D /* Resources */, - ); - path = "FaceUnity-SDK-iOS"; - sourceTree = ""; - }; - 0B5A0CED2021917F00AAD47D /* Headers */ = { - isa = PBXGroup; - children = ( - 0B5A0CEE2021917F00AAD47D /* funama.h */, - 0B5A0CEF2021917F00AAD47D /* FURenderer.h */, - ); - path = Headers; - sourceTree = ""; - }; - 0B5A0CF22021917F00AAD47D /* Resources */ = { - isa = PBXGroup; - children = ( - 0BF32A812068D39C00A59FD9 /* anim_model.bundle */, - 0BF32A822068D39C00A59FD9 /* ardata_ex.bundle */, - 0BF32A7E2068D39C00A59FD9 /* face_beautification.bundle */, - 0BF32A7F2068D39C00A59FD9 /* fxaa.bundle */, - 0BF32A802068D39C00A59FD9 /* v3.bundle */, - ); - path = Resources; - sourceTree = ""; - }; 0B5A0D2B2021917F00AAD47D /* Tool */ = { isa = PBXGroup; children = ( @@ -537,7 +522,7 @@ 0B5A0D382021918000AAD47D /* View */ = { isa = PBXGroup; children = ( - 0BA87BFA2074EF1F00CA972E /* FUAPIDemoBar.framework */, + 0B30FE95207F891C008E0543 /* FUAPIDemoBar.framework */, 0B5A0D3A2021918000AAD47D /* FUItemsView.h */, 0B5A0D3B2021918000AAD47D /* FUItemsView.m */, 0B5A0D3C2021918000AAD47D /* FUItemsViewCell.h */, @@ -560,9 +545,45 @@ name = Frameworks; sourceTree = ""; }; + 0B95D7232089ED6D006A6FBA /* FaceUnity-SDK-iOS */ = { + isa = PBXGroup; + children = ( + 0B95D7242089ED6D006A6FBA /* Headers */, + 0B95D7272089ED6D006A6FBA /* libnama.a */, + 0B95D7282089ED6D006A6FBA /* release_note.txt */, + 0B95D7292089ED6D006A6FBA /* Resources */, + ); + path = "FaceUnity-SDK-iOS"; + sourceTree = ""; + }; + 0B95D7242089ED6D006A6FBA /* Headers */ = { + isa = PBXGroup; + children = ( + 0B95D7252089ED6D006A6FBA /* funama.h */, + 0B95D7262089ED6D006A6FBA /* FURenderer.h */, + ); + path = Headers; + sourceTree = ""; + }; + 0B95D7292089ED6D006A6FBA /* Resources */ = { + isa = PBXGroup; + children = ( + 0B95D72A2089ED6D006A6FBA /* anim_model.bundle */, + 0B95D72B2089ED6D006A6FBA /* ardata_ex.bundle */, + 0B95D72C2089ED6D006A6FBA /* face_beautification.bundle */, + 0B95D72D2089ED6D006A6FBA /* fxaa.bundle */, + 0B95D72E2089ED6D006A6FBA /* v3.bundle */, + ); + path = Resources; + sourceTree = ""; + }; 0BF32A892068EDA000A59FD9 /* 背景分割 */ = { isa = PBXGroup; children = ( + 0B1853BE20C93C560079F31D /* sea_lm_fu.bundle */, + 0B1853BF20C93C560079F31D /* sea_lm_fu.png */, + 0B1853BC20C93C550079F31D /* xiandai_ztt_fu.bundle */, + 0B1853BD20C93C560079F31D /* xiandai_ztt_fu.png */, 0BF32A8A2068EDA000A59FD9 /* chiji_lm_fu.bundle */, 0BF32A8B2068EDA000A59FD9 /* chiji_lm_fu.png */, 0BF32A8C2068EDA000A59FD9 /* gufeng_zh_fu.bundle */, @@ -764,6 +785,8 @@ 0B5A0D7F202191AF00AAD47D /* Embed Frameworks */, 4F91CA75F85AF44CEEC4E935 /* [CP] Embed Pods Frameworks */, 4508CC438BF9C69090871A75 /* [CP] Copy Pods Resources */, + 0B30FE7B207F8879008E0543 /* CopyFiles */, + CD11A34D20CE7C580005C58C /* ShellScript */, ); buildRules = ( ); @@ -863,13 +886,11 @@ 0BF32B502068EDA000A59FD9 /* mask_luhan.png in Resources */, 0BF32B272068EDA000A59FD9 /* luhantongkuan_ztt_fu.bundle in Resources */, 0BF32BB22068FB8B00A59FD9 /* douniuquan_Animoji.bundle in Resources */, - 0B5A0D432021918000AAD47D /* release_note.txt in Resources */, 0BF32B4F2068EDA000A59FD9 /* mask_luhan.bundle in Resources */, 0BF32B4B2068EDA000A59FD9 /* mask_linzhiling.bundle in Resources */, 0BF32B532068EDA000A59FD9 /* mask_tongliya.bundle in Resources */, 0BF32B672068EF2A00A59FD9 /* douyin.png in Resources */, 0BF32B322068EDA000A59FD9 /* afd.png in Resources */, - 0BF32A842068D39C00A59FD9 /* face_beautification.bundle in Resources */, 0BF32B5D2068EDA000A59FD9 /* mask_hat.bundle in Resources */, 0BF32B462068EDA000A59FD9 /* facewarp6.png in Resources */, 0BF32BB82068FB8B00A59FD9 /* kulutou_Animoji.bundle in Resources */, @@ -884,12 +905,16 @@ 0BF32B612068EDA000A59FD9 /* yazui.bundle in Resources */, 0BF32B5B2068EDA000A59FD9 /* juanhuzi_lm_fu.bundle in Resources */, 0BF32B902068F30C00A59FD9 /* picasso_e2.png in Resources */, + 0B1853C320C93C560079F31D /* sea_lm_fu.png in Resources */, 0B5A0D7C2021919700AAD47D /* dataSource.plist in Resources */, 0B0D01EF2073575200E97B2F /* men_ztt_fu.png in Resources */, 0BF32B382068EDA000A59FD9 /* tiger.png in Resources */, 0BF32B372068EDA000A59FD9 /* tiger.bundle in Resources */, + 0B95D7312089ED6D006A6FBA /* anim_model.bundle in Resources */, + 0B1853C220C93C560079F31D /* sea_lm_fu.bundle in Resources */, 0BF32B492068EDA000A59FD9 /* mask_huangxiaoming.bundle in Resources */, 0BF32B632068EDA000A59FD9 /* yuguan.bundle in Resources */, + 0B1853C120C93C560079F31D /* xiandai_ztt_fu.png in Resources */, 0BF32B4C2068EDA000A59FD9 /* mask_linzhiling.png in Resources */, 0BF32B5F2068EDA000A59FD9 /* touhua_ztt_fu.bundle in Resources */, 0BF32B012068EDA000A59FD9 /* hez_ztt_fu.png in Resources */, @@ -906,8 +931,7 @@ 0BF32B522068EDA000A59FD9 /* mask_matianyu.png in Resources */, 0BF32B5C2068EDA000A59FD9 /* juanhuzi_lm_fu.png in Resources */, 0BF32B572068EDA000A59FD9 /* fengya_ztt_fu.bundle in Resources */, - 0BF32A862068D39C00A59FD9 /* v3.bundle in Resources */, - 0BF32A882068D39C00A59FD9 /* ardata_ex.bundle in Resources */, + 0B95D7302089ED6D006A6FBA /* release_note.txt in Resources */, 0BF32B252068EDA000A59FD9 /* jet_mask.bundle in Resources */, 0BF32AFF2068EDA000A59FD9 /* gufeng_zh_fu.png in Resources */, 0BF32B172068EDA000A59FD9 /* ssd_thread_cute.bundle in Resources */, @@ -919,14 +943,17 @@ 0BF32B312068EDA000A59FD9 /* afd.bundle in Resources */, 0BF32B182068EDA000A59FD9 /* ssd_thread_cute.png in Resources */, 0BF32B5E2068EDA000A59FD9 /* mask_hat.png in Resources */, + 0B95D7322089ED6D006A6FBA /* ardata_ex.bundle in Resources */, 0BF32B132068EDA000A59FD9 /* fu_zh_hezxiong.bundle in Resources */, 0BF32BB92068FB8B00A59FD9 /* kulutou_Animoji.png in Resources */, 0BF32B412068EDA000A59FD9 /* facewarp4.bundle in Resources */, + 0B95D7332089ED6D006A6FBA /* face_beautification.bundle in Resources */, 0BF32B122068EDA000A59FD9 /* fu_zh_baoquan.png in Resources */, 0BF32B3F2068EDA000A59FD9 /* facewarp3.bundle in Resources */, 0B5A0CC52021913900AAD47D /* LaunchScreen.storyboard in Resources */, 0BF32B582068EDA000A59FD9 /* fengya_ztt_fu.png in Resources */, 0BF32B142068EDA000A59FD9 /* fu_zh_hezxiong.png in Resources */, + 0B95D7342089ED6D006A6FBA /* fxaa.bundle in Resources */, 0BF32B4E2068EDA000A59FD9 /* mask_liudehua.png in Resources */, 0BF32B0D2068EDA000A59FD9 /* douyin.bundle in Resources */, 0B5A0CC22021913900AAD47D /* Assets.xcassets in Resources */, @@ -941,10 +968,9 @@ 0BF32BAC2068FB8B00A59FD9 /* baimao_Animoji.bundle in Resources */, 0BF32B1C2068EDA000A59FD9 /* ssd_thread_thumb.png in Resources */, 0BF32B5A2068EDA000A59FD9 /* hudie_lm_fu.png in Resources */, - 0BF32A872068D39C00A59FD9 /* anim_model.bundle in Resources */, 0BF32AFE2068EDA000A59FD9 /* gufeng_zh_fu.bundle in Resources */, 0BF32B1A2068EDA000A59FD9 /* ssd_thread_six.png in Resources */, - 0BF32A852068D39C00A59FD9 /* fxaa.bundle in Resources */, + 0B1853C020C93C560079F31D /* xiandai_ztt_fu.bundle in Resources */, 0BF32B232068EDA000A59FD9 /* future_warrior.bundle in Resources */, 0BF32B422068EDA000A59FD9 /* facewarp4.png in Resources */, 0BF32B3D2068EDA000A59FD9 /* facewarp2.bundle in Resources */, @@ -963,6 +989,7 @@ 0BF32B512068EDA000A59FD9 /* mask_matianyu.bundle in Resources */, 0BF32AFC2068EDA000A59FD9 /* chiji_lm_fu.bundle in Resources */, 0BF32B242068EDA000A59FD9 /* future_warrior.png in Resources */, + 0B95D7352089ED6D006A6FBA /* v3.bundle in Resources */, 0BF32B302068EDA000A59FD9 /* xiaoxueshen_ztt_fu.png in Resources */, 0BF32B402068EDA000A59FD9 /* facewarp3.png in Resources */, 0BF32B8E2068F30C00A59FD9 /* picasso_e1.png in Resources */, @@ -1034,6 +1061,19 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FULiveDemo/Pods-FULiveDemo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + CD11A34D20CE7C580005C58C /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "APP_PATH=\"${TARGET_BUILD_DIR}/${WRAPPER_NAME}\"\n\n# This script loops through the frameworks embedded in the application and\n\n# removes unused architectures.\n\nfind \"$APP_PATH\" -name '*.framework' -type d | while read -r FRAMEWORK\n\ndo\n\nFRAMEWORK_EXECUTABLE_NAME=$(defaults read \"$FRAMEWORK/Info.plist\" CFBundleExecutable)\n\nFRAMEWORK_EXECUTABLE_PATH=\"$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME\"\n\necho \"Executable is $FRAMEWORK_EXECUTABLE_PATH\"\n\nEXTRACTED_ARCHS=()\n\nfor ARCH in $ARCHS\n\ndo\n\necho \"Extracting $ARCH from $FRAMEWORK_EXECUTABLE_NAME\"\n\nlipo -extract \"$ARCH\" \"$FRAMEWORK_EXECUTABLE_PATH\" -o \"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\"\n\nEXTRACTED_ARCHS+=(\"$FRAMEWORK_EXECUTABLE_PATH-$ARCH\")\n\ndone\n\necho \"Merging extracted architectures: ${ARCHS}\"\n\nlipo -o \"$FRAMEWORK_EXECUTABLE_PATH-merged\" -create \"${EXTRACTED_ARCHS[@]}\"\n\nrm \"${EXTRACTED_ARCHS[@]}\"\n\necho \"Replacing original executable with thinned version\"\n\nrm \"$FRAMEWORK_EXECUTABLE_PATH\"\n\nmv \"$FRAMEWORK_EXECUTABLE_PATH-merged\" \"$FRAMEWORK_EXECUTABLE_PATH\"\n\ndone\n"; + }; FA957C64E2549EB6F75CB07D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1238,6 +1278,7 @@ baseConfigurationReference = 29B79CC7B81FD9FA254B7E7E /* Pods-FULiveDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 35A6KD62ZJ; FRAMEWORK_SEARCH_PATHS = ( @@ -1251,6 +1292,13 @@ "$(PROJECT_DIR)/FULiveDemo/Faceunity/FaceUnity-SDK-iOS", "$(PROJECT_DIR)/FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"SVProgressHUD\"", + "-framework", + "\"QuartzCore\"", + ); PRODUCT_BUNDLE_IDENTIFIER = FU.FULiveDemo; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1262,6 +1310,7 @@ baseConfigurationReference = D595CE4A595DEF848B6EF7B3 /* Pods-FULiveDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 35A6KD62ZJ; FRAMEWORK_SEARCH_PATHS = ( @@ -1275,6 +1324,13 @@ "$(PROJECT_DIR)/FULiveDemo/Faceunity/FaceUnity-SDK-iOS", "$(PROJECT_DIR)/FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"SVProgressHUD\"", + "-framework", + "\"QuartzCore\"", + ); PRODUCT_BUNDLE_IDENTIFIER = FU.FULiveDemo; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/1024-1024.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/1024-1024.png new file mode 100644 index 00000000..1f9869b3 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/1024-1024.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-120.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-120.png new file mode 100644 index 00000000..8ac7940a Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-120.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-121.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-121.png new file mode 100644 index 00000000..8ac7940a Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/120-121.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/152-152.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/152-152.png new file mode 100644 index 00000000..1e0ef86c Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/152-152.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/167-167.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/167-167.png new file mode 100644 index 00000000..f3ffb265 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/167-167.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/180-180.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/180-180.png new file mode 100644 index 00000000..f199325b Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/180-180.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/20-20.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/20-20.png new file mode 100644 index 00000000..02c7946d Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/20-20.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/29-29.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/29-29.png new file mode 100644 index 00000000..8d866dc9 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/29-29.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-40.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-40.png new file mode 100644 index 00000000..0b74131b Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-40.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-41.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-41.png new file mode 100644 index 00000000..0b74131b Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-41.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-42.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-42.png new file mode 100644 index 00000000..0b74131b Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/40-42.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-58.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-58.png new file mode 100644 index 00000000..7a86f97c Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-58.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-59.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-59.png new file mode 100644 index 00000000..7a86f97c Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/58-59.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/60-60.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/60-60.png new file mode 100644 index 00000000..1dbac719 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/60-60.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/76-76.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/76-76.png new file mode 100644 index 00000000..76271c92 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/76-76.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-80.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-80.png new file mode 100644 index 00000000..467b5837 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-80.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-81.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-81.png new file mode 100644 index 00000000..467b5837 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/80-81.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/87-87.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/87-87.png new file mode 100644 index 00000000..48692f08 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/87-87.png differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png deleted file mode 100644 index aa401da8..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20.png deleted file mode 100644 index b1ebe264..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png deleted file mode 100644 index e608bbe9..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png deleted file mode 100644 index e608bbe9..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png deleted file mode 100644 index 7f18cd15..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29.png deleted file mode 100644 index eeea758d..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png deleted file mode 100644 index e03a4239..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png deleted file mode 100644 index e03a4239..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png deleted file mode 100644 index 28d107b9..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40.png deleted file mode 100644 index e608bbe9..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png deleted file mode 100644 index ad4a4026..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png deleted file mode 100644 index ad4a4026..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png deleted file mode 100644 index 5f54ad1f..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png deleted file mode 100644 index 5f54ad1f..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png deleted file mode 100644 index 23e7d44d..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76.png deleted file mode 100644 index 3ee01d58..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png deleted file mode 100644 index 2a8c9949..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png deleted file mode 100644 index 8c451a5f..00000000 Binary files a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/AppIcon83.5x83.5@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json index 6492659c..c339913f 100644 --- a/FULiveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/FULiveDemo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -3,109 +3,109 @@ { "size" : "20x20", "idiom" : "iphone", - "filename" : "AppIcon20x20@2x.png", + "filename" : "40-40.png", "scale" : "2x" }, { "size" : "20x20", "idiom" : "iphone", - "filename" : "AppIcon20x20@3x.png", + "filename" : "60-60.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "AppIcon29x29@2x.png", + "filename" : "58-58.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "AppIcon29x29@3x.png", + "filename" : "87-87.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "AppIcon40x40@2x.png", + "filename" : "80-80.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "AppIcon40x40@3x.png", + "filename" : "120-120.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "AppIcon60x60@2x.png", + "filename" : "120-121.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "AppIcon60x60@3x.png", + "filename" : "180-180.png", "scale" : "3x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "AppIcon20x20.png", + "filename" : "20-20.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "AppIcon20x20@2x-1.png", + "filename" : "40-41.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "AppIcon29x29.png", + "filename" : "29-29.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "AppIcon29x29@2x-1.png", + "filename" : "58-59.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "AppIcon40x40.png", + "filename" : "40-42.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "AppIcon40x40@2x-1.png", + "filename" : "80-81.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "AppIcon76x76.png", + "filename" : "76-76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "AppIcon76x76@2x.png", + "filename" : "152-152.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "AppIcon83.5x83.5@2x.png", + "filename" : "167-167.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "AppIcon1024x1024.png", + "filename" : "1024-1024.png", "scale" : "1x" } ], diff --git a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 00000000..a86966be --- /dev/null +++ b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,162 @@ +{ + "images" : [ + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "2436h", + "filename" : "启动页1125-2436.png", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "启动页1242-2208.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "启动页750-1334.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "启动页640-960.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "启动页640-1136.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页768-1024.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页1024-768.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页1536-2048.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页-2048-1536.png", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "启动页320-480.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "启动页640-961.png", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "启动页640-1138.png", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页768-1004.png", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页768-1026.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页-1024-748.png", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页1024-769.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页1536-2008.png", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "启动页1536-2049.png", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页-2048-1496.png", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "启动页-2048-1537.png", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-1024-748.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-1024-748.png" new file mode 100644 index 00000000..b58e1e20 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-1024-748.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1496.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1496.png" new file mode 100644 index 00000000..f7b6b779 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1496.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1536.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1536.png" new file mode 100644 index 00000000..e058da96 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1536.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1537.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1537.png" new file mode 100644 index 00000000..e058da96 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265-2048-1537.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-768.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-768.png" new file mode 100644 index 00000000..a482f322 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-768.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-769.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-769.png" new file mode 100644 index 00000000..a482f322 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651024-769.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651125-2436.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651125-2436.png" new file mode 100644 index 00000000..2858e74a Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651125-2436.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651242-2208.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651242-2208.png" new file mode 100644 index 00000000..218e2159 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651242-2208.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2008.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2008.png" new file mode 100644 index 00000000..bd2617d0 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2008.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2048.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2048.png" new file mode 100644 index 00000000..778c12ec Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2048.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2049.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2049.png" new file mode 100644 index 00000000..778c12ec Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\2651536-2049.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265320-480.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265320-480.png" new file mode 100644 index 00000000..b51daaa7 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265320-480.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1136.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1136.png" new file mode 100644 index 00000000..2beffa0d Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1136.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1138.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1138.png" new file mode 100644 index 00000000..2beffa0d Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-1138.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-960.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-960.png" new file mode 100644 index 00000000..4bae1e35 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-960.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-961.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-961.png" new file mode 100644 index 00000000..4bae1e35 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265640-961.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265750-1334.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265750-1334.png" new file mode 100644 index 00000000..58239d84 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265750-1334.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1004.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1004.png" new file mode 100644 index 00000000..a6b44982 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1004.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1024.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1024.png" new file mode 100644 index 00000000..70754c23 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1024.png" differ diff --git "a/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1026.png" "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1026.png" new file mode 100644 index 00000000..70754c23 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/LaunchImage.launchimage/\345\220\257\345\212\250\351\241\265768-1026.png" differ diff --git a/FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/Contents.json b/FULiveDemo/Assets.xcassets/Performance.imageset/Contents.json similarity index 69% rename from FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/Contents.json rename to FULiveDemo/Assets.xcassets/Performance.imageset/Contents.json index df631443..c4e74638 100644 --- a/FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/Contents.json +++ b/FULiveDemo/Assets.xcassets/Performance.imageset/Contents.json @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "Performance.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "homeview_background@2x.png", + "filename" : "Performance@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "Performance@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/Performance.imageset/Performance.png b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance.png new file mode 100644 index 00000000..238390dd Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance.png differ diff --git a/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@2x.png b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@2x.png new file mode 100644 index 00000000..8aab35dc Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@2x.png differ diff --git a/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@3x.png b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@3x.png new file mode 100644 index 00000000..d7874b59 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance.imageset/Performance@3x.png differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/Contents.json" b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Contents.json similarity index 64% rename from "FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/Contents.json" rename to FULiveDemo/Assets.xcassets/Performance_selected.imageset/Contents.json index 24322288..d3d352f5 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/Contents.json" +++ b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Contents.json @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "Performance_selected.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "人像光效_selected@2x.png", + "filename" : "Performance_selected@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "Performance_selected@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected.png b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected.png new file mode 100644 index 00000000..ef4ed914 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected.png differ diff --git a/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@2x.png b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@2x.png new file mode 100644 index 00000000..1c720f06 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@2x.png differ diff --git a/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@3x.png b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@3x.png new file mode 100644 index 00000000..f064893f Binary files /dev/null and b/FULiveDemo/Assets.xcassets/Performance_selected.imageset/Performance_selected@3x.png differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267@2x.png" deleted file mode 100644 index 99e9e8ae..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon.png" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon.png" new file mode 100644 index 00000000..31f5d07c Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@2x.png" new file mode 100644 index 00000000..8ca72d50 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@3x.png" new file mode 100644 index 00000000..32c6c819 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/AR\351\235\242\345\205\267icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/Contents.json" index 4022cede..d814ded1 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "AR面具icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "AR面具@2x.png", + "filename" : "AR面具icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "AR面具icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/AR\351\235\242\345\205\267_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/AR\351\235\242\345\205\267_selected@2x.png" deleted file mode 100644 index 69b153bc..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/AR\351\235\242\345\205\267_selected@2x.png" and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon.png b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon.png new file mode 100644 index 00000000..78248788 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@2x.png b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@2x.png new file mode 100644 index 00000000..6fb80d5c Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@2x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@3x.png b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@3x.png new file mode 100644 index 00000000..753587b2 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/ANIMOJIicon@3x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Animoji@2x.png b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Animoji@2x.png deleted file mode 100644 index 5d4011c6..00000000 Binary files a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Animoji@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Contents.json b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Contents.json index 41af9a27..13acc381 100644 --- a/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Contents.json +++ b/FULiveDemo/Assets.xcassets/homeview/Animoji.imageset/Contents.json @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "ANIMOJIicon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "Animoji@2x.png", + "filename" : "ANIMOJIicon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "ANIMOJIicon@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Animoji_selected@2x.png b/FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Animoji_selected@2x.png deleted file mode 100644 index 32f4b34d..00000000 Binary files a/FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Animoji_selected@2x.png and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/Contents.json" b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/Contents.json similarity index 76% rename from "FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/Contents.json" rename to FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/Contents.json index 242e85bf..f3764fcc 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/AR\351\235\242\345\205\267_selected.imageset/Contents.json" +++ b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/Contents.json @@ -6,11 +6,12 @@ }, { "idiom" : "universal", - "filename" : "AR面具_selected@2x.png", + "filename" : "bottomImage@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "bottomImage@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@2x.png b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@2x.png new file mode 100644 index 00000000..70159643 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@2x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@3x.png b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@3x.png new file mode 100644 index 00000000..6b92ddb3 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/bottomImage.imageset/bottomImage@3x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Contents.json b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/Contents.json similarity index 74% rename from FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Contents.json rename to FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/Contents.json index 30b6bee5..a7409a3b 100644 --- a/FULiveDemo/Assets.xcassets/homeview/Animoji_selected.imageset/Contents.json +++ b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/Contents.json @@ -6,11 +6,12 @@ }, { "idiom" : "universal", - "filename" : "Animoji_selected@2x.png", + "filename" : "bottomImage_gray@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "bottomImage_gray@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@2x.png b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@2x.png new file mode 100644 index 00000000..a2c56165 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@2x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@3x.png b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@3x.png new file mode 100644 index 00000000..f36ec554 Binary files /dev/null and b/FULiveDemo/Assets.xcassets/homeview/bottomImage_gray.imageset/bottomImage_gray@3x.png differ diff --git a/FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/homeview_background@2x.png b/FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/homeview_background@2x.png deleted file mode 100644 index ddb7bf82..00000000 Binary files a/FULiveDemo/Assets.xcassets/homeview/homeview_background.imageset/homeview_background@2x.png and /dev/null differ diff --git a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/Contents.json b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/Contents.json index 2a9201f7..6e638559 100644 --- a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/Contents.json +++ b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/Contents.json @@ -6,11 +6,12 @@ }, { "idiom" : "universal", - "filename" : "homeview_background_top@2x.jpg", + "filename" : "图层1@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "图层1@3x.png", "scale" : "3x" } ], diff --git a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/homeview_background_top@2x.jpg b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/homeview_background_top@2x.jpg deleted file mode 100644 index c4b536e8..00000000 Binary files a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/homeview_background_top@2x.jpg and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@2x.png" new file mode 100644 index 00000000..f9712166 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@3x.png" new file mode 100644 index 00000000..85c08eb9 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/homeview_background_top.imageset/\345\233\276\345\261\2021@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/Contents.json" index 70c74104..eb2737ea 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "人像驱动icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "人像光效@2x.png", + "filename" : "人像驱动icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "人像驱动icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\345\205\211\346\225\210@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\345\205\211\346\225\210@2x.png" deleted file mode 100644 index d2a4f327..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\345\205\211\346\225\210@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" new file mode 100644 index 00000000..c3630510 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" new file mode 100644 index 00000000..c329eda9 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" new file mode 100644 index 00000000..75164b1c Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/\344\272\272\345\203\217\345\205\211\346\225\210_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/\344\272\272\345\203\217\345\205\211\346\225\210_selected@2x.png" deleted file mode 100644 index c3bc0eb7..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\345\205\211\346\225\210_selected.imageset/\344\272\272\345\203\217\345\205\211\346\225\210_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/Contents.json" index f403059b..eb2737ea 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "人像驱动icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "人像驱动@2x.png", + "filename" : "人像驱动icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "人像驱动icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250@2x.png" deleted file mode 100644 index 44d1d93b..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" new file mode 100644 index 00000000..c3630510 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" new file mode 100644 index 00000000..c329eda9 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" new file mode 100644 index 00000000..75164b1c Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250.imageset/\344\272\272\345\203\217\351\251\261\345\212\250icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/Contents.json" deleted file mode 100644 index 0f4dc86d..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "人像驱动_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/\344\272\272\345\203\217\351\251\261\345\212\250_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/\344\272\272\345\203\217\351\251\261\345\212\250_selected@2x.png" deleted file mode 100644 index 9c0f1188..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\344\272\272\345\203\217\351\251\261\345\212\250_selected.imageset/\344\272\272\345\203\217\351\251\261\345\212\250_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/Contents.json" index c95a0f3d..e2958135 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "哈哈镜icon .png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "哈哈镜@2x.png", + "filename" : "哈哈镜icon @2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "哈哈镜icon @3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234@2x.png" deleted file mode 100644 index 93b2b8fd..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon .png" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon .png" new file mode 100644 index 00000000..bfa27c50 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon .png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @2x.png" new file mode 100644 index 00000000..09d90d32 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @3x.png" new file mode 100644 index 00000000..f558212a Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234.imageset/\345\223\210\345\223\210\351\225\234icon @3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/Contents.json" deleted file mode 100644 index 4abd14e0..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "哈哈镜_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/\345\223\210\345\223\210\351\225\234_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/\345\223\210\345\223\210\351\225\234_selected@2x.png" deleted file mode 100644 index 63298fb9..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\345\223\210\345\223\210\351\225\234_selected.imageset/\345\223\210\345\223\210\351\225\234_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/Contents.json" index 6971c634..f6be4f56 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "赞icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "手势识别@2x.png", + "filename" : "赞icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "赞icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\346\211\213\345\212\277\350\257\206\345\210\253@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\346\211\213\345\212\277\350\257\206\345\210\253@2x.png" deleted file mode 100644 index 92adff9e..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\346\211\213\345\212\277\350\257\206\345\210\253@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon.png" new file mode 100644 index 00000000..2b29ae97 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@2x.png" new file mode 100644 index 00000000..75b6bf27 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@3x.png" new file mode 100644 index 00000000..607d68a5 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253.imageset/\350\265\236icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/Contents.json" deleted file mode 100644 index 41b02c2f..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "手势识别_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/\346\211\213\345\212\277\350\257\206\345\210\253_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/\346\211\213\345\212\277\350\257\206\345\210\253_selected@2x.png" deleted file mode 100644 index fe64eeab..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\346\211\213\345\212\277\350\257\206\345\210\253_selected.imageset/\346\211\213\345\212\277\350\257\206\345\210\253_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/Contents.json" index 8d4ce9b4..dd3e90a7 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "换脸icon .png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "换脸@2x.png", + "filename" : "换脸icon @2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "换脸icon @3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270@2x.png" deleted file mode 100644 index c4d7f840..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon .png" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon .png" new file mode 100644 index 00000000..35bd441f Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon .png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @2x.png" new file mode 100644 index 00000000..2affc3a9 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @3x.png" new file mode 100644 index 00000000..5c222529 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270.imageset/\346\215\242\350\204\270icon @3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/Contents.json" deleted file mode 100644 index b9bfb340..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "换脸_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/\346\215\242\350\204\270_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/\346\215\242\350\204\270_selected@2x.png" deleted file mode 100644 index 0f23a5c7..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\346\215\242\350\204\270_selected.imageset/\346\215\242\350\204\270_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/Contents.json" index c1a210df..a79e5479 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "美颜icon .png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "美颜@2x.png", + "filename" : "美颜icon @2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "美颜icon @3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234@2x.png" deleted file mode 100644 index 15976491..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon .png" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon .png" new file mode 100644 index 00000000..1984d9f3 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon .png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @2x.png" new file mode 100644 index 00000000..0cf3a434 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @3x.png" new file mode 100644 index 00000000..0027656f Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234.imageset/\347\276\216\351\242\234icon @3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/Contents.json" deleted file mode 100644 index ff378e16..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "美颜_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/\347\276\216\351\242\234_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/\347\276\216\351\242\234_selected@2x.png" deleted file mode 100644 index 3dcd4829..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\347\276\216\351\242\234_selected.imageset/\347\276\216\351\242\234_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/Contents.json" index 5f50b4f8..1fc956eb 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "背景图片icon .png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "背景分割灰.png", + "filename" : "背景图片icon @2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "背景图片icon @3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\347\201\260.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\347\201\260.png" deleted file mode 100644 index c0c8754d..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\347\201\260.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon .png" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon .png" new file mode 100644 index 00000000..54cfd976 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon .png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @2x.png" new file mode 100644 index 00000000..40e57ea0 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @3x.png" new file mode 100644 index 00000000..744f2948 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262.imageset/\350\203\214\346\231\257\345\233\276\347\211\207icon @3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/Contents.json" deleted file mode 100644 index f665a7e6..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "背景分割蓝.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\350\223\235.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\350\223\235.png" deleted file mode 100644 index 5db62e14..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\350\203\214\346\231\257\345\210\206\345\211\262_selected.imageset/\350\203\214\346\231\257\345\210\206\345\211\262\350\223\235.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/Contents.json" index 14c65e32..4fd37790 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "表情识别icon .png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "表情识别@2x.png", + "filename" : "表情识别icon @2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "表情识别icon @3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253@2x.png" deleted file mode 100644 index f1111060..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon .png" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon .png" new file mode 100644 index 00000000..9c2fa099 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon .png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @2x.png" new file mode 100644 index 00000000..2affa017 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @3x.png" new file mode 100644 index 00000000..7edf61ca Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253.imageset/\350\241\250\346\203\205\350\257\206\345\210\253icon @3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/Contents.json" deleted file mode 100644 index 41b5256f..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "表情识别_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/\350\241\250\346\203\205\350\257\206\345\210\253_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/\350\241\250\346\203\205\350\257\206\345\210\253_selected@2x.png" deleted file mode 100644 index 4d52f527..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\350\241\250\346\203\205\350\257\206\345\210\253_selected.imageset/\350\241\250\346\203\205\350\257\206\345\210\253_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/Contents.json" index d7e6bdad..d0e89814 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "道具贴纸icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "道具贴纸@2x.png", + "filename" : "道具贴纸icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "道具贴纸icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270@2x.png" deleted file mode 100644 index eb5538db..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon.png" new file mode 100644 index 00000000..5d44df32 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@2x.png" new file mode 100644 index 00000000..757a8bd2 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@3x.png" new file mode 100644 index 00000000..685777c8 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270.imageset/\351\201\223\345\205\267\350\264\264\347\272\270icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/Contents.json" deleted file mode 100644 index 106ae775..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "道具贴纸_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/\351\201\223\345\205\267\350\264\264\347\272\270_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/\351\201\223\345\205\267\350\264\264\347\272\270_selected@2x.png" deleted file mode 100644 index 3a47224d..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\351\201\223\345\205\267\350\264\264\347\272\270_selected.imageset/\351\201\223\345\205\267\350\264\264\347\272\270_selected@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/Contents.json" index a40beec2..355b97f7 100644 --- "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/Contents.json" +++ "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/Contents.json" @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", + "filename" : "音乐滤镜icon.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "音乐滤镜@2x.png", + "filename" : "音乐滤镜icon@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "音乐滤镜icon@3x.png", "scale" : "3x" } ], diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234@2x.png" deleted file mode 100644 index 771ddb33..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234@2x.png" and /dev/null differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon.png" new file mode 100644 index 00000000..500ac631 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@2x.png" new file mode 100644 index 00000000..5e11924d Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@2x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@3x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@3x.png" new file mode 100644 index 00000000..2edd49e2 Binary files /dev/null and "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234.imageset/\351\237\263\344\271\220\346\273\244\351\225\234icon@3x.png" differ diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/Contents.json" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/Contents.json" deleted file mode 100644 index 159187ff..00000000 --- "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/Contents.json" +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "音乐滤镜_selected@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/\351\237\263\344\271\220\346\273\244\351\225\234_selected@2x.png" "b/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/\351\237\263\344\271\220\346\273\244\351\225\234_selected@2x.png" deleted file mode 100644 index e13b336c..00000000 Binary files "a/FULiveDemo/Assets.xcassets/homeview/\351\237\263\344\271\220\346\273\244\351\225\234_selected.imageset/\351\237\263\344\271\220\346\273\244\351\225\234_selected@2x.png" and /dev/null differ diff --git a/FULiveDemo/Base.lproj/LaunchScreen.storyboard b/FULiveDemo/Base.lproj/LaunchScreen.storyboard index 3606483b..ea8052e7 100644 --- a/FULiveDemo/Base.lproj/LaunchScreen.storyboard +++ b/FULiveDemo/Base.lproj/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/FULiveDemo/Base.lproj/Main.storyboard b/FULiveDemo/Base.lproj/Main.storyboard index 0717755a..c036fcec 100644 --- a/FULiveDemo/Base.lproj/Main.storyboard +++ b/FULiveDemo/Base.lproj/Main.storyboard @@ -1,16 +1,17 @@ - + + - + @@ -19,86 +20,131 @@ - + - - + + - + - + - + - - - - - - + + - - + + - - - - - - + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - + + + + + + - + - + - - + - - + + + - + @@ -106,7 +152,7 @@ - + @@ -117,21 +163,21 @@ - + - + + - - + - + @@ -233,7 +289,7 @@ @@ -262,6 +318,7 @@ + @@ -269,11 +326,11 @@ - + - + @@ -337,12 +394,12 @@ - + - + @@ -358,10 +415,13 @@ + + - + + diff --git a/FULiveDemo/FURenderViewController.m b/FULiveDemo/FURenderViewController.m index 0404b617..8d6e8428 100644 --- a/FULiveDemo/FURenderViewController.m +++ b/FULiveDemo/FURenderViewController.m @@ -34,6 +34,7 @@ @interface FURenderViewController ()1 LSRequiresIPhoneOS - UIFileSharingEnabled - NSCameraUsageDescription 请授权访问您的相机 + NSMicrophoneUsageDescription + 请授权访问您的麦克风 NSPhotoLibraryAddUsageDescription 请授权访问您的相册 NSPhotoLibraryUsageDescription 请授权访问您的相册 - NSMicrophoneUsageDescription - 请授权访问您的麦克风 - UILaunchStoryboardName - LaunchScreen + UIFileSharingEnabled + UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/FULiveDemo/Tool/FUManager.h b/FULiveDemo/Tool/FUManager.h index 9bb5a69a..21a4036a 100755 --- a/FULiveDemo/Tool/FUManager.h +++ b/FULiveDemo/Tool/FUManager.h @@ -46,6 +46,8 @@ + (FUManager *)shareManager; +// 默认美颜参数 +- (void)setBeautyDefaultParameters ; /**初始化Faceunity,加载道具*/ - (void)loadItems; diff --git a/FULiveDemo/Tool/FUManager.m b/FULiveDemo/Tool/FUManager.m index 9b143ef2..56c3c6c2 100755 --- a/FULiveDemo/Tool/FUManager.m +++ b/FULiveDemo/Tool/FUManager.m @@ -11,6 +11,7 @@ #import "authpack.h" #import "FULiveModel.h" #import +#import #import "FUMusicPlayer.h" @interface FUManager () @@ -20,8 +21,13 @@ @interface FUManager () int frameID; NSDictionary *hintDic; + NSDictionary *alertDic ; } + +// 用于设置默认人脸识别朝向 +@property (nonatomic, strong) CMMotionManager *motionManager; +@property (nonatomic) int deviceOrientation; @end static FUManager *shareManager = NULL; @@ -60,7 +66,7 @@ - (instancetype)init NSLog(@"fuLoadExtendedARData %@",res1 == 0 ? @"failure":@"success" ); - [self setDefaultParameters]; + [self setBeautyDefaultParameters]; NSLog(@"faceunitySDK version:%@",[FURenderer getVersion]); @@ -88,6 +94,17 @@ - (instancetype)init [self loadItemDataSource]; + // 初始化陀螺仪 + self.motionManager = [[CMMotionManager alloc] init]; + self.motionManager.accelerometerUpdateInterval = 0.5;// 1s刷新一次 + + if ([self.motionManager isDeviceMotionAvailable]) { + [self.motionManager startAccelerometerUpdates]; + } + + // 默认竖屏 + self.deviceOrientation = 0 ; + fuSetDefaultOrientation(self.deviceOrientation) ; } return self; @@ -109,7 +126,6 @@ - (void)loadItemDataSource { model.title = itemName ; model.maxFace = [dict[@"maxFace"] integerValue] ; model.enble = NO; - model.imageName = itemName ; model.type = [dict[@"itemType"] integerValue]; model.modules = dict[@"modules"] ; model.items = dict[@"items"] ; @@ -125,9 +141,9 @@ - (void)loadItemDataSource { for (FULiveModel *model in modesArray) { model.enble = YES ; - model.imageName = [model.title stringByAppendingString:@"_selected"]; [_dataSource addObject:model] ; } + return ; } @@ -151,7 +167,6 @@ - (void)loadItemDataSource { [_dataSource removeObject:model]; model.enble = YES ; - model.imageName = [model.title stringByAppendingString:@"_selected"]; [_dataSource insertObject:model atIndex:insertIndex] ; insertIndex ++ ; @@ -159,12 +174,11 @@ - (void)loadItemDataSource { break ; } } - } } /*设置默认参数*/ -- (void)setDefaultParameters { +- (void)setBeautyDefaultParameters { self.filtersDataSource = @[@"origin", @"delta", @"electric", @"slowlived", @"tokyo", @"warm"]; @@ -174,25 +188,25 @@ - (void)setDefaultParameters { self.selectedFilter = self.filtersDataSource[0] ; self.selectedFilterLevel = 0.5 ; - self.skinDetectEnable = YES ; - self.blurShape = 0 ; - self.blurLevel = 0.7 ; - self.whiteLevel = 0.5 ; - self.redLevel = 0.5 ; + self.skinDetectEnable = YES ;// 精准美肤 + self.blurShape = 0 ; // 朦胧磨皮 1 ，清晰磨皮 0 + self.blurLevel = 0.7 ; // 磨皮， 实际设置的时候 x6 + self.whiteLevel = 0.5 ; // 美白 + self.redLevel = 0.5 ; // 红润 - self.eyelightingLevel = 0.7 ; - self.beautyToothLevel = 0.7 ; + self.eyelightingLevel = 0.7 ; // 亮眼 + self.beautyToothLevel = 0.7 ; // 美牙 - self.faceShape = 4 ; - self.enlargingLevel = 0.4 ; - self.thinningLevel = 0.4 ; + self.faceShape = 4 ; // 脸型 + self.enlargingLevel = 0.4 ; // 大眼 + self.thinningLevel = 0.4 ; // 瘦脸 - self.enlargingLevel_new = 0.4 ; - self.thinningLevel_new = 0.4 ; - self.jewLevel = 0.3 ; - self.foreheadLevel = 0.3 ; - self.noseLevel = 0.5 ; - self.mouthLevel = 0.4 ; + self.enlargingLevel_new = 0.4 ; // 大眼 + self.thinningLevel_new = 0.4 ; // 瘦脸 + self.jewLevel = 0.3 ; // 下巴 + self.foreheadLevel = 0.3 ; // 额头 + self.noseLevel = 0.5 ; // 鼻子 + self.mouthLevel = 0.4 ; // 嘴 self.enableGesture = NO; self.enableMaxFaces = NO; @@ -262,8 +276,7 @@ - (void)destoryItems [FURenderer OnDeviceLost]; // /**销毁道具后，重置默认参数*/ -// [self setDefaultParameters]; - +// [self setBeautyDefaultParameters]; } /** @@ -281,7 +294,6 @@ - (NSString *)alertForItem:(NSString *)item { return alertDic[item] ; } - - (void)setCalibrating { fuSetExpressionCalibration(1) ; @@ -299,7 +311,6 @@ - (BOOL)isCalibrating{ return is_calibrating[0] == 1.0; } - - (void)loadAnimojiFaxxBundle { /**先创建道具句柄*/ NSString *path = [[NSBundle mainBundle] pathForResource:@"fxaa.bundle" ofType:nil]; @@ -323,6 +334,7 @@ - (void)destoryAnimojiFaxxBundle { [FURenderer destroyItem:items[3]]; items[3] = 0 ; } + } #pragma -Faceunity Load Data @@ -348,6 +360,9 @@ - (void)loadItem:(NSString *)itemName [FURenderer itemSetParam:itemHandle withName:@"isFlipExpr" value:@(1)]; } + if ([itemName isEqualToString:@"luhantongkuan_ztt_fu"]) { + [FURenderer itemSetParam:itemHandle withName:@"flip_action" value:@(1)]; + } /**将刚刚创建的句柄存放在items[1]中*/ items[1] = itemHandle; }else{ @@ -416,6 +431,29 @@ - (void)setBeautyParams { /**将道具绘制到pixelBuffer*/ - (CVPixelBufferRef)renderItemsToPixelBuffer:(CVPixelBufferRef)pixelBuffer { + // 在未识别到人脸时根据重力方向设置人脸检测方向 + if (![FURenderer isTracking]) { + + CMAcceleration acceleration = self.motionManager.accelerometerData.acceleration ; + + int orientation = 0; + if (acceleration.x >= 0.75) { + orientation = 3; + } else if (acceleration.x <= -0.75) { + orientation = 1; + } else if (acceleration.y <= -0.75) { + orientation = 0; + } else if (acceleration.y >= 0.75) { + orientation = 2; + } + + if (self.deviceOrientation != orientation) { + self.deviceOrientation = orientation ; + + fuSetDefaultOrientation(self.deviceOrientation) ; + } + } + /**设置美颜参数*/ [self setBeautyParams]; diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/Assets.car b/FULiveDemo/View/FUAPIDemoBar.framework/Assets.car index e64eaa8a..f4569668 100644 Binary files a/FULiveDemo/View/FUAPIDemoBar.framework/Assets.car and b/FULiveDemo/View/FUAPIDemoBar.framework/Assets.car differ diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/FUAPIDemoBar b/FULiveDemo/View/FUAPIDemoBar.framework/FUAPIDemoBar index 7f34c3f0..befb532d 100755 Binary files a/FULiveDemo/View/FUAPIDemoBar.framework/FUAPIDemoBar and b/FULiveDemo/View/FUAPIDemoBar.framework/FUAPIDemoBar differ diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/FUDemoBar.nib b/FULiveDemo/View/FUAPIDemoBar.framework/FUDemoBar.nib index 834dbd26..524d6c94 100644 Binary files a/FULiveDemo/View/FUAPIDemoBar.framework/FUDemoBar.nib and b/FULiveDemo/View/FUAPIDemoBar.framework/FUDemoBar.nib differ diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/Headers/DemoBarType.h b/FULiveDemo/View/FUAPIDemoBar.framework/Headers/DemoBarType.h new file mode 100644 index 00000000..5d4d8afe --- /dev/null +++ b/FULiveDemo/View/FUAPIDemoBar.framework/Headers/DemoBarType.h @@ -0,0 +1,19 @@ +// +// DemoBarType.h +// FUAPIDemoBar +// +// Created by L on 2018/5/2. +// Copyright © 2018年 L. All rights reserved. +// + + +typedef NS_ENUM(NSInteger, FUAPIDemoBarType) { + FUAPIDemoBarTypeCommon, // 普通模式 + FUAPIDemoBarTypePerformance, // 性能优先 +}; + + +typedef NS_ENUM(NSInteger, BeautyViewType) { + BeautyViewTypeSkin = 1,// 美肤 + BeautyViewTypeShape = 2,// 美型 +}; diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/Headers/FUAPIDemoBar.h b/FULiveDemo/View/FUAPIDemoBar.framework/Headers/FUAPIDemoBar.h index d44ff60e..9acc0a31 100644 --- a/FULiveDemo/View/FUAPIDemoBar.framework/Headers/FUAPIDemoBar.h +++ b/FULiveDemo/View/FUAPIDemoBar.framework/Headers/FUAPIDemoBar.h @@ -2,11 +2,12 @@ // FUAPIDemoBar.h // FUAPIDemoBar // -// Created by 刘洋 on 2017/1/10. -// Copyright © 2017年 刘洋. All rights reserved. +// Created by L on 2018/4/12. +// Copyright © 2018年 L. All rights reserved. // #import +#import "DemoBarType.h" //! Project version number for FUDemoBar. FOUNDATION_EXPORT double FUDemoBarVersionNumber; @@ -17,10 +18,11 @@ FOUNDATION_EXPORT const unsigned char FUDemoBarVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import - @protocol FUAPIDemoBarDelegate @optional +- (void)demoBarDidSelectedItem:(NSString *)itemName; + - (void)demoBarDidSelectedFilter:(NSString *)filter; - (void)demoBarBeautyParamChanged; @@ -34,6 +36,7 @@ FOUNDATION_EXPORT const unsigned char FUDemoBarVersionString[]; @property (nonatomic, assign) iddelegate ; +@property (nonatomic, assign) FUAPIDemoBarType demoBarType ; @property (nonatomic, assign) BOOL skinDetectEnable ; // 精准美肤 @@ -56,6 +59,8 @@ FOUNDATION_EXPORT const unsigned char FUDemoBarVersionString[]; @property (nonatomic, assign) double noseLevel; /**鼻子 (0~1)*/ @property (nonatomic, assign) double mouthLevel; /**嘴型 (0~1)*/ +@property (nonatomic, strong) NSArray *itemsDataSource ; /**道具名称数组*/ +@property (nonatomic, copy) NSString *selectedItem ; /**选中的道具名称*/ @property (nonatomic, strong) NSArray *filtersDataSource; /**滤镜名称数组*/ @property (nonatomic, strong) NSArray *beautyFiltersDataSource; /**美颜滤镜名称数组*/ diff --git a/FULiveDemo/View/FUAPIDemoBar.framework/Info.plist b/FULiveDemo/View/FUAPIDemoBar.framework/Info.plist index 20d98fe6..be5448d0 100644 Binary files a/FULiveDemo/View/FUAPIDemoBar.framework/Info.plist and b/FULiveDemo/View/FUAPIDemoBar.framework/Info.plist differ diff --git a/FULiveDemo/View/FULiveCell.h b/FULiveDemo/View/FULiveCell.h index c39d0fa1..638cedd2 100644 --- a/FULiveDemo/View/FULiveCell.h +++ b/FULiveDemo/View/FULiveCell.h @@ -15,4 +15,5 @@ @property (weak, nonatomic) IBOutlet UIImageView *image; @property (weak, nonatomic) IBOutlet UILabel *title; +@property (weak, nonatomic) IBOutlet UIImageView *bottomImage; @end diff --git a/FULiveDemo/View/FULiveCell.m b/FULiveDemo/View/FULiveCell.m index 93d44b40..13261ef5 100644 --- a/FULiveDemo/View/FULiveCell.m +++ b/FULiveDemo/View/FULiveCell.m @@ -15,7 +15,6 @@ -(instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) { - self.backgroundColor = [UIColor clearColor]; } return self ; } @@ -25,8 +24,8 @@ -(void)setModel:(FULiveModel *)model { _model = model ; self.title.text = _model.title ; - self.title.textColor = _model.enble ? [UIColor colorWithRed:97.0/255.0 green:202.0/255.0 blue:244.0/255.0 alpha:1.0] : [UIColor colorWithRed:168.0/255.0 green:168.0/255.0 blue:168.0/255.0 alpha:1.0]; - self.image.image = [UIImage imageNamed:_model.imageName]; + self.image.image = [UIImage imageNamed:_model.title]; + self.bottomImage.image = _model.enble ? [UIImage imageNamed:@"bottomImage"] : [UIImage imageNamed:@"bottomImage_gray"] ; } @end diff --git a/FULiveDemo/View/FULiveModel.h b/FULiveDemo/View/FULiveModel.h index 8720125a..96000025 100644 --- a/FULiveDemo/View/FULiveModel.h +++ b/FULiveDemo/View/FULiveModel.h @@ -25,8 +25,6 @@ typedef NS_ENUM(NSUInteger, FULiveModelType) { @interface FULiveModel : NSObject -@property (nonatomic, copy) NSString *imageName ; - @property (nonatomic, assign) NSInteger maxFace ; @property (nonatomic, copy) NSString *title ; diff --git a/FULiveDemo/ViewController.m b/FULiveDemo/ViewController.m index f049d313..9cce3380 100644 --- a/FULiveDemo/ViewController.m +++ b/FULiveDemo/ViewController.m @@ -21,16 +21,15 @@ @interface ViewController () @implementation ViewController -- (BOOL)prefersStatusBarHidden -{ - return YES; +-(UIStatusBarStyle)preferredStatusBarStyle { + + return UIStatusBarStyleLightContent ; } + - (void)viewDidLoad { [super viewDidLoad]; -// [[FUManager shareManager] loadItems]; - self.dataArray = [FUManager shareManager].dataSource; } @@ -52,11 +51,25 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection return cell; } +#pragma mark --- UICollectionViewDelegateFlowLayout +- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath { + if (kind == UICollectionElementKindSectionHeader) { + return [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"FUHeader" forIndexPath:indexPath]; + } + return nil ; +} #pragma mark --- UICollectionViewDelegateFlowLayout - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { - return CGSizeMake((self.collection.frame.size.width - 20 * 4)/3.0 - 1, (self.collection.frame.size.width - 20 * 4)/3.0 + 12 ) ; + + CGFloat width = (self.view.frame.size.width - 72 )/ 3.0 ; + + return CGSizeMake(width, width / 101.0 * 122 ) ; +} + +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section { + return CGSizeMake(self.view.frame.size.width, self.view.frame.size.width / 375.0 * 212) ; } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { diff --git a/Nama-lite.podspec b/Nama-lite.podspec index 16e1f0ef..5a634433 100755 --- a/Nama-lite.podspec +++ b/Nama-lite.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = 'Nama-lite' - s.version = '5.0' + s.version = '5.1.0' s.license = 'MIT' - s.summary = 'faceunity nama v5.0-dev-lite' + s.summary = 'faceunity nama v5.1.0-dev-lite' s.homepage = 'https://www.faceunity.com' s.author = { 'faceunity' => 'dev@faceunity.com' } s.platform = :ios, "8.0" - s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.0-dev-fix' } + s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.1.0-dev' } s.source_files = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/**/*.{h,m}' s.resources = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/**/*.{bundle}' s.ios.vendored_library = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS-lite/libnama.a' diff --git a/Nama.podspec b/Nama.podspec index 50e92613..cd4c6c27 100755 --- a/Nama.podspec +++ b/Nama.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = 'Nama' - s.version = '5.0' + s.version = '5.1.0' s.license = 'MIT' - s.summary = 'faceunity nama v5.0-dev' + s.summary = 'faceunity nama v5.1.0-dev' s.homepage = 'https://github.com/Faceunity/FULiveDemo/tree/dev' s.author = { 'faceunity' => 'dev@faceunity.com' } s.platform = :ios, "8.0" - s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.0-dev-fix' } + s.source = { :git => 'https://github.com/Faceunity/FULiveDemo.git', :tag => 'v5.1.0-dev' } s.source_files = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/**/*.{h,m}' s.resources = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/**/*.{bundle}' s.ios.vendored_library = 'FULiveDemo/Faceunity/FaceUnity-SDK-iOS/libnama.a' diff --git a/README.md b/README.md index 811a5577..0a5a1475 100644 --- a/README.md +++ b/README.md @@ -4,23 +4,13 @@ FULiveDemo 是集成了 Faceunity 面部跟踪、美颜、Animoji、道具贴纸 注：第一运行Demo会报缺少证书的 error ,如果您已拥有我司颁发的证书，将证书替换到工程中重新运行即可。如您还没有我司颁发的证书，可以查看[这里](https://github.com/Faceunity/FULiveDemo/tree/dev#%E5%AF%BC%E5%85%A5%E8%AF%81%E4%B9%A6)获取证书 -## SDK v5.0 更新 +## SDK v5.1 更新 更新内容 -- 新增高级美颜功能 -- 新增精细脸型调整功能 -- 新增3D绘制抗锯齿功能 -- 新增照片驱动功能 -- 新增人脸夸张变形功能 -- 新增音乐节奏滤镜 -- 新增被动表情校准模式 -- 优化手势识别 -- 人脸跟踪底层性能进一步优化 -- 性能优化 -- 其他累积问题修复、接口调整 - -具体更新内容可以到[这里](https://github.com/Faceunity/FULiveDemo/blob/dev/docs/FUNama%20SDK%20v5.0%20%E6%9B%B4%E6%96%B0%E6%96%87%E6%A1%A3.md)查看详细文档。 +- 修复FXAA和自定义滤镜的兼容问题 +- 修复背景分割的道具在iPhone 5s上crash问题 +- 新增道具不加上自定义滤镜效果功能 ## 软件需求 @@ -38,11 +28,11 @@ FULiveDemo 是集成了 Faceunity 面部跟踪、美颜、Animoji、道具贴纸 含有深度学习的版本： - pod 'Nama', '5.0' #注意此版本目前为dev版 + pod 'Nama', '5.1' #注意此版本目前为dev版 不含深度学习的版本（lite版）： - pod 'Nama-lite', '5.0' #注意此版本目前为dev版 + pod 'Nama-lite', '5.1' #注意此版本目前为dev版 接下来执行： @@ -54,9 +44,9 @@ FULiveDemo 是集成了 Faceunity 面部跟踪、美颜、Animoji、道具贴纸 ### 二、通过 github 下载集成 -含有深度学习的版本：[FaceUnity-SDK-iOS-v5.0-dev.zip](https://github.com/Faceunity/FULiveDemo/releases/download/v5.0-dev-fix/FaceUnity-SDK-iOS-v5.0-dev.zip) +含有深度学习的版本：[FaceUnity-SDK-iOS-v5.1-dev.zip](https://github.com/Faceunity/FULiveDemo/releases/download/v5.1-dev/FaceUnity-SDK-iOS-v5.1-dev.zip) -不含深度学习的版本（lite版）：[FaceUnity-SDK-iOS-v5.0-dev-lite.zip](https://github.com/Faceunity/FULiveDemo/releases/download/v5.0-dev-fix/FaceUnity-SDK-iOS-v5.0-dev-lite.zip) +不含深度学习的版本（lite版）：[FaceUnity-SDK-iOS-v5.1-dev-lite.zip](https://github.com/Faceunity/FULiveDemo/releases/download/v5.1-dev/FaceUnity-SDK-iOS-v5.1-dev-lite.zip) 下载完成并解压后将库文件夹拖入到工程中，并勾选上 Copy items if needed，如图：