Merge branch 'master' of https://github.com/yidun/alive-detected-iOS-…

…demo # Conflicts: # NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo.xcodeproj/project.pbxproj # NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo/View/NTESLiveDetectView.m # NTESLiveDetectPublicDemo/Podfile # NTESLiveDetectPublicDemo/Podfile.lock
yidun · Dec 25, 2023 · 0064596 · 0064596
2 parents 25e2c15 + 2e7690d
commit 0064596
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo/LDDemoDefines.h b/NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo/LDDemoDefines.h
@@ -34,7 +34,7 @@
 #define UIColorFromHex(hexValue)        UIColorFromHexA(hexValue, 1.0f)
 
 #define bottomCopyRightText         @"© 1997-2020 网易公司"
-#define imageViewWidth              (300 * KWidthScale)
+#define imageViewWidth              (260 * KWidthScale)
 // 传入imageView的宽高比应为3:4
 #define imageViewHeight             (imageViewWidth * 4 / 3)
 #define cameraViewRadius            (130 * KWidthScale)

diff --git a/NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo/View/NTESLiveDetectView.m b/NTESLiveDetectPublicDemo/NTESLiveDetectPublicDemo/View/NTESLiveDetectView.m
@@ -92,7 +92,6 @@ - (void)customInitSubViews {
     [self __initVoiceButton];
     [self __initActivityIndicator];
     [self __initTitle];
-    [self transparentCutRoundArea];
 }
 
 - (void)showActionTips:(NSString *)actions {
@@ -291,16 +290,9 @@ - (void)__initImageView {
     [self.fuzzyImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self);
         make.top.equalTo(self).mas_offset(IS_IPHONE_X ? 50+statusBarHeight : 4+statusBarHeight);
-        make.width.equalTo(@(imageViewWidth));
-        make.height.equalTo(@(imageViewHeight));
+        make.width.equalTo(@(50));
+        make.height.equalTo(@(50));
     }];
-
-  UIBezierPath *cropPath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(imageViewWidth/2, imageViewHeight/2) radius:cameraViewRadius startAngle:DegreesToRadian(-35) endAngle:DegreesToRadian(215) clockwise:NO];
-   CAShapeLayer *cropLayer = [CAShapeLayer layer];
-   cropLayer.path = cropPath.CGPath;
-    cropLayer.fillColor = [[UIColor ntes_colorWithHexString:@"#E2E2E2"] colorWithAlphaComponent:0.9].CGColor;
-   cropLayer.zPosition = 2.0f;
-  [self.fuzzyImage.layer addSublayer:cropLayer];
 }
 
 - (void)__initActionsText {