重庆迈尖科技有限公司
2018-08-20 084ca63004892f334a275d69aa56104633f60fba
no message
7个文件已修改
109 ■■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/数据/YTHsharedManger.h 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/动态/DynamicViewController.m 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/message/MineMessageViewController.m 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/网页视图/商品详情/ButtomCarView.m 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/首页/NEWHomeViewController.m 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -36,28 +36,12 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/界面/动态/DynamicViewController.m"
            timestampString = "556172363.6755069"
            timestampString = "556441547.824281"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "229"
            endingLineNumber = "229"
            landmarkName = "-wxShareWithArray:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/messageLogin/MessageLoginViewController.m"
            timestampString = "556193788.808499"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "415"
            endingLineNumber = "415"
            landmarkName = "-sendMessage:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
@@ -90,22 +74,6 @@
            startingLineNumber = "253"
            endingLineNumber = "253"
            landmarkName = "-getAccount"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x6211;&#x7684;/MineViewController.m"
            timestampString = "556193788.808673"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "1149"
            endingLineNumber = "1149"
            landmarkName = "-tableView:cellForRowAtIndexPath:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
MIduo/Êý¾Ý/YTHsharedManger.h
@@ -38,7 +38,7 @@
/// æ˜¯å¦æ˜¯ç‚¹å‡»è´­ç‰©è½¦æˆ–者订单微信登录的判断
@property (nonatomic, assign) BOOL isShopCarWXLogin;
@property (nonatomic, strong) NSString *alipay_helpUrlString;
@property (nonatomic, assign)NSInteger playingType;
+ (YTHsharedManger *)startManger;
//返利券登录
MIduo/½çÃæ/¶¯Ì¬/DynamicViewController.m
@@ -600,8 +600,14 @@
        
        _tableview.rowHeight = cell.labelHeight.constant + 95;
    } else {
        if ([YTHsharedManger startManger].playingType == 0) {
            cell.buttomView .hidden = NO;
            _tableview .rowHeight = _tableview.rowHeight - 10;
        }else{
            cell.buttomView .hidden = YES;
            _tableview .rowHeight = _tableview.rowHeight - 30;
        }
        
        cell.buttomView .hidden = NO;
    }
    cell.selectionStyle = UITableViewCellSelectionStyleNone;
    
MIduo/½çÃæ/ÎÒµÄ/message/MineMessageViewController.m
@@ -131,7 +131,7 @@
    if (_messageTableView) {
        return _messageTableView;
    }
    _messageTableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, KScreenW, KScreenH) style:UITableViewStylePlain];
    _messageTableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, KScreenW, KScreenH - kNavigationBarH - kStatusBarH) style:UITableViewStylePlain];
    _messageTableView.delegate = self;
    _messageTableView.dataSource = self;
    _messageTableView.rowHeight = 150;
MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/ButtomCarView.m
@@ -25,32 +25,39 @@
        [self addSubview:self.buyButton];
        [self addSubview:_heartImage];
        [self addSubview:_collecLabel];
        UIImageView *shareImage = [[UIImageView alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 35 - 3   , 7, 17, 16)];
        if (KScreenW < 375) {
            shareImage.frame = CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 30   , 3, 19, 17);
        if ([YTHsharedManger startManger].playingType == 0) {
            UIImageView *shareImage = [[UIImageView alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 35 - 3   , 7, 17, 16)];
            if (KScreenW < 375) {
                shareImage.frame = CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 30   , 3, 19, 17);
            }
            shareImage.image = [UIImage imageNamed:@"detailShare"];
            [self addSubview:shareImage];
            UILabel *sharelabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMaxX(shareImage.frame) + 8  , 6, 65, 18)];
            if (KScreenW < 375) {
                sharelabel.frame = CGRectMake(CGRectGetMaxX(shareImage.frame) + 5  , 2, 65, 22);
                shareImage.bounds = CGRectMake(0, 0, 15, 14);
            }else if(KScreenW > 375){
                shareImage.frame = CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 30   , 8, 19, 17);
                sharelabel.frame = CGRectMake(CGRectGetMaxX(shareImage.frame) + 10  , 7, 65, 22);
            }
            //        sharelabel.textAlignment = NSTextAlignmentCenter;
            sharelabel.text = @"分享奖金";
            sharelabel.font = [UIFont boldSystemFontOfSize:15];
            sharelabel.textColor = SJColor(253, 215, 3, 1);
            [self addSubview:sharelabel];
            _moneyLabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.shareButton.frame), CGRectGetMaxY(sharelabel.frame) , self.shareButton.frame.size.width, 18)];
            _moneyLabel.font = [UIFont systemFontOfSize:15];
            _moneyLabel.textAlignment = NSTextAlignmentCenter;
            _moneyLabel.text = @"";
            _moneyLabel.textColor = SJColor(253, 215, 3, 1);
            [self addSubview:_moneyLabel];
        }else{
            self.shareButton.hidden = YES;
            self.buyButton.frame = CGRectMake(CGRectGetMaxX(self.collectButton.frame), CGRectGetMinY(self.collectButton.frame), KScreenW - self.collectButton.frame.size.width, self.collectButton.frame.size.height);
        }
        shareImage.image = [UIImage imageNamed:@"detailShare"];
        [self addSubview:shareImage];
        UILabel *sharelabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMaxX(shareImage.frame) + 8  , 6, 65, 18)];
        if (KScreenW < 375) {
            sharelabel.frame = CGRectMake(CGRectGetMaxX(shareImage.frame) + 5  , 2, 65, 22);
            shareImage.bounds = CGRectMake(0, 0, 15, 14);
        }else if(KScreenW > 375){
            shareImage.frame = CGRectMake(CGRectGetMinX(self.shareButton.frame) + (KScreenW - KScreenW / 5) / 4 - 30   , 8, 19, 17);
            sharelabel.frame = CGRectMake(CGRectGetMaxX(shareImage.frame) + 10  , 7, 65, 22);
        }
//        sharelabel.textAlignment = NSTextAlignmentCenter;
        sharelabel.text = @"分享奖金";
        sharelabel.font = [UIFont boldSystemFontOfSize:15];
        sharelabel.textColor = SJColor(253, 215, 3, 1);
        [self addSubview:sharelabel];
        _moneyLabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.shareButton.frame), CGRectGetMaxY(sharelabel.frame) , self.shareButton.frame.size.width, 18)];
        _moneyLabel.font = [UIFont systemFontOfSize:15];
        _moneyLabel.textAlignment = NSTextAlignmentCenter;
        _moneyLabel.text = @"";
        _moneyLabel.textColor = SJColor(253, 215, 3, 1);
        [self addSubview:_moneyLabel];
    }
    return self;
}
MIduo/½çÃæ/Ê×Ò³/NEWHomeViewController.m
@@ -502,7 +502,11 @@
                   for (NSInteger index = 0; index < array.count; index ++) {
                       
                       NSDictionary *dic = array[index];
                       if ([dic[@"key"] compare:@"iosonling"] == 0) {
                           [YTHsharedManger startManger].playingType =  [[NSString stringWithFormat:@"%@", dic[@"value"]]integerValue];// 1为上线前,隐藏,0 ï¼šä¸éšè—
//                           [YTHsharedManger startManger].playingType = 0;
                       }
                       if ([dic[@"key"] compare:@"alipay_help"] == 0) {//支付宝帮助详情
                           [YTHsharedManger startManger].alipay_helpUrlString =  [NSString stringWithFormat:@"%@", dic[@"value"]];
                       }