Преглед изворни кода

1.修改NPD Place Order提交按钮。

Pen Li пре 8 година
родитељ
комит
553bc780bc

+ 3 - 3
RedAnt ERP Mobile/common/Functions/order/RAOrderPreviewController.m

@@ -298,8 +298,9 @@
                                               action:@selector(onSaveClick:)];
     
     
+    UIImage *submit_img = [[UIImage imageNamed:@"submit_red"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     self.btnSubmitOrder = nil;
-    self.btnSubmitOrder =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+    self.btnSubmitOrder =[[UIBarButtonItem alloc] initWithImage:submit_img
                                                           style:UIBarButtonItemStylePlain
                                                          target:self
                                                          action:@selector(onCommitOrderClick:)];
@@ -355,8 +356,7 @@
     if(appDelegate.can_submit_order)
     {
         
-        
-        [self.btnSubmitOrder setImage:[UIImage imageNamed:@"commit"]];
+        [self.btnSubmitOrder setImage:submit_img];
         self.btnSubmitOrder.enabled = true;
     }
     else

+ 6 - 0
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		423A4ADC1D503A53005ECE4A /* createContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 423A4ADB1D503A53005ECE4A /* createContact.json */; };
 		423B49EF1DAC8071004181C2 /* CUL.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423B49EE1DAC8071004181C2 /* CUL.storyboard */; };
+		424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */; };
 		4254CCDE1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4254CCDD1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m */; };
 		428980041E2490C1005F1BD8 /* NotificationNameCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980031E2490C1005F1BD8 /* NotificationNameCenter.m */; };
 		4289800A1E24918F005F1BD8 /* CartUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980091E24918F005F1BD8 /* CartUtils.m */; };
@@ -292,6 +293,8 @@
 /* Begin PBXFileReference section */
 		423A4ADB1D503A53005ECE4A /* createContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = createContact.json; sourceTree = "<group>"; };
 		423B49EE1DAC8071004181C2 /* CUL.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CUL.storyboard; sourceTree = "<group>"; };
+		424A02CF1FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RABackOrderSubmitAlertController.h; path = common/Functions/order/RABackOrderSubmitAlertController.h; sourceTree = SOURCE_ROOT; };
+		424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RABackOrderSubmitAlertController.m; path = common/Functions/order/RABackOrderSubmitAlertController.m; sourceTree = SOURCE_ROOT; };
 		4254CCDC1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAOrderEditorViewController.h; path = common/Functions/order/RAOrderEditorViewController.h; sourceTree = SOURCE_ROOT; };
 		4254CCDD1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAOrderEditorViewController.m; path = common/Functions/order/RAOrderEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		428980021E2490C1005F1BD8 /* NotificationNameCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotificationNameCenter.h; path = common/NotificationNameCenter.h; sourceTree = SOURCE_ROOT; };
@@ -1148,6 +1151,8 @@
 			children = (
 				42FD1A011FBD1A3000C5D9A8 /* RAOrderPreviewController.h */,
 				42FD1A021FBD1A3000C5D9A8 /* RAOrderPreviewController.m */,
+				424A02CF1FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.h */,
+				424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */,
 			);
 			name = "Order Preview";
 			sourceTree = "<group>";
@@ -2057,6 +2062,7 @@
 				712AFEDC1DBA050200254965 /* PDFDrawable.m in Sources */,
 				7195623C1CF57D1800C74A49 /* CategoryHeaderView.m in Sources */,
 				712AFED81DBA050200254965 /* GridDrawable.m in Sources */,
+				424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */,
 				7162A5C11C5873BB00AB630E /* FilterCellCadedate.m in Sources */,
 				71DF748A1C57608F00F2789C /* RTLabel.m in Sources */,
 				42BEF3581E89FE1200632AB6 /* GTMNSData+zlib.m in Sources */,

+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/submit_red.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "submit_red.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "submit_red@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "submit_red@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/submit_red.imageset/submit_red.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/submit_red.imageset/submit_red@2x.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/submit_red.imageset/submit_red@3x.png