0724

KuDianProject.xcodeproj/project.pbxproj

@@ -1596,7 +1596,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1679,7 +1679,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1691,8 +1691,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1775,7 +1775,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dis;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -29,13 +29,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
-            timestampString = "584959676.7361929"
+            filePath = "KuDianProject/TOP/View/Detail/KDPPasteView.m"
+            timestampString = "584979530.172259"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "106"
-            endingLineNumber = "106"
-            landmarkName = "-JumpGoodDetail:"
+            startingLineNumber = "74"
+            endingLineNumber = "74"
+            landmarkName = "-clickTBBtuuton"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

KuDianProject/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>104</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

KuDianProject/LiveData/Controller/KDPLiveRightTableViewCell.m

@@ -166,7 +166,7 @@
     [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:statisModel.img]placeholderImage:[UIImage imageNamed:placholderImg]];
     self.titleLabel.text = statisModel.name;
     self.priceLabel.text = [NSString stringWithFormat:@"%.2f",[statisModel.money floatValue]];
-    self.profitLabel.text = [NSString stringWithFormat:@"%@%%",statisModel.commission_rate];
+    self.profitLabel.text = [NSString stringWithFormat:@"%@%%",statisModel.commission_rate_2];
     self.orderLabel.text = statisModel.predictCount;
     self.profitImageView.hidden = NO;
     if ([statisModel.commission_rate_2 integerValue] > [statisModel.commission_rate integerValue]) {

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -145,6 +145,7 @@
     KDPGoodsModel *goodModel = [[KDPGoodsModel alloc] init];
     goodModel.goods_id = statusModel.goods_id;
     goodModel.img = statusModel.img;
+    goodModel.commission_rate=statusModel.commission_rate_2;
     detailVC.model = goodModel;
     [self.navigationController pushViewController:detailVC animated:YES];
     

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -91,6 +91,9 @@
         if (self.detailModel.goods_point.length>0) {
             [self good_points];
         }
+        if (self.model.commission_rate.length>0) {
+            self.detailModel.commission_rate = self.model.commission_rate;
+        }
         self.infoView.model=self.detailModel;
         self.shopView.shopDic=self.detailModel.shop;
         [self loadRequestWeb];
@@ -168,7 +171,7 @@
     [bottomView addSubview:buybutton];
     buybutton.titleLabel.font=[UIFont systemFontOfSize:14];
      buybutton.backgroundColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:(SCREEN_WIDTH-96)/2];
-    
+    [buybutton addTarget:self action:@selector(clickBuyButton) forControlEvents:UIControlEventTouchUpInside];
     
     UIButton *getKwaiButton =[[UIButton alloc]initWithFrame:CGRectMake(buybutton.right, 3, (SCREEN_WIDTH-96)/2, 39)];
     getKwaiButton.backgroundColor=[UIColor colorWithHexString:ThemeColor];
@@ -189,7 +192,7 @@
          buybutton.layer.masksToBounds=YES;
      }else{
          [bottomView addSubview:getKwaiButton];
-         [buybutton addTarget:self action:@selector(clickBuyButton) forControlEvents:UIControlEventTouchUpInside];
+         
          UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:buybutton.bounds byRoundingCorners:UIRectCornerTopLeft| UIRectCornerBottomLeft cornerRadii:CGSizeMake(19.5, 19.5)];
          CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
          maskLayer.frame = buybutton.bounds;
@@ -422,7 +425,11 @@
         return;
     }
     [LoadingView show];
-    [KDPNetworkRequestHTTP postURL:KwaiJumpURL params:@{@"goods_id":self.detailModel.goods_id} success:^(id  _Nonnull json) {
+    NSDictionary *dics=@{@"goods_id":self.detailModel.goods_id};
+    if (self.detailModel.coupon_price.length>0) {
+        dics=@{@"goods_id":self.detailModel.goods_id,@"coupon_price":self.detailModel.coupon_price};
+    }
+    [KDPNetworkRequestHTTP postURL:KwaiJumpURL params:dics success:^(id  _Nonnull json) {
         [LoadingView dismiss];
         /**
          弹框状态 1:用户没有快手Pid
@@ -451,7 +458,11 @@
     if (self.detailModel.goods_id.length<=0) {
         return;
     }
-    [KDPNetworkRequestHTTP postURL:BuyURL params:@{@"goods_id":self.detailModel.goods_id} success:^(id  _Nonnull json) {
+    NSDictionary *dics=@{@"goods_id":self.detailModel.goods_id};
+    if (self.detailModel.coupon_price.length>0) {
+        dics=@{@"goods_id":self.detailModel.goods_id,@"coupon_price":self.detailModel.coupon_price};
+    }
+    [KDPNetworkRequestHTTP postURL:KwaiJumpURL params:dics success:^(id  _Nonnull json) {
         UIPasteboard * pastboard = [UIPasteboard generalPasteboard];
         pastboard.string=json[@"data"][@"tkl"];
         if (![KDPublicMethod JumpOpenURL:KWai]) {//没有安装快手，过审用

KuDianProject/TOP/Controller/KDPNoticeViewController.m

@@ -9,10 +9,12 @@
 #import "KDPNoticeViewController.h"
 #import "KDPNoticeModel.h"
 #import "KDPMessageTableViewCell.h"
+#import "KDPForecastVC.h"
+#import "KDPAccountVC.h"
 @interface KDPNoticeViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource>
 
 @property (nonatomic, strong) UITableView *tableView;
-
+@property(nonatomic,strong)UIView *messageNoView;
 @property (nonatomic, strong) NSMutableArray *dataSource;
 
 @property (nonatomic, assign) NSInteger page;
@@ -32,6 +34,14 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     [self setUpNav];
+     [self.view addSubview:self.messageNoView];
+    if (![self isOpenNotice]) {//是否开启通知
+        self.messageNoView.hidden=NO;
+        self.tableView.frame=CGRectMake(0, KDNavBarHeight+50, SCREEN_WIDTH, SCREEN_HEIGHT-KDNavBarHeight-50);
+    }else{
+        self.messageNoView.hidden=YES;
+        self.tableView.frame=CGRectMake(0, KDNavBarHeight+10, SCREEN_WIDTH, SCREEN_HEIGHT-KDNavBarHeight-10);
+    }
     self.view.backgroundColor = [UIColor colorWithHex:0xF2F2F2];
     [self.view addSubview:self.tableView];
 }
@@ -159,6 +169,27 @@
 - (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView{
     return YES;
 }
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    KDPNoticeModel *model =self.dataSource[indexPath.row];
+    [self messageisreadLoad:model];
+    switch (model.message_type.integerValue) {
+        case 2://商品详情
+            [self goodDetailWithModel:model];
+            break;
+        case 3://版本更新
+            [self updataArrrapp];
+            break;
+        case 4://收入结算
+            [self ForecastVClist];
+            break;
+        case 5://提现通过
+            [self myAccountList];
+            break;
+        default:
+            break;
+    }
+}
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
     return [[NSAttributedString alloc] initWithString:@"还没有记录" attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:0x333333],NSFontAttributeName:FONT_SYS(12)}];
@@ -167,4 +198,113 @@
 - (CGFloat )spaceHeightForEmptyDataSet:(UIScrollView *)scrollView{
     return 30;
 }
+
+-(void)messageisreadLoad:(KDPNoticeModel *)model
+{
+    [LoadingView show];
+    [KDPNetworkRequestHTTP postURL:[NSString stringWithFormat:@"%@api/message_push/messageClick",KDURL] params:@{@"message_id":model.Id,@"person_group":model.person_group,@"is_view":model.is_view} success:^(id  _Nonnull json) {
+        [LoadingView dismiss];
+        
+    } failure:^(NSError * _Nonnull error) {
+        [LoadingView dismiss];
+        
+    }];
+}
+
+#pragma mark----收入结算
+-(void)ForecastVClist
+{
+    KDPForecastVC *forecastV =[[KDPForecastVC alloc]init];
+    [self.navigationController pushViewController:forecastV animated:YES];
+}
+
+#pragma mark---商品详情
+-(void)goodDetailWithModel:(KDPNoticeModel *)model
+{
+    KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
+    KDPGoodsModel *goodM =[[KDPGoodsModel alloc]init];
+    goodM.goods_id=model.goods_id;
+    detailVC.model = goodM;
+    [self.navigationController pushViewController:detailVC animated:YES];
+}
+/**
+ 版本更新
+ */
+- (void)updataArrrapp {
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:APP_STORE_URL]];
+}
+
+#pragma mark---提现通过
+-(void)myAccountList
+{
+    KDPAccountVC *drawV =[[KDPAccountVC alloc]init];
+    [self.navigationController pushViewController:drawV animated:YES];
+}
+
+-(UIView *)messageNoView
+{
+    if (!_messageNoView) {
+        _messageNoView =[[UIView alloc]initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, 50)];
+        _messageNoView.backgroundColor=[UIColor colorWithHexString:LineColor];
+       
+        UIButton *backBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, 10, SCREEN_WIDTH,30)];
+        backBtn.backgroundColor =[UIColor whiteColor];
+        [self.messageNoView addSubview:backBtn];
+        
+        UIButton *openButton =[[UIButton alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-56, 6.5, 40,17)];
+        [openButton setTitle:@"开启" forState:UIControlStateNormal];
+         [openButton setTitleColor:[UIColor colorWithHexString:ThemeColor] forState:UIControlStateNormal];
+        openButton.layer.cornerRadius=8.5;
+        openButton.layer.masksToBounds=YES;
+        openButton.layer.borderColor =[UIColor colorWithHexString:ThemeColor].CGColor;
+        openButton.layer.borderWidth=0.5;
+       
+        openButton.titleLabel.font =[UIFont systemFontOfSize:9];
+      
+        [openButton addTarget:self action:@selector(openNotice) forControlEvents:UIControlEventTouchUpInside];
+        [backBtn addSubview:openButton];
+        
+        UIImageView *messageIcon =[[UIImageView alloc]initWithFrame:CGRectMake(15, 7.5, 15, 15)];
+        messageIcon.image =[UIImage imageNamed:@"icon_message"];
+        [backBtn addSubview:messageIcon];
+        
+        UILabel *tipL =[[UILabel alloc]initWithFrame:CGRectMake(40, 0, 300, 30)];
+        tipL.textColor=[UIColor colorWithHexString:ThemeColor];
+        tipL.font=[UIFont systemFontOfSize:12];
+        [backBtn addSubview:tipL];
+        tipL.text=@"您还未开启消息通知，开启获取最新通知";
+        tipL.tag = 1234;
+        
+    }
+    return _messageNoView;
+}
+#pragma mark---开启通知
+-(void)openNotice
+{
+    UIApplication *application = [UIApplication sharedApplication];
+    NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+    if ([application canOpenURL:url]) {
+        if ([application respondsToSelector:@selector(openURL:options:completionHandler:)]) {
+            if (@available(iOS 10.0, *)) {
+                [application openURL:url options:@{} completionHandler:nil];
+            } else {
+                // Fallback on earlier versions
+            }
+        } else {
+            [application openURL:url];
+        }
+    }
+}
+//判断是否开启通知
+- (BOOL)isOpenNotice { // 判断用户是否允许接收通知
+    BOOL isEnable = NO;
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0f) { // iOS版本 >=8.0 处理逻辑
+        UIUserNotificationSettings *setting = [[UIApplication sharedApplication] currentUserNotificationSettings];
+        isEnable = (UIUserNotificationTypeNone == setting.types) ? NO : YES;
+    } else { // iOS版本 <8.0 处理逻辑
+        UIRemoteNotificationType type = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
+        isEnable = (UIRemoteNotificationTypeNone == type) ? NO : YES;
+    }
+    return isEnable;
+}
 @end

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -248,7 +248,9 @@
     }
     if (indexPath.section == 2) {
         KDPGoodDetailVC *goodDetail=[[KDPGoodDetailVC alloc]init];
-        goodDetail.model=self.dataArray[indexPath.row];
+        KDPGoodsModel *models=self.dataArray[indexPath.row];
+        
+        goodDetail.model=models;
         [self.navigationController pushViewController:goodDetail animated:YES];
     }
 }

KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m

@@ -106,6 +106,10 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
     NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
     KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
     model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsid"]];
+    if ([dict[@"commissionRate"]length]>0) {
+        model.commission_rate= [NSString stringWithFormat:@"%@",dict[@"commissionRate"]];
+    }
+    
     KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
     detailVC.model = model;
 
@@ -116,6 +120,9 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
     NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
     KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
     model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsId"]];
+    if ([dict[@"commissionRate"]length]>0) {
+        model.commission_rate= [NSString stringWithFormat:@"%@",dict[@"commissionRate"]];
+    }
     KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];
     detailVC.model = model;
     

KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -83,7 +83,7 @@
         NSMutableAttributedString *attribtStr = [[NSMutableAttributedString alloc]initWithString:textStr attributes:attribtDic];
         self.originalLabel.attributedText=attribtStr;
         
-        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(self.detailTitleL.left, self.detailTitleL.bottom+10, 60, 16)];
+        self.volumeL=[[UILabel alloc]initWithFrame:CGRectMake(self.detailTitleL.left, self.detailTitleL.bottom+10, 100, 16)];
         self.volumeL.textAlignment=NSTextAlignmentLeft;
         self.volumeL.text=@"月销:--";
         self.volumeL.textColor=[UIColor colorWithHexString:@"#a9a9a9"];
@@ -123,6 +123,7 @@
     
     self.volumeL.text=[NSString stringWithFormat:@"月销 %@",model.volume];
     
+    
     NSString *timetitle= [NSString stringWithFormat:@"  利润 %@   ",model.commission_rate];
     
     NSMutableAttributedString *timestr = [[NSMutableAttributedString alloc] initWithString:timetitle];
@@ -182,7 +183,7 @@
     if (!_couponPriceL) {
         _couponPriceL=[[UILabel alloc]init];
         _couponPriceL.text=@"---";
-        _couponPriceL.textColor=[UIColor colorWithHexString:ThemeColor];
+        _couponPriceL.textColor=[UIColor colorWithHexString:@"#FFFFFF"];
         _couponPriceL.font=[UIFont systemFontOfSize:12];
         _couponPriceL.textAlignment=NSTextAlignmentCenter;