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

重庆迈尖科技有限公司

2018-08-20 3fcc8c408d9b90fe272232cb4f5541635871d4c3

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

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

 MIduo.xcodeproj/project.pbxproj

@@ -599,6 +599,7 @@
        2D8F4C5A2100672500198E06 /* SettingViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D8F4C592100672500198E06 /* SettingViewModel.m */; };
        2D8F4C5D2100891C00198E06 /* SJTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D8F4C5C2100891C00198E06 /* SJTipView.m */; };
        2DB8DAA121241CAE0034CD7C /* InviteOneCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB8DAA021241CAE0034CD7C /* InviteOneCell.m */; };
        2DF196CA2126BECE0007D310 /* MainBaseController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DF196C92126BECE0007D310 /* MainBaseController.m */; };
        2DF1FA4121250D81007043AF /* UIButton+SGCountdown.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DF1FA3C21250D81007043AF /* UIButton+SGCountdown.m */; };
        2DF1FA4221250D81007043AF /* UIButton+SGEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DF1FA3E21250D81007043AF /* UIButton+SGEvent.m */; };
        2DF1FA4321250D81007043AF /* UIButton+SGImagePosition.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DF1FA4021250D81007043AF /* UIButton+SGImagePosition.m */; };
@@ -1715,6 +1716,8 @@
        2D9767D720C7D7FE006EE24F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
        2DB8DA9F21241CAE0034CD7C /* InviteOneCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InviteOneCell.h; sourceTree = "<group>"; };
        2DB8DAA021241CAE0034CD7C /* InviteOneCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InviteOneCell.m; sourceTree = "<group>"; };
        2DF196C82126BECE0007D310 /* MainBaseController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainBaseController.h; sourceTree = "<group>"; };
        2DF196C92126BECE0007D310 /* MainBaseController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainBaseController.m; sourceTree = "<group>"; };
        2DF1FA3A21250D81007043AF /* SGEasyButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGEasyButton.h; sourceTree = "<group>"; };
        2DF1FA3B21250D81007043AF /* UIButton+SGCountdown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+SGCountdown.h"; sourceTree = "<group>"; };
        2DF1FA3C21250D81007043AF /* UIButton+SGCountdown.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+SGCountdown.m"; sourceTree = "<group>"; };
@@ -3448,6 +3451,8 @@
                18AC534F1E5A92B7006D1FDF /* BaseViewController.m */,
                2D24615521226E7B00D483B1 /* SJBaseViewController.h */,
                2D24615621226E7B00D483B1 /* SJBaseViewController.m */,
                2DF196C82126BECE0007D310 /* MainBaseController.h */,
                2DF196C92126BECE0007D310 /* MainBaseController.m */,
                2D37FC5620C126AD00E11051 /* åŠ¨æ€ */,
                1845E052207A019C00EB1571 /* é‚€è¯· */,
                18AC534B1E5A9186006D1FDF /* é¦–页 */,
@@ -4443,6 +4448,7 @@
                1892034220BE51C6008C1045 /* LBXScanVideoZoomView.m in Sources */,
                1845C4D8209C562E009C639B /* ZXEAN8Reader.m in Sources */,
                2DF1FA4321250D81007043AF /* UIButton+SGImagePosition.m in Sources */,
                2DF196CA2126BECE0007D310 /* MainBaseController.m in Sources */,
                1845C503209C562E009C639B /* ZXQRCodeDataBlock.m in Sources */,
                1845C463209C562D009C639B /* ZXSMSParsedResult.m in Sources */,
                180B16E41F009F320043B74D /* TAAnimatedDotView.m in Sources */,

 MIduo/½çÃæ/MainBaseController.h

New file
@@ -0,0 +1,13 @@
//
//  MainBaseController.h
//  MIduo
//
//  Created by é‡åº†è¿ˆå°–科技有限公司 on 2018/8/17.
//  Copyright Â© 2018å¹´ yeshi. All rights reserved.
//

#import "SJBaseViewController.h"

@interface MainBaseController : SJBaseViewController

@end

 MIduo/½çÃæ/MainBaseController.m

New file
@@ -0,0 +1,41 @@
//
//  MainBaseController.m
//  MIduo
//
//  Created by é‡åº†è¿ˆå°–科技有限公司 on 2018/8/17.
//  Copyright Â© 2018å¹´ yeshi. All rights reserved.
//

#import "MainBaseController.h"

@interface MainBaseController ()

@end

@implementation MainBaseController

- (void)viewDidLoad {
    [super viewDidLoad];
    
    self.view.backgroundColor=XYRBackgroundColor;
    self.automaticallyAdjustsScrollViewInsets=NO;
    
    UIButton *backbutton = [UIButton buttonWithType:UIButtonTypeCustom];
    backbutton.frame=CGRectMake(0, 0, 30, 30);
    [backbutton setImage:[UIImage imageNamed:@"第二版返回按钮"] forState:UIControlStateNormal];
    [backbutton addTarget:self action:@selector(back:) forControlEvents:UIControlEventTouchUpInside];
    
    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backbutton];
}

- (void)back:(UIBarButtonItem*)item {
    
    [self.navigationController popViewControllerAnimated:YES];
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end

 MIduo/½çÃæ/ÎÒµÄ/LoginViewController.h

@@ -21,6 +21,10 @@
 é€šçŸ¥ç‚¹å‡»æˆ‘的界面按钮事件,进入登录后进入其他界面返回协议
 */
- (void)noticeMineBackEvent:(NSString *)vcName;
/**
 é€šçŸ¥æ”¶è—æŒ‰é’®ç™»å½•åŽè¿”回 (收藏按钮独有的delegte)
 */
- (void)noticeCollectionBackWithLoginVc;

@end

@@ -29,6 +33,8 @@
@property (nonatomic, assign) BOOL isShopCar;

@property (nonatomic, assign) BOOL isShopCarShare;
/// æ˜¯ä¸æ˜¯å•†å“è¯¦æƒ…界面，点击收藏登录
@property (nonatomic, assign)BOOL isCollections;

@property (nonatomic, weak) id<LoginViewControllerDelegate>delegate;
/// æ˜¯å¦æ˜¯ç‚¹å‡»è´­ç‰©è½¦æˆ–订单

 MIduo/½çÃæ/ÎÒµÄ/LoginViewController.m

@@ -306,6 +306,7 @@
    messVc.isShopCarShare = self.isShopCarShare;
    messVc.vcName = self.vcName;
    messVc.isClickShopCarOrOrderLogin = self.isClickShopCarOrOrderLogin;
    messVc.isCollections = self.isCollections;
    
    [self.navigationController pushViewController:messVc animated:YES];
}
@@ -326,6 +327,15 @@
    if (_delegate && [_delegate respondsToSelector:@selector(noticeMineBackEvent:)]) {
        
        [_delegate noticeMineBackEvent:vcName];
    }
}


#pragma mark --- é€šçŸ¥ç‚¹å‡»æ”¶è—æŒ‰é’®,短信登录后进入其他界面返回协议 ---
- (void)noticeCollectionBackWithLoginVc {
    
    if (_delegate && [_delegate respondsToSelector:@selector(noticeCollectionBackWithLoginVc)]) {
        [_delegate noticeCollectionBackWithLoginVc];
    }
}

@@ -523,6 +533,13 @@
                    [_delegate shopCarBack:NO isShopCarShare:NO];
                }
            }
            
            if (self.isCollections) {
                
                if (_delegate && [_delegate respondsToSelector:@selector(noticeCollectionBackWithLoginVc)]) {
                    [_delegate noticeCollectionBackWithLoginVc];
                }
            }
        
                [self.navigationController popViewControllerAnimated:YES];
            

 MIduo/½çÃæ/ÎÒµÄ/messageLogin/MessageLoginViewController.h

@@ -12,14 +12,21 @@

@optional
- (void)shopCarMessageBack:(BOOL)isShopCarShare;

/**
 é€šçŸ¥ç‚¹å‡»æˆ‘的界面按钮事件,进入登录后进入其他界面返回协议
 */
- (void)noticeMineBackEventWithMessageLogin:(NSString *)vcName;

/**
 é€šçŸ¥ç‚¹å‡»è®¢å•æˆ–者购物车登录后返回 (订单或者购物车独有的delegte)
 */
- (void)noticeOrderOrShopCarBackWithMMessageLoginVc;

/**
 é€šçŸ¥æ”¶è—æŒ‰é’®ç™»å½•åŽè¿”回 (收藏按钮独有的delegte)
 */
- (void)noticeCollectionBackWithLoginVc;

@end

@@ -35,7 +42,9 @@
@property (nonatomic, weak) UIViewController *rootVc;

@property (nonatomic, weak) id<MessageLoginViewControllerDelegate>delegates;

/// è·³è½¬è¿‡æ¥çš„controller名字
@property (nonatomic, copy) NSString *vcName;
/// æ˜¯ä¸æ˜¯å•†å“è¯¦æƒ…界面，点击收藏登录
@property (nonatomic, assign)BOOL isCollections;

@end

 MIduo/½çÃæ/ÎÒµÄ/messageLogin/MessageLoginViewController.m

@@ -267,6 +267,14 @@
                                   [self->_delegates noticeOrderOrShopCarBackWithMMessageLoginVc];
                               }
                           }
                           
                           if (self.isCollections) {
                               
                               if (self->_delegates && [self->_delegates respondsToSelector:@selector(noticeCollectionBackWithLoginVc)]) {
                                   
                                   [self->_delegates noticeCollectionBackWithLoginVc];
                               }
                           }
                       }
                       
                       

 MIduo/½çÃæ/ÎÒµÄ/userInfoViewController.m

@@ -16,6 +16,9 @@
#import "MessageLoginViewController.h"
//#import "SJRemoveBoundView.h"
#import "SJUnbindPhoneViewController.h"

#import "MainInviteViewController.h"

@interface userInfoViewController ()<UITableViewDelegate, UITableViewDataSource>

@property (weak, nonatomic) IBOutlet UITableView *userInfoTableView;
@@ -259,33 +262,27 @@
}

#pragma mark -UITableViewDelegate
//- (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSIndexPath *)indexPath{
//    if (indexPath.section>0) {
//        return YES;
//    }
//    return NO;
//}

- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
    [tableView deselectRowAtIndexPath:indexPath animated:YES];
//    if (indexPath.section == 0 && indexPath.row == 2) {
//        MergeAccountViewController *merVC=[[MergeAccountViewController alloc] init];
//        merVC.hidesBottomBarWhenPushed=YES;
//        [self.navigationController pushViewController:merVC animated:YES];
//    }

    if (indexPath.section == 0 && indexPath.row == 3) {
        GradeViewController *gradeVC=[[GradeViewController alloc] init];
        gradeVC.hidesBottomBarWhenPushed=YES;
        [self.navigationController pushViewController:gradeVC animated:YES];
        
        MainInviteViewController *mainInviteVc = [[MainInviteViewController alloc] init];
        mainInviteVc.isMine = YES;
        [self.navigationController pushViewController:mainInviteVc animated:YES];
        
    }
    if (indexPath.section == 1 && indexPath.row == 2) {
        NSString *phoneStr = _userInfo[@"phone"];
        
        if(phoneStr.length != 0){
            SJUnbindPhoneViewController *unBoundVC = [[SJUnbindPhoneViewController alloc]init];
            unBoundVC.hidesBottomBarWhenPushed = YES;
            [self.navigationController pushViewController:unBoundVC animated:YES];
//            self.removeBoundView.hidden = NO;
        }else{

        } else {
            
            MessageLoginViewController *messVC = [[MessageLoginViewController alloc]init];
            messVC.hidesBottomBarWhenPushed = YES;
            messVC.isBoundPhone = YES;
@@ -314,7 +311,7 @@
                            [SVProgressHUD showSuccessWithStatus:BIND_REMOVE_SUCCESS];
                            [self LoginForBuXinJie];
                            [[ALBBSDK sharedInstance] logout];
                            [self WeChatReload];
                            //[self WeChatReload];
                        }else{
                            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
                            [SVProgressHUD showErrorWithStatus:object[@"msg"]];

 MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/ButtomCarView.h

@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
@class ButtomCarView;
@protocol ButtomCarViewDelegate <NSObject>
- (void)collectCliced:(ButtomCarView *)view ;

- (void)shareClicked:(ButtomCarView *)view;
- (void)buyClicked:(ButtomCarView *)view;
@end
@@ -18,6 +18,10 @@
@property (nonatomic,strong)UIButton *shareButton;
@property (nonatomic,strong)UIButton *buyButton;
@property (nonatomic,strong)UILabel *moneyLabel;

@property (nonatomic,strong)UIImageView *heartImage;
@property (nonatomic,strong)UILabel *collecLabel;

@property (nonatomic,weak)id<ButtomCarViewDelegate>delegate;

- (void)loadViewInfomation:(NSDictionary *)dic;

 MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/ButtomCarView.m

@@ -9,8 +9,7 @@
#import "ButtomCarView.h"

@interface ButtomCarView()
@property (nonatomic,strong)UIImageView *heartImage;
@property (nonatomic,strong)UILabel *collecLabel;

@property (nonatomic,strong)NSDictionary *dic;
@property (nonatomic,assign)BOOL isCollect;
@property (nonatomic,assign)NSInteger TopHeight;
@@ -52,16 +51,6 @@
        _moneyLabel.text = @"";
        _moneyLabel.textColor = SJColor(253, 215, 3, 1);
        [self addSubview:_moneyLabel];
        
//        if (IsiPhoneX) {
//            [self.buyButton setTitle:@"" forState:UIControlStateNormal];
//            UILabel *buyLabel = [[UILabel alloc]initWithFrame:CGRectMake(CGRectGetMinX(self.buyButton.frame), CGRectGetMinY(self.buyButton.frame), self.buyButton.frame.size.width, self.buyButton.frame.size.height - 20)];
//            buyLabel.textAlignment = NSTextAlignmentCenter;
//            buyLabel.text = @"立即购买";
//            buyLabel.font = [UIFont systemFontOfSize:16];
//            buyLabel.textColor = XYRMainColor;
//            [self addSubview:buyLabel];
//        }
    }
    return self;
}
@@ -81,48 +70,7 @@
    }
    self.moneyLabel.text = dic[@"shareMoney"];
}
- (void)collectTaped:(UIButton *)sender{
    if (_delegate && [_delegate respondsToSelector:@selector(collectCliced:)]) {
        [_delegate collectCliced:self];
    }
    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) {
        return;
    }
    
    NSMutableDictionary *dic = [[NSMutableDictionary alloc] init];
    
    [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"];
    [dic setObject:self.dic[@"goods"][@"auctionId"] forKey:@"auctionId"];

    if (!self.isCollect) {
        [dic setObject:@"1" forKey:@"type"];
    }else{
        [dic setObject:@"2" forKey:@"type"];
    }
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/collectionGoods"] param:dic success:^(NSDictionary *object) {
        NSLog(@"%@",object);
        NSInteger code = [object[@"code"]integerValue];
        if (code == 0) {
            self.isCollect = !self.isCollect;
            if (self.isCollect) {
                self->_heartImage.image = [UIImage imageNamed: @"商品详情-已收藏"];
                self->_collecLabel.text = @"已收藏";
            }else{
                self->_heartImage.image = [UIImage imageNamed: @"商品详情-收藏"];
                self->_collecLabel.text = @"收藏";            }
            
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showSuccessWithStatus:[object objectForKey:@"data"]];
        }else{
            
            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
            [SVProgressHUD showWithStatus:[object objectForKey:@"data"]];
        }
        
    } fail:^(id object) {
        NSLog(@"%@",object);
    }];
}
- (void)shareTaped:(UIButton *)sender{
    if (_delegate && [_delegate respondsToSelector:@selector(shareClicked:)]) {
        [_delegate shareClicked:self];
@@ -133,45 +81,6 @@
    if (_delegate && [_delegate respondsToSelector:@selector(buyClicked:)]) {
        [_delegate buyClicked:self];
    }
}

//网络请求基本信息
-(NSMutableDictionary *)CommonDictionary{
    NSString *device=[NSString DeviceIdentifier];
    NSString *AppSecre=@"23649898";
    NSString *apiversion=@"1";
    NSString *platform=@"ios";
    
    NSMutableDictionary *dic = [[NSMutableDictionary alloc] initWithCapacity:0];
    
    [dic setObject:AppSecre forKey:@"appkey"];
    [dic setObject:device forKey:@"device"];
    [dic setObject:Package forKey:@"packages"];
    [dic setObject:Version forKey:@"version"];
    [dic setObject:apiversion forKey:@"apiversion"];
    [dic setObject:platform forKey:@"platform"];
    
    //现在的时间
    NSTimeInterval timeNow = [[NSDate date] timeIntervalSince1970];
    long long int date = (long long int)timeNow*1000;
    NSString *timeStr=[NSString stringWithFormat:@"%lld",date];
    [dic setObject:timeStr forKey:@"time"];
    
    //加密方法
    NSArray * array = [[NSArray alloc]initWithObjects:AppSecre,device,Package,Version,apiversion,platform,timeStr,nil];
    //排序
    NSArray *resultArrayrr = [array sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
        NSComparisonResult result = [obj1 compare:obj2];
        return result == NSOrderedDescending; // å‡åº
    }];
    
    NSString *sign =[[NSString alloc] init];
    for (int i=0; i<resultArrayrr.count; i++) {
        sign=[sign stringByAppendingString:resultArrayrr[i]];
    }
    sign=[sign stringByAppendingString:@"buXiNjie2017!"];
    [dic setObject:[NSString md5:sign] forKey:@"sign"];
    return dic;
}

#pragma mark - getter
@@ -196,7 +105,7 @@
    _collecLabel.font = [UIFont systemFontOfSize:16];
    _collecLabel.textColor = XYRMainColor;
    _collecLabel.textAlignment = NSTextAlignmentCenter;
    [_collectButton addTarget:self action:@selector(collectTaped:) forControlEvents:UIControlEventTouchUpInside];

    return _collectButton;
}
- (UIButton *)shareButton{

 MIduo/½çÃæ/ÍøÒ³ÊÓͼ/ÉÌÆ·ÏêÇé/GoodDeTrViewController.m

@@ -62,6 +62,10 @@
/// æ˜¯å¦éœ€è¦åŠ è½½è¿›åº¦æ¡
@property (nonatomic, assign) BOOL isProgressHud;

/// æ ¹æ®bool值判断是否收藏
@property (nonatomic, assign) BOOL isCollection;
@property (nonatomic, assign) BOOL isCollectionBack;

@end

@implementation GoodDeTrViewController
@@ -151,6 +155,101 @@
    [self.view addSubview:self.backButton];
    [self.view addSubview:self.buttomView];
    [self .view addSubview:self.transitionView];
    
    [self.buttomView.collectButton addTarget:self action:@selector(collectTaped:)
                            forControlEvents:UIControlEventTouchUpInside];
}

- (void)collectTaped:(UIButton *)sender {
    
    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"userId"]) {
        
        self.isCollectionBack = YES;
        
        LoginViewController *loginVc = [[LoginViewController alloc] init];
        loginVc.hidesBottomBarWhenPushed = YES;
        loginVc.isShopCar = YES;
        loginVc.isCollections = YES;
        loginVc.delegate = self;
        loginVc.rootVc = self;
        [self.navigationController pushViewController:loginVc animated:YES];
        
        return;
    }
    
    [self fecthAndPostCollection];
}

#pragma mark --- æ”¶è—äº‹ä»¶ ---
/**
 æ”¶è—äº‹ä»¶
 */
- (void)fecthAndPostCollection {
   
    self.buttomView.collectButton.enabled = NO;
    
    NSMutableDictionary *dic = @{}.mutableCopy;
    [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"];
    [dic setObject:self.dataSource[@"goods"][@"auctionId"] forKey:@"auctionId"];
    
    if (!self.isCollection) {
        
        [dic setObject:@"1" forKey:@"type"];
        
    } else {
        
        [dic setObject:@"2" forKey:@"type"];
    }
    
    [[YTHNetInterface startInterface] cancelAll];

    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/collectionGoods"]
                 param:dic
               success:^(NSDictionary *object) {
                   
                   self.buttomView.collectButton.enabled = YES;
                   
                   NSInteger code = [object[@"code"] integerValue];
                   
                   if (code == 0) {
                       
                       self.isCollection = !self.isCollection;
                       
                       if (self.isCollection) {
                           
                           self.buttomView.heartImage.image = [UIImage imageNamed: @"商品详情-已收藏"];
                           self.buttomView.collecLabel.text = @"已收藏";
                           self.buttomView.collecLabel.textColor = XYRMainColor;
                           
                       } else {
                           
                           self.buttomView.heartImage.image = [UIImage imageNamed: @"商品详情-收藏"];
                           self.buttomView.collecLabel.text = @"收藏";
                           self.buttomView.collecLabel.textColor = SJColor(153, 153, 153, 1);
                       }
                       [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];
                       [SVProgressHUD showSuccessWithStatus:[object objectForKey:@"data"]];
                       
                   } else {
                       
                       if ([object[@"code"]integerValue] == 1) {
                           self.isCollection = YES;
                           self.buttomView.heartImage.image = [UIImage imageNamed: @"商品详情-已收藏"];
                           self.buttomView.collecLabel.text = @"已收藏";
                           self.buttomView.collecLabel.textColor = XYRMainColor;
                       }
                   }
                   
               } fail:^(id object) {
                   self.buttomView.collectButton.enabled = YES;
                   ALToastCenter(object[@"msg"]);
               }];
}

- (void)noticeCollectionBackWithLoginVc {
    
    // ç™»å½•æˆåŠŸåŽ ç›´æŽ¥æ”¶è—æˆ–跳转
    [self fecthAndPostCollection];
}

#pragma mark --- Custom method ---
@@ -313,6 +412,18 @@
         [SVProgressHUD dismiss];
        [self.detailTableview reloadData];
        [self getRecomeSource];
        
        NSInteger isCollect = [self.dataSource[@"collected"] integerValue];
        
        if (isCollect == 0) {
            
            self.isCollection = NO;
            
        } else {
            
            self.isCollection = YES;
        }
        
        [self.buttomView loadViewInfomation:self.dataSource];
        self.alibaichuan = [[SJAliBaicun alloc] initWithDic:self.dataSource[@"tbPidInfo"]];
        
@@ -433,13 +544,20 @@
#pragma mark --- ç™»å½•æˆåŠŸè¿”回 é€šçŸ¥ ---
- (void)shopCarBack:(BOOL)isSMS isShopCarShare:(BOOL)isShopCarShare{
    
    if (isShopCarShare) {
    if (self.isCollectionBack) {
        
        [self jumpCreateShare];
        self.isCollectionBack = NO;
        
    } else {
        
        [self detectionIsBindTaoBaoTips];
        if (isShopCarShare) {
            
            [self jumpCreateShare];
            
        } else {
            
            [self detectionIsBindTaoBaoTips];
        }
    }
}


 MIduo/½çÃæ/ÑûÇë/InviteViewCell/InviteTwoCell.h

@@ -8,6 +8,10 @@

#import <UIKit/UIKit.h>

static const CGFloat currentWidth = 375;
static const CGFloat currentHeight = 363;


@interface InviteTwoCell : UITableViewCell

@end

 MIduo/½çÃæ/ÑûÇë/InviteViewCell/InviteTwoCell.m

@@ -44,12 +44,27 @@

- (void)cellConfig {
    
    CGFloat setHeight = 0;
    
    if (SCREEN_WIDTH > 375) {
        
        setHeight = (SCREEN_WIDTH - currentWidth) + currentHeight;
        
    } else if (SCREEN_WIDTH < 375) {
        
         setHeight = currentHeight - (currentWidth - SCREEN_WIDTH);
        
    } else {
        
        setHeight = currentHeight;
    }
    
    [self.contentView addSubview:self.bgImgView];
    self.bgImgView.sd_layout
    .rightSpaceToView(self.contentView, 0)
    .topSpaceToView(self.contentView, 0)
    .leftSpaceToView(self.contentView, 0)
    .heightIs(363);
    .heightIs(setHeight);
}

#pragma mark --- getter ---

 MIduo/½çÃæ/ÑûÇë/InviteViewCell/InvitewFourCell.m

@@ -57,7 +57,7 @@
    if (!_titlesLabel) {
        _titlesLabel = [[UILabel alloc] init];
        _titlesLabel.textAlignment = NSTextAlignmentLeft;
        _titlesLabel.font = [UIFont boldSystemFontOfSize:14];
        _titlesLabel.font = [UIFont boldSystemFontOfSize:15];
        _titlesLabel.textColor = SJColor(136, 136, 136, 1.0);
    }
    return _titlesLabel;
@@ -67,9 +67,9 @@
    
    if (model) {
        
        self.titlesLabel.attributedText = model.activityRulesAttributed;
        self.titlesLabel.text = [model.activityRulesAttributed string];
        
        [self setupAutoHeightWithBottomView:self.titlesLabel bottomMargin:0];
        [self setupAutoHeightWithBottomView:self.titlesLabel bottomMargin:20];
    }
}


 MIduo/½çÃæ/ÑûÇë/MainInviteViewController.h

@@ -7,8 +7,9 @@
//

#import <UIKit/UIKit.h>
#import "MainBaseController.h"

@interface MainInviteViewController : SJBaseViewController
@interface MainInviteViewController : MainBaseController

@property (nonatomic)BOOL isMine;


 MIduo/½çÃæ/ÑûÇë/MainInviteViewController.m

@@ -73,7 +73,7 @@
        [self.navigationController setNavigationBarHidden:YES animated:animated];
        
    } else {
        //self.title = @"邀请有奖";
        self.title = @"邀请有奖";
        [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
    }
    
@@ -119,9 +119,6 @@
- (NSAttributedString *)stringWithAttributedString:(NSString *)str {
    
    NSMutableAttributedString * attrString = [[NSMutableAttributedString alloc] initWithData:[str dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType} documentAttributes:nil error:nil];
    
    //设置基线偏移值，取值为 NSNumber ï¼ˆfloat）,正值上偏，负值下偏，可使UILabel文本垂直居中
    [attrString addAttributes:@{NSBaselineOffsetAttributeName:@(5), NSFontAttributeName:[UIFont systemFontOfSize:14]} range:NSMakeRange(0, attrString.length)];
    
    return attrString;
}
@@ -181,12 +178,6 @@
    
    _primtWindow.hidden = YES;
    _primtWindow = nil;
}

- (void)onRefreshData {
    
    NSIndexSet *reloadSet = [NSIndexSet indexSetWithIndex:3];
    [self.tableView reloadSections:reloadSet withRowAnimation:UITableViewRowAnimationNone];
}

#pragma mark - UITableViewDataSource,UITableViewDelegate
@@ -299,7 +290,22 @@
        
    } else if (indexPath.section == 1) {
        
        return 363;
        CGFloat setHeight = 0;
        
        if (SCREEN_WIDTH > 375) {
            
            setHeight = (SCREEN_WIDTH - currentWidth) + currentHeight;
            
        } else if (SCREEN_WIDTH < 375) {
            
            setHeight = currentHeight - (currentWidth - SCREEN_WIDTH);
            
        } else {
            
            setHeight = currentHeight;
        }
        
        return setHeight;
        
    } else if (indexPath.section == 2) {
        
@@ -356,29 +362,40 @@
- (UITableView *)tableView {
    if (!_tableView) {
        
        NSInteger height = -20;
        CGRect rect;
        NSInteger height;
        
        if (IsiPhoneX) {
            
            height = -44;
            
        } else if (IS_IPHONE_5) {
        if (self.isMine) {
            
            height = 0;
            
            rect.size.height = SCREEN_HEIGHT - kNavigationBarH - kStatusBarH;
            
        } else {
            
            height = -20;
            
            if (IsiPhoneX) {
                
                height = -44;
                
            } else if (IS_IPHONE_5) {
                
                height = 0;
            }
            
             rect.size.height = SCREEN_HEIGHT - kToolBarH - height;
        }
        
        CGRect rect;
        rect.origin.x = 0;
        rect.origin.y = height;
        rect.size.width = SCREEN_WIDTH;
        rect.size.height = SCREEN_HEIGHT - kToolBarH - height;
        
        
       
        _tableView = [[UITableView alloc] initWithFrame:rect
                                                  style:UITableViewStyleGrouped];
        _tableView.delegate = self;
        _tableView.dataSource = self;
        _tableView.estimatedRowHeight = 40;
        _tableView.estimatedRowHeight = 0;
        _tableView.estimatedSectionHeaderHeight = 0;
        _tableView.estimatedSectionFooterHeight = 0;
        _tableView.backgroundColor = XYRBackgroundColor;

 MIduo/½çÃæ/Ê×Ò³/NEWHomeViewController.m

@@ -683,6 +683,7 @@
    
    self.baseView.backgroundColor = [UIColor clearColor];
    [self.view addSubview:self.baseView];
    self.baseView.hidden = YES;
    
    //无网占位图
    UIImageView *iconImage=[[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 146, 123)];
@@ -698,7 +699,6 @@
    
    // è”网按钮
    UIButton *connectBtn=[[UIButton alloc] initWithFrame:CGRectMake(21, CGRectGetMaxY(label.frame) + 5, 103, 35)];
    // [connectBtn setImage:[UIImage imageNamed:@"设置网络"] forState:UIControlStateNormal];
    connectBtn.layer.cornerRadius = connectBtn.frame.size.height / 2;
    connectBtn.layer.masksToBounds = YES;
    [connectBtn setTitle:@"重新加载" forState:UIControlStateNormal];
@@ -708,7 +708,6 @@
    [self.baseView addSubview:connectBtn];
    
    // å› ä¸ºè¿™ä¸ªè§†å›¾çš„特殊性，必须隐藏
    [self.baseView setHidden:YES];
}

- (void)ClickConnectBtn:(UIButton *)sender {
@@ -727,7 +726,7 @@
            
        case 0:
            // æ²¡æœ‰ç½‘络
            [self.baseView setHidden:NO];
            self.baseView.hidden = NO;
            // [self.view bringSubviewToFront:baseView];
            [self.scrollPageView setHidden:YES];
            break;
@@ -735,7 +734,7 @@
        case 1:
            // 3G或者4G，反正用的是流量
            [self.scrollPageView setHidden:NO];
            [self.baseView setHidden:YES];
            self.baseView.hidden = YES;
            
            [self loadData];
            break;
@@ -743,7 +742,7 @@
        case 2:
            // WIFI网络
            [self.scrollPageView setHidden:NO];
            [self.baseView setHidden:YES];
            self.baseView.hidden = YES;
            
            [self loadData];
            break;