修改bug

KuDianProject.xcodeproj/project.pbxproj

@@ -205,6 +205,7 @@
 		7662960D22D8233600B2C0DB /* KDPMainNavViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPMainNavViewController.m; sourceTree = "<group>"; };
 		7662960F22D8267800B2C0DB /* KDPBaseLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPBaseLabel.h; path = KuDianProject/MainTab/KDPBaseLabel.h; sourceTree = SOURCE_ROOT; };
 		7662961022D8267800B2C0DB /* KDPBaseLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPBaseLabel.m; path = KuDianProject/MainTab/KDPBaseLabel.m; sourceTree = SOURCE_ROOT; };
+		7662961B22D87B3600B2C0DB /* KuDianProject.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KuDianProject.entitlements; sourceTree = "<group>"; };
 		76D6EE6F22D4A7A100E7AC1C /* KDPTabBarVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KDPTabBarVC.m; sourceTree = "<group>"; };
 		76D6EE7022D4A7A100E7AC1C /* KDPTabBarVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDPTabBarVC.h; sourceTree = "<group>"; };
 		76D6EE7222D4A7D600E7AC1C /* KDPSupplyContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDPSupplyContentViewController.h; sourceTree = "<group>"; };
@@ -797,6 +798,7 @@
 		C5D561F922CD97840035A714 /* KuDianProject */ = {
 			isa = PBXGroup;
 			children = (
+				7662961B22D87B3600B2C0DB /* KuDianProject.entitlements */,
 				C5D5624022CD9E710035A714 /* MainTab */,
 				C5D5623F22CD9D350035A714 /* Public */,
 				76D7943222CDDBE200C2ECFA /* Vendors */,
@@ -1097,6 +1099,11 @@
 				TargetAttributes = {
 					C5D561F622CD97840035A714 = {
 						CreatedOnToolsVersion = 10.1;
+						SystemCapabilities = {
+							com.apple.Push = {
+								enabled = 1;
+							};
+						};
 					};
 					C5D5620E22CD97860035A714 = {
 						CreatedOnToolsVersion = 10.1;
@@ -1492,8 +1499,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
+				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = KuDianProject/PrefixHeader.pch;
 				INFOPLIST_FILE = KuDianProject/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
@@ -1514,8 +1523,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
+				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = KuDianProject/PrefixHeader.pch;
 				INFOPLIST_FILE = KuDianProject/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;

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

@@ -2,16 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

KuDianProject/KuDianProject.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

KuDianProject/LiveData/Controller/KDPLiveDataViewController.m

@@ -63,7 +63,7 @@
         config.shadowLineAnimationType = XLPageShadowLineAnimationTypePan;
         config.separatorLineBottomMargin = 5;
         _pageVC = [[XLPageViewController alloc] initWithConfig:config];
-        _pageVC.view.bounds = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-KDTabBarHeight);
+        _pageVC.view.bounds = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-KDTabBarHeight+1);
         _pageVC.delegate = self;
         _pageVC.dataSource = self;
     }

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -91,7 +91,7 @@
             self.page = 1;
             [self requestData];
         }];
-        _tableView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
             self.page ++;
             [self requestData];
         }];

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -31,6 +31,7 @@
     // Do any additional setup after loading the view.
     self.navBar.hidden = YES;
     self.type = @"today";
+    [self.navBar setLineViewWithHidden:YES];
     UIView *backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 115)];
     [backView setGradientBackgroundWithColors:@[[UIColor colorWithHex:0xFF235F],[UIColor colorWithHex:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     [self.view addSubview:backView];
@@ -84,12 +85,17 @@
         _tableView.rowHeight = 105;
         _tableView.delegate = self;
         _tableView.dataSource = self;
+        if (@available(iOS 11.0, *)) {
+            _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+        } else {
+            // Fallback on earlier versions
+        }
         _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-20, 0.1f)];
         _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
             self.page = 1;
             [self requestTotalData];
         }];
-        _tableView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
             self.page ++;
             [self requestTotalData];
         }];

KuDianProject/LiveData/Controller/KDPOrderDetailViewController.m

@@ -76,7 +76,7 @@
             self.page = 1;
             [self requestDetailDataWithPage:self.page];
         }];
-        _tableview.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+        _tableview.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
             self.page ++;
             [self requestDetailDataWithPage:self.page];
         }];

KuDianProject/Login/controller/KDPPhoneLoginViewController.m

@@ -212,6 +212,17 @@ static int count = 0;
     [self.sendCodeBtn setTitle:title forState:UIControlStateNormal];
 }
 
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
+}
+-(void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
+}
+
 - (void)updateTime {
     count --;
     [self changeCode];

KuDianProject/Login/controller/KDPWebViewViewController.m

@@ -28,16 +28,12 @@
 }
 
 - (void)setContentView{
-    self.navBar.backgroundColor = [UIColor whiteColor];
-    self.navBar.navTitleLabel.textColor = [UIColor colorWithHex:0x333333];
-//    self.backButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    self.backButton = [UIButton buttonWithType:UIButtonTypeSystem];
 //    [self.backButton setImage:[UIImage imageNamed:@"return_black"] forState:UIControlStateNormal];
 //    self.backButton.frame = CGRectMake(0, 0, 40, 40);
 //    [self.backButton addTarget:self action:@selector(backAction:) forControlEvents:UIControlEventTouchUpInside];
 //    [self.navBar addSubview:self.backButton];
-    
     [self.navBar addleftReturnButton:self selector:@selector(backAction:)];
-    
     WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
     config.allowsInlineMediaPlayback = NO;
     self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, SCREEN_HEIGHT-KDNavBarHeight) configuration:config];
@@ -121,18 +117,6 @@
     self.navBar.navTitleLabel.text = webView.title;
 }
 
--(void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
-    self.navBar.navTitleLabel.textColor = [UIColor whiteColor];
-}
--(void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
-}
-
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
     if ([keyPath isEqualToString:NSStringFromSelector(@selector(estimatedProgress))] && object == self.webView ) {
         [self.processView setAlpha:1.0];

KuDianProject/Search/Controller/KDPSearchResultViewController.m

@@ -169,7 +169,6 @@
             reusAbleView.changeBlock = ^(BOOL isPrice) {
                 KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
                 screenVC.params = weakSelf.params;
-                screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
                 screenVC.resetBlock = ^(BOOL isPrice) {
                     if (isPrice == YES) {
                         [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -211,6 +210,7 @@
                     [weakSelf.collectionView.mj_header beginRefreshing];
                 };
                 CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
+                conf.distance=SCREEN_WIDTH/3*2;
                 [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
             };
             return reusAbleView;

KuDianProject/Search/Controller/KDPSearchViewController.m

@@ -120,18 +120,18 @@
 
 - (void)requestSearchData:(NSString *)keyWord{
     NSString *searchUrl = [NSString stringWithFormat:@"%@api/goods/searchAdvice",KDURL];
-    [self.searchArray removeAllObjects];
     [KDPNetworkRequestHTTP postURL:searchUrl params:@{@"keyword":keyWord} success:^(id  _Nonnull json) {
         NSArray *data = json[@"data"];
+        [self.searchArray removeAllObjects];
         [self.searchArray addObjectsFromArray:data];
         if (self.searchArray.count) {
             self.historyView.hidden = YES;
             self.tableview.hidden = NO;
-            [self.tableview reloadData];
         } else{
             self.historyView.hidden = NO;
             self.tableview.hidden = YES;
         }
+        [self.tableview reloadData];
     } failure:^(NSError * _Nonnull error) {
         
     }];

KuDianProject/SupplyGood/Controller/KDPScreenViewController.m

@@ -42,7 +42,7 @@
 }
 
 - (void)setContentView{
-    self.tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(13 + 91, KDStatusHeight + 16, SCREEN_WIDTH-91-13, 20)];
+    self.tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(13 + SCREEN_WIDTH/3, KDStatusHeight + 16, SCREEN_WIDTH-91-13, 20)];
     self.tipLabel.textColor = [UIColor colorWithHexString:@"0x333333"];
     self.tipLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size: 14];
     NSString *tipText = _isPrice ? @"价格区间(元)":@"利润区间";
@@ -50,13 +50,13 @@
     [self.view addSubview:self.tipLabel];
     
     // 初始化tagView
-    CGFloat btnWidth = (self.view.width - 91 - kBtnMargin * 2 - 20)/2;
+    CGFloat btnWidth = (self.view.width - SCREEN_WIDTH/3 - kBtnMargin * 2 - 20)/2;
     CGFloat height = 45;
     NSArray *btnDataArray = _isPrice ? @[@"最低价",@"最高价",@"10元以下",@"10-50元",@"50-100元",@"100元以上"] : @[@"最低利润",@"",@"20%以上",@"30%以上",@"40%以上",@"50%以上"];
     for (NSInteger i = 0; i < 6; i++) {
         NSInteger row = i / 2;
         NSInteger line = i % 2;
-        KDPScreenBtnView *btnView = [[KDPScreenBtnView alloc] initWithFrame:CGRectMake(kBtnMargin +91 + (btnWidth+20)*line,self.tipLabel.bottom + 25 + row *(17+height) , btnWidth, height)];
+        KDPScreenBtnView *btnView = [[KDPScreenBtnView alloc] initWithFrame:CGRectMake(kBtnMargin +SCREEN_WIDTH/3 + (btnWidth+20)*line,self.tipLabel.bottom + 25 + row *(17+height) , btnWidth, height)];
         btnView.delegate = self;
         btnView.tag = kBaseBtnViewTag + i;
         btnView.textColor = [UIColor colorWithHexString:@"#333333"];
@@ -80,7 +80,7 @@
     // 重置按钮和确定按钮
     
     UIButton *resetBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    resetBtn.frame = CGRectMake(91 + 14, self.tipLabel.bottom + 235, (SCREEN_WIDTH-91-28)/2, 41);
+    resetBtn.frame = CGRectMake(SCREEN_WIDTH/3 + 14, self.tipLabel.bottom + 235, (SCREEN_WIDTH-SCREEN_WIDTH/3-28)/2, 41);
 //    [resetBtn setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFFC300],[UIColor colorWithRGB:0xFF9A01]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 1)];
     resetBtn.backgroundColor = [UIColor colorWithHex:0xFF7693];
     [resetBtn addCornerRadiusByRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(20, 20)];
@@ -92,7 +92,7 @@
     [self.view addSubview:resetBtn];
     
     UIButton *confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    confirmBtn.frame = CGRectMake(resetBtn.right, self.tipLabel.bottom + 235, (SCREEN_WIDTH-91-28)/2, 41);
+    confirmBtn.frame = CGRectMake(resetBtn.right, self.tipLabel.bottom + 235, (SCREEN_WIDTH-SCREEN_WIDTH/3-28)/2, 41);
 //    [confirmBtn setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF8300],[UIColor colorWithRGB:0xFF5200]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 1)];
     confirmBtn.backgroundColor = [UIColor colorWithHex:0xFF6B8A];
     [confirmBtn addCornerRadiusByRoundingCorners:UIRectCornerTopRight | UIRectCornerBottomRight cornerRadii:CGSizeMake(20, 20)];

KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -111,7 +111,7 @@
             self.page = 1;
             [self requestGoodlistData];
         }];
-        _collectionView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
+        _collectionView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
             self.page ++;
             [self requestGoodlistData];
         }];
@@ -248,7 +248,6 @@
                 weakSelf.shouldHiddenScreen = NO;
                 KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
                 screenVC.params = weakSelf.mutabParams;
-                screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
                 screenVC.resetBlock = ^(BOOL isPrice) {
                     if (isPrice == YES) {
                         [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -290,6 +289,7 @@
                     [weakSelf.collectionView.mj_header beginRefreshing];
                 };
                 CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
+                conf.distance=SCREEN_WIDTH/3*2;
                 [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
             };
             return reusAbleView;

KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m

@@ -91,7 +91,8 @@
 
 - (void)setUpTopView{
     self.navBar.hidden = YES;
-    UIView *topBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 163)];
+    NSInteger height = KDNavBarHeight == 64 ? 130 : 163;
+    UIView *topBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, height)];
     [topBackView setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF235F],[UIColor colorWithRGB:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     [self.view addSubview:topBackView];
     

KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m

@@ -140,7 +140,6 @@
         reusAbleView.changeBlock = ^(BOOL isPrice) {
             KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
             screenVC.params = weakSelf.params;
-            screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
             screenVC.resetBlock = ^(BOOL isPrice) {
                 if (isPrice == YES) {
                     [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -182,6 +181,7 @@
                 [weakSelf.collectionView.mj_header beginRefreshing];
             };
             CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
+            conf.distance=SCREEN_WIDTH/3*2;
             [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
         };
         return reusAbleView;

KuDianProject/SupplyGood/View/KDPSupplyCommentViewCell.m

@@ -105,7 +105,7 @@
 - (void)setSubViewsConstraints{
     [_commentImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.contentView.mas_top).offset(30);
-        make.size.equalTo(CGSizeMake(20, 35));
+        make.size.equalTo(CGSizeMake(40, 40));
         make.centerX.equalTo(self.contentView);
     }];
     [_commentLabel mas_makeConstraints:^(MASConstraintMaker *make) {