Эх сурвалжийг харах

优化Homer App Model Detail 的显示,并修复如果Availability字符串超长会造成重叠的问题。

Ray Zhang 8 жил өмнө
parent
commit
033d7c626f

+ 9 - 9
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 = "537088573.1261981"
+            timestampString = "537156245.723384"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "381"
-            endingLineNumber = "381"
+            startingLineNumber = "383"
+            endingLineNumber = "383"
             landmarkName = "-addtocart"
             landmarkType = "7">
          </BreakpointContent>
@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537088573.126267"
+            timestampString = "537156245.723902"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "114"
@@ -74,7 +74,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537088573.126385"
+            timestampString = "537156245.724292"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "96"
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "537088573.126436"
+            timestampString = "537156245.724619"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
-            endingLineNumber = "149"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
             landmarkName = "-generate_information"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,7 +138,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategorySearchFilterViewController.m"
-            timestampString = "537088573.126536"
+            timestampString = "537156245.724986"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"

+ 5 - 3
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;
@@ -146,8 +146,10 @@
 //    [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);
-//
+    
+    float new_height=newsize.height<self.inforframe.height?newsize.height:self.inforframe.height;
+//    self.informationLabel.frame = CGRectMake(self.informationLabel_arch.frame.origin.x, CGRectGetMaxY(self.informationLabel.frame)-newsize.height, newsize.width, newsize.height);
+self.informationLabel.frame = CGRectMake(self.informationLabel.frame.origin.x, self.informationLabel.frame.origin.y, self.inforframe.width, new_height);
     
 }
 - (IBAction)add_toPortfolio:(id)sender {