Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

重庆迈尖科技有限公司

2020-06-30 9487b7da49e0279fa69b135c6275c9d159aeddd4

Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

 MIduo.xcworkspace/xcuserdata/lrj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 MIduo.xcworkspace/xcuserdata/lrj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -20,5 +20,17 @@
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            uuid = "6D4329AC-3769-406F-808A-6310024843CC"
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            breakpointStackSelectionBehavior = "1"
            scope = "1"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>

 MIduo/数据/ALWebView/ShonpingShareViewController.m

@@ -708,8 +708,23 @@
    }];
}

- (void)addMenu:(NSArray *)arraryJS {
    NSArray *array = arraryJS;
- (void)addMenu:(NSString *)arraryJS {
    NSArray *array = nil;
    
    @try {
        NSData *jsonData = [arraryJS dataUsingEncoding:NSUTF8StringEncoding];
        array = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:nil];
        
    } @catch (NSException *exception) {
       
        
    } @finally {
        if (!array) {
            array = (NSArray *)arraryJS;
        }
    }
    
    
    if (![self isHaveValue:array]) {
        return;
    }

 MIduo/界面/商品详情/View/ButtomCarView.m

@@ -98,6 +98,10 @@
}

- (void)loadViewInfomation:(GoodsDetailBaseModel *)model extraDic:(NSDictionary *)extraDic {
    
    BOOL fanliValid = [extraDic[@"fanliValid"] boolValue];
    BOOL shareValid = [extraDic[@"shareValid"] boolValue];
    
    if (_from && [_from isEqualToString:@"miandan"]) {
        self.buttonCopuLink.hidden = YES;
        self.buttonCollection.hidden = YES;
@@ -117,15 +121,18 @@
        }
        
        [self.buyButton updateLayout];
        [self.shareButton updateLayout];
        
        if ([YTHsharedManger startManger].iosonling == 0) {
            UIBezierPath *maskPathBuyButton = [UIBezierPath bezierPathWithRoundedRect:self.buyButton.bounds byRoundingCorners:UIRectCornerBottomRight | UIRectCornerTopRight cornerRadii:CGSizeMake(20, 20)];
        if (shareValid) {
            UIBezierPath *maskPathBuyButton = [UIBezierPath bezierPathWithRoundedRect:self.buyButton.bounds byRoundingCorners:UIRectCornerTopRight | UIRectCornerBottomRight cornerRadii:CGSizeMake(20, 20)];
            CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
            maskLayer.frame = self.buyButton.bounds;
            maskLayer.path = maskPathBuyButton.CGPath;
            self.buyButton.layer.mask = maskLayer;
            
        } else {
            self.shareButton.hidden = YES;
            
            UIBezierPath *maskPathBuyButton = [UIBezierPath bezierPathWithRoundedRect:self.buyButton.bounds byRoundingCorners:UIRectCornerAllCorners cornerRadii:CGSizeMake(20, 20)];
            CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
            maskLayer.frame = self.buyButton.bounds;
@@ -133,12 +140,34 @@
            self.buyButton.layer.mask = maskLayer;
        }
        
        [self.shareButton updateLayout];
        UIBezierPath *maskPathShareButton = [UIBezierPath bezierPathWithRoundedRect:self.shareButton.bounds byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(20, 20)];
        CAShapeLayer *maskLayer1 = [[CAShapeLayer alloc] init];
        maskLayer1.frame = self.shareButton.bounds;
        maskLayer1.path = maskPathShareButton.CGPath;
        self.shareButton.layer.mask = maskLayer1;
        if (fanliValid) {
            UIBezierPath *maskPathShareButton = [UIBezierPath bezierPathWithRoundedRect:self.shareButton.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(20, 20)];
            CAShapeLayer *maskLayer1 = [[CAShapeLayer alloc] init];
            maskLayer1.frame = self.shareButton.bounds;
            maskLayer1.path = maskPathShareButton.CGPath;
            self.shareButton.layer.mask = maskLayer1;
            
        } else {
            self.buyButton.hidden = YES;
            self.shareButton.sd_resetLayout.rightSpaceToView(self, 5).topSpaceToView(self, 5).widthIs((SCREEN_WIDTH - 115) / 2).heightIs(40);
            UIBezierPath *maskPathShareButton = [UIBezierPath bezierPathWithRoundedRect:self.shareButton.bounds byRoundingCorners:UIRectCornerAllCorners cornerRadii:CGSizeMake(20, 20)];
            CAShapeLayer *maskLayer1 = [[CAShapeLayer alloc] init];
            maskLayer1.frame = self.shareButton.bounds;
            maskLayer1.path = maskPathShareButton.CGPath;
            self.shareButton.layer.mask = maskLayer1;
        }
        
        if ([YTHsharedManger startManger].iosonling == 0) {
            
            
        } else {
            self.shareButton.hidden = YES;
            UIBezierPath *maskPathBuyButton = [UIBezierPath bezierPathWithRoundedRect:self.buyButton.bounds byRoundingCorners:UIRectCornerAllCorners cornerRadii:CGSizeMake(20, 20)];
            CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
            maskLayer.frame = self.buyButton.bounds;
            maskLayer.path = maskPathBuyButton.CGPath;
            self.buyButton.layer.mask = maskLayer;
        }
        
        self.labelContentBuy.text = model.moneyInfo.fanliMoney;
        self.labelContentShare.text = model.moneyInfo.shareMoney;
@@ -192,9 +221,6 @@
    _buyButton .backgroundColor = XYRMainColor;
    _buyButton.titleLabel.font = [UIFont boldSystemFontOfSize:15];
    [_buyButton addTarget:self action:@selector(buyTaped:) forControlEvents:UIControlEventTouchUpInside];
    if(SCREEN_WIDTH < 375){
        _buyButton.titleLabel.font = [UIFont boldSystemFontOfSize:13];
    }
    return _buyButton;
}