Homer App

修改model detail 显示

Ants Contract/AntsContract.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -127,7 +127,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2120"
             endingLineNumber = "2120"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -143,7 +143,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2124"
             endingLineNumber = "2124"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -159,7 +159,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2151"
             endingLineNumber = "2151"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -175,7 +175,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "954"
             endingLineNumber = "954"
-            landmarkName = "-ControlButtonClicked:"
+            landmarkName = "-addImage:destView:index:update:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -191,7 +191,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "967"
             endingLineNumber = "967"
-            landmarkName = "-CheckButtonClicked:"
+            landmarkName = "-scrollViewDidEndZooming:withView:atScale:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -223,7 +223,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2113"
             endingLineNumber = "2113"
-            landmarkName = "-tapRecognizer:"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -239,7 +239,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2127"
             endingLineNumber = "2127"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -255,7 +255,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2152"
             endingLineNumber = "2152"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -287,7 +287,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2123"
             endingLineNumber = "2123"
-            landmarkName = "-updatePageControl:"
+            landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -627,5 +627,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../RedAnt ERP Mobile/common/pdfCreator/TextDrawable.m"
+            timestampString = "536657426.439347"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "313"
+            endingLineNumber = "313"
+            landmarkName = "-Query_Rect:dataSource:ParentRect:startX:startY:flipHeight:range:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "536232538.785389"
+            timestampString = "536721848.446811"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "340"
-            endingLineNumber = "340"
+            startingLineNumber = "381"
+            endingLineNumber = "381"
             landmarkName = "-addtocart"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "536232538.789257"
+            timestampString = "536721848.447035"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "110"
-            endingLineNumber = "110"
+            startingLineNumber = "114"
+            endingLineNumber = "114"
             landmarkName = "-generate_information"
             landmarkType = "7">
          </BreakpointContent>
@@ -41,15 +41,111 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/RAOrderPreviewController.m"
+            timestampString = "536721848.4472"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1318"
+            endingLineNumber = "1318"
+            landmarkName = "-onCommitOrderClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/RAOrderPreviewController.m"
+            timestampString = "536721848.447269"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2037"
+            endingLineNumber = "2037"
+            landmarkName = "-alertView:clickedButtonAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
+            timestampString = "536721848.447326"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "96"
+            endingLineNumber = "96"
+            landmarkName = "-generate_information"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "536232538.790163"
+            timestampString = "536721848.447388"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "107"
-            endingLineNumber = "107"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
             landmarkName = "-generate_information"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/DetailViewController.m"
+            timestampString = "536721848.447446"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "717"
+            endingLineNumber = "717"
+            landmarkName = "-numberOfSectionsInTableView:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/DetailViewController.m"
+            timestampString = "536721848.448085"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "757"
+            endingLineNumber = "757"
+            landmarkName = "-tableView:numberOfRowsInSection:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/category/CategorySearchFilterViewController.m"
+            timestampString = "536743931.196529"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "56"
+            endingLineNumber = "56"
+            landmarkName = "-initUI"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -715,6 +715,8 @@ self.isrefreshing=false;
 
 
     int section_count =[[self.detail_data valueForKey:@"detail_section_count"] intValue];
+    if(section_count==0)
+        return section_count;
     NSDictionary* related_json = [self.detail_data objectForKey:@"related_model"];
     if(related_json==nil)
         return  section_count+1;

RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.h

@@ -85,4 +85,7 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *informationLabel;
 
+@property (weak, nonatomic) IBOutlet UILabel *informationLabel_arch;
+
+@property (assign) CGSize inforframe;
 @end

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

@@ -49,7 +49,7 @@
     
     self.informationLabel.numberOfLines = 0;
 //    self.informationLabel.verticalAlignment=MDHTMLLabelVerticalAlignmentTop;
-//    self.informationLabel.backgroundColor = [UIColor yellowColor];
+    self.informationLabel.backgroundColor = [UIColor yellowColor];
 //    self.selector_Button.layer.borderWidth = 0.5;
 //    self.selector_Button.layer.borderColor = [[UIColor lightGrayColor] CGColor];
 //    self.selector_Button.layer.cornerRadius = 0;
@@ -64,7 +64,9 @@
               options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld)
               context:@"content changed"];
     
-    [self generate_information];
+    
+    self.inforframe=self.informationLabel.frame.size;
+//    [self generate_information];
 }
 
 -(void) dealloc
@@ -83,6 +85,11 @@
         
     }
     
+}
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+//    [self generate_information];
 }
 -(void) generate_information
 {
@@ -106,8 +113,42 @@
     
     NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[information_str dataUsingEncoding:NSUnicodeStringEncoding] options:optoins documentAttributes:nil error:nil];
     
-    
+//    self.informationLabel.numberOfLines
+//    self.informationLabel.lineBreakMode
+//
+//    self.informationLabel.adjustsFontSizeToFitWidth  = YES;
+//    self.informationLabel.minimumFontSize      =  0.5;
     self.informationLabel.attributedText=attrStr;
+    
+//    self.informationLabel.text =  @"文字在语言学中指书面语的视觉形式，古代把独体字叫做“文”，把合体字叫做“字”，如今联合起来叫做“文字”，文字的基本个体叫做“字”。在日常生活中，";
+    
+//    [self.informationLabel sizeToFit];
+    
+//    CGSize inforsize=[self.informationLabel sizeThatFits:self.informationLabel.frame.size];
+  
+//    CTFramesetterRef  framesetter = CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attrStr);
+//    //计算文本绘制size ，这里300是文字宽度，你可以自己更改为247，但是要记得，在height 方法里的这个位置，也改为247
+//    CGSize tmpSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, CFRangeMake(0,0), NULL, CGSizeMake(self.informationLabel.frame.size.width, MAXFLOAT), NULL);
+//
+//
+//
+//    CFRelease(framesetter);
+    
+//    CGSize lblSize = [self.informationLabel.text boundingRectWithSize:self.informationLabel.frame.size options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14]} context:nil].size;
+//    self.informationLabel.frame = CGRectMake(self.informationLabel.frame.origin.x, self.informationLabel.frame.origin.y, tmpSize.width, tmpSize.height);
+//    [self.informationLabel sizeToFit];
+    
+    UILabel* textLabel = [UILabel new];
+    textLabel.attributedText = attrStr;
+    textLabel.numberOfLines = 0;
+    
+    textLabel.lineBreakMode = NSLineBreakByWordWrapping;
+//    [textLabel sizeToFit];
+    CGSize newsize = [textLabel sizeThatFits:self.inforframe];
+    
+    self.informationLabel.frame = CGRectMake(self.informationLabel_arch.frame.origin.x, CGRectGetMaxY(self.informationLabel.frame)-newsize.height, newsize.width, newsize.height);
+//
+    
 }
 - (IBAction)add_toPortfolio:(id)sender {
     

RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.xib

@@ -119,7 +119,7 @@
                         </connections>
                     </button>
                     <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="CCe-eu-ria">
-                        <rect key="frame" x="624" y="383" width="92" height="29"/>
+                        <rect key="frame" x="624" y="382" width="92" height="29"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     </stepper>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7U2-88-bEi">
@@ -244,8 +244,8 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TGZ-pl-Y5r">
-                        <rect key="frame" x="448" y="169" width="272" height="207"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <rect key="frame" x="448" y="168" width="272" height="207"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
@@ -269,6 +269,7 @@
                 <outlet property="incoming_stock_label" destination="5VL-X9-WjJ" id="z3f-wQ-AxH"/>
                 <outlet property="incomingcount_Label" destination="2CX-bB-G2v" id="4Lc-Mt-VF0"/>
                 <outlet property="informationLabel" destination="TGZ-pl-Y5r" id="tah-hW-QTO"/>
+                <outlet property="informationLabel_arch" destination="NSs-s3-H8z" id="6iS-8z-Iog"/>
                 <outlet property="introduceBtn" destination="mss-jN-aaG" id="09e-ts-8Ii"/>
                 <outlet property="model_label" destination="sIm-Dr-Yf1" id="CmT-fv-Sh5"/>
                 <outlet property="on_sale_lb" destination="mvn-Q4-VfR" id="daB-z8-yQP"/>