UGC upate SDK

abyyxwang · abyyxwang · commit c5201201b227 · 2020-09-28T12:52:39.000+08:00
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Contents.json b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/Contents.json b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/baixi.imageset/Contents.json b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/baixi.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "baixi.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/baixi.imageset/baixi.png b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/baixi.imageset/baixi.png
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/ziran.imageset/Contents.json b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/ziran.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ziran.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/ziran.imageset/ziran.png b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/Filter/ziran.imageset/ziran.png
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/ziran.imageset/Contents.json b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/ziran.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ziran.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/ziran.imageset/ziran.png b/iOS/Demo/BeautySettingKit/Resources/Media.xcassets/ziran.imageset/ziran.png
diff --git a/iOS/Demo/BeautySettingKit/TCBeautyPanel/Filter/TCFilter.h b/iOS/Demo/BeautySettingKit/TCBeautyPanel/Filter/TCFilter.h
@@ -7,7 +7,9 @@ NS_ASSUME_NONNULL_BEGIN
 typedef NSString * TCFilterIdentifier NS_STRING_ENUM;
 
 extern TCFilterIdentifier const TCFilterIdentifierNone;
+extern TCFilterIdentifier const TCFilterIdentifierBaiXi;
 extern TCFilterIdentifier const TCFilterIdentifierNormal;
+extern TCFilterIdentifier const TCFilterIdentifierZiRan;
 extern TCFilterIdentifier const TCFilterIdentifierYinghong;
 extern TCFilterIdentifier const TCFilterIdentifierYunshang;
 extern TCFilterIdentifier const TCFilterIdentifierChunzhen;
diff --git a/iOS/Demo/BeautySettingKit/TCBeautyPanel/Filter/TCFilter.m b/iOS/Demo/BeautySettingKit/TCBeautyPanel/Filter/TCFilter.m
@@ -3,7 +3,9 @@
 #import "TCFilter.h"
 
 TCFilterIdentifier const TCFilterIdentifierNone      = @"";
+TCFilterIdentifier const TCFilterIdentifierBaiXi     = @"baixi";
 TCFilterIdentifier const TCFilterIdentifierNormal    = @"normal";
+TCFilterIdentifier const TCFilterIdentifierZiRan     = @"ziran";
 TCFilterIdentifier const TCFilterIdentifierYinghong  = @"yinghong";
 TCFilterIdentifier const TCFilterIdentifierYunshang  = @"yunshang";
 TCFilterIdentifier const TCFilterIdentifierChunzhen  = @"chunzhen";
@@ -57,7 +59,9 @@ - (instancetype)init
         NSFileManager *manager = [[NSFileManager alloc] init];
         if ([manager fileExistsAtPath:path]) {
             NSArray<TCFilterIdentifier> *availableFilters = @[
+                TCFilterIdentifierBaiXi,
                 TCFilterIdentifierNormal,
+                TCFilterIdentifierZiRan,
                 TCFilterIdentifierYinghong,
                 TCFilterIdentifierYunshang,
                 TCFilterIdentifierChunzhen,
diff --git a/iOS/Demo/BeautySettingKit/TCBeautyPanel/Model/TCPituMotionManager.m b/iOS/Demo/BeautySettingKit/TCBeautyPanel/Model/TCPituMotionManager.m
@@ -28,13 +28,13 @@ - (instancetype)init
             @[@"video_boom", @"http://dldir1.qq.com/hudongzhibo/AISpecial/ios/160/video_boom.zip", L(@"Boom")],
         ];
         NSArray *gestureMotionArray = @[
-            @[@"video_pikachu", @"", L(@"皮卡丘")],
+            @[@"video_pikachu", @"http://dldir1.qq.com/hudongzhibo/AISpecial/Android/181/video_pikachu.zip", L(@"皮卡丘")],
         ];
         NSArray *cosmeticMotionArray = @[
-            @[@"video_qingchunzannan_iOS", @"", L(@"原宿复古")],
+            @[@"video_qingchunzannan_iOS", @"http://res.tu.qq.com/materials/video_qingchunzannan_iOS.zip", L(@"原宿复古")],
         ];
         NSArray *backgroundRemovalArray = @[
-            @[@"video_xiaofu", @"", L(@"AI抠背")],
+            @[@"video_xiaofu", @"http://dldir1.qq.com/hudongzhibo/AISpecial/ios/160/video_xiaofu.zip", L(@"AI抠背")],
         ];
         NSArray *(^generate)(NSArray *) = ^(NSArray *inputArray){
             NSMutableArray *array = [NSMutableArray arrayWithCapacity:inputArray.count];
diff --git a/iOS/Demo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m b/iOS/Demo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m
@@ -190,9 +190,9 @@ - (float)whiteLevel {
 - (void)resetAndApplyValues
 {
     // 默认值配置
-    const BeautyMenuItem defaultBeautyStyle = BeautyMenuItemNature;
-    self.beautyStyle = TCBeautyStyleNature;
-    const TCFilterIdentifier defaultFilterIdentifier = TCFilterIdentifierNormal;
+    const BeautyMenuItem defaultBeautyStyle = BeautyMenuItemPiTu;
+    self.beautyStyle = BeautyMenuItemPiTu;
+    const TCFilterIdentifier defaultFilterIdentifier = TCFilterIdentifierBaiXi;
     // index = 0 为关闭
     NSUInteger defaultFilterIndex = [_filters indexOfObjectPassingTest:
                                      ^BOOL(TCFilter * _Nonnull obj,
@@ -203,7 +203,9 @@ - (void)resetAndApplyValues
     // 滤镜
     NSDictionary *defaultFilterValue = @{
                                      TCFilterIdentifierNone :@(0)
+                                     ,TCFilterIdentifierBaiXi :@(5)
                                     ,TCFilterIdentifierNormal :@(5)
+                                     ,TCFilterIdentifierZiRan :@(5)
                                     ,TCFilterIdentifierYinghong :@(8)
                                     ,TCFilterIdentifierYunshang :@(8)
                                     ,TCFilterIdentifierChunzhen :@(7)
@@ -232,8 +234,8 @@ - (void)resetAndApplyValues
 #ifndef UGC_SMART
     [self.beautyLevelDic setObject:@(DefaultBeautyLevel) forKey:@(BeautyMenuItemPiTu)];
 #endif
-    [self.beautyLevelDic setObject:@(DefaultWhitnessLevel) forKey:@(BeautyMenuItemWhite)];
-    [self.beautyLevelDic setObject:@(0) forKey:@(BeautyMenuItemRed)];
+//    [self.beautyLevelDic setObject:@(DefaultWhitnessLevel) forKey:@(BeautyMenuItemWhite)];
+//    [self.beautyLevelDic setObject:@(0) forKey:@(BeautyMenuItemRed)];
 
     NSInteger beautyValue = [self.beautyLevelDic[@(defaultBeautyStyle)] integerValue];
     [self setSliderValue:beautyValue];
diff --git a/iOS/Demo/BeautySettingKit/TCBeautyPanel/View/TCBeautyPanelTheme.m b/iOS/Demo/BeautySettingKit/TCBeautyPanel/View/TCBeautyPanelTheme.m
@@ -201,7 +201,9 @@ - (NSString *)localizedString:(nonnull NSString *)key {
             @"TC.BeautyPanel.Menu.Gesture" : @"手势",
             @"TC.BeautyPanel.Menu.Cosmetic" : @"美妆",
             @"TC.Common.Filter_original" : @"原图",
+            @"TC.Common.Filter_baixi" : @"白皙",
             @"TC.Common.Filter_normal" : @"标准",
+            @"TC.Common.Filter_ziran" : @"自然",
             @"TC.Common.Filter_yinghong" : @"樱红",
             @"TC.Common.Filter_yunshang" : @"云裳",
             @"TC.Common.Filter_chunzhen" : @"纯真",
diff --git a/iOS/Demo/UGCKit/Source/Record/UGCKitRecordViewController.m b/iOS/Demo/UGCKit/Source/Record/UGCKitRecordViewController.m
@@ -150,6 +150,8 @@ @interface UGCKitRecordViewController()
     
     // 是否正在合成视频参数（保证只合成一次）
     BOOL _isCompletingRecord;
+    // 是否从音乐选择面返回（保证不会刷新其他配置）
+    BOOL _isFromMusicSelectVC;
 }
 
 @property (strong, nonatomic) IBOutlet UIButton *btnNext;
@@ -661,7 +663,9 @@ - (IBAction)onBtnMusicClicked:(id)sender
         [nv.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:_theme.titleColor}];
         nv.navigationBar.barTintColor = _theme.backgroundColor;
         nv.modalPresentationStyle = UIModalPresentationFullScreen;
-        [self presentViewController:nv animated:YES completion:nil];
+        [self presentViewController:nv animated:YES completion:^{
+            self->_isFromMusicSelectVC = YES;
+        }];
         [_bgmListVC loadBGMList];
     }
 }
@@ -1116,7 +1120,12 @@ -(void)startCameraPreview
 #endif
         //内存里面没有视频数据，重置美颜状态
         if ([TXUGCRecord shareInstance].partsManager.getVideoPathList.count == 0) {
-            [self resetBeautySettings];
+            if (self->_isFromMusicSelectVC) {
+                self->_isFromMusicSelectVC = NO;
+            } else {
+                [self resetBeautySettings];
+            }
+            
         }
         
         //加载本地视频 -> 内存
@@ -1471,7 +1480,10 @@ -(void)onBtnMusicSelected
     [nv.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
     //    nv.navigationBar.barTintColor = RGB(25, 29, 38);
     nv.modalPresentationStyle = UIModalPresentationFullScreen;
-    [self presentViewController:nv animated:YES completion:nil];
+   
+    [self presentViewController:nv animated:YES completion:^{
+        self->_isFromMusicSelectVC = YES;
+    }];
     [_bgmListVC loadBGMList];
 }
 
diff --git a/iOS/Demo/UGCKit/UGCKitResources/en.lproj/Localizable.strings b/iOS/Demo/UGCKit/UGCKitResources/en.lproj/Localizable.strings
@@ -21,6 +21,8 @@
 "UGCKit.Media.VideoSynthesizing" = "Processing…";
 "UGCKit.Media.HintVideoSynthesizeFailed" = "Unable to create";
 "TC.Common.Clear" = "Clear";
+"TC.Common.Filter_baixi" = "White";
+"TC.Common.Filter_ziran" = "Nature";
 "TC.Common.Filter_original"  = "Original";
 "TC.Common.Filter_normal"  = "Standard";
 "TC.Common.Filter_yinghong"  = "Cheery";
diff --git a/iOS/Demo/UGCKit/UGCKitResources/zh-Hans.lproj/Localizable.strings b/iOS/Demo/UGCKit/UGCKitResources/zh-Hans.lproj/Localizable.strings
@@ -21,7 +21,9 @@
 "UGCKit.Media.VideoSynthesizing" = "视频合成中";
 "UGCKit.Media.HintVideoSynthesizeFailed" = "视频合成失败";
 "TC.Common.Clear" = "清除";
+"TC.Common.Filter_baixi" = "白皙";
 "TC.Common.Filter_original" = "原图";
+"TC.Common.Filter_ziran" = "自然";
 "TC.Common.Filter_normal" = "标准";
 "TC.Common.Filter_yinghong" = "樱红";
 "TC.Common.Filter_yunshang" = "云裳";
diff --git a/iOS/Demo/XiaoShiPin/Info.plist b/iOS/Demo/XiaoShiPin/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.7.0</string>
+	<string>7.8.0</string>
 	<key>CFBundleVersion</key>
-	<string>555</string>
+	<string>589</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/iOS/Demo/XiaoShiPinApp.xcodeproj/project.pbxproj b/iOS/Demo/XiaoShiPinApp.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 		45D52F74238D6998006F71FA /* PhotoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 45D52F71238D6998006F71FA /* PhotoUtil.m */; };
 		45D56F8B238E60FD008DA052 /* UGCKitWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 45D56F8A238E60FD008DA052 /* UGCKitWrapper.m */; };
 		45E8294B2384EB7800702418 /* TCNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E8294A2384EB7800702418 /* TCNavigationController.m */; };
-		9FD5FA61112B0D236429169E /* TXLiteAVSDK_UGC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3C0660B99DB3B7F1C896051 /* TXLiteAVSDK_UGC.framework */; };
+		FDA619C0690C6254569117DD /* TXLiteAVSDK_UGC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752066EE2777197395789C2A /* TXLiteAVSDK_UGC.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -531,7 +531,7 @@
 		45D56F8A238E60FD008DA052 /* UGCKitWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UGCKitWrapper.m; sourceTree = "<group>"; };
 		45E829492384EB7800702418 /* TCNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TCNavigationController.h; sourceTree = "<group>"; };
 		45E8294A2384EB7800702418 /* TCNavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TCNavigationController.m; sourceTree = "<group>"; };
-		A3C0660B99DB3B7F1C896051 /* TXLiteAVSDK_UGC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_UGC.framework; path = ../SDK/TXLiteAVSDK_UGC.framework; sourceTree = "<group>"; };
+		752066EE2777197395789C2A /* TXLiteAVSDK_UGC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_UGC.framework; path = ../SDK/TXLiteAVSDK_UGC.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -550,7 +550,7 @@
 				40F4D6892473EC9800847F5B /* QCloudCore.framework in Frameworks */,
 				455AAEEB237ABBAA00AF4A3C /* libc++.tbd in Frameworks */,
 				40F4D6882473EC9800847F5B /* libmtasdk.a in Frameworks */,
-				9FD5FA61112B0D236429169E /* TXLiteAVSDK_UGC.framework in Frameworks */,
+				FDA619C0690C6254569117DD /* TXLiteAVSDK_UGC.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -712,7 +712,7 @@
 				455AAEEE237ABBB300AF4A3C /* OpenAL.framework */,
 				455AAEEC237ABBAE00AF4A3C /* libresolv.tbd */,
 				455AAEEA237ABBAA00AF4A3C /* libc++.tbd */,
-				A3C0660B99DB3B7F1C896051 /* TXLiteAVSDK_UGC.framework */,
+				752066EE2777197395789C2A /* TXLiteAVSDK_UGC.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"info" : {`
`3`		`- "version" : 1,`
`4`		`- "author" : "xcode"`
	`3`	`+ "author" : "xcode",`
	`4`	`+ "version" : 1`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`