1.修改Homer图片变形。

2.修改Homer查看Model图片大图时，禁止缩小。
3.修复Homer Model Detail加载图像导致主线程卡顿。

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -2849,6 +2849,10 @@
         {
             CellIdentifier = @"CommonEditorCellImg";
             CommonEditorCellImg * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+            cell.touchImageView0.contentMode = UIViewContentModeScaleAspectFit;
+            cell.touchImageView1.contentMode = UIViewContentModeScaleAspectFit;
+            cell.touchImageView2.contentMode = UIViewContentModeScaleAspectFit;
+            
             NSString* title = [item_json valueForKey:@"aname"] ;
             NSString* value =[item_json valueForKey:@"value"];
             int disable = [[item_json valueForKey:@"disable"] intValue];
@@ -3711,6 +3715,7 @@
             
             cell.labelUnitPrice.text = newunitprice;
             cell.imgModel.image = [UIImage imageNamed:@"loading_s"];
+            cell.imgModel.contentMode = UIViewContentModeScaleAspectFit;
             
             NSString* file_name=[img_url lastPathComponent];
             NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
@@ -3874,6 +3879,7 @@
             
             CellIdentifier = @"CommonEditorCellSignature";
             CommonEditorCellSignature * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+            cell.imageviewSignature.contentMode = UIViewContentModeScaleAspectFit;
             
             NSMutableString* title = [[item_json valueForKey:@"aname"] mutableCopy];
             //            if([required isEqualToString:@"true"])

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -1623,6 +1623,8 @@
     
     NSString *CellIdentifier = @"CartItemCell";
     ModelItemCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+    
+    
     NSDictionary * item_json = nil;//[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
     
     if (self.back_order_flag) {
@@ -1834,17 +1836,26 @@
     
     [cell set_Count:count];
     
+    // Button 设置了大小约束，Size就不会随内容变化
+    [cell.btnImage setContentMode:UIViewContentModeScaleAspectFit];
+    [cell.btnImage setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+    [cell.btnImage setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+    [cell.btnImage setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+    cell.btnImage.imageView.contentMode = UIViewContentModeScaleAspectFit;
     
     if (![cell.imageName isEqualToString:img_url]) {
         cell.imageName = img_url;
-        [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//        [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+        [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+        
         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.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+//            [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+            [cell.btnImage setImage:img forState:UIControlStateNormal];
         }
         else
         {
@@ -1863,11 +1874,13 @@
                         [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
-                        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+//                        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+                        [cell.btnImage setImage:img forState:UIControlStateNormal];
                     }
                     else
                     {
-                        [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                        [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                        [cell.btnImage setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                     }
                     
                 });

RedAnt ERP Mobile/common/Functions/modelDetail/DetailTopicCell.m

@@ -84,6 +84,8 @@
 
         static NSString * CellIdentifier = @"RelatedModelCell";
         CategoryCellSmall * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
+        cell.cellImageView.contentMode = UIViewContentModeScaleAspectFit;
+    
         NSDictionary * item_json =[self.related_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
         NSString* img_url =[item_json valueForKey:@"picture_path"];
         NSString* description =[item_json valueForKey:@"fash_name"];

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -2056,6 +2056,8 @@ self.isrefreshing=false;
                 float height = [[img_json valueForKey:@"height"]floatValue];
                 //
                 UIImageView * imgview = [[UIImageView alloc] initWithFrame:CGRectMake(0, posy, tableView.bounds.size.width , height*tableView.bounds.size.width / width)];
+                imgview.contentMode = UIViewContentModeScaleAspectFit;
+                
                 NSString* img_url = [img_json valueForKey:@"img_url"];
                 posy+=height*tableView.bounds.size.width / width;
                 NSString* file_name=[img_url lastPathComponent];

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -2196,6 +2196,7 @@
         NSString* img_url = [section valueForKey:@"data"];
         
         cell.sign_img.userInteractionEnabled = NO;
+        
         __block BOOL hasTapGesture = NO;
         [cell.sign_img.gestureRecognizers enumerateObjectsUsingBlock:^(__kindof UIGestureRecognizer * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             
@@ -2454,9 +2455,17 @@
                 }
             }
             
+            // Button 设置了大小约束，Size就不会随内容变化
+            [cell.imgbtn setContentMode:UIViewContentModeScaleAspectFit];
+            [cell.imgbtn setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+            [cell.imgbtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+            [cell.imgbtn setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+            cell.imgbtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
+            
             if (![cell.imageName isEqualToString:img_url]) {
                 cell.imageName = img_url;
-                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+                [cell.imgbtn setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
                 
                 NSString* file_name=[img_url lastPathComponent];
                 NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
@@ -2464,7 +2473,8 @@
                 {
                     
                     UIImage * img =[UIImage imageWithData:img_data];
-                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.imgbtn setImage:img forState:UIControlStateNormal];
                 }
                 else
                 {
@@ -2483,10 +2493,12 @@
                                 [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
-                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:img forState:UIControlStateNormal];
                             }
                             else
-                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                             
                             
                         });
@@ -2829,9 +2841,17 @@
                 }
             }
             
+            // Button 设置了大小约束，Size就不会随内容变化
+            [cell.imgbtn setContentMode:UIViewContentModeScaleAspectFit];
+            [cell.imgbtn setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+            [cell.imgbtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+            [cell.imgbtn setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+            cell.imgbtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
+            
             if (![cell.imageName isEqualToString:img_url]) {
                 cell.imageName = img_url;
-                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+                [cell.imgbtn setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
                 
                 NSString* file_name=[img_url lastPathComponent];
                 NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
@@ -2839,7 +2859,8 @@
                 {
                     
                     UIImage * img =[UIImage imageWithData:img_data];
-                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.imgbtn setImage:img forState:UIControlStateNormal];
                 }
                 else
                 {
@@ -2858,10 +2879,12 @@
                                 [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
-                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                                 [cell.imgbtn setImage:img forState:UIControlStateNormal];
                             }
                             else
-                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                             
                             
                         });
@@ -3204,9 +3227,17 @@
                 }
             }
             
+            // Button 设置了大小约束，Size就不会随内容变化
+            [cell.imgbtn setContentMode:UIViewContentModeScaleAspectFit];
+            [cell.imgbtn setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+            [cell.imgbtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+            [cell.imgbtn setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+            cell.imgbtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
+            
             if (![cell.imageName isEqualToString:img_url]) {
                 cell.imageName = img_url;
-                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+                [cell.imgbtn setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
                 
                 NSString* file_name=[img_url lastPathComponent];
                 NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
@@ -3214,7 +3245,8 @@
                 {
                     
                     UIImage * img =[UIImage imageWithData:img_data];
-                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.imgbtn setImage:img forState:UIControlStateNormal];
                 }
                 else
                 {
@@ -3233,10 +3265,12 @@
                                 [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
-                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:img forState:UIControlStateNormal];
                             }
                             else
-                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                             
                             
                         });
@@ -3606,9 +3640,17 @@
                 }
             }
             
+            // Button 设置了大小约束，Size就不会随内容变化
+            [cell.imgbtn setContentMode:UIViewContentModeScaleAspectFit];
+            [cell.imgbtn setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+            [cell.imgbtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+            [cell.imgbtn setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+            cell.imgbtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
+            
             if (![cell.imageName isEqualToString:img_url]) {
                 cell.imageName = img_url;
-                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+                [cell.imgbtn setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
                 
                 NSString* file_name=[img_url lastPathComponent];
                 NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
@@ -3616,7 +3658,8 @@
                 {
                     
                     UIImage * img =[UIImage imageWithData:img_data];
-                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.imgbtn setImage:img forState:UIControlStateNormal];
                 }
                 else
                 {
@@ -3635,10 +3678,12 @@
                                 [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
-                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:img forState:UIControlStateNormal];
                             }
                             else
-                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                                [cell.imgbtn setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                                [cell.imgbtn setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                             
                             
                         });

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -1094,6 +1094,13 @@
     ModelItemCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSDictionary * item_json = [self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
     
+    // Button 设置了大小约束，Size就不会随内容变化
+    [cell.btnImage setContentMode:UIViewContentModeScaleAspectFit];
+    [cell.btnImage setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+    [cell.btnImage setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+    [cell.btnImage setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+    cell.btnImage.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    
     NSString* img_url = [item_json valueForKey:@"img"];
     NSString* description = [item_json valueForKey:@"description"];
     //    NSString* identifier = [item_json valueForKey:@"identifier"];
@@ -1177,14 +1184,17 @@
     cell.img_checkmark.hidden=true;
     
     //    UIImageView* iv =cell.btnImage.imageView;
-    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+    [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+    
     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.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+//        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+        [cell.btnImage setImage:img forState:UIControlStateNormal];
         //  cell.btnImage.imageView.image = img;
     }
     else
@@ -1204,10 +1214,12 @@
                     [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
-                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.btnImage setImage:img forState:UIControlStateNormal];
                 }
                 else
-                [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                    [cell.btnImage setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                 
                 
             });

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -809,6 +809,13 @@
     ModelItemCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
     NSDictionary * item_json = [self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
     
+    // Button 设置了大小约束，Size就不会随内容变化
+    [cell.btnImage setContentMode:UIViewContentModeScaleAspectFit];
+    [cell.btnImage setContentEdgeInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
+    [cell.btnImage setContentHorizontalAlignment:UIControlContentHorizontalAlignmentFill];
+    [cell.btnImage setContentVerticalAlignment:UIControlContentVerticalAlignmentFill];
+    cell.btnImage.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    
     NSString* img_url = [item_json valueForKey:@"img"];
     NSString* description = [item_json valueForKey:@"description"];
     //    NSString* identifier = [item_json valueForKey:@"identifier"];
@@ -831,15 +838,17 @@
         cell.img_checkmark.hidden=true;
     
     //    UIImageView* iv =cell.btnImage.imageView;
-    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+//    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+    [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
+    
     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.btnImage setBackgroundImage:img forState:UIControlStateNormal];
-        //  cell.btnImage.imageView.image = img;
+//        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+          [cell.btnImage setImage:img forState:UIControlStateNormal];
     }
     else
     {
@@ -858,10 +867,12 @@
                     [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
-                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+//                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];
+                    [cell.btnImage setImage:img forState:UIControlStateNormal];
                 }
                 else
-                    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+//                    [cell.btnImage setBackgroundImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
+                    [cell.btnImage setImage:[UIImage imageNamed:@"notfound_s"] forState:UIControlStateNormal];
                 
                 
             });

RedAnt ERP Mobile/common/PhotoList/Storyboard/PhotoList.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -37,7 +37,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="735"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.5" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="5Dl-d3-MLq">
+                                                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="5Dl-d3-MLq">
                                                     <rect key="frame" x="0.0" y="0.0" width="414" height="735"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sni-z4-WnW">

RedAnt ERP Mobile/common/customUI/NIDropDown.m

@@ -184,6 +184,8 @@
         cell.contentView.layer.borderWidth = 0.0;
     }
     
+    cell.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    
     NSDictionary* item = [self.selector objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
     
     cell.imageView.image=[UIImage imageNamed:@"loading_s"];
@@ -200,21 +202,25 @@
     }
     else
     {
-        NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            
+        dispatch_async(dispatch_get_global_queue(0, 0), ^{
             
-            
-            if(downloadimg_data!=nil)
-            {
+            NSData*  downloadimg_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:img_url]];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                
                 
-                [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.imageView.image=img;
+                }
+                else
+                    cell.imageView.image=[UIImage imageNamed:@"notfound_s"];
                 
-                UIImage * img =[UIImage imageWithData:downloadimg_data];
-                cell.imageView.image=img;
-            }
-            else
-                cell.imageView.image=[UIImage imageNamed:@"notfound_s"];
+            });
             
         });
     }

RedAnt ERP Mobile/common/photoStack/PhotoStackView.m

@@ -347,6 +347,7 @@ static CGFloat const PhotoRotationOffsetDefault = 4.0f;
                 imageSize = [self.dataSource photoStackView:self photoSizeForIndex:index];
             }
             UIImageView *photoImageView     = [[UIImageView alloc] initWithFrame:(CGRect){CGPointZero, self.frame.size}];
+            photoImageView.contentMode = UIViewContentModeScaleAspectFit;
             photoImageView.image            = image;
             UIView *view                    = [[UIView alloc] initWithFrame:photoImageView.frame];
             view.layer.rasterizationScale   = [[UIScreen mainScreen] scale];            

RedAnt ERP Mobile/iSales-NPD.xcodeproj/xcuserdata/macmini1.xcuserdatad/xcschemes/iSales-NPD.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -11,7 +11,7 @@
 #define BUILD_NPD
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1
@@ -306,6 +306,8 @@
 
 #define URL_BLOG @"https://www.newpacificdirect.com/blog"
 
+#define  URL_BACK_ORDER_PREVIEW  @"https://www.newpacificdirect.com/isales/cartDeliveryBackOrderReview.htm"
+
 #endif
 
 #endif