瀏覽代碼

1.修改Homer增加RA前缀。

Pen Li 8 年之前
父節點
當前提交
97dd2fa229

二進制
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 12 - 12
RedAnt ERP Mobile/iSales-HOMER.xcodeproj/project.pbxproj

@@ -63,7 +63,7 @@
 		712AFEDA1DBA050200254965 /* ImageDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFECC1DBA050200254965 /* ImageDrawable.m */; };
 		712AFEDB1DBA050200254965 /* LineDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFECE1DBA050200254965 /* LineDrawable.m */; };
 		712AFEDC1DBA050200254965 /* PDFDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED01DBA050200254965 /* PDFDrawable.m */; };
-		712AFEDD1DBA050200254965 /* PDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED21DBA050200254965 /* PDFPage.m */; };
+		712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED21DBA050200254965 /* RAPDFPage.m */; };
 		712AFEDE1DBA050200254965 /* TableDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED41DBA050200254965 /* TableDrawable.m */; };
 		712AFEDF1DBA050200254965 /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED61DBA050200254965 /* TextDrawable.m */; };
 		712AFEE21DBA077F00254965 /* pdfCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFEE11DBA077F00254965 /* pdfCreator.m */; };
@@ -103,7 +103,7 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* PDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* PDFViewController.m */; };
+		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
 		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
@@ -378,8 +378,8 @@
 		712AFECE1DBA050200254965 /* LineDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LineDrawable.m; path = common/pdfCreator/LineDrawable.m; sourceTree = SOURCE_ROOT; };
 		712AFECF1DBA050200254965 /* PDFDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFDrawable.h; path = common/pdfCreator/PDFDrawable.h; sourceTree = SOURCE_ROOT; };
 		712AFED01DBA050200254965 /* PDFDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFDrawable.m; path = common/pdfCreator/PDFDrawable.m; sourceTree = SOURCE_ROOT; };
-		712AFED11DBA050200254965 /* PDFPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPage.h; path = common/pdfCreator/PDFPage.h; sourceTree = SOURCE_ROOT; };
-		712AFED21DBA050200254965 /* PDFPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFPage.m; path = common/pdfCreator/PDFPage.m; sourceTree = SOURCE_ROOT; };
+		712AFED11DBA050200254965 /* RAPDFPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFPage.h; path = common/pdfCreator/RAPDFPage.h; sourceTree = SOURCE_ROOT; };
+		712AFED21DBA050200254965 /* RAPDFPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFPage.m; path = common/pdfCreator/RAPDFPage.m; sourceTree = SOURCE_ROOT; };
 		712AFED31DBA050200254965 /* TableDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableDrawable.h; path = common/pdfCreator/TableDrawable.h; sourceTree = SOURCE_ROOT; };
 		712AFED41DBA050200254965 /* TableDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableDrawable.m; path = common/pdfCreator/TableDrawable.m; sourceTree = SOURCE_ROOT; };
 		712AFED51DBA050200254965 /* TextDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDrawable.h; path = common/pdfCreator/TextDrawable.h; sourceTree = SOURCE_ROOT; };
@@ -450,8 +450,8 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFViewController.h; path = "common/Functions/PDF+Web/PDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* PDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFViewController.m; path = "common/Functions/PDF+Web/PDFViewController.m"; sourceTree = SOURCE_ROOT; };
+		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
+		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
 		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
@@ -1115,8 +1115,8 @@
 				712AFECE1DBA050200254965 /* LineDrawable.m */,
 				712AFECF1DBA050200254965 /* PDFDrawable.h */,
 				712AFED01DBA050200254965 /* PDFDrawable.m */,
-				712AFED11DBA050200254965 /* PDFPage.h */,
-				712AFED21DBA050200254965 /* PDFPage.m */,
+				712AFED11DBA050200254965 /* RAPDFPage.h */,
+				712AFED21DBA050200254965 /* RAPDFPage.m */,
 				712AFED31DBA050200254965 /* TableDrawable.h */,
 				712AFED41DBA050200254965 /* TableDrawable.m */,
 				712AFED51DBA050200254965 /* TextDrawable.h */,
@@ -1580,8 +1580,8 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* PDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* PDFViewController.m */,
+				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
+				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
 				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
 				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
 			);
@@ -2118,7 +2118,7 @@
 				7162A54A1C58719D00AB630E /* RATreeView+UIScrollView.m in Sources */,
 				7162A55D1C58724700AB630E /* ContactListViewController.m in Sources */,
 				7162A5751C58728D00AB630E /* LineView.m in Sources */,
-				712AFEDD1DBA050200254965 /* PDFPage.m in Sources */,
+				712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */,
 				428980481E249339005F1BD8 /* JKMessageBoxController.m in Sources */,
 				7162A5741C58728D00AB630E /* DetailViewController.m in Sources */,
 				71DF748E1C57608F00F2789C /* UILabel+FontAppearance.m in Sources */,
@@ -2165,7 +2165,7 @@
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* PDFViewController.m in Sources */,
+				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,

+ 2 - 2
RedAnt ERP Mobile/iSales-HOMER/AppDelegate.m

@@ -9,7 +9,7 @@
 #import "AppDelegate.h"
 #import "UILabel+FontAppearance.h"
 #import "MainViewController.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "ZipArchive.h"
 #import "DefaultAppearance.h"
 #import "OLDataProvider.h"
@@ -2936,7 +2936,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 
 -(void) printPdf:(NSString*) url company:(NSString*)company send_to:(NSString*)send_to soid:(NSString*)soid content:(NSString*)content
 {
-    PDFViewController *ViewController = [self.main_vc.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.main_vc.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = url;
     ViewController.canSave = false;