Browse Source

recommend -> Recommend
修复横竖屏切换时Wish List的QTY位置错误。

Pen Li 9 years ago
parent
commit
6d16cd01c7

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -303,7 +303,7 @@
                         //block代码块取代了delegate
                         //block代码块取代了delegate
                         
                         
                         
                         
-                        UIAlertAction *actionTwo = [UIAlertAction actionWithTitle:@"Yes(recommend)" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                        UIAlertAction *actionTwo = [UIAlertAction actionWithTitle:@"Yes(Recommend)" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
                             
                             
                             
                             
                             
                             

+ 15 - 5
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -29,6 +29,7 @@
 @property (nonatomic,strong) SortItemViewController *sortItemController;
 @property (nonatomic,strong) SortItemViewController *sortItemController;
 @property (nonatomic,assign) int sortIndex;
 @property (nonatomic,assign) int sortIndex;
 @property (nonatomic,strong) SortButton *sortButton;
 @property (nonatomic,strong) SortButton *sortButton;
+@property (nonatomic,strong) UILabel *qtyLabel;
 
 
 @end
 @end
 
 
@@ -701,11 +702,8 @@
     [myView addSubview:titlelabel];
     [myView addSubview:titlelabel];
     
     
     
     
-    UILabel *qtyLabel = [[UILabel alloc] initWithFrame:CGRectMake(tableView.bounds.size.width - 200, 5.5, 40, 22)];
-    qtyLabel.text = @"QTY";
-    qtyLabel.textAlignment = NSTextAlignmentCenter;
-    qtyLabel.autoresizingMask=UIViewAutoresizingFlexibleWidth;
-    [myView addSubview:qtyLabel];
+   
+    [myView addSubview:self.qtyLabel];
     
     
     return myView;
     return myView;
 }
 }
@@ -1194,6 +1192,16 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     
     
 }
 }
 
 
+- (UILabel *)qtyLabel {
+    if (!_qtyLabel) {
+        _qtyLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.itemListTable.bounds.size.width - 200, 5.5, 40, 22)];
+        _qtyLabel.text = @"QTY";
+        _qtyLabel.textAlignment = NSTextAlignmentCenter;
+        _qtyLabel.autoresizingMask=UIViewAutoresizingFlexibleWidth;
+    }
+    return _qtyLabel;
+}
+
 #pragma mark - rotation
 #pragma mark - rotation
 
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
@@ -1207,6 +1215,8 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     self.sortItemController.view.frame = self.view.bounds;
     self.sortItemController.view.frame = self.view.bounds;
+    self.qtyLabel.frame = CGRectMake(self.itemListTable.bounds.size.width - 200, 5.5, 40, 22);
+
 }
 }
 
 
 @end
 @end

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

@@ -507,7 +507,7 @@
                                                 </imageView>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QTY:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lbZ-RY-0aG">
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QTY:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lbZ-RY-0aG">
                                                     <rect key="frame" x="571" y="50" width="160" height="21"/>
                                                     <rect key="frame" x="571" y="50" width="160" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                     <nil key="highlightedColor"/>

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 #define BUILD_NPD
 
 
-//#define test_server
+#define test_server
 
 
 //#define ENCRYPT_OFF
 //#define ENCRYPT_OFF