diff --git a/FULiveDemo.xcodeproj/project.pbxproj b/FULiveDemo.xcodeproj/project.pbxproj index 5ce2db73..03377d3d 100644 --- a/FULiveDemo.xcodeproj/project.pbxproj +++ b/FULiveDemo.xcodeproj/project.pbxproj @@ -2605,7 +2605,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 65; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 35A6KD62ZJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -2650,7 +2650,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 65; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 35A6KD62ZJ; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit b/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit index 73bc1d75..d2946a2d 100755 Binary files a/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit and b/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit differ diff --git "a/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" "b/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" index 850bc3bf..6d57b56f 100644 --- "a/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" +++ "b/FULiveDemo/FURenderKit/FURenderKit.framework/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" @@ -4,7 +4,7 @@ ### 通过cocoapods集成 ``` -pod 'FURenderKit', '8.3.1' +pod 'FURenderKit' ``` 接下来执行： @@ -338,6 +338,33 @@ AI能力相关的功能都通过FUAIKit 加载或获取 /// @param type AI 识别类型 + (void)setTrackFaceAIType:(FUAITYPE)type; +/// 对输入的图像进行 AI 识别，支持人脸、身体、手指能类型的识别 ++ (int)trackFaceWithInput:(FUTrackFaceInput *)trackFaceInput; + +/// 图像明显发生改变时调用该接口重置内部检测结果 ++ (void)resetTrackedResult; + +/// 跟踪到的人脸数量 ++ (int)aiFaceProcessorNums; + +/// 设置面部参数 ++ (void)setFaceTrackParam:(NSString *)param value:(int)value; + +/// 获取人脸信息： ++ (int)getFaceInfo:(int)faceId + name:(NSString *)name + pret:(float *)pret + number:(int)number; + +/// 设置了InputCameraMatrix之后获取获取人脸信息 ++ (int)getRotatedFaceInfo:(int)faceId + name:(NSString *)name + pret:(float *)pret + number:(int)number; + +/// 人脸检测置信度 ++ (float)fuFaceProcessorGetConfidenceScore:(int)index; + /// 设置跟踪到人脸时每次检测的间隔帧数 /// @param frames 帧数 /// @note 底层默认间隔帧数为7 @@ -348,33 +375,32 @@ AI能力相关的功能都通过FUAIKit 加载或获取 /// @note 底层默认间隔帧数为7 + (void)setFaceProcessorDetectEveryFramesWhenNoFace:(int)frames; -/// 对输入的图像进行 AI 识别，支持人脸、身体、手指能类型的识别 -+ (int)trackFaceWithInput:(FUTrackFaceInput *)trackFaceInput; - -/// 重置身体识别 -+ (void)resetHumanProcessor; +/// 设置人脸离开延迟打开或关闭 +/// @param enable YES为打开 NO为关闭 ++ (void)setFaceDelayLeaveEnable:(BOOL)enable; /// 跟踪到的人体数量 + (int)aiHumanProcessorNums; -/// 跟踪到的人脸数量 -+ (int)aiFaceProcessorNums; +/// 重置身体识别 ++ (void)resetHumanProcessor; -/// 人脸检测置信度 -+ (float)fuFaceProcessorGetConfidenceScore:(int)index; +/// 设置人体分割场景类型 ++ (void)setHumanSegmentationSceneType:(FUHumanSegmentationSceneType)type; -/// ai手势识别 +/// 跟踪到的手势数量 + (int)aiHandDistinguishNums; -/// 手势识别：获取手势类型 +/// 获取手势类型 /// @param handIndex aiHandDistinguishNums返回手的索引 + (FUAIGESTURETYPE)fuHandDetectorGetResultGestureType:(int)handIndex; +/// 设置未跟踪到手势时每次检测的间隔帧数 +/// @param frames 帧数 ++ (void)setHandDetectEveryFramesWhenNoHand:(int)frames; + /// 动作识别： actionId index of fuHumanProcessorGetNumResults + (int)fuHumanProcessorGetResultActionType:(int)actionId; - -/// 设置面部参数 -+ (void)setFaceTrackParam:(NSString *)param value:(int)value; ``` 其他接口参考 FUAIKit.h @@ -408,7 +434,7 @@ beauty.filterName = FUFilterOrigin; beauty.colorLevel = 0.3; beauty.redLevel = 0.3; -beauty.blurLevel = 0.7*6; +beauty.blurLevel = 4.2; beauty.heavyBlur = 0; beauty.blurType = 3; @@ -422,6 +448,7 @@ beauty.removeNasolabialFoldsStrength = 0.0; beauty.faceShapeLevel = 1.0; beauty.changeFrames = 0; beauty.faceShape = 4; +beauty.faceThreed = 0.0; beauty.eyeEnlarging = 0.4; beauty.cheekThinning = 0.0; @@ -444,6 +471,10 @@ beauty.intensityLowerJaw= 0.0; beauty.intensityEyeCircle = 0.0; beauty.intensityBrowHeight = 0.5; beauty.intensityBrowSpace = 0.5; +beauty.intensityEyeLid = 0.0; +beauty.intensityEyeHeight = 0.5; +beauty.intensityBrowThick = 0.5; +beauty.intensityLipThick = 0.5; ``` @@ -467,47 +498,55 @@ FUSticker *sticker1 = [[FUSticker alloc] initWithPath:path1 name:@"sticker"]; [[FURenderKit shareRenderKit].stickerContainer removeSticker:sticker1]; ``` -带属性的特殊贴纸说明: +### 人像分割 + +初始化一个FUAISegment的实例，修改好参数后可以直接赋值给 FURenderKit或者也可以参考贴纸的方式加入stickerContainer中；修改属性示例如下，属性对应的含义详见FUAISegment.h 注释： ```objective-c -1. 人像分割 FUAISegment - 外轮廓bundle 的用法 -NSString *path = [[NSBundle mainBundle] pathForResource:@"human_outline" ofType:@"bundle"]; -FUAISegment *outline = [FUAISegment alloc] initWithPath:path name:@"sticker"]; +1. 外轮廓bundle的用法 +NSString *path = [[NSBundle mainBundle] pathForResource:@"human_outline_740" ofType:@"bundle"]; +FUAISegment *outline = [FUAISegment alloc] initWithPath:path name:@"human_outline"]; outline.lineGap = 2.8; //轮廓分割线和人之间的间距 outline.lineSize = 2.8; //轮廓分割线宽度 outline.lineColor = FUColorMake(255/255.0, 180/255.0, 0.0, 0.0); //线的颜色 -[[FURenderKit shareRenderKit].stickerContainer addSticker:outline]; +[FURenderKit shareRenderKit].segmentation = outline; -1. 人像分割 FUAISegment - 自定义背景视频 +2. 自定义背景视频的用法 NSString *path = [[NSBundle mainBundle] pathForResource:@"bg_segment" ofType:@"bundle"]; -FUAISegment *segment = [FUAISegment alloc] initWithPath:path name:@"sticker"]; +FUAISegment *segment = [FUAISegment alloc] initWithPath:path name:@"bg_segment"]; segment.videoPath = @“背景视频路径”;//NSURL or NSString [segment startVideoDecode]; -//获取视频解析的第一帧图片 -UIImage *image = [segment readFirstFrame]; -[[FURenderKit shareRenderKit].stickerContainer replaceSticker:outline withSticker:segment completion:nil]; +[FURenderKit shareRenderKit].segmentation = segment; -1. 人像分割 FUAISegment - 自定义背景照片 +3. 自定义背景照片的用法 segment.setBackgroundImage = @"自定义图片"; -2. FUAnimoji - 表情 -NSString *path = [[NSBundle mainBundle] pathForResource:@"animoji" ofType:@"bundle"]; -FUAnimoji *animoji = [FUAnimoji alloc] initWithPath:path name:@"animoji"]; -animoji.flowEnable = YES; //卡通表情是否跟随人物移动而移动， YES，跟随， NO 不跟随 +``` -3. FUGesture -- 手势 -NSString *path = [[NSBundle mainBundle] pathForResource:@"fugesture" ofType:@"bundle"]; -FUGesture *gesture = [FUGesture alloc] initWithPath:path name:@"animoji"]; -gesture.handOffY = YES; //可以单独调整比心的偏移量，> 0 向上，< 0 向下 +### 音乐滤镜 + +初始化一个FUMusicFilter的实例，修改好参数后可以直接赋值给 FURenderKit或者也可以参考贴纸的方式加入stickerContainer中；修改属性示例如下，属性对应的含义详见FUMusicFilter.h 注释： -4. FUMusicFilter - 音乐滤镜 +```objective-c NSString *path = [[NSBundle mainBundle] pathForResource:@"music" ofType:@"bundle"]; FUMusicFilter *music = [FUMusicFilter alloc] initWithPath:path name:@"music"]; music.musicPath = "音乐文件路径"; +[FURenderKit shareRenderKit].musicFilter = music; ``` -带属性的特殊贴纸说明: +### 其他带属性的特殊贴纸说明 + +```objective-c +1. FUAnimoji - 表情 +NSString *path = [[NSBundle mainBundle] pathForResource:@"animoji" ofType:@"bundle"]; +FUAnimoji *animoji = [FUAnimoji alloc] initWithPath:path name:@"animoji"]; +animoji.flowEnable = YES; //卡通表情是否跟随人物移动而移动， YES，跟随， NO 不跟随 +2. FUGesture -- 手势 +NSString *path = [[NSBundle mainBundle] pathForResource:@"fugesture" ofType:@"bundle"]; +FUGesture *gesture = [FUGesture alloc] initWithPath:path name:@"animoji"]; +gesture.handOffY = YES; //可以单独调整比心的偏移量，> 0 向上，< 0 向下 +``` ### 海报换脸 diff --git a/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/FUMakeup.h b/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/FUMakeup.h index 3db229d5..aab8e8b6 100644 --- a/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/FUMakeup.h +++ b/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/FUMakeup.h @@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) BOOL isClearMakeup; /// 美妆分割，YES为开，NO为关，默认NO +/// @note 建议在高端机型中使用 @property (nonatomic, assign) BOOL makeupSegmentation; /// 口红类型 diff --git a/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/UIDevice+FURenderKit.h b/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/UIDevice+FURenderKit.h index 7ec11949..178fd155 100644 --- a/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/UIDevice+FURenderKit.h +++ b/FULiveDemo/FURenderKit/FURenderKit.framework/Headers/UIDevice+FURenderKit.h @@ -49,6 +49,11 @@ typedef NS_ENUM(NSInteger, FUDeviceModelType) { FUDeviceModelTypeiPhone13, FUDeviceModelTypeiPhone13Pro, FUDeviceModelTypeiPhone13ProMax, + FUDeviceModelTypeiPhoneSENew, + FUDeviceModelTypeiPhone14, + FUDeviceModelTypeiPhone14Plus, + FUDeviceModelTypeiPhone14Pro, + FUDeviceModelTypeiPhone14ProMax, FUDeviceModelTypeOthers }; diff --git a/FULiveDemo/FURenderKit/FURenderKit.framework/Info.plist b/FULiveDemo/FURenderKit/FURenderKit.framework/Info.plist index 0639a190..f38b19f3 100644 Binary files a/FULiveDemo/FURenderKit/FURenderKit.framework/Info.plist and b/FULiveDemo/FURenderKit/FURenderKit.framework/Info.plist differ diff --git a/FULiveDemo/FURenderKit/Resources/graphics/body_slim.bundle b/FULiveDemo/FURenderKit/Resources/graphics/body_slim.bundle index 0b2a3a21..729d7e4d 100644 Binary files a/FULiveDemo/FURenderKit/Resources/graphics/body_slim.bundle and b/FULiveDemo/FURenderKit/Resources/graphics/body_slim.bundle differ diff --git a/FULiveDemo/FURenderKit/Resources/graphics/controller_cpp.bundle b/FULiveDemo/FURenderKit/Resources/graphics/controller_cpp.bundle index ec9c102a..ffff1638 100644 Binary files a/FULiveDemo/FURenderKit/Resources/graphics/controller_cpp.bundle and b/FULiveDemo/FURenderKit/Resources/graphics/controller_cpp.bundle differ diff --git a/FULiveDemo/FURenderKit/Resources/graphics/face_beautification.bundle b/FULiveDemo/FURenderKit/Resources/graphics/face_beautification.bundle index f4373a9a..c4f55cb6 100644 Binary files a/FULiveDemo/FURenderKit/Resources/graphics/face_beautification.bundle and b/FULiveDemo/FURenderKit/Resources/graphics/face_beautification.bundle differ diff --git a/FULiveDemo/FURenderKit/Resources/graphics/face_makeup.bundle b/FULiveDemo/FURenderKit/Resources/graphics/face_makeup.bundle index 33a64e22..d6a8c56a 100644 Binary files a/FULiveDemo/FURenderKit/Resources/graphics/face_makeup.bundle and b/FULiveDemo/FURenderKit/Resources/graphics/face_makeup.bundle differ diff --git a/FULiveDemo/Homepage/ViewController/FUHomepageViewController.m b/FULiveDemo/Homepage/ViewController/FUHomepageViewController.m index a4a5d55e..14de8a79 100644 --- a/FULiveDemo/Homepage/ViewController/FUHomepageViewController.m +++ b/FULiveDemo/Homepage/ViewController/FUHomepageViewController.m @@ -220,7 +220,7 @@ - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectio } - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section { - return 20; + return 16; } - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { diff --git a/FULiveDemo/Resource/Animoji/baimao_Animoji.bundle b/FULiveDemo/Resource/Animoji/baimao_Animoji.bundle index 8842179f..0d99f01e 100644 Binary files a/FULiveDemo/Resource/Animoji/baimao_Animoji.bundle and b/FULiveDemo/Resource/Animoji/baimao_Animoji.bundle differ diff --git a/FULiveDemo/Resource/Animoji/douniuquan_Animoji.bundle b/FULiveDemo/Resource/Animoji/douniuquan_Animoji.bundle index b21caeb3..f9d4f699 100644 Binary files a/FULiveDemo/Resource/Animoji/douniuquan_Animoji.bundle and b/FULiveDemo/Resource/Animoji/douniuquan_Animoji.bundle differ diff --git a/FULiveDemo/Resource/Animoji/hashiqi_Animoji.bundle b/FULiveDemo/Resource/Animoji/hashiqi_Animoji.bundle index ddec306d..28804d6a 100644 Binary files a/FULiveDemo/Resource/Animoji/hashiqi_Animoji.bundle and b/FULiveDemo/Resource/Animoji/hashiqi_Animoji.bundle differ diff --git a/FULiveDemo/Resource/Animoji/hetun_Animoji.bundle b/FULiveDemo/Resource/Animoji/hetun_Animoji.bundle index dc33c7a7..e0a14f42 100644 Binary files a/FULiveDemo/Resource/Animoji/hetun_Animoji.bundle and b/FULiveDemo/Resource/Animoji/hetun_Animoji.bundle differ diff --git a/FULiveDemo/Resource/Animoji/huangya_Animoji.bundle b/FULiveDemo/Resource/Animoji/huangya_Animoji.bundle index 33b9ae23..6761b0c7 100644 Binary files a/FULiveDemo/Resource/Animoji/huangya_Animoji.bundle and b/FULiveDemo/Resource/Animoji/huangya_Animoji.bundle differ diff --git a/FULiveDemo/Resource/Animoji/qgirl_Animoji.bundle b/FULiveDemo/Resource/Animoji/qgirl_Animoji.bundle index ef7997b0..6dde354c 100644 Binary files a/FULiveDemo/Resource/Animoji/qgirl_Animoji.bundle and b/FULiveDemo/Resource/Animoji/qgirl_Animoji.bundle differ diff --git a/FULiveDemo/Resource/GestureRecognition/ctrl_flower_740.bundle b/FULiveDemo/Resource/GestureRecognition/ctrl_flower_740.bundle index 6851ee41..f13a7bf9 100644 Binary files a/FULiveDemo/Resource/GestureRecognition/ctrl_flower_740.bundle and b/FULiveDemo/Resource/GestureRecognition/ctrl_flower_740.bundle differ diff --git a/FULiveDemo/Resource/GestureRecognition/ctrl_rain_740.bundle b/FULiveDemo/Resource/GestureRecognition/ctrl_rain_740.bundle index d85a48f1..378597a9 100644 Binary files a/FULiveDemo/Resource/GestureRecognition/ctrl_rain_740.bundle and b/FULiveDemo/Resource/GestureRecognition/ctrl_rain_740.bundle differ diff --git a/FULiveDemo/Resource/GestureRecognition/ctrl_snow_740.bundle b/FULiveDemo/Resource/GestureRecognition/ctrl_snow_740.bundle index 79cb0a2e..450cd84a 100644 Binary files a/FULiveDemo/Resource/GestureRecognition/ctrl_snow_740.bundle and b/FULiveDemo/Resource/GestureRecognition/ctrl_snow_740.bundle differ diff --git a/FULiveDemo/Resource/GreenScreen/green_screen_740.bundle b/FULiveDemo/Resource/GreenScreen/green_screen_740.bundle index eebcd72c..c559324f 100644 Binary files a/FULiveDemo/Resource/GreenScreen/green_screen_740.bundle and b/FULiveDemo/Resource/GreenScreen/green_screen_740.bundle differ diff --git a/FULiveDemo/Resource/HairBeauty/hair_gradient.bundle b/FULiveDemo/Resource/HairBeauty/hair_gradient.bundle index 3d71a0e7..f963cc77 100644 Binary files a/FULiveDemo/Resource/HairBeauty/hair_gradient.bundle and b/FULiveDemo/Resource/HairBeauty/hair_gradient.bundle differ diff --git a/FULiveDemo/Resource/HairBeauty/hair_normal.bundle b/FULiveDemo/Resource/HairBeauty/hair_normal.bundle index 7265a7cf..3c1015fc 100644 Binary files a/FULiveDemo/Resource/HairBeauty/hair_normal.bundle and b/FULiveDemo/Resource/HairBeauty/hair_normal.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/bg_segment.bundle b/FULiveDemo/Resource/Segmentation/bg_segment.bundle index a1567688..3bc64f6c 100644 Binary files a/FULiveDemo/Resource/Segmentation/bg_segment.bundle and b/FULiveDemo/Resource/Segmentation/bg_segment.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/boyfriend1_740.bundle b/FULiveDemo/Resource/Segmentation/boyfriend1_740.bundle index 246130c5..5867b338 100644 Binary files a/FULiveDemo/Resource/Segmentation/boyfriend1_740.bundle and b/FULiveDemo/Resource/Segmentation/boyfriend1_740.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/boyfriend2_740.bundle b/FULiveDemo/Resource/Segmentation/boyfriend2_740.bundle index 2bc52c07..d4144dd2 100644 Binary files a/FULiveDemo/Resource/Segmentation/boyfriend2_740.bundle and b/FULiveDemo/Resource/Segmentation/boyfriend2_740.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/boyfriend3_740.bundle b/FULiveDemo/Resource/Segmentation/boyfriend3_740.bundle index 24b8a0a4..44db0f31 100644 Binary files a/FULiveDemo/Resource/Segmentation/boyfriend3_740.bundle and b/FULiveDemo/Resource/Segmentation/boyfriend3_740.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/gufeng_zh_fu.bundle b/FULiveDemo/Resource/Segmentation/gufeng_zh_fu.bundle index dfeed510..47616f6a 100644 Binary files a/FULiveDemo/Resource/Segmentation/gufeng_zh_fu.bundle and b/FULiveDemo/Resource/Segmentation/gufeng_zh_fu.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/hez_ztt_fu.bundle b/FULiveDemo/Resource/Segmentation/hez_ztt_fu.bundle index bdd2fce6..aed4a4c4 100644 Binary files a/FULiveDemo/Resource/Segmentation/hez_ztt_fu.bundle and b/FULiveDemo/Resource/Segmentation/hez_ztt_fu.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/human_outline_740.bundle b/FULiveDemo/Resource/Segmentation/human_outline_740.bundle index bba23202..9422f24a 100644 Binary files a/FULiveDemo/Resource/Segmentation/human_outline_740.bundle and b/FULiveDemo/Resource/Segmentation/human_outline_740.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/ice_lm_fu.bundle b/FULiveDemo/Resource/Segmentation/ice_lm_fu.bundle index 08e64645..25c31fc5 100644 Binary files a/FULiveDemo/Resource/Segmentation/ice_lm_fu.bundle and b/FULiveDemo/Resource/Segmentation/ice_lm_fu.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/sea_lm_fu.bundle b/FULiveDemo/Resource/Segmentation/sea_lm_fu.bundle index 63ef0609..3989dca6 100644 Binary files a/FULiveDemo/Resource/Segmentation/sea_lm_fu.bundle and b/FULiveDemo/Resource/Segmentation/sea_lm_fu.bundle differ diff --git a/FULiveDemo/Resource/Segmentation/xiandai_ztt_fu.bundle b/FULiveDemo/Resource/Segmentation/xiandai_ztt_fu.bundle index 18a33742..6078751e 100644 Binary files a/FULiveDemo/Resource/Segmentation/xiandai_ztt_fu.bundle and b/FULiveDemo/Resource/Segmentation/xiandai_ztt_fu.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/FUMakeupComponentManager.m b/FUMakeupComponent/FUMakeupComponent/FUMakeupComponentManager.m index 67b125a0..cfb3b536 100644 --- a/FUMakeupComponent/FUMakeupComponent/FUMakeupComponentManager.m +++ b/FUMakeupComponent/FUMakeupComponent/FUMakeupComponentManager.m @@ -118,7 +118,7 @@ - (void)combinationMakeupViewDidClickCustomize { - (void)customizedMakeupViewDidClickBack { // 返回组合妆时需要判断子妆是否变化 - if ([self combinationMakeupIsChangedByCustoming]) { + if (self.combinationMakeupViewModel.selectedIndex >= 0 && [self combinationMakeupIsChangedByCustoming]) { [self.combinationMakeupView deselectCurrentCombinationMakeup]; } self.colorPicker.hidden = YES; diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chaomo.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chaomo.bundle index de79a1ce..92202735 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chaomo.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chaomo.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuju.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuju.bundle index 0fe53059..bd40a6db 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuju.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuju.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuqiu.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuqiu.bundle index cb539048..579726da 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuqiu.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/chuqiu.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/diadiatu.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/diadiatu.bundle index 31d40c1b..7c51306e 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/diadiatu.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/diadiatu.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/dongling.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/dongling.bundle index e7c281b6..10963bae 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/dongling.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/dongling.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/gangfeng.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/gangfeng.bundle index 2b2fe51b..6a5a55eb 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/gangfeng.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/gangfeng.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/guofeng.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/guofeng.bundle index df998706..af0e9ca2 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/guofeng.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/guofeng.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hongfeng.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hongfeng.bundle index bcb2c5b2..83ccc712 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hongfeng.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hongfeng.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hunxue.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hunxue.bundle index c9337091..889f11ee 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hunxue.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/hunxue.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/jianling.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/jianling.bundle index a8809b42..81c4b096 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/jianling.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/jianling.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/linjia.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/linjia.bundle index 957e74fa..7074b367 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/linjia.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/linjia.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/nuandong.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/nuandong.bundle index 94e6a108..fd69ec55 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/nuandong.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/nuandong.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/oumei.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/oumei.bundle index e9f68f62..56d9f26c 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/oumei.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/oumei.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/qianzhihe.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/qianzhihe.bundle index 4f3ad3f5..210f085d 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/qianzhihe.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/qianzhihe.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/renyu.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/renyu.bundle index 1552575a..4cf1e75e 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/renyu.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/renyu.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/rose.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/rose.bundle index d9133de1..e48990b0 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/rose.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/rose.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/shaonv.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/shaonv.bundle index c2ced5e7..82dad951 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/shaonv.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/shaonv.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/tianmei.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/tianmei.bundle index 37e59930..a1f1a4c5 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/tianmei.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/tianmei.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/wumei.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/wumei.bundle index 00652b19..301aabf9 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/wumei.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/wumei.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/xinggan.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/xinggan.bundle index af7709da..3da5c742 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/xinggan.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/xinggan.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/yanshimao.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/yanshimao.bundle index 9493f488..28315d9e 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/yanshimao.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/yanshimao.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/ziyun.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/ziyun.bundle index dfeb40a7..b85ba293 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/ziyun.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CombinationMakeup/Bundle/ziyun.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/runze.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/runze.bundle index 5f5eaeef..1cc93111 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/runze.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/runze.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/shuirun.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/shuirun.bundle index b0ff5bba..e2e61745 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/shuirun.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/shuirun.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/wumian.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/wumian.bundle index 36aecd1c..0fcdccae 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/wumian.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/wumian.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/yaochun.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/yaochun.bundle index bcb0b539..ed7c2fe7 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/yaochun.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/yaochun.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/zhuguang.bundle b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/zhuguang.bundle index d7527c90..c95e9e6d 100644 Binary files a/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/zhuguang.bundle and b/FUMakeupComponent/FUMakeupComponent/Resource/CustomizedMakeup/Lip/zhuguang.bundle differ diff --git a/FUMakeupComponent/FUMakeupComponent/View/FUCombinationMakeupView.m b/FUMakeupComponent/FUMakeupComponent/View/FUCombinationMakeupView.m index 5002f7f7..eb39b252 100644 --- a/FUMakeupComponent/FUMakeupComponent/View/FUCombinationMakeupView.m +++ b/FUMakeupComponent/FUMakeupComponent/View/FUCombinationMakeupView.m @@ -40,9 +40,17 @@ - (instancetype)initWithFrame:(CGRect)frame viewModel:(FUCombinationMakeupViewMo self.viewModel = viewModel; self.backgroundColor = [UIColor clearColor]; [self configureUI]; + // 默认选中 [self.collectionView selectItemAtIndexPath:[NSIndexPath indexPathForItem:self.viewModel.selectedIndex inSection:0] animated:YES scrollPosition:UICollectionViewScrollPositionCenteredHorizontally]; - [self refreshSubviews]; + [self.viewModel selectCombinationMakeupAtIndex:self.viewModel.selectedIndex complectionHandler:^{ + dispatch_async(dispatch_get_main_queue(), ^{ + [self refreshSubviews]; + self.collectionView.userInteractionEnabled = YES; + self.slider.userInteractionEnabled = YES; + self.customizeButton.userInteractionEnabled = YES; + }); + }]; } return self; } @@ -98,8 +106,9 @@ - (void)deselectCurrentCombinationMakeup { } dispatch_async(dispatch_get_main_queue(), ^{ [self.collectionView deselectItemAtIndexPath:[NSIndexPath indexPathForItem:self.viewModel.selectedIndex inSection:0] animated:NO]; - [self.viewModel selectCombinationMakeupAtIndex:-1 complectionHandler:nil]; - [self refreshSubviews]; + [self.viewModel selectCombinationMakeupAtIndex:-1 complectionHandler:^{ + [self refreshSubviews]; + }]; }); } @@ -170,6 +179,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { collectionView.userInteractionEnabled = NO; self.slider.userInteractionEnabled = NO; + self.customizeButton.userInteractionEnabled = NO; FUCombinationMakeupCell *selectedCell = (FUCombinationMakeupCell *)[self.collectionView cellForItemAtIndexPath:indexPath]; [selectedCell.indicatorView startAnimating]; [self.viewModel selectCombinationMakeupAtIndex:indexPath.item complectionHandler:^{ @@ -178,6 +188,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa [self refreshSubviews]; collectionView.userInteractionEnabled = YES; self.slider.userInteractionEnabled = YES; + self.customizeButton.userInteractionEnabled = YES; }); }]; } @@ -212,6 +223,7 @@ - (UICollectionView *)collectionView { _collectionView.dataSource = self; _collectionView.delegate = self; _collectionView.translatesAutoresizingMaskIntoConstraints = NO; + _collectionView.userInteractionEnabled = NO; [_collectionView registerClass:[FUCombinationMakeupCell class] forCellWithReuseIdentifier:kFUCombinationMakeupCellIdentifierKey]; } return _collectionView; diff --git a/FUMakeupComponent/FUMakeupComponent/ViewModel/FUCombinationMakeupViewModel.m b/FUMakeupComponent/FUMakeupComponent/ViewModel/FUCombinationMakeupViewModel.m index 42ecd03c..fed4753f 100644 --- a/FUMakeupComponent/FUMakeupComponent/ViewModel/FUCombinationMakeupViewModel.m +++ b/FUMakeupComponent/FUMakeupComponent/ViewModel/FUCombinationMakeupViewModel.m @@ -27,7 +27,7 @@ @implementation FUCombinationMakeupViewModel { - (instancetype)init { self = [super init]; if (self) { - [self selectCombinationMakeupAtIndex:1 complectionHandler:nil]; + _selectedIndex = 1; } return self; } @@ -35,10 +35,10 @@ - (instancetype)init { #pragma mark - Instance methods - (void)selectCombinationMakeupAtIndex:(NSInteger)index complectionHandler:(void (^)(void))complection { - if (index == self.selectedIndex) { - !complection ?: complection(); - return; - } +// if (index == self.selectedIndex) { +// !complection ?: complection(); +// return; +// } if (index < 0 || index >= self.combinationMakeups.count) { self.selectedIndex = -1; !complection ?: complection(); diff --git a/FUVideoComponent/FUVideoComponent.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist b/FUVideoComponent/FUVideoComponent.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist index 32be4db0..1aa14d69 100644 --- a/FUVideoComponent/FUVideoComponent.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/FUVideoComponent/FUVideoComponent.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ FUVideoComponent.xcscheme_^#shared#^_ orderHint - 4 + 2 diff --git a/FUVideoComponent/FUVideoComponent/FUVideoWriter.m b/FUVideoComponent/FUVideoComponent/FUVideoWriter.m index d19085ca..2bcf1861 100644 --- a/FUVideoComponent/FUVideoComponent/FUVideoWriter.m +++ b/FUVideoComponent/FUVideoComponent/FUVideoWriter.m @@ -43,13 +43,11 @@ - (instancetype)initWithVideoURL:(NSURL *)URL videoSize:(CGSize)size setting:(FU NSAssert(!CGSizeEqualToSize(size, CGSizeZero), @"size cannot be 0!"); self.videoURL = URL; - self.videoSize = size; if (!settings) { settings = [[FUVideoWriterSettings alloc] init]; - } else { - self.writerSettings = settings; } + self.writerSettings = settings; } return self; } diff --git a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/FLAnimatedImage.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/FLAnimatedImage.xcscheme deleted file mode 100644 index e31ebc42..00000000 --- a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/FLAnimatedImage.xcscheme +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/MJExtension.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/MJExtension.xcscheme deleted file mode 100644 index 5ac09201..00000000 --- a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/MJExtension.xcscheme +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/SVProgressHUD.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/SVProgressHUD.xcscheme deleted file mode 100644 index d2434a08..00000000 --- a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/SVProgressHUD.xcscheme +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/lottie-ios.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/lottie-ios.xcscheme deleted file mode 100644 index e4e6875e..00000000 --- a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/lottie-ios.xcscheme +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist index 6a122c9a..ad0dcefe 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/sunmu.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,63 +9,62 @@ isShown orderHint - 2 + 4 - FLAnimatedImage.xcscheme + FLAnimatedImage.xcscheme_^#shared#^_ - isShown - orderHint - 3 + 10 - MJExtension.xcscheme + MJExtension.xcscheme_^#shared#^_ - isShown - orderHint - 7 + 11 Masonry.xcscheme isShown orderHint - 6 + 5 Pods-FULiveDemo.xcscheme isShown orderHint - 8 + 6 SDWebImage.xcscheme isShown orderHint - 9 + 7 SSZipArchive.xcscheme isShown orderHint - 10 + 8 - SVProgressHUD.xcscheme + SVProgressHUD.xcscheme_^#shared#^_ - isShown - orderHint - 11 + 14 - lottie-ios.xcscheme + YYModel.xcscheme isShown orderHint - 5 + 9 + + lottie-ios.xcscheme_^#shared#^_ + + orderHint + 12 SuppressBuildableAutocreation diff --git a/README.md b/README.md index 7ab6092b..983d032e 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,10 @@ FULiveDemo 是 iOS 平台上，集成相芯人脸跟踪及视频特效开发包 相关文档位于本项目docs目录，包括: -1. [iOS_Nama_Demo_运行文档.md](./docs/iOS_Nama_Demo_运行文档.md)，介绍如何运行demo。 -2. [iOS_Nama_SDK_集成指导文档.md](./docs/iOS_Nama_SDK_集成指导文档.md)，介绍如何在宿主APP中集成Nama SDK。 -3. [iOS_Nama_OC_API_参考文档.md](./docs/iOS_Nama_OC_API_参考文档.md)，Nama SDK OC接口定义。 +1. [iOS_Nama_Demo_版本更新文档](./docs/iOS_Nama_Demo_版本更新文档.md)，介绍各版本更新内容。 +2. [iOS_Nama_Demo_运行文档.md](./docs/iOS_Nama_Demo_运行文档.md)，介绍如何运行demo。 +3. [iOS_Nama_SDK_集成指导文档.md](./docs/iOS_Nama_SDK_集成指导文档.md)，介绍如何在宿主APP中集成Nama SDK。 +4. [iOS_Nama_OC_API_参考文档.md](./docs/iOS_Nama_OC_API_参考文档.md)，Nama SDK OC接口定义。 ## English diff --git a/docs/iOS_Nama_Demo_Guide.md b/docs/iOS_Nama_Demo_Guide.md index 9530f229..8078ba65 100755 --- a/docs/iOS_Nama_Demo_Guide.md +++ b/docs/iOS_Nama_Demo_Guide.md @@ -1,101 +1,5 @@ # Demo running documentation-iOS ------- - -Level：Public -Update date：2021-12-24 -SDK version: 8.0.2 - -### Updates： - -1）Fix some bugs - ------- - -Level：Public -Update date：2021-11-17 -SDK version: 8.0.1 - -### Updates： - -1）Fix some bugs - ------- - -Level：Public -Update date：2021-10-27 -SDK version: 8.0.0 - -### Updates： - -1）Optimized beauty special effects, optimized 8 functions such as microdermabrasion, big eyes, face shape, etc., and improved multi-dimensional effects such as skin details, contour lines, deformation ratio, etc. -2）Newly added sub-model adaptation strategy, the use of better uniform dermabrasion on high-end machines, and the use of fine dermabrasion with balanced performance and effect on middle and low-end machines, improving the utilization of the overall equipment -3）Optimized beauty, optimized the naturalness of lipstick, eyebrows, eyelashes, and cosmetic contact lenses, and added lipstick texture and style combination makeup -4）Face detection algorithm optimization, optimized detection rate and false detection rate -5）Optimization of portrait segmentation algorithm to optimize segmentation accuracy, segmentation edge smoothness, background misrecognition and other issues in the PC-side bust scene -6）Added the green screen safe area function, which supports the green screen keying of the designated area according to the template, and the template supports customer customization -7）Optimize the rendering timing issue when multiple functions are mixed -8）Fix some bugs - ------- - -Level：Public -Update date：2021-07-09 -SDK version: 7.4.1 - -### Updates： - -1）Update 8 types of premium stickers, including 2 PK games, 5 decorative and interactive stickers, and 1 full-body drive prop -2）Update 2 Chinese style Animoji models -3）Fix the problem of portrait segmentation sticker effect. After the repair, the portrait segmentation result and sticker effect will appear at the same time -4）Fix some bugs, including high-resolution dermabrasion effects, face detection and sticker drawing timing issues - ------- - -Level：Public -Update date：2021-04-19 -SDK version: 7.4.0 - ------- - -### Updates： - -2021-04-19 7.4.0 -1）[Demo layer] Refactoring the special effects Demo, changing process-oriented to object-oriented, the overall structure and logic are clearer, and customer calls are more convenient. At the same time, it has many advantages such as saving memory, optimizing the automatic destruction logic of itemID, simplifying the process of user input information, and low coupling to improve the flexibility of the architecture. -2）Added emotion recognition function, supporting 8 basic full emotion detection -3）Added content service module to display game props and boutique stickers, mainly including rich special effects props such as games, plots, headwear, atmospheres, etc. -4）Added asynchronous interface to improve the problem of insufficient frame rate for users on low-end devices -5）Optimize body performance, the frame rate on the Android side increased by 24%, and the time consumption on the iOS side decreased by 13% -6）Optimize the performance of portrait segmentation, and the frame rate of Andriod is increased by 39%, and the time consumption of iOS is reduced by 39% -7）Optimize the effect of portrait segmentation, mainly including optimizing the gap problem, so that the portrait segmentation fits the human body more closely, and there will be no obvious gaps; improve the accuracy of human body segmentation and reduce background misrecognition -8）Added a new method of portrait segmentation, open the user-defined background interface, which is convenient for users to quickly change the background; support the portrait stroke gameplay, and customize the stroke width, distance, and color -9）Add the Animoji koala model; optimize the Animoji facial driving effect to improve the stability and sensitivity of the driven model -10）Optimize the beauty effect, including the lipstick no longer appears when the lips are blocked; improve the fit of the color contact lenses; add a variety of color contact materials - ------- - -### Updates： - -**2021-1-25 v7.3.2: ** - -- Optimize the performance of facial expression tracking driver. -- fuSetup function changed to thread safe. -- fuSetUp 、fuCreateItemFromPackage、fuLoadAIModel functions add exception handling and enhances robustness. -- Fix the effect of custom haha mirror function. -- Fix the SDK crash problem on Mac 10.11. -- Fix the crash problem when the SDK is mixed with "Sticker" and "Animoji". - ------- - -### Updates： - -2019-04-29 v1.0: - -1. Added a pinch function demo -2. Optimized interaction -3. Updates props - ------- ### Contents： [TOC] diff --git "a/docs/iOS_Nama_Demo_\347\211\210\346\234\254\346\233\264\346\226\260\346\226\207\346\241\243.md" "b/docs/iOS_Nama_Demo_\347\211\210\346\234\254\346\233\264\346\226\260\346\226\207\346\241\243.md" new file mode 100755 index 00000000..4073b698 --- /dev/null +++ "b/docs/iOS_Nama_Demo_\347\211\210\346\234\254\346\233\264\346\226\260\346\226\207\346\241\243.md" @@ -0,0 +1,175 @@ +# 版本更新文档-iOS + +------ + +级别：Public +更新日期：2022-11-18 +SDK版本: 8.4.1 + +### 更新内容： +1）修复全身Avatar模块，全身/半身模式切换问题 +2）修复美妆模块，美瞳位置问题 + +------ + +级别：Public +更新日期：2022-11-09 +SDK版本: 8.4.0 + +### 更新内容： +1)【美颜】新增眉毛粗细、眼睛位置、眼睑下至、嘴唇厚度、五官立体功能，优化瘦脸、下巴功能 +2)【美妆】新增嘴唇遮挡分割算法，实现口红遮挡不穿帮 +3)【人脸关键点】算法升级，全面优化点位稳定性 +4)【人像分割】新增会议场景专用模式 +5)【人体检测】全平台模型检出率提升 +6)【手势识别】全平台模型检出率及误检率优化 + +------ + +级别：Public +更新日期：2022-09-09 +SDK版本: 8.3.1 + +### 更新内容： + +1)适配Mac M系列平台 +2)鉴权模块升级 +3)新增表情系数映射接口、人脸检测频率接口 +4)修复一些bug + +------ + +级别：Public +更新日期：2022-07-21 +SDK版本: 8.3.0 + +### 更新内容： + +1)优化人像分割效果：全面提升人像分割效果，优化了分割精度、迟滞感、边缘细腻度 +2)优化绿幕分割效果：全面提升绿幕、白幕分割效果，优化了绿幕场景下边缘泛绿、锯齿、抖动的问题；白幕场景下背景闪烁、轮廓不干净的问题 +3)优化手势识别效果：优化手势识别检出率，并针对性地解决一些误检问题 +4)优化美颜效果：优化瘦脸效果，新增眉毛上下、眉间距2个功能 +5)优化美妆效果：更新4款眉毛效果 +6)解决部分已知bug + +------ + +级别：Public +更新日期：2022-06-16 +SDK版本: 8.2.1 + +### 更新内容： + +1）修复一些bug + +------ + +级别：Public +更新日期：2022-04-15 +SDK版本: 8.2.0 + +### 更新内容： + +1）提升美颜效果，包括6大功能维度：祛黑眼圈功能保留卧蚕，优化祛黑效果；祛法令纹改善涂抹问题；嘴型功能、大眼功能优化等比例问题；小脸功能优化侧脸自然度问题；新增粉嫩透亮的美白功能 +2）提高人脸检测功能小人脸模型的检出率，更好地支持远距离场景 +3）提高人脸基础关键点稳定性 +4）解决部分bug + +------ + +级别：Public +更新日期：2022-01-27 +SDK版本: 8.1.0 + +### 更新内容： + +1）更新人脸检测模型为全角度,高端机可自由选择是否启动小人脸检测 +2）更新PTA侧驱动相关接口 +3）解决部分已知bug + +------ + +级别：Public +更新日期：2021-12-24 +SDK版本: 8.0.2 + +### 更新内容： + +1）解决部分bug + +------ + +级别：Public +更新日期：2021-11-17 +SDK版本: 8.0.1 + +### 更新内容： + +1）解决部分bug + +------ + +级别：Public +更新日期：2021-10-27 +SDK版本: 8.0.0 + +### 更新内容： + +1）美颜特效优化，优化了磨皮、大眼、脸型等8大功能，对皮肤细节、轮廓线条、变形比例等多维度的效果进行提升 +2）新增分机型适配策略，在高端机上使用效果更佳的均匀磨皮，中低端机上使用性能效果均衡的精细磨皮，提高整体设备的利用率 +3）美妆优化，优化了口红、眉毛、睫毛、美瞳的自然度，新增了口红质地和风格组合妆 +4）人脸检测算法优化，优化了检出率及误检率 +5）人像分割算法优化，优化PC端半身场景下，分割准确性、分割边缘平滑度、背景误识别等问题 +6）新增绿幕安全区域功能，支持根据模板对制定区域进行绿幕抠像，模板支持客户自定义 +7）优化多个功能混用时的渲染时序问题 +8）解决一些bug + +------ + +级别：Public +更新日期：2021-07-09 +SDK版本: 7.4.1 + +### 更新内容： + +1）更新精品贴纸8款，包含2款PK游戏，5款装饰及互动贴纸，1款全身驱动道具 +2）更新2款中国风Animoji模型 +3）修复人像分割贴纸效果问题，修复后人像分割结果和贴纸效果会同时出现 +4）修复一些bug，包括高分辨率磨皮效果问题，人脸检测与贴纸绘制的时序问题 + +------ + +级别：Public +更新日期：2021-04-19 +SDK版本: 7.4.0 + +------ + +### 更新内容： + +2021-04-19 7.4.0更新说明 +1）【Demo层】重构特效Demo，将面向过程变成改为面向对象，整体结构逻辑更清晰，客户调用更便捷。同时具有节省内存、优化itemID自动销毁逻辑、精简用户传入信息过程，低耦合性提高架构灵活度等多方优势 +2）新增情绪识别功能，支持8种基本的饱满情绪检测 +3）新增内容服务模块，展示游戏道具及精品贴纸，主要包括游戏类、情节类、头饰类、氛围类等丰富的特效道具 +4）新增异步接口，改善用户在低端设备上帧率不足问题 +5）优化美体性能，Android端帧率上升24%，iOS端耗时下降13% +6）优化人像分割性能，Andriod端帧率上升39%，iOS耗时下降39% +7）优化人像分割效果，主要包括优化缝隙问题，使人像分割更加贴合人体，不会有明显空隙；提升人体分割准确性，减少背景误识别情况 +8）增加人像分割新玩法，开放用户自定义背景接口，便于用户快速换背景；支持人像描边玩法，可自定义描边的宽度、距离、颜色 +9）增加Animoji无尾熊模型；优化Animoji面部驱动效果，提升驱动后模型的稳定性和灵敏度 +10）优化美妆效果，主要包括唇部遮挡时口红不再显现；提升美瞳的贴合度；增加多款美瞳素材 + +------ + +### 更新内容： + +**2021-1-25 v7.3.2: ** + +- 优化人脸表情跟踪驱动性能。 +- fuSetup 函数改为线程安全。 +- fuSetUp 、fuCreateItemFromPackage、fuLoadAIModel函数增加异常处理，增强鲁棒性。 +- 修复自定义哈哈镜功能效果问题。 +- 修复SDK在Mac 10.11上crash问题。 +- 修复SDK在贴纸和Animoji混用时crash问题。 + +------ diff --git "a/docs/iOS_Nama_Demo_\350\277\220\350\241\214\346\226\207\346\241\243.md" "b/docs/iOS_Nama_Demo_\350\277\220\350\241\214\346\226\207\346\241\243.md" index 8c5f49ba..74f5350d 100755 --- "a/docs/iOS_Nama_Demo_\350\277\220\350\241\214\346\226\207\346\241\243.md" +++ "b/docs/iOS_Nama_Demo_\350\277\220\350\241\214\346\226\207\346\241\243.md" @@ -2,167 +2,6 @@ ------ -级别：Public -更新日期：2022-11-09 -SDK版本: 8.4.0 - -### 最新更新内容： -1)【美颜】新增眉毛粗细、眼睛位置、眼睑下至、嘴唇厚度、五官立体功能，优化瘦脸、下巴功能 -2)【美妆】新增嘴唇遮挡分割算法，实现口红遮挡不穿帮 -3)【人脸关键点】算法升级，全面优化点位稳定性 -4)【人像分割】新增会议场景专用模式 -5)【人体检测】全平台模型检出率提升 -6)【手势识别】全平台模型检出率及误检率优化 - ------- - -级别：Public -更新日期：2022-09-09 -SDK版本: 8.3.1 - -### 最新更新内容： - -1)适配Mac M系列平台 -2)鉴权模块升级 -3)新增表情系数映射接口、人脸检测频率接口 -4)修复一些bug - ------- - -级别：Public -更新日期：2022-07-21 -SDK版本: 8.3.0 - -### 最新更新内容： - -1)优化人像分割效果：全面提升人像分割效果，优化了分割精度、迟滞感、边缘细腻度 -2)优化绿幕分割效果：全面提升绿幕、白幕分割效果，优化了绿幕场景下边缘泛绿、锯齿、抖动的问题；白幕场景下背景闪烁、轮廓不干净的问题 -3)优化手势识别效果：优化手势识别检出率，并针对性地解决一些误检问题 -4)优化美颜效果：优化瘦脸效果，新增眉毛上下、眉间距2个功能 -5)优化美妆效果：更新4款眉毛效果 -6)解决部分已知bug - ------- - -级别：Public -更新日期：2022-06-16 -SDK版本: 8.2.1 - -### 最新更新内容： - -1）修复一些bug - ------- - -级别：Public -更新日期：2022-04-15 -SDK版本: 8.2.0 - -### 最新更新内容： - -1）提升美颜效果，包括6大功能维度：祛黑眼圈功能保留卧蚕，优化祛黑效果；祛法令纹改善涂抹问题；嘴型功能、大眼功能优化等比例问题；小脸功能优化侧脸自然度问题；新增粉嫩透亮的美白功能 -2）提高人脸检测功能小人脸模型的检出率，更好地支持远距离场景 -3）提高人脸基础关键点稳定性 -4）解决部分bug - ------- - -级别：Public -更新日期：2022-01-27 -SDK版本: 8.1.0 - -### 最新更新内容： - -1）更新人脸检测模型为全角度,高端机可自由选择是否启动小人脸检测 -2）更新PTA侧驱动相关接口 -3）解决部分已知bug - ------- - -级别：Public -更新日期：2021-12-24 -SDK版本: 8.0.2 - -### 最新更新内容： - -1）解决部分bug - ------- - -级别：Public -更新日期：2021-11-17 -SDK版本: 8.0.1 - -### 最新更新内容： - -1）解决部分bug - ------- - -级别：Public -更新日期：2021-10-27 -SDK版本: 8.0.0 - -### 最新更新内容： - -1）美颜特效优化，优化了磨皮、大眼、脸型等8大功能，对皮肤细节、轮廓线条、变形比例等多维度的效果进行提升 -2）新增分机型适配策略，在高端机上使用效果更佳的均匀磨皮，中低端机上使用性能效果均衡的精细磨皮，提高整体设备的利用率 -3）美妆优化，优化了口红、眉毛、睫毛、美瞳的自然度，新增了口红质地和风格组合妆 -4）人脸检测算法优化，优化了检出率及误检率 -5）人像分割算法优化，优化PC端半身场景下，分割准确性、分割边缘平滑度、背景误识别等问题 -6）新增绿幕安全区域功能，支持根据模板对制定区域进行绿幕抠像，模板支持客户自定义 -7）优化多个功能混用时的渲染时序问题 -8）解决一些bug - ------- - -级别：Public -更新日期：2021-07-09 -SDK版本: 7.4.1 - -### 最新更新内容： - -1）更新精品贴纸8款，包含2款PK游戏，5款装饰及互动贴纸，1款全身驱动道具 -2）更新2款中国风Animoji模型 -3）修复人像分割贴纸效果问题，修复后人像分割结果和贴纸效果会同时出现 -4）修复一些bug，包括高分辨率磨皮效果问题，人脸检测与贴纸绘制的时序问题 - ------- - -级别：Public -更新日期：2021-04-19 -SDK版本: 7.4.0 - ------- - -### 最新更新内容： - -2021-04-19 7.4.0更新说明 -1）【Demo层】重构特效Demo，将面向过程变成改为面向对象，整体结构逻辑更清晰，客户调用更便捷。同时具有节省内存、优化itemID自动销毁逻辑、精简用户传入信息过程，低耦合性提高架构灵活度等多方优势 -2）新增情绪识别功能，支持8种基本的饱满情绪检测 -3）新增内容服务模块，展示游戏道具及精品贴纸，主要包括游戏类、情节类、头饰类、氛围类等丰富的特效道具 -4）新增异步接口，改善用户在低端设备上帧率不足问题 -5）优化美体性能，Android端帧率上升24%，iOS端耗时下降13% -6）优化人像分割性能，Andriod端帧率上升39%，iOS耗时下降39% -7）优化人像分割效果，主要包括优化缝隙问题，使人像分割更加贴合人体，不会有明显空隙；提升人体分割准确性，减少背景误识别情况 -8）增加人像分割新玩法，开放用户自定义背景接口，便于用户快速换背景；支持人像描边玩法，可自定义描边的宽度、距离、颜色 -9）增加Animoji无尾熊模型；优化Animoji面部驱动效果，提升驱动后模型的稳定性和灵敏度 -10）优化美妆效果，主要包括唇部遮挡时口红不再显现；提升美瞳的贴合度；增加多款美瞳素材 - ------- - -### 最新更新内容： - -**2021-1-25 v7.3.2: ** - -- 优化人脸表情跟踪驱动性能。 -- fuSetup 函数改为线程安全。 -- fuSetUp 、fuCreateItemFromPackage、fuLoadAIModel函数增加异常处理，增强鲁棒性。 -- 修复自定义哈哈镜功能效果问题。 -- 修复SDK在Mac 10.11上crash问题。 -- 修复SDK在贴纸和Animoji混用时crash问题。 - ------- ### 目录： 本文档内容目录： diff --git a/docs/iOS_Nama_SDK_Integration_Guide.md b/docs/iOS_Nama_SDK_Integration_Guide.md index 060b3ac1..8348abdd 100755 --- a/docs/iOS_Nama_SDK_Integration_Guide.md +++ b/docs/iOS_Nama_SDK_Integration_Guide.md @@ -158,24 +158,24 @@ Xcode 8 or above Nama full version: ``` -pod 'Nama', '8.0.2' +pod 'Nama' ``` Nama version without physical engine: ``` -pod 'Nama-lite', '8.0.2' +pod 'Nama-lite' ``` FURenderKit full version: ``` -pod 'FURenderKit', '8.0.2' +pod 'FURenderKit' ``` FURenderKit version without physical engine: ``` -pod 'FURenderKit-lite', '8.0.2' +pod 'FURenderKit-lite' ``` Then execute: @@ -192,17 +192,9 @@ pod repo update or pod setup #### 3.2.1 Integration via GitHub -Nama full version:[FaceUnity-SDK-iOS-v8.0.2.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FaceUnity-SDK-iOS-v8.0.2.zip) +1、Download[SDK](https://github.com/Faceunity/FULiveDemo/releases) -Nama version without physical engine(lite version):[FaceUnity-SDK-iOS-v8.0.2-lite.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FaceUnity-SDK-iOS-v8.0.2-lite.zip) - -FURenderKit full version: - [FURenderKit-v8.0.2.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FURenderKit-v8.0.2.zip) - -FURenderKit without physical engine(lite version)： - [FURenderKit-lite-v8.0.2.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FURenderKit-lite-v8.0.2.zip) - -After downloading and uncompressing, please drag Nama SDK files to your own project and check 'Copy items if needed' as picture below: +2、After downloading and uncompressing, please drag Nama SDK files to your own project and check 'Copy items if needed' as picture below: ------ diff --git "a/docs/iOS_Nama_SDK_\351\233\206\346\210\220\346\214\207\345\257\274\346\226\207\346\241\243.md" "b/docs/iOS_Nama_SDK_\351\233\206\346\210\220\346\214\207\345\257\274\346\226\207\346\241\243.md" index ff19defd..3f3d4b86 100755 --- "a/docs/iOS_Nama_SDK_\351\233\206\346\210\220\346\214\207\345\257\274\346\226\207\346\241\243.md" +++ "b/docs/iOS_Nama_SDK_\351\233\206\346\210\220\346\214\207\345\257\274\346\226\207\346\241\243.md" @@ -68,24 +68,24 @@ Xcode 8或更高版本 Nama全功能版本（支持物理特效）： ``` -pod 'Nama', '8.4.0' +pod 'Nama' ``` Nama-lite版本（体积更小，包含人脸相关的功能(海报换脸除外)）： ``` -pod 'Nama-lite', '8.4.0' +pod 'Nama-lite' ``` FURenderKit全功能版本（支持物理特效）： ``` -pod 'FURenderKit', '8.4.0' +pod 'FURenderKit' ``` FURenderKit-lite版本： ``` -pod 'FURenderKit-lite', '8.4.0' +pod 'FURenderKit-lite' ``` 接下来执行： @@ -102,18 +102,9 @@ pod repo update 或 pod setup #### 3.2.2 直接下载 -Nama全功能版本（支持物理特效）：[FaceUnity-SDK-iOS-v8.4.0.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FaceUnity-SDK-iOS-v8.4.0.zip) +1、前往[SDK下载页面](https://github.com/Faceunity/FULiveDemo/releases)，获取需要的版本 -Nama-lite版本： 版（体积更小，包含人脸相关的功能(海报换脸除外)）：[FaceUnity-SDK-iOS-lite-v8.4.0.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FaceUnity-SDK-iOS-lite-v8.4.0.zip) - -FURenderKit全功能版本（支持物理特效）： - [FURenderKit-v8.4.0.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FURenderKit-v8.4.0.zip) - -FURenderKit-lite版本： - [FURenderKit-lite-v8.4.0.zip](https://fu-sdk.oss-cn-hangzhou.aliyuncs.com/FURenderKit-lite-v8.4.0.zip) - - -下载完成并解压后将库文件夹拖入到工程中，并勾选上 Copy items if needed，如图： +2、下载完成并解压后将库文件夹拖入到工程中，并勾选上 Copy items if needed，如图： ------ diff --git "a/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" "b/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" index 36487454..6d57b56f 100644 --- "a/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" +++ "b/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/FURenderKit\345\277\253\351\200\237\351\233\206\346\210\220\346\226\207\346\241\243.md" @@ -4,7 +4,7 @@ ### 通过cocoapods集成 ``` -pod 'FURenderKit', '8.4.0' +pod 'FURenderKit' ``` 接下来执行： diff --git "a/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/Nama-\344\270\232\345\212\241\346\250\241\345\236\213\346\226\207\346\241\243\350\257\264\346\230\216.md" "b/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/Nama-\344\270\232\345\212\241\346\250\241\345\236\213\346\226\207\346\241\243\350\257\264\346\230\216.md" index c226ee09..7a9fc0cf 100644 --- "a/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/Nama-\344\270\232\345\212\241\346\250\241\345\236\213\346\226\207\346\241\243\350\257\264\346\230\216.md" +++ "b/docs/\347\247\273\345\212\250\347\253\257\346\226\207\346\241\243/Nama-\344\270\232\345\212\241\346\250\241\345\236\213\346\226\207\346\241\243\350\257\264\346\230\216.md" @@ -1,6 +1,6 @@ ---- -更新时间: 2022-10-28 +更新时间: 2022-11-09 创建时间: 2020-01-22 @@ -333,7 +333,7 @@ ___ | ------------- | ---- | ------------------------------------------------------------ | --------------- | | isMakeUpOn | BOOL | 美妆开关，1开 0关 | is_makeup_on | | isClearMakeup | BOOL | 在解绑妆容时是否清空除口红以外的妆容，0表示不清空，1表示清空，口红可由强度进行设置 | is_clear_makeup | -| makeupSegmentation | BOOL | 美妆分割，1开 0关 | machine_level | +| makeupSegmentation | BOOL | 美妆分割，1开 0关，建议在高端机型中使用 | machine_level | | lipType | int | 口红类型 0雾面 2润泽Ⅰ 3珠光 6高性能（不支持双色）7润泽Ⅱ | lip_type | | isLipHighlightOn | BOOL | 是否开启口红高光 1开 0关 | makeup_lip_highlight_enable | | isTwoColor | int | 口红双色开关，0为关闭，1为开启，如果想使用咬唇，开启双色开关，并且将makeup_lip_color2的值都设置为0 | is_two_color |