布局微调

yanglingyu
1 parent 215105c9
Showing 9 changed files with 59 additions and 22 deletions
CNLiveCServiceModule.podspec
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLIveCategoryCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceOrLookCell.m
Example/CNLiveCServiceModule.xcodeproj/project.pbxproj
Example/CNLiveCServiceModule/CNLIVEAppDelegate.m
Example/CNLiveCServiceModule/CNLiveCServiceModule-Info.plist
Example/CNLiveCServiceModule/main.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCServiceModule'
-  s.version          = '0.0.32'
+  s.version          = '0.0.33'
   s.summary          = '我的服务内容'
 # This description is used to generate tags and improve search results.
@@ -122,9 +122,9 @@ static const CGFloat margin = 15;
                     }
                     NSString *serviceId = [dic[@"category"] stringForKey:@"id"];
                     if (serviceId.integerValue == 6) {
-                            cellheight = 160;
+                            cellheight = 150;
                             if (lists.count <= 2) {
-                                cellheight = 90;
+                                cellheight = 80;
                             }
                             showNum = 4;
                             itemSize = CGSizeMake((KScreenWidth - 3*margin)/2, 60);
@@ -234,7 +234,7 @@ static const CGFloat margin = 15;
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setupShowResult:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/contentApi/getPage") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetClassifyPageUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         NSArray *array = responseObject[@"data"];
         NSMutableArray *dataArray = [NSMutableArray array];
         if (array &&[array isKindOfClass:[NSArray class]]) {
@@ -359,7 +359,7 @@ static const CGFloat margin = 15;
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/allCategory") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         NSDictionary * dic = responseObject[@"data"];
         NSMutableArray *array = [NSMutableArray array];
-        if (dic) {
+        if (dic&&[dic isKindOfClass:[NSDictionary class]]) {
             if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
                 NSArray *list = dic[@"list"];
@@ -379,7 +379,7 @@ static const CGFloat margin = 15;
         }
-            if (dic) {
+            if (dic&&[dic isKindOfClass:[NSDictionary class]]) {
                 NSString *lastPage = dic[@"hasNextPage"];
                 !succeed?:succeed(array.copy,!lastPage.boolValue);
             }else{
@@ -86,7 +86,7 @@
 {
     if (!_subTitle) {
         _subTitle = [[UILabel alloc] init];
-        _subTitle.textColor = CNLiveColorWithHexString(@"#A9A9A9");
+        _subTitle.textColor = CNLiveColorWithHexString(@"#999999");
         _subTitle.font = UIFontCNMake(12);
     }
     return _subTitle;
@@ -100,19 +100,19 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 #pragma mark - UICollectionViewDelegateFlowLayout
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
     if ([_model.title isEqualToString:@"大家都在用"]) {
-        return CGSizeMake(collectionView.width, (collectionView.height -40)/3);
+        return CGSizeMake(collectionView.width, (collectionView.height -20)/3);
     }
     return CGSizeMake(_model.layout.width, _model.layout.height);
 }
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
     if ([_model.categoryId isEqual:@"6"]) {
-        return UIEdgeInsetsMake(10, 5, 10, 5);
+        return UIEdgeInsetsMake(0, 5, 5, 5);
     }
     if ([_model.title isEqual:@""] && [_model.subTitle isEqualToString:@""]) {
         return UIEdgeInsetsMake(5, 0, 5, 0);
     }
     if ([_model.title isEqual:@"大家都在用"]) {
-        return UIEdgeInsetsMake(15, 0, 0, 0);
+        return UIEdgeInsetsMake(5, 0, 0, 0);
     }
     return UIEdgeInsetsMake(15, 0, 0, 0);
@@ -124,6 +124,12 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
     }
     return 0;
 }
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
+    if ([_model.title isEqual:@"大家都在用"]) {
+        return 0;
+    }
+    return 5;
+}
 #pragma mark - Setting&&Getting
 -(void)setModel:(CNLiveSearchHotsModel *)model
 {
@@ -95,7 +95,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.font = UIFontCNMake(10);
-        _titleLabel.textColor = CNLiveColorWithHexString(@"#A9A9A9");
+        _titleLabel.textColor = CNLiveColorWithHexString(@"#999999");
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
     return _titleLabel;
@@ -568,10 +568,12 @@
 			baseConfigurationReference = 7FFF279F44B52D3DBDEA06AA /* Pods-CNLiveCServiceModule_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 2.0.5.21.12.28.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveCServiceModule/CNLiveCServiceModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveCServiceModule/CNLiveCServiceModule-Info.plist";
+				MARKETING_VERSION = 2.0.5;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -585,10 +587,12 @@
 			baseConfigurationReference = 89D3A4127C6ABFDE73E3D2CA /* Pods-CNLiveCServiceModule_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 2.0.5.21.12.28.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveCServiceModule/CNLiveCServiceModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveCServiceModule/CNLiveCServiceModule-Info.plist";
+				MARKETING_VERSION = 2.0.5;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -9,20 +9,48 @@
 #import "CNLIVEAppDelegate.h"
 #import <CNLiveCServiceModule/CNLiveServiceVC.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
-
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveEnvironment/CNLiveEnvironmentManager.h>
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    CNUserShareModel.uid = @"430783";
+    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
+    [BHContext shareInstance].application = application;
+    [BHContext shareInstance].launchOptions = launchOptions;
+    [BHContext shareInstance].moduleConfigName = @"CNLiveBeeHive.bundle/BeeHive.bundle/BeeHive";
+    [BHContext shareInstance].serviceConfigName = @"CNLiveBeeHive.bundle/BeeHive.bundle/BHService";
+    [BeeHive shareInstance].enableException = YES;
+    
+    [super application:application didFinishLaunchingWithOptions:launchOptions];
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    self.window.backgroundColor = [UIColor whiteColor];
     CNLiveServiceVC *vc = [[CNLiveServiceVC alloc] init];
-    CNUserShareModel.uid = @"1000057899";
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:vc];
     self.window.rootViewController = nav;
     [self.window makeKeyAndVisible];
+    [self setParamNet];
     return YES;
 }
-
+-(void)setParamNet
+{
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:[CNUserInfoManager manager].userInfoModel.uid forKey:@"loginSid"];
+    [mDict setValue:@"com.cnlive.CNLiveNetAdd.debug" forKey:@"platform_id"];
+    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [mDict setObject:[CNUserInfoManager manager].userInfoModel.uid forKey:@"sid"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+}
 - (void)applicationWillResignActive:(UIApplication *)application
 {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -22,13 +17,18 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -13,7 +13,6 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }