修改未登录状态下Add To Portfolio登录Customer账号后，Category Toolbar显示不正确。

修改Category、Item Search以及Search，消除UICollectionViewFlowLayoutBreakForInvalidSizes警告。
修改Category、Item Search以及Search图片加载。
消除导航栏一闪而过的黑色阴影，消除Push Lock界面动画残影。

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,66 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            symbolName = "UICollectionViewFlowLayoutBreakForInvalidSizes"
+            moduleName = "">
+            <Locations>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "509275768.54248"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1534"
+            endingLineNumber = "1534"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "509275820.952781"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1708"
+            endingLineNumber = "1708"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "509275913.812287"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1583"
+            endingLineNumber = "1583"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -44,7 +44,9 @@
 @interface CategoryViewController ()
 
 @property (nonatomic,assign) BOOL addAll;
+@property (nonatomic,assign) BOOL disappear;
 @property (nonatomic,strong) NSOperationQueue *dataOperationQueue;
+@property (nonatomic,assign) UIInterfaceOrientation toOrientation;///<屏幕将要旋转到的方向
 
 @end
 
@@ -520,7 +522,7 @@
             {
                 [main_vc checklogin:false];
                 
-                
+                [self checkToolBar];
                 [self addtoportfolio];
             }
             
@@ -729,6 +731,11 @@
 //        [RAUtils message_alert:@"offline mode does not support this function." title:@"Add to Portfolio" controller:self] ;
 //        return;
 //    }
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        [RAUtils message_alert:@"Cannot Add to portfolio." title:@"Warning" controller:self] ;
+        return;
+    }
     
     NSMutableDictionary* items =[[self.category_data objectForKey:@"items"] mutableCopy];
     
@@ -1139,8 +1146,14 @@
         DebugLog(@"routed");
     }
     
+}
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     
+    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
     
+    self.toOrientation = toInterfaceOrientation;
+    [self.collectionview.collectionViewLayout invalidateLayout];
     
 }
 
@@ -1354,14 +1367,8 @@
     
     // [self showCategory];
 }
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [[self navigationController] setNavigationBarHidden:YES animated:NO];
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    
-//    [appDelegate test_onDecodedDataResult:@"371252"];
 
+- (void)checkToolBar {
     // customer 隐藏add to portfolio
     AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
     NSMutableArray *items = [self.selectToolbar.items mutableCopy];
@@ -1382,12 +1389,34 @@
         }
         
     }
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [[self navigationController] setNavigationBarHidden:YES animated:NO];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    
+//    [appDelegate test_onDecodedDataResult:@"371252"];
+
+    [self checkToolBar];
     
+    self.disappear = NO;
+    self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+    [self.collectionview reloadData];
 }
+
+- (void)viewWillDisappear:(BOOL)animated {
+    // 消除横排切换出去，竖屏切换回来时invalidateSize警告
+    self.disappear = YES;
+    [self.collectionview reloadData];
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
     
+    self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
     
     self.refresh_type = REFRESH_NONE;
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
@@ -1553,7 +1582,9 @@
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 
 {
-    
+    if (self.disappear) {
+        return 0;
+    }
     // 每个Section的item个数
     NSDictionary * item_json = [self.category_data objectForKey:@"items"];
     int count =[[item_json valueForKey:@"count"] intValue];
@@ -1585,7 +1616,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPD";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
+//        NSString* img_url =[item_json valueForKey:@"img"];
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"name"];
@@ -1638,50 +1669,7 @@
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
         
-        NSString* file_name=[img_url lastPathComponent];
-        
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_s"];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                        {
-                            
-                            //                    UIImage * img=[UIImage imageNamed:@"notfound_s"];
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_s"];
-                        }
-                        
-                    });
-                });
-                
-                
-            }
-        }
+
 
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
@@ -1694,7 +1682,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPDLarge";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img_big"];
+//        NSString* img_url =[item_json valueForKey:@"img_big"];
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"name"];
@@ -1743,45 +1731,7 @@
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
         
-        NSString* file_name=[img_url lastPathComponent];
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_l"];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_l"];
-                        
-                    });
-                });
-                
-                
-            }
-        }
+
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
         //cell.layer.cornerRadius=15;
@@ -1793,7 +1743,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPDList";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
+//        NSString* img_url =[item_json valueForKey:@"img"];
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"name"];
@@ -1844,53 +1794,102 @@
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
         
-        NSString* file_name=[img_url lastPathComponent];
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_l"];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
+
+        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
+        cell.layer.borderWidth = 0.5;
+       // cell.layer.cornerRadius=15;
+        cell.layer.masksToBounds=true;
+        return cell;
+    }
+    
+    
+}
+
+- (void)collectionCell:(CategoryCellNPD *)cell setImageForIndexPath:(NSIndexPath *)indexPath {
+    
+    NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
+    NSString* img_url =[item_json valueForKey:@"img"];
+    NSString* file_name=[img_url lastPathComponent];
+    
+    NSString *loading = @"loading_l";
+    NSString *notFound = @"notfound_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        notFound = @"notfound_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        notFound = @"notfound_s";
+        
+    }
+    
+    if (![cell.imageName isEqualToString:img_url]) {
+        cell.imageName = img_url;
+        cell.cellImageView.image = [UIImage imageNamed:loading];
+        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        if(img_data!=nil)
+        {
+            
+            UIImage * img =[UIImage imageWithData:img_data];
+            cell.cellImageView.image = img;
+        }
+        else
+        {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
+                NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                 
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                dispatch_async(dispatch_get_main_queue(), ^{
                     
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                     
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
+                    
+                    if(downloadimg_data!=nil)
+                    {
                         
+                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_l"];
-                        
-                    });
+                        UIImage * img =[UIImage imageWithData:downloadimg_data];
+                        cell.cellImageView.image = img;
+                    }
+                    else
+                        cell.cellImageView.image = [UIImage imageNamed:notFound];
+                    
                 });
-                
-                
-            }
+            });
+            
+            
         }
-        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
-        cell.layer.borderWidth = 0.5;
-       // cell.layer.cornerRadius=15;
-        cell.layer.masksToBounds=true;
-        return cell;
     }
     
+}
+
+- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
     
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    son_cell.imageName = nil;
+    [self collectionCell:son_cell setImageForIndexPath:indexPath];
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    
+    NSString *loading = @"loading_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        
+    }
+    
+    son_cell.cellImageView.image = [UIImage imageNamed:loading];
 }
 
 #pragma mark --UICollectionViewDelegateFlowLayout
@@ -1909,9 +1908,8 @@
     
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication]statusBarOrientation];
     
+    orientation = self.toOrientation; // 避免横排转竖屏时UICollectionViewFlowLayoutBreakForInvalidSizes警告
     
-    
-    //    UIDeviceOrientation deviceOrientation = [UIDevice currentDevice].orientation;
     if (UIInterfaceOrientationIsLandscape(orientation))
     {
         //        DebugLog(@"横");
@@ -1953,6 +1951,15 @@
     //    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LIST)
     //            return UIEdgeInsetsMake(1, 1, 1, 1);
     
+
+
+    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LARGE)
+        return UIEdgeInsetsMake(10, 10, 10, 10);
+    else if(self.categoryViewType ==CATEGORY_VIEWTYPE_LIST)
+        return UIEdgeInsetsMake(10, 0, 10, 0);
+    return UIEdgeInsetsMake(10, 10, 10, 10);
+
+
     
     
     return UIEdgeInsetsMake(10, 10, 10, 10);

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -30,6 +30,8 @@
 @interface ItemSearchViewController ()
 
 @property (nonatomic,assign) BOOL addAll;
+@property (nonatomic,assign) BOOL disappear;
+@property (nonatomic,assign) UIInterfaceOrientation toOrientation;///<屏幕将要旋转到的方向
 
 @property (nonatomic,strong) NSOperationQueue *dataOperationQueue;
 
@@ -454,10 +456,8 @@
     
     self.collectionview.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.collectionview.bounds].CGPath;
 }
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [[self navigationController] setNavigationBarHidden:YES animated:NO];
+
+- (void) checkToolBar {
     
     // customer 隐藏add to portfolio
     AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -479,9 +479,27 @@
         }
         
     }
+    
+}
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [[self navigationController] setNavigationBarHidden:YES animated:NO];
     
+    [self checkToolBar];
+
+    self.disappear = NO;
+    self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+    [self.collectionview reloadData];
 }
+
+- (void)viewWillDisappear:(BOOL)animated {
+    // 消除横排切换出去，竖屏切换回来时invalidateSize警告
+    self.disappear = YES;
+    [self.collectionview reloadData];
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -993,7 +1011,7 @@
             {
                 [main_vc checklogin:false];
                 
-                
+                [self checkToolBar];
                 [self addtoportfolio];
             }
             
@@ -1199,7 +1217,11 @@
 //        [RAUtils message_alert:@"offline mode does not support this function." title:@"Add to Portfolio" controller:self] ;
 //        return;
 //    }
-    
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        [RAUtils message_alert:@"Cannot Add to portfolio." title:@"Warning" controller:self] ;
+        return;
+    }
     
     NSMutableDictionary* items =[[self.category_data objectForKey:@"items"] mutableCopy];
     
@@ -1451,17 +1473,26 @@
         [self.collectionview.collectionViewLayout invalidateLayout];
         DebugLog(@"routed");
     }
+
+}
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     
+    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
     
-    
+    self.toOrientation = toInterfaceOrientation;
+    [self.collectionview.collectionViewLayout invalidateLayout];
     
 }
+
 #pragma mark -- UICollectionViewDataSource
 
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 
 {
-    
+    if (self.disappear) {
+        return 0;
+    }
     // 每个Section的item个数
     NSDictionary * item_json = [self.category_data objectForKey:@"items"];
     int count =[[item_json valueForKey:@"count"] intValue];
@@ -1484,7 +1515,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPD";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
+
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"fash_name"];
@@ -1535,51 +1566,8 @@
         //    cell.Price.text = price;
         
         
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image=[UIImage imageNamed:@"loading_s"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        
-                        else
-                        {
-                            UIImage * img =[UIImage imageNamed:@"notfound_s"];
-                            cell.cellImageView.image = img;
-                        }
-                        
-                        
-                    });
-                });
-                
-                
-            }
 
-        }
+        
         
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
@@ -1592,7 +1580,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPDLarge";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img_big"];
+
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* modelid =[item_json valueForKey:@"fash_name"];
@@ -1638,44 +1626,8 @@
         //    cell.cellDescription.text = description;
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image=[UIImage imageNamed:@"loading_l"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        cell.cellImageView.image=[UIImage imageNamed:@"notfound_l"];
-                        
-                    });
-                });
-                
-                
-            }
-        }
+        
+        
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
         //cell.layer.cornerRadius=15;
@@ -1688,7 +1640,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPDList";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
+
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"fash_name"];
@@ -1738,53 +1690,105 @@
         //    cell.cellDescription.text = description;
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_l"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
+        
+        
+        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
+        cell.layer.borderWidth = 0.5;
+        // cell.layer.cornerRadius=15;
+        cell.layer.masksToBounds=true;
+        return cell;
+    }
+}
+
+- (void)collectionCell:(CategoryCellNPD *)cell setImageForIndexPath:(NSIndexPath *)indexPath {
+    
+    NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
+    NSString* img_url =[item_json valueForKey:@"img"];
+    NSString* file_name=[img_url lastPathComponent];
+    
+    NSString *loading = @"loading_l";
+    NSString *notFound = @"notfound_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        notFound = @"notfound_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        notFound = @"notfound_s";
+        
+    }
+    
+    if (![cell.imageName isEqualToString:img_url]) {
+        cell.imageName = img_url;
+        cell.cellImageView.image = [UIImage imageNamed:loading];
+        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        if(img_data!=nil)
+        {
+            
+            UIImage * img =[UIImage imageWithData:img_data];
+            cell.cellImageView.image = img;
+        }
+        else
+        {
+            NSLog(@"load image");
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
+                NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                 
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                dispatch_async(dispatch_get_main_queue(), ^{
                     
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                     
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
+                    
+                    if(downloadimg_data!=nil)
+                    {
                         
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_l"];
+                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
-                    });
+                        UIImage * img =[UIImage imageWithData:downloadimg_data];
+                        cell.cellImageView.image = img;
+                    }
+                    else
+                        cell.cellImageView.image = [UIImage imageNamed:notFound];
+                    
                 });
-                
-                
-            }
+            });
+            
+            
         }
-        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
-        cell.layer.borderWidth = 0.5;
-        // cell.layer.cornerRadius=15;
-        cell.layer.masksToBounds=true;
-        return cell;
     }
+    
 }
 
+- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    son_cell.imageName = nil;
+    [self collectionCell:son_cell setImageForIndexPath:indexPath];
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    
+    NSString *loading = @"loading_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        
+    }
+    
+    son_cell.cellImageView.image = [UIImage imageNamed:loading];
+}
+
+
 #pragma mark --UICollectionViewDelegateFlowLayout
 
 
@@ -1801,7 +1805,7 @@
     
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication]statusBarOrientation];
     
-    
+    orientation = self.toOrientation;
     
     if (UIInterfaceOrientationIsLandscape(orientation))
     {
@@ -1845,7 +1849,11 @@
     //    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LARGE)
     //        return UIEdgeInsetsMake(10, 10, 10, 10);
     
-    
+    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LARGE)
+        return UIEdgeInsetsMake(10, 10, 10, 10);
+    else if(self.categoryViewType ==CATEGORY_VIEWTYPE_LIST)
+        return UIEdgeInsetsMake(10, 0, 10, 0);
+    return UIEdgeInsetsMake(10, 10, 10, 10);
     
     return UIEdgeInsetsMake(10, 10, 10, 10);
 }

RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -27,6 +27,8 @@
 @interface SearchViewController ()
 
 @property (nonatomic,assign) BOOL addAll;
+@property (nonatomic,assign) UIInterfaceOrientation toOrientation;///<屏幕将要旋转到的方向
+@property (nonatomic,assign) BOOL disappear;
 
 @property (nonatomic,strong) NSOperationQueue *dataOperationQueue;
 
@@ -154,6 +156,48 @@
     [self end_select:0];
     
 }
+
+- (void)checkToolBar {
+    // customer 隐藏add to portfolio
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    NSMutableArray *items = [self.selectToolbar.items mutableCopy];
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        
+        if ([items containsObject:self.addPortfolioBtn]) {
+            
+            [items removeObject:self.addPortfolioBtn];
+            self.selectToolbar.items = items;
+        }
+        
+    } else {
+        
+        if (![items containsObject:self.addPortfolioBtn]) {
+            
+            [items insertObject:self.addPortfolioBtn atIndex:4];
+            self.selectToolbar.items = items;
+        }
+        
+    }
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [[self navigationController] setNavigationBarHidden:YES animated:NO];
+    
+    [self checkToolBar];
+    
+    self.disappear = NO;
+    self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+    [self.collectionview reloadData];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    self.disappear = YES;
+    [self.collectionview reloadData];
+}
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.mum.hidden = true;
@@ -534,34 +578,7 @@
    // self.cagegoryLabel.hidden = false;
     
 }
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [[self navigationController] setNavigationBarHidden:YES animated:NO];
-    
-    // customer 隐藏add to portfolio
-    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-    NSMutableArray *items = [self.selectToolbar.items mutableCopy];
-    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
-        
-        if ([items containsObject:self.addPortfolioBtn]) {
-            
-            [items removeObject:self.addPortfolioBtn];
-            self.selectToolbar.items = items;
-        }
-        
-    } else {
-        
-        if (![items containsObject:self.addPortfolioBtn]) {
-            
-            [items insertObject:self.addPortfolioBtn atIndex:4];
-            self.selectToolbar.items = items;
-        }
-        
-    }
 
-    
-}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -775,6 +792,7 @@
             {
                 [main_vc checklogin:false];
                 
+                [self checkToolBar];
                 
                 [self addtoportfolio];
             }
@@ -996,6 +1014,12 @@
 //        return;
 //    }
     
+    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        [RAUtils message_alert:@"Cannot Add to portfolio." title:@"Warning" controller:self] ;
+        return;
+    }
+    
     if (!count) {
         [RAUtils message_alert:@"There is no model." title:@"Cannot Add to portfolio." controller:self] ;
         return;
@@ -1415,6 +1439,16 @@
     
     
 }
+
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    
+    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    
+    self.toOrientation = toInterfaceOrientation;
+    [self.collectionview.collectionViewLayout invalidateLayout];
+    
+}
+
 /*
 #pragma mark - Navigation
 
@@ -1475,7 +1509,9 @@
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 
 {
-    
+    if (self.disappear) { // 消除invalidateSize警告，在横屏切出，竖屏切回时
+        return 0;
+    }
     // 每个Section的item个数
     NSDictionary * item_json = [self.category_data objectForKey:@"items"];
     int count =[[item_json valueForKey:@"count"] intValue];
@@ -1500,7 +1536,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPD";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
+
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"fash_name"];
@@ -1551,49 +1587,8 @@
         //    cell.cellDescription.text = description;
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_s"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                        {
-                            
-                            //                    UIImage * img=[UIImage imageNamed:@"notfound_s"];
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_s"];
-                        }
-                        
-                    });
-                });
-                
-                
-            }
-        }
+
+        
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
         //cell.layer.cornerRadius=15;
@@ -1605,7 +1600,7 @@
         static NSString * CellIdentifier = @"CategoryCellNPDLarge";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img_big"];
+
         NSString* description =[item_json valueForKey:@"description"];
         
         NSString* name =[item_json valueForKey:@"fash_name"];
@@ -1655,45 +1650,7 @@
         //    cell.cellDescription.text = description;
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_l"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
-                
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
-                
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-                    
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
-                        
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_l"];
-                        
-                    });
-                });
-                
-                
-            }
-        }
+
         cell.layer.borderColor = UIColorFromRGB(color).CGColor;
         cell.layer.borderWidth = 0.5;
         //cell.layer.cornerRadius=15;
@@ -1705,10 +1662,9 @@
         static NSString * CellIdentifier = @"CategoryCellNPDList";
         CategoryCellNPD * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
         NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
-        NSString* img_url =[item_json valueForKey:@"img"];
         NSString* description =[item_json valueForKey:@"description"];
         
-        NSString* name =[item_json valueForKey:@"fash_name "];
+        NSString* name =[item_json valueForKey:@"fash_name"];
         
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
@@ -1755,57 +1711,109 @@
         //    cell.cellDescription.text = description;
         //    cell.oldPrice.text = old_price;
         //    cell.Price.text = price;
-        if (![cell.imageName isEqualToString:img_url]) {
-            cell.imageName = img_url;
-            cell.cellImageView.image = [UIImage imageNamed:@"loading_l"];
-            NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
-            if(img_data!=nil)
-            {
+
+        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
+        cell.layer.borderWidth = 0.5;
+        //cell.layer.cornerRadius=15;
+        cell.layer.masksToBounds=true;
+        return cell;
+    }
+    
+
+    
+  
+}
+
+- (void)collectionCell:(CategoryCellNPD *)cell setImageForIndexPath:(NSIndexPath *)indexPath {
+    
+    NSDictionary * item_json =[[self.category_data objectForKey:@"items" ] objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
+    NSString* img_url =[item_json valueForKey:@"img"];
+    NSString* file_name=[img_url lastPathComponent];
+    
+    NSString *loading = @"loading_l";
+    NSString *notFound = @"notfound_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        notFound = @"notfound_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        notFound = @"notfound_s";
+        
+    }
+    
+    if (![cell.imageName isEqualToString:img_url]) {
+        cell.imageName = img_url;
+        cell.cellImageView.image = [UIImage imageNamed:loading];
+        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        if(img_data!=nil)
+        {
+            
+            UIImage * img =[UIImage imageWithData:img_data];
+            cell.cellImageView.image = img;
+        }
+        else
+        {
+            NSLog(@"load image");
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 
-                UIImage * img =[UIImage imageWithData:img_data];
-                cell.cellImageView.image = img;
-            }
-            else
-            {
+                NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                 
-                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                dispatch_async(dispatch_get_main_queue(), ^{
                     
-                    NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
                     
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        
-                        
+                    
+                    if(downloadimg_data!=nil)
+                    {
                         
-                        if(downloadimg_data!=nil)
-                        {
-                            
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
-                            
-                            UIImage * img =[UIImage imageWithData:downloadimg_data];
-                            cell.cellImageView.image = img;
-                        }
-                        else
-                            cell.cellImageView.image = [UIImage imageNamed:@"notfound_l"];
+                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
-                    });
+                        UIImage * img =[UIImage imageWithData:downloadimg_data];
+                        cell.cellImageView.image = img;
+                    }
+                    else
+                        cell.cellImageView.image = [UIImage imageNamed:notFound];
+                    
                 });
-                
-                
-            }
+            });
+            
+            
         }
-        cell.layer.borderColor = UIColorFromRGB(color).CGColor;
-        cell.layer.borderWidth = 0.5;
-        //cell.layer.cornerRadius=15;
-        cell.layer.masksToBounds=true;
-        return cell;
     }
     
+}
 
+- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
     
-  
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    son_cell.imageName = nil;
+    [self collectionCell:son_cell setImageForIndexPath:indexPath];
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    CategoryCellNPD * son_cell = (CategoryCellNPD *)cell;
+    
+    NSString *loading = @"loading_l";
+    
+    if (self.categoryViewType == CATEGORY_VIEWTYPE_LARGE) {
+        
+        loading = @"loading_l";
+        
+    } else if (self.categoryViewType == CATEGORY_VIEWTYPE_SMALL) {
+        
+        loading = @"loading_s";
+        
+    }
+    
+    son_cell.cellImageView.image = [UIImage imageNamed:loading];
 }
 
+
+
 #pragma mark --UICollectionViewDelegateFlowLayout
 
 
@@ -1822,7 +1830,7 @@
     
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication]statusBarOrientation];
     
-    
+    orientation = self.toOrientation;
     
     if (UIInterfaceOrientationIsLandscape(orientation))
     {
@@ -1865,6 +1873,11 @@
     //    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LARGE)
     //        return UIEdgeInsetsMake(10, 10, 10, 10);
     
+    if(self.categoryViewType ==CATEGORY_VIEWTYPE_LARGE)
+        return UIEdgeInsetsMake(10, 10, 10, 10);
+    else if(self.categoryViewType ==CATEGORY_VIEWTYPE_LIST)
+        return UIEdgeInsetsMake(10, 0, 10, 0);
+    return UIEdgeInsetsMake(10, 10, 10, 10);
     
     
     return UIEdgeInsetsMake(10, 10, 10, 10);

RedAnt ERP Mobile/common/JKLock/JKLockController.m

@@ -40,7 +40,7 @@
 
 - (instancetype)init {
     if (self = [super init]) {
-        self.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:0.8];
+        self.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:1];
         
         self.dotStrokColor = [UIColor colorWithRed:0.4737 green:0.3641 blue:0.2456 alpha:0.5];
         self.dotFillColor = [UIColor colorWithRed:0.4737 green:0.3641 blue:0.2456 alpha:0.5];

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -790,7 +790,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
 
-
+    self.window.backgroundColor = [UIColor whiteColor];
     
 //    [RAUtils expression_varable:nil regex:nil];
     self.disable_trigger = false;

RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -338,7 +338,7 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pki-xD-OOT">
-                                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
+                                                            <rect key="frame" x="15" y="12" width="31" height="20"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -474,7 +474,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hjj-gq-Qs5" id="bKF-1X-6DE">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567890.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MZM-06-tL3" userLabel="item price">
@@ -603,7 +603,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L9J-GT-Vuy" id="8jz-dG-ECN">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567890.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0CU-0E-u4Q" userLabel="item price">
@@ -877,7 +877,7 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kAP-gb-Gce" id="Ilc-6o-RhI">
-                                            <rect key="frame" x="0.0" y="0.0" width="360" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AxX-hS-Jtg">
@@ -956,10 +956,10 @@
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailHeaderCell" rowHeight="550" id="PCZ-Ci-oQf" customClass="DetailHeaderCell">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="550"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="550"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PCZ-Ci-oQf" id="DiR-eY-PiR">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="549"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="549.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USD 123.45" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fD8-Km-IT3">
@@ -1205,10 +1205,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="DetailTopicCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailTopicCell" id="zzF-db-bsq" customClass="DetailTopicCell">
-                                        <rect key="frame" x="0.0" y="606" width="768" height="600"/>
+                                        <rect key="frame" x="0.0" y="605.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zzF-db-bsq" id="rZ0-x8-h3B">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Refreshing...
Please wait." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bSP-hh-M2A">
@@ -1271,18 +1271,18 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailImageCell" id="gSx-f2-mrB" customClass="DetailImageCell">
-                                        <rect key="frame" x="0.0" y="1206" width="768" height="600"/>
+                                        <rect key="frame" x="0.0" y="1205.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gSx-f2-mrB" id="k28-H7-ddZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailInfoCell" rowHeight="44" id="hYM-aE-rjR" customClass="DetailKVCell">
-                                        <rect key="frame" x="0.0" y="1806" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="1805.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hYM-aE-rjR" id="o59-aa-UU2">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EOR-Ov-zPZ">
@@ -2081,7 +2081,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QWz-EJ-Yzy" id="E1L-su-dvV">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="PJV-YE-GvQ">
@@ -2105,7 +2105,7 @@
                                         <rect key="frame" x="0.0" y="44" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TID-OY-afi" id="yuC-0D-Ebs">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diskspace" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pVO-Tx-wMs">
@@ -2133,7 +2133,7 @@
                                         <rect key="frame" x="0.0" y="88" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <rect key="frame" x="0.0" y="0.0" width="702" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="730" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AHm-p1-51h">
@@ -2181,7 +2181,7 @@
                                         <rect key="frame" x="0.0" y="22" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KaA-n8-IuZ" id="C6b-m1-PvY">
-                                            <rect key="frame" x="0.0" y="0.0" width="507" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="507" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -2366,7 +2366,7 @@
                                                 <rect key="frame" x="0.0" y="22" width="768" height="146"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0QE-xl-8q8" id="tZa-g0-y6H">
-                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="145"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="146"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="S98-fV-nsC" userLabel="name and description">
@@ -2882,7 +2882,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="66"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wnt-DO-dKG" id="BF2-Qh-ul9">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="65"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="66"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XKD-dm-WDq" userLabel="name">
@@ -2996,7 +2996,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="66"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H8t-DU-AtW" id="q6R-9a-SsD">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="65"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="66"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEB1509140024" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fu3-Bf-ZH2" userLabel="So#">
@@ -3164,7 +3164,7 @@
                                         <rect key="frame" x="0.0" y="22" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bQp-uU-NIo" id="Ymj-RC-clP">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="ZwE-Yj-Qcc" customClass="RTLabel">
@@ -3219,7 +3219,7 @@
                                         <rect key="frame" x="0.0" y="28" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Al-fa-yxk" id="WsV-DS-v1A">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Model" lineBreakMode="characterWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RFL-cS-0MU">
@@ -3290,7 +3290,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="w28-aV-219" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w28-aV-219" id="yuU-dg-V0S">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3375,7 +3375,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="QPf-Af-7Me" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QPf-Af-7Me" id="irR-6K-df5">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3400,7 +3400,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="Vs9-Qf-vxV" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Vs9-Qf-vxV" id="3Do-0O-Onj">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3425,7 +3425,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="C8t-En-sTC" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="380" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="379.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C8t-En-sTC" id="6ch-Nb-zL4">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3445,7 +3445,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="CVv-i3-6xU" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="424" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="423.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CVv-i3-6xU" id="5TH-wP-I5s">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3493,7 +3493,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="uSh-rW-JhP" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="468" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="467.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uSh-rW-JhP" id="aTm-1j-ybX">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3523,7 +3523,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="do6-if-39e" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="608" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="607.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="do6-if-39e" id="RAk-Jz-OB9">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3578,7 +3578,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="UZ5-RY-yCg" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="696" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="695.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UZ5-RY-yCg" id="3xt-ff-xmR">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3604,7 +3604,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="hgq-kD-iRf" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="740" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="739.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hgq-kD-iRf" id="9g7-Vy-Z4W">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
@@ -3680,7 +3680,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="w7f-2o-3My" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w7f-2o-3My" id="dR2-6K-auD">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3765,7 +3765,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="s03-lY-Sk5" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s03-lY-Sk5" id="H9Q-Lh-0RC">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3790,7 +3790,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="tBL-9H-IHt" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tBL-9H-IHt" id="FMA-VD-5lg">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3815,7 +3815,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="DjB-vz-gce" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="380" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="379.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DjB-vz-gce" id="N8R-s2-YlG">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3835,7 +3835,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="Dxk-mD-7s3" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="424" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="423.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dxk-mD-7s3" id="rYx-1g-cpi">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3883,7 +3883,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="8je-xy-cas" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="468" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="467.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8je-xy-cas" id="0Vc-DF-vVj">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -3913,7 +3913,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="mOe-CU-sxV" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="608" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="607.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mOe-CU-sxV" id="Gk5-VC-pbV">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3968,7 +3968,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="wHj-1P-1PF" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="696" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="695.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wHj-1P-1PF" id="MBN-Df-2u3">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -3994,7 +3994,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="cy9-9y-7dy" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="740" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="739.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="cy9-9y-7dy" id="eie-Ln-elB">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
@@ -4063,7 +4063,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="jfO-PG-uLf" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jfO-PG-uLf" id="OQa-3r-YQf">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4148,7 +4148,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="8jN-k8-vT8" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8jN-k8-vT8" id="y8d-Br-QK9">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4176,7 +4176,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="fhp-We-Evw" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fhp-We-Evw" id="peL-rj-bhn">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4196,7 +4196,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="953-S4-Ybs" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="284" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="283.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="953-S4-Ybs" id="Tf0-xp-ake">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4244,7 +4244,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="hgI-Qq-2nD" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="328" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hgI-Qq-2nD" id="wiw-ap-T5s">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
@@ -4295,7 +4295,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="wWC-LA-FLo" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="448" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="447.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wWC-LA-FLo" id="Sbm-NG-TCy">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4364,7 +4364,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="HwS-XR-mHk" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="536" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="535.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HwS-XR-mHk" id="FWK-YS-Wvs">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4397,7 +4397,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="8eu-kF-HjJ" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="676" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="675.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8eu-kF-HjJ" id="CHz-cc-955">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4435,7 +4435,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="yQG-fa-dLU" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="816" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="815.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yQG-fa-dLU" id="bwC-z2-Brp">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4501,7 +4501,7 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="VsS-mx-QUE" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VsS-mx-QUE" id="swD-Ty-dh5">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4562,7 +4562,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="jMZ-h9-v7w" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jMZ-h9-v7w" id="h5V-78-c7u">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4592,7 +4592,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="nEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="3LN-pk-gwJ" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3LN-pk-gwJ" id="m3o-A5-n3D">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4612,7 +4612,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="ILu-EU-lsU" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="284" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="283.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ILu-EU-lsU" id="e2Y-b9-F17">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
@@ -4690,7 +4690,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="jKe-Oa-th9" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="448" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="447.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jKe-Oa-th9" id="md5-yk-kcj">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4724,7 +4724,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="r9X-D7-CbM" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="492" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="491.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="r9X-D7-CbM" id="NkN-ek-2mk">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4762,7 +4762,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="ExY-o6-9O4" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="632" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="631.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ExY-o6-9O4" id="CH0-fk-1Xj">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4795,7 +4795,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="ZHP-xj-rXt" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="772" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="771.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZHP-xj-rXt" id="LdD-kY-z21">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4875,7 +4875,7 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="n4c-77-hLv" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="n4c-77-hLv" id="DvL-17-pkX">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -4935,7 +4935,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="Xog-Cl-i5m" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xog-Cl-i5m" id="POr-6Z-bgE">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -4961,7 +4961,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="bU5-1H-8Ym" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bU5-1H-8Ym" id="ThQ-zS-Kmf">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5013,7 +5013,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="1Ld-bY-s0l" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="328" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Ld-bY-s0l" id="keH-oZ-gZA">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -5038,7 +5038,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="n0g-se-pw1" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="468" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="467.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="n0g-se-pw1" id="MTt-Lc-1Mu">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5066,7 +5066,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="nEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="lUK-Sp-QMR" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="512" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="511.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lUK-Sp-QMR" id="SU0-Og-nm9">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5466,7 +5466,7 @@ Email: redantsupport@united-us.net</string>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="PRa-4x-STz" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PRa-4x-STz" id="j94-2I-Aua">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -5526,7 +5526,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="mUu-Gu-4WC" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mUu-Gu-4WC" id="Eik-OE-OLM">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5554,7 +5554,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="nEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="aY6-fA-U1S" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aY6-fA-U1S" id="DID-HS-9ld">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5609,7 +5609,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="w7k-Sm-sh2" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="328" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w7k-Sm-sh2" id="wUI-h8-GJ0">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5643,7 +5643,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="3EE-eu-NG5" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="372" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="371.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3EE-eu-NG5" id="lbr-V3-fxF">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -5676,7 +5676,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="gqK-qF-Nl2" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="512" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="511.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gqK-qF-Nl2" id="jMN-a4-IRZ">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -5749,7 +5749,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6hT-I3-WW3" id="gKI-En-sgV">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="Eyx-Zr-PLO" customClass="RTLabel">
@@ -5767,7 +5767,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="66" width="768" height="190"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lSe-2G-cT7" id="KDS-aU-tYT">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="189"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="190"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yQq-ma-HdT" userLabel="unit price">
@@ -5891,7 +5891,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="256" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9rG-Hv-ICg" id="e5s-wc-IkL">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fNL-sW-tkk" userLabel="price">
@@ -5919,7 +5919,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="300" width="768" height="186"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9hm-qp-u5H" id="PQ9-FQ-6Si">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="185"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="186"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <webView userInteractionEnabled="NO" contentMode="scaleToFill" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" id="9m6-iq-KMk">
@@ -5938,7 +5938,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="486" width="768" height="148"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s5l-6k-iWO" id="8ms-PN-eNw">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="147"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="148"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="wjN-UC-W3J">
@@ -6385,7 +6385,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Vyi-Ez-P2a" id="LVn-pY-YDc">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="N1s-I8-bJv" customClass="RTLabel">
@@ -6458,7 +6458,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aNn-5E-yfU" id="blR-1z-uB4">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="Joe-9c-mhx">
@@ -6551,7 +6551,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="162" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0El-DP-xYZ" id="WXt-bL-3En">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e6Y-d9-upz">
@@ -6585,7 +6585,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="206" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="J3d-cG-qdt" id="j4j-Ny-UDJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Way-zK-rPT">
@@ -6618,7 +6618,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="250" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xOa-Xr-gTr" id="j8Z-My-v13">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9dp-dT-Iun">
@@ -6653,7 +6653,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="294" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="INw-X5-a6L" id="dMk-dO-jRe">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ims-8q-OTf">
@@ -6686,7 +6686,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="434" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WbT-Mq-Y44" id="qI1-h7-szu">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b2f-XC-2x6">
@@ -6714,7 +6714,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="478" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sAj-KH-YeP" id="hWS-Yn-EOD">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1DW-rj-4BZ">
@@ -6734,7 +6734,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="522" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1bG-aS-FTW" id="u8v-qb-zq2">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="kvi-MS-wS3" userLabel="action3">
@@ -6782,7 +6782,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="566" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LoG-P8-L3l" id="uQB-ra-pgG">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ara-TK-zIp">
@@ -6820,7 +6820,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="706" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Y94-S0-YG0" id="Cdh-u2-URo">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gKp-K8-IGk">
@@ -6896,7 +6896,7 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ebw-26-5Ud" id="gop-RV-8fg">
-                                    <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </tableViewCellContentView>
                             </tableViewCell>
@@ -7433,7 +7433,7 @@ Email: redantsupport@united-us.net</string>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="7KD-Co-OAK" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="56" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7KD-Co-OAK" id="FbA-z6-0iG">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -7518,7 +7518,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="kUY-2X-OQd" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="196" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kUY-2X-OQd" id="FXj-l5-1mU">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7538,7 +7538,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="GVD-y8-KLS" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="240" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GVD-y8-KLS" id="RmE-tM-RaX">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7586,7 +7586,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="nn8-y2-LYf" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="284" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="283.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nn8-y2-LYf" id="GWS-Tc-qsC">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7614,7 +7614,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="fqz-qc-NeD" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="328" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="327.5" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fqz-qc-NeD" id="GHW-OE-Nwx">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="119"/>
@@ -7685,7 +7685,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="vBb-qx-uNy" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="492" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="491.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vBb-qx-uNy" id="aif-s6-qis">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7719,7 +7719,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="P2I-qc-Fio" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="536" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="535.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P2I-qc-Fio" id="yVb-6C-FGP">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -7757,7 +7757,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="V2v-qA-8Zy" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="676" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="675.5" width="768" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="V2v-qA-8Zy" id="Qvj-UB-24L">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="139"/>
@@ -7790,7 +7790,7 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="zGI-xw-2DP" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="816" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="815.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zGI-xw-2DP" id="Jy6-oM-9pA">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7859,11 +7859,11 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="28" width="728" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nP5-gn-0Jl" id="MCy-CI-ivv">
-                                            <rect key="frame" x="0.0" y="0.0" width="728" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="728" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HwF-54-hzr">
-                                                    <rect key="frame" x="28" y="0.0" width="672" height="43"/>
+                                                    <rect key="frame" x="15" y="0.0" width="698" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -8571,7 +8571,7 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="28" width="440" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FV6-lD-g7T" id="FCT-G6-wmp">
-                                            <rect key="frame" x="0.0" y="0.0" width="440" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="440" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NOt-hZ-Ysa">

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,7 +10,6 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
-
 #define test_server
 
 #define exception_switch 1