1.修改More Color图标对齐。

2.修改Item Search和Search从Model Detail返回时刷新。

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

@@ -2,4 +2,22 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/search+itemsearch/ItemSearchFilterViewController.m"
+            timestampString = "519611782.722609"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "388"
+            endingLineNumber = "388"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

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

@@ -30,7 +30,6 @@
 @interface ItemSearchViewController ()
 
 @property (nonatomic,assign) BOOL addAll;
-@property (nonatomic,assign) BOOL disappear;
 @property (nonatomic,assign) UIInterfaceOrientation toOrientation;///<屏幕将要旋转到的方向
 
 @property (nonatomic,strong) NSOperationQueue *dataOperationQueue;
@@ -489,15 +488,14 @@
     
     [self checkToolBar];
 
-    self.disappear = NO;
     self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
-    [self.collectionview reloadData];
+
+    [self.collectionview layoutIfNeeded];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
-    // 消除横排切换出去，竖屏切换回来时invalidateSize警告
-    self.disappear = YES;
-    [self.collectionview reloadData];
+    [super viewWillDisappear:animated];
+
 }
 
 - (void)didReceiveMemoryWarning {
@@ -1490,9 +1488,6 @@
 -(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];

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

@@ -28,7 +28,6 @@
 
 @property (nonatomic,assign) BOOL addAll;
 @property (nonatomic,assign) UIInterfaceOrientation toOrientation;///<屏幕将要旋转到的方向
-@property (nonatomic,assign) BOOL disappear;
 
 @property (nonatomic,strong) NSOperationQueue *dataOperationQueue;
 
@@ -187,14 +186,14 @@
     
     [self checkToolBar];
     
-    self.disappear = NO;
+
     self.toOrientation = [[UIApplication sharedApplication] statusBarOrientation];
-    [self.collectionview reloadData];
+    [self.collectionview layoutIfNeeded];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
-    self.disappear = YES;
-    [self.collectionview reloadData];
+
+    [super viewWillDisappear:animated];
 }
 
 
@@ -1509,9 +1508,6 @@
 -(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];

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="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -1373,7 +1373,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CategoryCellNPD" id="cah-A8-bXi" customClass="CategoryCellNPD">
-                                        <rect key="frame" x="0.0" y="95" width="180" height="251"/>
+                                        <rect key="frame" x="0.0" y="94.5" width="180" height="251"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="180" height="251"/>
@@ -1502,8 +1502,8 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="drL-KU-Xb0">
-                                                    <rect key="frame" x="123" y="90" width="495" height="21"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="$139.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="drL-KU-Xb0">
+                                                    <rect key="frame" x="123" y="90" width="399" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                     <nil key="highlightedColor"/>
@@ -1531,7 +1531,7 @@
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="more_color_larger" id="Z2a-02-p0m">
-                                                    <rect key="frame" x="636" y="88" width="24" height="24"/>
+                                                    <rect key="frame" x="530" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                             </subviews>