Pārlūkot izejas kodu

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

jikaipeng 5 gadi atpakaļ
vecāks
revīzija
293d89e4bc

+ 4 - 4
KuDianProject.xcodeproj/project.pbxproj

@@ -1596,7 +1596,7 @@
1596 1596
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1597 1597
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1598 1598
 				CODE_SIGN_IDENTITY = "iPhone Developer";
1599
-				CODE_SIGN_STYLE = Automatic;
1599
+				CODE_SIGN_STYLE = Manual;
1600 1600
 				DEVELOPMENT_TEAM = WV23VEMQV8;
1601 1601
 				ENABLE_BITCODE = NO;
1602 1602
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1679,7 +1679,7 @@
1679 1679
 				);
1680 1680
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1681 1681
 				PRODUCT_NAME = "$(TARGET_NAME)";
1682
-				PROVISIONING_PROFILE_SPECIFIER = "";
1682
+				PROVISIONING_PROFILE_SPECIFIER = dev;
1683 1683
 				TARGETED_DEVICE_FAMILY = 1;
1684 1684
 			};
1685 1685
 			name = Debug;
@@ -1692,7 +1692,7 @@
1692 1692
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1693 1693
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1694 1694
 				CODE_SIGN_IDENTITY = "iPhone Developer";
1695
-				CODE_SIGN_STYLE = Automatic;
1695
+				CODE_SIGN_STYLE = Manual;
1696 1696
 				DEVELOPMENT_TEAM = WV23VEMQV8;
1697 1697
 				ENABLE_BITCODE = NO;
1698 1698
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1775,7 +1775,7 @@
1775 1775
 				);
1776 1776
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1777 1777
 				PRODUCT_NAME = "$(TARGET_NAME)";
1778
-				PROVISIONING_PROFILE_SPECIFIER = "";
1778
+				PROVISIONING_PROFILE_SPECIFIER = dev;
1779 1779
 				TARGETED_DEVICE_FAMILY = 1;
1780 1780
 			};
1781 1781
 			name = Release;

+ 1 - 1
KuDianProject/MainTab/KDPNavBar.m

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

+ 2 - 0
KuDianProject/Public/KDPNetworkRequestHTTP.m

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

+ 5 - 2
KuDianProject/Public/UIButton+ImageTitleStyle.m

@@ -13,6 +13,7 @@
13 13
 {
14 14
     if (self.imageView.image != nil && self.titleLabel.text != nil)
15 15
     {
16
+        self.adjustsImageWhenHighlighted=NO;
16 17
         
17 18
         //先还原
18 19
         self.titleEdgeInsets = UIEdgeInsetsZero;
@@ -180,6 +181,8 @@
180 181
     }
181 182
     
182 183
 }
184
+- (void)setHighlighted:(BOOL)highlighted{
185
+    
186
+}
183 187
 
184
-
185
-@end
188
+@end

+ 10 - 0
KuDianProject/TOP/Controller/KDPDrawerVC.m

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

+ 3 - 0
KuDianProject/TOP/Controller/KDPGoodDetailVC.m

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

+ 2 - 4
KuDianProject/TOP/Controller/KDPTopViewController.m

@@ -53,8 +53,6 @@
53 53
     [self initialieValues];
54 54
     [self initUI];
55 55
     
56
-    [self getBanner];
57
-   
58 56
     
59 57
     
60 58
 }
@@ -82,7 +80,7 @@
82 80
 #pragma makr---首页banner
83 81
 -(void)getBanner
84 82
 {
85
-    [LoadingView show];
83
+//    [LoadingView show];
86 84
     [KDPNetworkRequestHTTP getURL:bannerURL params:nil success:^(id  _Nonnull json) {
87 85
         [LoadingView dismiss];
88 86
         self.bannerArray=[NSArray yy_modelArrayWithClass:[KDPBannerModel class] json:json[@"data"]];
@@ -398,7 +396,7 @@
398 396
         [self isOpenService];
399 397
         [self initialieValues];
400 398
         [self getRecommendGood];
401
-        
399
+        [self getBanner];
402 400
         [self messageUnreadNumData];
403 401
         order_timer = [NSTimer timerWithTimeInterval:30 target:self selector:@selector(order_timerAction) userInfo:nil repeats:YES];
404 402
         [[NSRunLoop mainRunLoop] addTimer:order_timer forMode:NSDefaultRunLoopMode];

+ 1 - 4
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

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

+ 1 - 1
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

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