jikaipeng 5 anni fa
parent
commit
4b3333b888

+ 5 - 5
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 = Manual;
1599
+				CODE_SIGN_STYLE = Automatic;
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 = dev;
1682
+				PROVISIONING_PROFILE_SPECIFIER = "";
1683 1683
 				TARGETED_DEVICE_FAMILY = 1;
1684 1684
 			};
1685 1685
 			name = Debug;
@@ -1691,8 +1691,8 @@
1691 1691
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1692 1692
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1693 1693
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1694
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
1695
-				CODE_SIGN_STYLE = Manual;
1694
+				CODE_SIGN_IDENTITY = "iPhone Developer";
1695
+				CODE_SIGN_STYLE = Automatic;
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 = dis;
1778
+				PROVISIONING_PROFILE_SPECIFIER = "";
1779 1779
 				TARGETED_DEVICE_FAMILY = 1;
1780 1780
 			};
1781 1781
 			name = Release;

BIN
KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 12
KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,16 +2,4 @@
2 2
 <Bucket
3 3
    type = "0"
4 4
    version = "2.0">
5
-   <Breakpoints>
6
-      <BreakpointProxy
7
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
8
-         <BreakpointContent
9
-            shouldBeEnabled = "Yes"
10
-            ignoreCount = "0"
11
-            continueAfterRunningActions = "No"
12
-            scope = "0"
13
-            stopOnStyle = "0">
14
-         </BreakpointContent>
15
-      </BreakpointProxy>
16
-   </Breakpoints>
17 5
 </Bucket>

+ 11 - 7
KuDianProject/AppDelegate.m

@@ -19,18 +19,22 @@
19 19
 
20 20
 
21 21
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
22
+    [self setUpKeyWindow];
23
+    [IQKeyboardManager sharedManager].shouldResignOnTouchOutside = YES;
24
+    [self setUpUM];
25
+    [self setUpMiPush];
26
+    return YES;
27
+}
28
+
29
+- (void)setUpKeyWindow{
22 30
     self.window=[[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
23 31
     self.window.backgroundColor=[UIColor whiteColor];
24 32
     self.window.rootViewController=[[KDPTabBarVC alloc]init];
25 33
     [self.window makeKeyAndVisible];
26
-    [IQKeyboardManager sharedManager].shouldResignOnTouchOutside = YES;
27
-    [self setUpUM];
28
-    [self setUpMiPush];
29
-    if (![KDPAccountTool isLogin]) {
30
-         [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
34
+    KDPAccountModel *accountModel = [KDPAccountTool account];
35
+    if (![KDPAccountTool isLogin] || [accountModel.has_kwai integerValue] != 1) {
36
+        [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
31 37
     }
32
-
33
-    return YES;
34 38
 }
35 39
 
36 40
 #pragma mark - 推送

+ 3 - 5
KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -27,14 +27,14 @@
27 27
     // Do any additional setup after loading the view.
28 28
     self.navBar.hidden = YES;
29 29
     [self setUpUI];
30
+    self.page = 1;
31
+    [self requestData];
30 32
 }
31 33
 
32 34
 - (void)requestData{
33 35
     NSDictionary *params = @{@"page":@(self.page)};
34 36
     NSString *liveListUrl = [NSString stringWithFormat:@"%@api/onlive/liveList",KDURL];
35
-    [LoadingView showInView:self.view];
36 37
     [KDPNetworkRequestHTTP postURL:liveListUrl params:params success:^(id  _Nonnull json) {
37
-        [LoadingView dismiss];
38 38
         NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveListModel class] json:json[@"data"]];
39 39
         if (self.page == 1) {
40 40
             [self.dataSource removeAllObjects];
@@ -48,7 +48,6 @@
48 48
         [self.tableView.mj_header endRefreshing];
49 49
         [self.tableView reloadData];
50 50
     } failure:^(NSError * _Nonnull error) {
51
-        [LoadingView dismiss];
52 51
         [self.tableView.mj_footer endRefreshing];
53 52
         [self.tableView.mj_header endRefreshing];
54 53
     }];
@@ -56,7 +55,7 @@
56 55
 
57 56
 - (void)viewWillAppear:(BOOL)animated{
58 57
     [super viewWillAppear:animated];
59
-    [self.tableView.mj_header beginRefreshing];
58
+    [self requestData];
60 59
 }
61 60
 
62 61
 - (void)setUpUI{
@@ -95,7 +94,6 @@
95 94
             self.page ++;
96 95
             [self requestData];
97 96
         }];
98
-        [_tableView.mj_header beginRefreshing];
99 97
     }
100 98
     return _tableView;
101 99
 }

+ 3 - 4
KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -37,14 +37,14 @@
37 37
     [self.view addSubview:self.tableView];
38 38
     self.view.backgroundColor = [UIColor colorWithHex:0xF9F9F9];
39 39
     self.tableView.tableHeaderView = self.headerView;
40
+    self.page = 1;
41
+    [self requestTotalData];
40 42
 }
41 43
 
42 44
 - (void)requestTotalData{
43 45
     NSDictionary *params = @{@"type":self.type,@"page":@(self.page)};
44
-    [LoadingView show];
45 46
     NSString *statisticsUrl = [NSString stringWithFormat:@"%@api/onlive/statistics",KDURL];
46 47
     [KDPNetworkRequestHTTP postURL:statisticsUrl params:params success:^(id  _Nonnull json) {
47
-        [LoadingView dismiss];
48 48
         NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveStatisticsModel class] json:json[@"data"]];
49 49
         NSDictionary *headerDict = json[@"total"];
50 50
         [self.headerView reloadHeaderData:headerDict];
@@ -68,7 +68,7 @@
68 68
 
69 69
 - (void)viewWillAppear:(BOOL)animated{
70 70
     [super viewWillAppear:animated];
71
-    [self.tableView.mj_header beginRefreshing];
71
+    [self requestTotalData];
72 72
 }
73 73
 
74 74
 - (UITableView *)tableView{
@@ -98,7 +98,6 @@
98 98
             self.page ++;
99 99
             [self requestTotalData];
100 100
         }];
101
-        [_tableView.mj_header beginRefreshing];
102 101
     }
103 102
     return _tableView;
104 103
 }

+ 2 - 1
KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -40,6 +40,8 @@
40 40
     if ([self.classModel.type isEqualToString:@"cate"]) {
41 41
         [self requestTopListWithGoodId:self.classModel.Id];
42 42
     }
43
+    self.page = 1;
44
+    [self requestGoodlistData];
43 45
 }
44 46
 
45 47
 - (void)setUpUI{
@@ -115,7 +117,6 @@
115 117
             self.page ++;
116 118
             [self requestGoodlistData];
117 119
         }];
118
-        [_collectionView.mj_header beginRefreshing];
119 120
     }
120 121
     return _collectionView;
121 122
 }

+ 2 - 0
KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m

@@ -135,6 +135,8 @@
135 135
     KDPSupplyContentReusableView *reusAbleView;
136 136
     if (kind == UICollectionElementKindSectionHeader) {
137 137
         reusAbleView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([KDPSupplyContentReusableView class]) forIndexPath:indexPath];
138
+        reusAbleView.layer.borderColor = [UIColor colorWithHex:0xf4f4f4].CGColor;
139
+        reusAbleView.layer.borderWidth = 0.5;
138 140
         WeakSelf(weakSelf);
139 141
         __weak KDPSupplyContentReusableView *weakReusAbleView = reusAbleView;
140 142
         reusAbleView.changeBlock = ^(BOOL isPrice) {