Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

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;
@@ -1692,7 +1692,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 = (
@@ -1775,7 +1775,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = dev;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

KuDianProject/MainTab/KDPNavBar.m

@@ -42,7 +42,7 @@
     UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 44, 44)];
     [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
     [returnBtn addTarget:target action:selector forControlEvents:UIControlEventTouchUpInside];
-//    [returnBtn bringSubviewToFront:[UIApplication sharedApplication].keyWindow];
+    [returnBtn bringSubviewToFront:[UIApplication sharedApplication].keyWindow];
     [self addSubview:returnBtn];
     
 }

KuDianProject/Public/KDPNetworkRequestHTTP.m

@@ -82,7 +82,9 @@
 }
 +(void)appOpenLogin
 {
+    [[NSNotificationCenter defaultCenter]postNotificationName:@"exitLogin" object:nil];
     [KDPAccountTool deleteAccount];
+    
     [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:nil];
     
 }

KuDianProject/Public/UIButton+ImageTitleStyle.m

@@ -13,6 +13,7 @@
 {
     if (self.imageView.image != nil && self.titleLabel.text != nil)
     {
+        self.adjustsImageWhenHighlighted=NO;
         
         //先还原
         self.titleEdgeInsets = UIEdgeInsetsZero;
@@ -180,6 +181,8 @@
     }
     
 }
+- (void)setHighlighted:(BOOL)highlighted{
+    
+}
 
-
-@end
+@end

KuDianProject/TOP/Controller/KDPDrawerVC.m

@@ -31,8 +31,18 @@
     [super viewDidLoad];
     self.navBar.hidden=YES;
     infoArray=@[@{@"img":@"shoucangliulan",@"title":@"收藏浏览"},@{@"img":@"kefuxiaomi",@"title":@"客服小蜜"},@{@"img":@"zhoashang",@"title":@"招商合作"},@{@"img":@"kuaishouxiaodian",@"title":@"快手小店Pid"},@{@"img":@"shezhi",@"title":@"设置"}];
+     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(changeEixts ) name:@"exitLogin" object:nil];
+    
+    
+    
+    
     [self.view addSubview:self.listTabView];
 }
+-(void)changeEixts
+{
+    // 注意：动画要设置为YES
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     KDPDrawerListCell *listC=[tableView dequeueReusableCellWithIdentifier:@"draw"];

KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -154,10 +154,13 @@
     
     [collectButton setTitleColor:[UIColor colorWithHexString:@"#828282"] forState:UIControlStateNormal];
     [collectButton setImage:[UIImage imageNamed:@"collection_un"] forState:UIControlStateNormal];
+     collectButton.adjustsImageWhenHighlighted=NO;
+    
     [collectButton setButtonImageTitleStyle:ButtonImageTitleStyleCenterDown padding:3];
     [collectButton addTarget:self action:@selector(detailCollectClickButton) forControlEvents:UIControlEventTouchUpInside];
     [bottomView addSubview:collectButton];
     
+   
     
     
     UIButton *buybutton =[[UIButton alloc]initWithFrame:CGRectMake(collectButton.right, 3, (SCREEN_WIDTH-96)/2, 39)];

KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -53,8 +53,6 @@
     [self initialieValues];
     [self initUI];
     
-    [self getBanner];
-   
     
     
 }
@@ -82,7 +80,7 @@
 #pragma makr---首页banner
 -(void)getBanner
 {
-    [LoadingView show];
+//    [LoadingView show];
     [KDPNetworkRequestHTTP getURL:bannerURL params:nil success:^(id  _Nonnull json) {
         [LoadingView dismiss];
         self.bannerArray=[NSArray yy_modelArrayWithClass:[KDPBannerModel class] json:json[@"data"]];
@@ -398,7 +396,7 @@
         [self isOpenService];
         [self initialieValues];
         [self getRecommendGood];
-        
+        [self getBanner];
         [self messageUnreadNumData];
         order_timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(order_timerAction) userInfo:nil repeats:YES];
         [[NSRunLoop mainRunLoop] addTimer:order_timer forMode:NSDefaultRunLoopMode];

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

@@ -29,10 +29,7 @@
     
     titleArray=@[@"收藏夹",@"浏览记录"];
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
-    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
-    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
-    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
-    self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
+    
     
     XLPageViewControllerConfig *config = [[XLPageViewControllerConfig alloc] init];
     //标题间距

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -22,7 +22,7 @@
     [super viewDidLoad];
     self.page_num = 1;
     [self setNavUI];
-    
+    [self.navBar addleftReturnButton:self selector:@selector(returnClickBtn)];
     [self reqeustData];
 }
 -(void)reqeustData